X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=1f21b024fb4f79000d2bee510833a17950a54dcf;hb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace;hp=b2ead1a66848600e1ae11425fe874d708b73f39a;hpb=da50281d69f15d125b56971a3009fd31cbbab58b;p=pulseview.git diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index b2ead1a6..1f21b024 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -44,12 +44,12 @@ extern "C" { #include "decodetrace.hpp" #include +#include #include #include #include #include #include -#include #include #include #include @@ -128,10 +128,11 @@ 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), row_height_(0), max_visible_rows_(0), @@ -140,7 +141,12 @@ DecodeTrace::DecodeTrace(pv::Session &session, { assert(decoder_stack_); - set_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())); @@ -164,7 +170,10 @@ pair DecodeTrace::v_extents() const { const int row_height = (ViewItemPaintParams::text_height() * 6) / 4; - return make_pair(-row_height, row_height * max_visible_rows_); + // 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) @@ -190,6 +199,9 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &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( @@ -199,9 +211,7 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) const vector rows(decoder_stack_->get_visible_rows()); visible_rows_.clear(); - for (auto i : rows) { - const Row &row = i; - + for (const Row& row : rows) { // Cache the row title widths int row_title_width; try { @@ -229,13 +239,16 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) y += row_height_; - visible_rows_.push_back(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()); } @@ -374,7 +387,7 @@ void DecodeTrace::draw_annotations(vector annotati bool a_is_separate = false; // Annotation wider than the threshold for a useful label width? - if (a_width > 20) { + 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 @@ -590,7 +603,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(); @@ -599,8 +612,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()) @@ -793,8 +806,8 @@ void DecodeTrace::create_decoder_form(int index, 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); @@ -808,8 +821,8 @@ void DecodeTrace::create_decoder_form(int index, 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); @@ -832,14 +845,15 @@ QComboBox* DecodeTrace::create_channel_selector( { assert(dec); - const auto sigs(session_.signals()); + const auto sigs(session_.signalbases()); - vector< shared_ptr > sig_list(sigs.begin(), sigs.end()); + 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; }); + [](const shared_ptr &a, + const shared_ptr &b) { + return strnatcasecmp(a->name().toStdString(), + b->name().toStdString()) < 0; }); - assert(decoder_stack_); const auto channel_iter = dec->channels().find(pdch); QComboBox *selector = new QComboBox(parent); @@ -849,14 +863,14 @@ QComboBox* DecodeTrace::create_channel_selector( if (channel_iter == dec->channels().end()) selector->setCurrentIndex(0); - for (const shared_ptr &s : sig_list) { - assert(s); - if (dynamic_pointer_cast(s) && s->enabled()) { - selector->addItem(s->name(), - qVariantFromValue((void*)s.get())); + for (const shared_ptr &b : sig_list) { + assert(b); + if (b->type() == sigrok::ChannelType::LOGIC && b->enabled()) { + selector->addItem(b->name(), + qVariantFromValue((void*)b.get())); if (channel_iter != dec->channels().end() && - (*channel_iter).second == s) + (*channel_iter).second == b) selector->setCurrentIndex( selector->count() - 1); } @@ -869,22 +883,22 @@ void DecodeTrace::commit_decoder_channels(shared_ptr &dec { assert(dec); - map > channel_map; + map > channel_map; - const unordered_set< shared_ptr > sigs(session_.signals()); + const unordered_set< shared_ptr > + sigs(session_.signalbases()); 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) + for (shared_ptr sig : sigs) if (sig.get() == selection) { - channel_map[s.pdch_] = - dynamic_pointer_cast(sig); + channel_map[s.pdch_] = sig; break; } }