X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=2e16ff96ce76f54995742c92a8a0ddcb86fe7f63;hp=36e7a10458a0c9467740f5edf770177199268e2f;hb=3370799041d0ee09bf1c7c4f006933778579c037;hpb=f32905530347e1020d5ce7959123cf797c9a4829 diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 36e7a104..2e16ff96 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -29,6 +29,8 @@ extern "C" { #include #include +#include +#include #include #include @@ -136,7 +138,7 @@ DecodeTrace::DecodeTrace(pv::Session &session, { assert(decoder_stack_); - colour_ = DecodeColours[index % countof(DecodeColours)]; + set_colour(DecodeColours[index % countof(DecodeColours)]); connect(decoder_stack_.get(), SIGNAL(new_decode_data()), this, SLOT(on_new_decode_data())); @@ -158,10 +160,10 @@ const std::shared_ptr& DecodeTrace::decoder() const pair DecodeTrace::v_extents() const { - /// @todo Replace this with an implementation that knows the true - /// height of the trace const int row_height = (ViewItemPaintParams::text_height() * 6) / 4; - return make_pair(-row_height / 2, row_height * 7 / 2); + const int rows = visible_rows_.size(); + + return make_pair(-row_height, row_height * rows); } void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp) @@ -180,8 +182,7 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) assert(decoder_stack_); const QString err = decoder_stack_->error_message(); - if (!err.isEmpty()) - { + if (!err.isEmpty()) { draw_unresolved_period( p, annotation_height, pp.left(), pp.right()); draw_error(p, err, pp); @@ -197,8 +198,7 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) const vector rows(decoder_stack_->get_visible_rows()); visible_rows_.clear(); - for (size_t i = 0; i < rows.size(); i++) - { + for (size_t i = 0; i < rows.size(); i++) { const Row &row = rows[i]; size_t base_colour = 0x13579BDF; @@ -211,9 +211,9 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) decoder_stack_->get_annotation_subset(annotations, row, sample_range.first, sample_range.second); if (!annotations.empty()) { - for (const Annotation &a : annotations) - draw_annotation(a, p, annotation_height, - pp, y, base_colour); + draw_annotations(annotations, p, annotation_height, pp, y, + base_colour); + y += row_height_; visible_rows_.push_back(rows[i]); @@ -230,15 +230,13 @@ void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp) assert(row_height_); - for (size_t i = 0; i < visible_rows_.size(); i++) - { + for (size_t i = 0; i < visible_rows_.size(); i++) { const int y = i * row_height_ + get_visual_y(); p.setPen(QPen(Qt::NoPen)); p.setBrush(QApplication::palette().brush(QPalette::WindowText)); - if (i != 0) - { + if (i != 0) { const QPointF points[] = { QPointF(pp.left(), y - ArrowSize), QPointF(pp.left() + ArrowSize, y), @@ -284,15 +282,12 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form) const list< shared_ptr >& stack = decoder_stack_->stack(); - if (stack.empty()) - { + if (stack.empty()) { QLabel *const l = new QLabel( tr("

No decoders in the stack

")); l->setAlignment(Qt::AlignCenter); form->addRow(l); - } - else - { + } else { auto iter = stack.cbegin(); for (int i = 0; i < (int)stack.size(); i++, iter++) { shared_ptr dec(*iter); @@ -332,6 +327,48 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent) return menu; } +void DecodeTrace::draw_annotations(vector annotations, + QPainter &p, int h, const ViewItemPaintParams &pp, int y, + size_t base_colour) +{ + using namespace pv::data::decode; + + vector a_block; + int prev_ann_pos = INT_MIN; + + double samples_per_pixel, pixels_offset; + tie(pixels_offset, samples_per_pixel) = + get_pixels_offset_samples_per_pixel(); + + // Gather all annotations that form a visual "block" and draw them as such + for (const Annotation &a : annotations) { + + const int end = a.end_sample() / samples_per_pixel - pixels_offset; + const int delta = end - prev_ann_pos; + + // Some annotations are in reverse order, so we cannot + // simply check for delta > 1 + if (abs(delta) > 1) { + // Block was broken, draw it + if (a_block.size() == 1) + draw_annotation(a_block.front(), p, h, pp, y, base_colour); + else + if (a_block.size() > 0) + draw_annotation_block(a_block, p, h, y, base_colour); + + a_block.clear(); + } + + a_block.push_back(a); + prev_ann_pos = end; + } + + if (a_block.size() == 1) + draw_annotation(a_block.front(), p, h, pp, y, base_colour); + else + draw_annotation_block(a_block, p, h, y, base_colour); +} + void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, QPainter &p, int h, const ViewItemPaintParams &pp, int y, size_t base_colour) const @@ -358,6 +395,55 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, draw_range(a, p, fill, outline, h, start, end, y); } +void DecodeTrace::draw_annotation_block( + vector annotations, QPainter &p, int h, + int y, size_t base_colour) const +{ + using namespace pv::data::decode; + + double samples_per_pixel, pixels_offset; + tie(pixels_offset, samples_per_pixel) = + get_pixels_offset_samples_per_pixel(); + + const double start = annotations.front().start_sample() / + samples_per_pixel - pixels_offset; + const double end = annotations.back().end_sample() / + samples_per_pixel - pixels_offset; + + const double top = y + .5 - h / 2; + const double bottom = y + .5 + h / 2; + const double cap_width = min((end - start) / 4, EndCapWidth); + + QPointF pts[] = { + QPointF(start, y + .5f), + QPointF(start + cap_width, top), + QPointF(end - cap_width, top), + QPointF(end, y + .5f), + QPointF(end - cap_width, bottom), + QPointF(start + cap_width, bottom) + }; + + const size_t colour = (base_colour + annotations.front().format()) % + countof(Colours); + + // Check if all annotations are of the same type (i.e. we can use one color) + // or if we should use a neutral color (i.e. gray) + bool single_format = true; + int format = annotations.front().format(); + + for (const Annotation &a : annotations) + if (a.format() != format) { + single_format = false; + break; + } + + p.setPen((single_format ? OutlineColours[colour] : Qt::gray)); + p.setBrush(QBrush((single_format ? Colours[colour] : Qt::gray), + Qt::Dense4Pattern)); + + p.drawConvexPolygon(pts, countof(pts)); +} + void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p, QColor fill, QColor outline, int h, double x, int y) const { @@ -387,8 +473,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, p.setBrush(fill); // If the two ends are within 1 pixel, draw a vertical line - if (start + 1.0 > end) - { + if (start + 1.0 > end) { p.drawLine(QPointF(start, top), QPointF(start, bottom)); return; } @@ -525,7 +610,7 @@ pair DecodeTrace::get_pixels_offset_samples_per_pixel() const assert(scale > 0); const double pixels_offset = - (view->offset() - decoder_stack_->start_time()) / scale; + ((view->offset() - decoder_stack_->start_time()) / scale).convert_to(); double samplerate = decoder_stack_->samplerate(); @@ -642,13 +727,17 @@ void DecodeTrace::create_decoder_form(int index, const srd_decoder *const decoder = dec->decoder(); assert(decoder); + const bool decoder_deletable = index > 0; + pv::widgets::DecoderGroupBox *const group = new pv::widgets::DecoderGroupBox( - QString::fromUtf8(decoder->name)); + QString::fromUtf8(decoder->name), nullptr, decoder_deletable); group->set_decoder_visible(dec->shown()); - delete_mapper_.setMapping(group, index); - connect(group, SIGNAL(delete_decoder()), &delete_mapper_, SLOT(map())); + if (decoder_deletable) { + delete_mapper_.setMapping(group, index); + connect(group, SIGNAL(delete_decoder()), &delete_mapper_, SLOT(map())); + } show_hide_mapper_.setMapping(group, index); connect(group, SIGNAL(show_hide_decoder()), @@ -704,8 +793,7 @@ QComboBox* DecodeTrace::create_channel_selector( { assert(dec); - shared_lock lock(session_.signals_mutex()); - const auto &sigs(session_.signals()); + const auto sigs(session_.signals()); vector< shared_ptr > sig_list(sigs.begin(), sigs.end()); std::sort(sig_list.begin(), sig_list.end(), @@ -724,11 +812,12 @@ QComboBox* DecodeTrace::create_channel_selector( for (const shared_ptr &s : sig_list) { assert(s); - if (dynamic_pointer_cast(s) && s->enabled()) - { + if (dynamic_pointer_cast(s) && s->enabled()) { selector->addItem(s->name(), qVariantFromValue((void*)s.get())); - if ((*channel_iter).second == s) + + if (channel_iter != dec->channels().end() && + (*channel_iter).second == s) selector->setCurrentIndex( selector->count() - 1); } @@ -743,11 +832,9 @@ void DecodeTrace::commit_decoder_channels(shared_ptr &dec map > channel_map; - shared_lock lock(session_.signals_mutex()); - const unordered_set< shared_ptr > &sigs(session_.signals()); + const unordered_set< shared_ptr > sigs(session_.signals()); - for (const ChannelSelector &s : channel_selectors_) - { + for (const ChannelSelector &s : channel_selectors_) { if (s.decoder_ != dec) break;