X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=b4201dd9c022005ce50d673c9ebc6747ee6c6d0a;hp=745cf29b297f8835128740afd2cd6c9643d0bc07;hb=04394ded8776d2163c1e815ccc8170b81d76b028;hpb=6e2c3c855dff36f6e946e2a54d576bea699f4a61 diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 745cf29b..b4201dd9 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -29,6 +29,8 @@ extern "C" { #include #include +#include +#include #include #include @@ -42,12 +44,13 @@ extern "C" { #include "decodetrace.hpp" #include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -66,6 +69,7 @@ using std::min; using std::pair; using std::shared_ptr; using std::tie; +using std::unordered_set; using std::vector; namespace pv { @@ -83,6 +87,7 @@ const QColor DecodeTrace::NoDecodeColour = QColor(0x88, 0x8A, 0x85); const int DecodeTrace::ArrowSize = 4; const double DecodeTrace::EndCapWidth = 5; +const int DecodeTrace::RowTitleMargin = 10; const int DecodeTrace::DrawPadding = 100; const QColor DecodeTrace::Colours[16] = { @@ -124,19 +129,25 @@ const QColor DecodeTrace::OutlineColours[16] = { }; DecodeTrace::DecodeTrace(pv::Session &session, + shared_ptr signalbase, std::shared_ptr decoder_stack, int index) : - Trace(QString::fromUtf8( - decoder_stack->stack().front()->decoder()->name)), + Trace(signalbase), session_(session), + signalbase_(signalbase), decoder_stack_(decoder_stack), - text_height_(0), row_height_(0), + max_visible_rows_(0), delete_mapper_(this), show_hide_mapper_(this) { assert(decoder_stack_); - colour_ = DecodeColours[index % countof(DecodeColours)]; + // Determine shortest string we want to see displayed in full + QFontMetrics m(QApplication::font()); + min_useful_label_width_ = m.width("XX"); // e.g. two hex characters + + signalbase_->set_name(QString::fromUtf8(decoder_stack->stack().front()->decoder()->name)); + signalbase_->set_colour(DecodeColours[index % countof(DecodeColours)]); connect(decoder_stack_.get(), SIGNAL(new_decode_data()), this, SLOT(on_new_decode_data())); @@ -158,10 +169,12 @@ 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); + + // Make an empty decode trace appear symmetrical + const int row_count = max(1, max_visible_rows_); + + return make_pair(-row_height, row_height * row_count); } void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp) @@ -174,20 +187,22 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) { using namespace pv::data::decode; - text_height_ = ViewItemPaintParams::text_height(); - row_height_ = (text_height_ * 6) / 4; - const int annotation_height = (text_height_ * 5) / 4; + const int text_height = ViewItemPaintParams::text_height(); + row_height_ = (text_height * 6) / 4; + const int annotation_height = (text_height * 5) / 4; 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); return; } + // Set default pen to allow for text width calculation + p.setPen(Qt::black); + // Iterate through the rows int y = get_visual_y(); pair sample_range = get_sample_range( @@ -197,10 +212,19 @@ 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++) - { - const Row &row = rows[i]; + for (const Row& row : rows) { + // Cache the row title widths + int row_title_width; + try { + row_title_width = row_title_widths_.at(row); + } catch (std::out_of_range) { + const int w = p.boundingRect(QRectF(), 0, row.title()).width() + + RowTitleMargin; + row_title_widths_[row] = w; + row_title_width = w; + } + // Determine the row's color size_t base_colour = 0x13579BDF; boost::hash_combine(base_colour, this); boost::hash_combine(base_colour, row.decoder()); @@ -211,17 +235,23 @@ 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, row_title_width); + y += row_height_; - visible_rows_.push_back(rows[i]); + visible_rows_.push_back(row); } } // Draw the hatching draw_unresolved_period(p, annotation_height, pp.left(), pp.right()); + + if ((int)visible_rows_.size() > max_visible_rows_) + owner_->extents_changed(false, true); + + // Update the maximum row count if needed + max_visible_rows_ = std::max(max_visible_rows_, (int)visible_rows_.size()); } void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp) @@ -230,15 +260,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 +312,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,9 +357,83 @@ 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, int row_title_width) +{ + using namespace pv::data::decode; + + vector a_block; + int p_end = INT_MIN; + + double samples_per_pixel, pixels_offset; + tie(pixels_offset, samples_per_pixel) = + get_pixels_offset_samples_per_pixel(); + + // Sort the annotations by start sample so that decoders + // can't confuse us by creating annotations out of order + stable_sort(annotations.begin(), annotations.end(), + [](const Annotation &a, const Annotation &b) { + return a.start_sample() < b.start_sample(); }); + + // Gather all annotations that form a visual "block" and draw them as such + for (const Annotation &a : annotations) { + + const int a_start = a.start_sample() / samples_per_pixel - pixels_offset; + const int a_end = a.end_sample() / samples_per_pixel - pixels_offset; + const int a_width = a_end - a_start; + + const int delta = a_end - p_end; + + bool a_is_separate = false; + + // Annotation wider than the threshold for a useful label width? + if (a_width >= min_useful_label_width_) { + for (const QString &ann_text : a.annotations()) { + const int w = p.boundingRect(QRectF(), 0, ann_text).width(); + // Annotation wide enough to fit a label? Don't put it in a block then + if (w <= a_width) { + a_is_separate = true; + break; + } + } + } + + // Were the previous and this annotation more than a pixel apart? + if ((abs(delta) > 1) || a_is_separate) { + // Block was broken, draw annotations that form the current block + if (a_block.size() == 1) { + draw_annotation(a_block.front(), p, h, pp, y, base_colour, + row_title_width); + } + else + draw_annotation_block(a_block, p, h, y, base_colour); + + a_block.clear(); + } + + if (a_is_separate) { + draw_annotation(a, p, h, pp, y, base_colour, row_title_width); + // Next annotation must start a new block. delta will be > 1 + // because we set p_end to INT_MIN but that's okay since + // a_block will be empty, so nothing will be drawn + p_end = INT_MIN; + } else { + a_block.push_back(a); + p_end = a_end; + } + } + + if (a_block.size() == 1) + draw_annotation(a_block.front(), p, h, pp, y, base_colour, + row_title_width); + 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 + size_t base_colour, int row_title_width) const { double samples_per_pixel, pixels_offset; tie(pixels_offset, samples_per_pixel) = @@ -346,20 +445,59 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, pixels_offset; const size_t colour = (base_colour + a.format()) % countof(Colours); - const QColor &fill = Colours[colour]; - const QColor &outline = OutlineColours[colour]; + p.setPen(OutlineColours[colour]); + p.setBrush(Colours[colour]); if (start > pp.right() + DrawPadding || end < pp.left() - DrawPadding) return; if (a.start_sample() == a.end_sample()) - draw_instant(a, p, fill, outline, h, start, y); + draw_instant(a, p, h, start, y); else - draw_range(a, p, fill, outline, h, start, end, y); + draw_range(a, p, h, start, end, y, pp, + row_title_width); +} + +void DecodeTrace::draw_annotation_block( + vector annotations, QPainter &p, int h, + int y, size_t base_colour) const +{ + using namespace pv::data::decode; + + if (annotations.empty()) + return; + + 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 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) + const int format = annotations.front().format(); + const bool single_format = std::all_of( + annotations.begin(), annotations.end(), + [&](const Annotation &a) { return a.format() == format; }); + + p.setPen((single_format ? OutlineColours[colour] : Qt::gray)); + p.setBrush(QBrush((single_format ? Colours[colour] : Qt::gray), + Qt::Dense4Pattern)); + p.drawRoundedRect( + QRectF(start, top, end - start, bottom - top), h/4, h/4); } void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p, - QColor fill, QColor outline, int h, double x, int y) const + int h, double x, int y) const { const QString text = a.annotations().empty() ? QString() : a.annotations().back(); @@ -367,8 +505,6 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter & 0.0) + h; const QRectF rect(x - w / 2, y - h / 2, w, h); - p.setPen(outline); - p.setBrush(fill); p.drawRoundedRect(rect, h / 2, h / 2); p.setPen(Qt::black); @@ -376,19 +512,15 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter & } void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, - QColor fill, QColor outline, int h, double start, - double end, int y) const + int h, double start, double end, int y, const ViewItemPaintParams &pp, + int row_title_width) const { const double top = y + .5 - h / 2; const double bottom = y + .5 + h / 2; const vector annotations = a.annotations(); - p.setPen(outline); - 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; } @@ -409,8 +541,14 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, if (annotations.empty()) return; - QRectF rect(start + cap_width, y - h / 2, - end - start - cap_width * 2, h); + const int ann_start = start + cap_width; + const int ann_end = end - cap_width; + + const int real_start = std::max(ann_start, pp.left() + row_title_width); + const int real_end = std::min(ann_end, pp.right()); + const int real_width = real_end - real_start; + + QRectF rect(real_start, y - h / 2, real_width, h); if (rect.width() <= 4) return; @@ -466,7 +604,7 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, assert(decoder_stack_); shared_ptr data; - shared_ptr logic_signal; + shared_ptr signalbase; const list< shared_ptr > &stack = decoder_stack_->stack(); @@ -475,8 +613,8 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, // LogicSignals have the same data/segment for (const shared_ptr &dec : stack) if (dec && !dec->channels().empty() && - ((logic_signal = (*dec->channels().begin()).second)) && - ((data = logic_signal->logic_data()))) + ((signalbase = (*dec->channels().begin()).second)) && + ((data = signalbase->logic_data()))) break; if (!data || data->logic_segments().empty()) @@ -525,7 +663,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 +780,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()), @@ -658,38 +800,38 @@ 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); connect(combo, SIGNAL(currentIndexChanged(int)), this, SLOT(on_channel_selected(int))); decoder_form->addRow(tr("%1 (%2) *") - .arg(QString::fromUtf8(pdch->name)) - .arg(QString::fromUtf8(pdch->desc)), combo); + .arg(QString::fromUtf8(pdch->name), + QString::fromUtf8(pdch->desc)), combo); const ChannelSelector s = {combo, dec, pdch}; channel_selectors_.push_back(s); } // 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); connect(combo, SIGNAL(currentIndexChanged(int)), this, SLOT(on_channel_selected(int))); decoder_form->addRow(tr("%1 (%2)") - .arg(QString::fromUtf8(pdch->name)) - .arg(QString::fromUtf8(pdch->desc)), combo); + .arg(QString::fromUtf8(pdch->name), + QString::fromUtf8(pdch->desc)), combo); const ChannelSelector s = {combo, dec, pdch}; channel_selectors_.push_back(s); } // Add the options - shared_ptr binding( - new prop::binding::DecoderOptions(decoder_stack_, dec)); + shared_ptr binding( + new binding::Decoder(decoder_stack_, dec)); binding->add_properties_to_form(decoder_form, true); bindings_.push_back(binding); @@ -704,29 +846,34 @@ 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 strnatcasecmp(a->base()->name().toStdString(), + b->base()->name().toStdString()) < 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()) - { - selector->addItem(s->name(), - qVariantFromValue((void*)s.get())); - if ((*channel_iter).second == s) - selector->setCurrentIndex(i + 1); + if (s->base()->type() == sigrok::ChannelType::LOGIC && s->enabled()) { + selector->addItem(s->base()->name(), + qVariantFromValue((void*)s->base().get())); + + if (channel_iter != dec->channels().end() && + (*channel_iter).second == s->base()) + selector->setCurrentIndex( + selector->count() - 1); } } @@ -737,24 +884,21 @@ void DecodeTrace::commit_decoder_channels(shared_ptr &dec { assert(dec); - map > channel_map; + 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 = - (LogicSignal*)s.combo_->itemData( + const data::SignalBase *const selection = + (data::SignalBase*)s.combo_->itemData( s.combo_->currentIndex()).value(); for (shared_ptr sig : sigs) - if(sig.get() == selection) { - channel_map[s.pdch_] = - dynamic_pointer_cast(sig); + if (sig->base().get() == selection) { + channel_map[s.pdch_] = sig->base(); break; } } @@ -821,7 +965,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;