X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=31ea9d73647f42ba7436753a305f267a235337d3;hp=f423b21ef9a009caa04202109882666e2b6d0fb4;hb=35365c66bf6166c5607f1180016528d996a45b66;hpb=3cc9ad7b867853315473df611612c562d562ed8a diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index f423b21e..31ea9d73 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -29,6 +29,8 @@ extern "C" { #include #include +#include +#include #include #include @@ -66,6 +68,7 @@ using std::min; using std::pair; using std::shared_ptr; using std::tie; +using std::unordered_set; using std::vector; namespace pv { @@ -135,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())); @@ -179,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); @@ -196,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; @@ -210,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]); @@ -229,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), @@ -283,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); @@ -331,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, pp, 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, pp, 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 @@ -357,6 +395,33 @@ 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 a, + QPainter &p, int h, const ViewItemPaintParams &pp, int y, + size_t base_colour) const +{ + double samples_per_pixel, pixels_offset; + tie(pixels_offset, samples_per_pixel) = + get_pixels_offset_samples_per_pixel(); + + const size_t colour = + (base_colour + a.front().format()) % countof(Colours); + + const int start = a.front().start_sample() / samples_per_pixel - + pixels_offset; + const int end = a.back().end_sample() / samples_per_pixel - + pixels_offset; + + const QRectF rect( + std::max(pp.left(), start), + y - h/2 + 0.5, + std::min(pp.right(), end) - std::max(pp.left(), start) + 1, + h); + + p.setPen(OutlineColours[colour]); + p.setBrush(Colours[colour]); + p.drawRect(rect); +} + void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p, QColor fill, QColor outline, int h, double x, int y) const { @@ -386,8 +451,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; } @@ -524,7 +588,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(); @@ -641,13 +705,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()), @@ -657,7 +725,7 @@ void DecodeTrace::create_decoder_form(int index, group->add_layout(decoder_form); // Add the mandatory channels - for(l = decoder->channels; l; l = l->next) { + for (l = decoder->channels; l; l = l->next) { const struct srd_channel *const pdch = (struct srd_channel *)l->data; QComboBox *const combo = create_channel_selector(parent, dec, pdch); @@ -672,7 +740,7 @@ void DecodeTrace::create_decoder_form(int index, } // Add the optional channels - for(l = decoder->opt_channels; l; l = l->next) { + for (l = decoder->opt_channels; l; l = l->next) { const struct srd_channel *const pdch = (struct srd_channel *)l->data; QComboBox *const combo = create_channel_selector(parent, dec, pdch); @@ -703,29 +771,33 @@ QComboBox* DecodeTrace::create_channel_selector( { assert(dec); - shared_lock lock(session_.signals_mutex()); - const vector< shared_ptr > &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(), + [](const shared_ptr &a, const shared_ptr b) { + return a->name().compare(b->name()) < 0; }); assert(decoder_stack_); const auto channel_iter = dec->channels().find(pdch); QComboBox *selector = new QComboBox(parent); - selector->addItem("-", qVariantFromValue((void*)NULL)); + selector->addItem("-", qVariantFromValue((void*)nullptr)); if (channel_iter == dec->channels().end()) selector->setCurrentIndex(0); - for(size_t i = 0; i < sigs.size(); i++) { - const shared_ptr s(sigs[i]); + 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) - selector->setCurrentIndex(i + 1); + + if (channel_iter != dec->channels().end() && + (*channel_iter).second == s) + selector->setCurrentIndex( + selector->count() - 1); } } @@ -738,12 +810,10 @@ void DecodeTrace::commit_decoder_channels(shared_ptr &dec map > channel_map; - shared_lock lock(session_.signals_mutex()); - const vector< shared_ptr > &sigs(session_.signals()); + const unordered_set< shared_ptr > sigs(session_.signals()); - for (const ChannelSelector &s : channel_selectors_) - { - if(s.decoder_ != dec) + for (const ChannelSelector &s : channel_selectors_) { + if (s.decoder_ != dec) break; const LogicSignal *const selection = @@ -751,7 +821,7 @@ void DecodeTrace::commit_decoder_channels(shared_ptr &dec s.combo_->currentIndex()).value(); for (shared_ptr sig : sigs) - if(sig.get() == selection) { + if (sig.get() == selection) { channel_map[s.pdch_] = dynamic_pointer_cast(sig); break; @@ -820,7 +890,7 @@ void DecodeTrace::on_show_hide_decoder(int index) // Find the decoder in the stack auto iter = stack.cbegin(); - for(int i = 0; i < index; i++, iter++) + for (int i = 0; i < index; i++, iter++) assert(iter != stack.end()); shared_ptr dec = *iter;