X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=164c7e5a6075fc719a9cc3e9c117e309ecf37ff8;hp=6947491a285ead6b3317e166e4ca645354d627c6;hb=067bb62415847791709f4c3cad8bb252a63f45f8;hpb=8b9df0ad2eca9048757cda9207bf1f0e5ad5b978 diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 6947491a..164c7e5a 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ extern "C" { @@ -29,6 +28,8 @@ extern "C" { #include #include +#include +#include #include #include @@ -41,13 +42,13 @@ extern "C" { #include "decodetrace.hpp" -#include +#include +#include #include #include #include -#include +#include #include -#include #include #include #include @@ -65,11 +66,14 @@ using std::map; using std::min; using std::pair; using std::shared_ptr; +using std::make_shared; using std::tie; +using std::unordered_set; using std::vector; namespace pv { -namespace view { +namespace views { +namespace TraceView { const QColor DecodeTrace::DecodeColours[4] = { QColor(0xEF, 0x29, 0x29), // Red @@ -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] = { @@ -123,22 +128,26 @@ const QColor DecodeTrace::OutlineColours[16] = { QColor(0x6B, 0x23, 0x37) }; -DecodeTrace::DecodeTrace(pv::SigSession &session, - std::shared_ptr decoder_stack, int index) : - Trace(QString::fromUtf8( - decoder_stack->stack().front()->decoder()->name)), +DecodeTrace::DecodeTrace(pv::Session &session, + shared_ptr signalbase, int index) : + Trace(signalbase), session_(session), - decoder_stack_(decoder_stack), - text_height_(0), row_height_(0), + max_visible_rows_(0), delete_mapper_(this), show_hide_mapper_(this) { - assert(decoder_stack_); + std::shared_ptr decoder_stack = + base_->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 + + base_->set_name(QString::fromUtf8(decoder_stack->stack().front()->decoder()->name)); + base_->set_colour(DecodeColours[index % countof(DecodeColours)]); - connect(decoder_stack_.get(), SIGNAL(new_decode_data()), + connect(decoder_stack.get(), SIGNAL(new_decode_data()), this, SLOT(on_new_decode_data())); connect(&delete_mapper_, SIGNAL(mapped(int)), this, SLOT(on_delete_decoder(int))); @@ -151,57 +160,71 @@ bool DecodeTrace::enabled() const return true; } -const std::shared_ptr& DecodeTrace::decoder() const +std::shared_ptr DecodeTrace::base() const { - return decoder_stack_; + return base_; } pair DecodeTrace::v_extents() const { - /// @todo Replace this with an implementation that knows the true - /// height of the trace - QFontMetrics m(QApplication::font()); - const int text_height = m.boundingRect(QRect(), 0, "Tg").height(); - const int row_height = (text_height * 6) / 4; - return make_pair(-row_height / 2, row_height * 7 / 2); + const int row_height = (ViewItemPaintParams::text_height() * 6) / 4; + + // 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, int left, int right) +void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp) { - Trace::paint_back(p, left, right); - paint_axis(p, get_visual_y(), left, right); + Trace::paint_back(p, pp); + paint_axis(p, pp, get_visual_y()); } -void DecodeTrace::paint_mid(QPainter &p, int left, int right) +void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) { using namespace pv::data::decode; - QFontMetrics m(QApplication::font()); - text_height_ = m.boundingRect(QRect(), 0, "Tg").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()) - { - draw_unresolved_period(p, annotation_height, left, right); - draw_error(p, err, left, right); + std::shared_ptr decoder_stack = + base_->decoder_stack(); + + 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()) { + 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(left, right); + pair sample_range = get_sample_range( + pp.left(), pp.right()); - assert(decoder_stack_); - const vector rows(decoder_stack_->get_visible_rows()); + 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()); @@ -209,50 +232,51 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right) base_colour >>= 16; vector annotations; - decoder_stack_->get_annotation_subset(annotations, row, + 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, get_text_colour(), - annotation_height, left, right, 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, left, right); + 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, int left, int right) +void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp) { using namespace pv::data::decode; - (void)right; - 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(left, y - ArrowSize), - QPointF(left + ArrowSize, y), - QPointF(left, y + ArrowSize) + QPointF(pp.left(), y - ArrowSize), + QPointF(pp.left() + ArrowSize, y), + QPointF(pp.left(), y + ArrowSize) }; p.drawPolygon(points, countof(points)); } - const QRect r(left + ArrowSize * 2, y - row_height_ / 2, - right - left, row_height_); + const QRect r(pp.left() + ArrowSize * 2, y - row_height_ / 2, + pp.right() - pp.left(), row_height_); const QString h(visible_rows_[i].title()); const int f = Qt::AlignLeft | Qt::AlignVCenter | Qt::TextDontClip; @@ -274,9 +298,12 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form) { using pv::data::decode::Decoder; + std::shared_ptr decoder_stack = + base_->decoder_stack(); + assert(form); assert(parent); - assert(decoder_stack_); + assert(decoder_stack); // Add the standard options Trace::populate_popup_form(parent, form); @@ -286,17 +313,14 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form) channel_selectors_.clear(); decoder_forms_.clear(); - const list< shared_ptr >& stack = decoder_stack_->stack(); + 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); @@ -336,9 +360,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, QColor text_color, int h, int left, int right, int y, - size_t base_colour) const + QPainter &p, int h, const ViewItemPaintParams &pp, int y, + size_t base_colour, int row_title_width) const { double samples_per_pixel, pixels_offset; tie(pixels_offset, samples_per_pixel) = @@ -350,22 +448,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 > right + DrawPadding || end < left - DrawPadding) + if (start > pp.right() + DrawPadding || end < pp.left() - DrawPadding) return; if (a.start_sample() == a.end_sample()) - draw_instant(a, p, fill, outline, text_color, h, - start, y); + draw_instant(a, p, h, start, y); else - draw_range(a, p, fill, outline, text_color, 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, QColor text_color, int h, double x, int y) const + int h, double x, int y) const { const QString text = a.annotations().empty() ? QString() : a.annotations().back(); @@ -373,28 +508,22 @@ 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(text_color); + p.setPen(Qt::black); p.drawText(rect, Qt::AlignCenter | Qt::AlignVCenter, text); } void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, - QColor fill, QColor outline, QColor text_color, 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; } @@ -415,12 +544,18 @@ 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; - p.setPen(text_color); + p.setPen(Qt::black); // Try to find an annotation that will fit QString best_annotation; @@ -441,7 +576,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, } void DecodeTrace::draw_error(QPainter &p, const QString &message, - int left, int right) + const ViewItemPaintParams &pp) { const int y = get_visual_y(); @@ -449,7 +584,7 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message, p.setBrush(ErrorBgColour); const QRectF bounding_rect = - QRectF(left, INT_MIN / 2 + y, right - left, INT_MAX); + QRectF(pp.width(), INT_MIN / 2 + y, pp.width(), INT_MAX); const QRectF text_rect = p.boundingRect(bounding_rect, Qt::AlignCenter, message); const float r = text_rect.height() / 4; @@ -457,7 +592,7 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message, p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r, Qt::AbsoluteSize); - p.setPen(get_text_colour()); + p.setPen(Qt::black); p.drawText(text_rect, message); } @@ -469,33 +604,36 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, double samples_per_pixel, pixels_offset; - assert(decoder_stack_); + std::shared_ptr decoder_stack = + base_->decoder_stack(); + + assert(decoder_stack); shared_ptr data; - shared_ptr logic_signal; + shared_ptr signalbase; - const list< shared_ptr > &stack = decoder_stack_->stack(); + const list< shared_ptr > &stack = decoder_stack->stack(); // We get the logic data of the first channel in the list. // This works because we are currently assuming all - // LogicSignals have the same data/snapshot + // 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->get_snapshots().empty()) + if (!data || data->logic_segments().empty()) return; - const shared_ptr snapshot = - data->get_snapshots().front(); - assert(snapshot); - const int64_t sample_count = (int64_t)snapshot->get_sample_count(); + const shared_ptr segment = + data->logic_segments().front(); + assert(segment); + const int64_t sample_count = (int64_t)segment->get_sample_count(); if (sample_count == 0) return; - const int64_t samples_decoded = decoder_stack_->samples_decoded(); + const int64_t samples_decoded = decoder_stack->samples_decoded(); if (sample_count == samples_decoded) return; @@ -521,8 +659,11 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, pair DecodeTrace::get_pixels_offset_samples_per_pixel() const { + std::shared_ptr decoder_stack = + base_->decoder_stack(); + assert(owner_); - assert(decoder_stack_); + assert(decoder_stack); const View *view = owner_->view(); assert(view); @@ -531,9 +672,9 @@ pair DecodeTrace::get_pixels_offset_samples_per_pixel() const assert(scale > 0); const double pixels_offset = - (view->offset() - decoder_stack_->get_start_time()) / scale; + ((view->offset() - decoder_stack->start_time()) / scale).convert_to(); - double samplerate = decoder_stack_->samplerate(); + double samplerate = decoder_stack->samplerate(); // Show sample rate as 1Hz when it is unknown if (samplerate == 0.0) @@ -562,9 +703,15 @@ int DecodeTrace::get_row_at_point(const QPoint &point) if (!row_height_) return -1; - const int row = (point.y() - get_visual_y() + row_height_ / 2) / - row_height_; - if (row < 0 || row >= (int)visible_rows_.size()) + const int y = (point.y() - get_visual_y() + row_height_ / 2); + + /* Integer divison of (x-1)/x would yield 0, so we check for this. */ + if (y < 0) + return -1; + + const int row = y / row_height_; + + if (row >= (int)visible_rows_.size()) return -1; return row; @@ -585,19 +732,17 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point) vector annotations; - assert(decoder_stack_); - decoder_stack_->get_annotation_subset(annotations, visible_rows_[row], + std::shared_ptr decoder_stack = + base_->decoder_stack(); + + assert(decoder_stack); + decoder_stack->get_annotation_subset(annotations, visible_rows_[row], sample_range.first, sample_range.second); return (annotations.empty()) ? QString() : annotations[0].annotations().front(); } -void DecodeTrace::hide_hover_annotation() -{ - QToolTip::hideText(); -} - void DecodeTrace::hover_point_changed() { assert(owner_); @@ -611,7 +756,7 @@ void DecodeTrace::hover_point_changed() assert(view); if (!row_height_ || ann.isEmpty()) { - hide_hover_annotation(); + QToolTip::hideText(); return; } @@ -632,7 +777,7 @@ void DecodeTrace::hover_point_changed() hp.setY(get_visual_y() - (row_height_ / 2) + (hover_row * row_height_) - - row_height_ - text_size.height()); + row_height_ - text_size.height() - padding); QToolTip::showText(view->viewport()->mapToGlobal(hp), ann); } @@ -647,13 +792,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()), @@ -663,38 +812,41 @@ 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); } + std::shared_ptr decoder_stack = + base_->decoder_stack(); + // 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); @@ -709,29 +861,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_.signalbases()); + + 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->name().toStdString(), + b->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]); - assert(s); + 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 (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 == b) + selector->setCurrentIndex( + selector->count() - 1); } } @@ -742,24 +899,22 @@ 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_.signalbases()); - 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); + for (shared_ptr sig : sigs) + if (sig.get() == selection) { + channel_map[s.pdch_] = sig; break; } } @@ -769,17 +924,20 @@ void DecodeTrace::commit_decoder_channels(shared_ptr &dec void DecodeTrace::commit_channels() { - assert(decoder_stack_); - for (shared_ptr dec : decoder_stack_->stack()) + std::shared_ptr decoder_stack = + base_->decoder_stack(); + + assert(decoder_stack); + for (shared_ptr dec : decoder_stack->stack()) commit_decoder_channels(dec); - decoder_stack_->begin_decode(); + decoder_stack->begin_decode(); } void DecodeTrace::on_new_decode_data() { if (owner_) - owner_->appearance_changed(false, true); + owner_->row_item_appearance_changed(false, true); } void DecodeTrace::delete_pressed() @@ -789,7 +947,7 @@ void DecodeTrace::delete_pressed() void DecodeTrace::on_delete() { - session_.remove_decode_signal(this); + session_.remove_decode_signal(base_); } void DecodeTrace::on_channel_selected(int) @@ -799,34 +957,42 @@ void DecodeTrace::on_channel_selected(int) void DecodeTrace::on_stack_decoder(srd_decoder *decoder) { + std::shared_ptr decoder_stack = + base_->decoder_stack(); + assert(decoder); - assert(decoder_stack_); - decoder_stack_->push(shared_ptr( - new data::decode::Decoder(decoder))); - decoder_stack_->begin_decode(); + assert(decoder_stack); + decoder_stack->push(make_shared(decoder)); + decoder_stack->begin_decode(); create_popup_form(); } void DecodeTrace::on_delete_decoder(int index) { - decoder_stack_->remove(index); + std::shared_ptr decoder_stack = + base_->decoder_stack(); + + decoder_stack->remove(index); // Update the popup create_popup_form(); - decoder_stack_->begin_decode(); + decoder_stack->begin_decode(); } void DecodeTrace::on_show_hide_decoder(int index) { using pv::data::decode::Decoder; - const list< shared_ptr > stack(decoder_stack_->stack()); + std::shared_ptr decoder_stack = + base_->decoder_stack(); + + const list< shared_ptr > stack(decoder_stack->stack()); // 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; @@ -839,8 +1005,9 @@ void DecodeTrace::on_show_hide_decoder(int index) decoder_forms_[index]->set_decoder_visible(show); if (owner_) - owner_->appearance_changed(false, true); + owner_->row_item_appearance_changed(false, true); } -} // namespace view +} // namespace TraceView +} // namespace views } // namespace pv