X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=020ce77090acd4d86bc06ba49185be1282106a02;hp=745cf29b297f8835128740afd2cd6c9643d0bc07;hb=5da5d0813b0253fbe430d3a0b7cb780df1dcb72a;hpb=6e2c3c855dff36f6e946e2a54d576bea699f4a61 diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 745cf29b..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) @@ -174,9 +176,9 @@ 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(); @@ -525,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(); @@ -642,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()), @@ -658,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); @@ -673,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); @@ -688,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); @@ -704,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); } } @@ -739,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 = @@ -752,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; @@ -821,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;