X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=020ce77090acd4d86bc06ba49185be1282106a02;hp=5392b17e0fc815fa3f2b799424bca5c633a4d25f;hb=5da5d0813b0253fbe430d3a0b7cb780df1dcb72a;hpb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 5392b17e..020ce770 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 { @@ -129,7 +132,6 @@ DecodeTrace::DecodeTrace(pv::Session &session, decoder_stack->stack().front()->decoder()->name)), session_(session), decoder_stack_(decoder_stack), - text_height_(0), row_height_(0), delete_mapper_(this), show_hide_mapper_(this) @@ -160,23 +162,23 @@ pair DecodeTrace::v_extents() const { /// @todo Replace this with an implementation that knows the true /// height of the trace - const int row_height = (RowItemPaintParams::text_height() * 6) / 4; + const int row_height = (ViewItemPaintParams::text_height() * 6) / 4; return make_pair(-row_height / 2, row_height * 7 / 2); } -void DecodeTrace::paint_back(QPainter &p, const RowItemPaintParams &pp) +void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp) { Trace::paint_back(p, pp); paint_axis(p, pp, get_visual_y()); } -void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp) +void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) { using namespace pv::data::decode; - text_height_ = RowItemPaintParams::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(); @@ -212,8 +214,8 @@ void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp) sample_range.first, sample_range.second); if (!annotations.empty()) { for (const Annotation &a : annotations) - draw_annotation(a, p, get_text_colour(), - annotation_height, pp, y, base_colour); + draw_annotation(a, p, annotation_height, + pp, y, base_colour); y += row_height_; visible_rows_.push_back(rows[i]); @@ -224,7 +226,7 @@ void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp) draw_unresolved_period(p, annotation_height, pp.left(), pp.right()); } -void DecodeTrace::paint_fore(QPainter &p, const RowItemPaintParams &pp) +void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp) { using namespace pv::data::decode; @@ -333,7 +335,7 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent) } void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, - QPainter &p, QColor text_color, int h, const RowItemPaintParams &pp, int y, + QPainter &p, int h, const ViewItemPaintParams &pp, int y, size_t base_colour) const { double samples_per_pixel, pixels_offset; @@ -353,15 +355,13 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, return; if (a.start_sample() == a.end_sample()) - draw_instant(a, p, fill, outline, text_color, h, - start, y); + draw_instant(a, p, fill, outline, h, start, y); else - draw_range(a, p, fill, outline, text_color, h, - start, end, y); + draw_range(a, p, fill, outline, h, start, end, y); } 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 + QColor fill, QColor outline, int h, double x, int y) const { const QString text = a.annotations().empty() ? QString() : a.annotations().back(); @@ -373,12 +373,12 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter & 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, + QColor fill, QColor outline, int h, double start, double end, int y) const { const double top = y + .5 - h / 2; @@ -416,7 +416,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, if (rect.width() <= 4) return; - p.setPen(text_color); + p.setPen(Qt::black); // Try to find an annotation that will fit QString best_annotation; @@ -437,7 +437,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, } void DecodeTrace::draw_error(QPainter &p, const QString &message, - const RowItemPaintParams &pp) + const ViewItemPaintParams &pp) { const int y = get_visual_y(); @@ -453,7 +453,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); } @@ -527,7 +527,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(); @@ -558,9 +558,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; @@ -589,11 +595,6 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point) QString() : annotations[0].annotations().front(); } -void DecodeTrace::hide_hover_annotation() -{ - QToolTip::hideText(); -} - void DecodeTrace::hover_point_changed() { assert(owner_); @@ -607,7 +608,7 @@ void DecodeTrace::hover_point_changed() assert(view); if (!row_height_ || ann.isEmpty()) { - hide_hover_annotation(); + QToolTip::hideText(); return; } @@ -628,7 +629,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); } @@ -643,13 +644,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()), @@ -659,7 +664,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); @@ -674,7 +679,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); @@ -689,8 +694,8 @@ void DecodeTrace::create_decoder_form(int index, } // 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); @@ -705,29 +710,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 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()) { 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); } } @@ -740,12 +750,11 @@ 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) + if (s.decoder_ != dec) break; const LogicSignal *const selection = @@ -753,7 +762,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; @@ -775,7 +784,7 @@ void DecodeTrace::commit_channels() void DecodeTrace::on_new_decode_data() { if (owner_) - owner_->appearance_changed(false, true); + owner_->row_item_appearance_changed(false, true); } void DecodeTrace::delete_pressed() @@ -822,7 +831,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; @@ -835,7 +844,7 @@ 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