X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=4a802c3b7b051b41803bb0ac22c5cfe0ce40280e;hp=405e06e145b50ed15743af7e47892125c297613d;hb=b9591f3a680dd35b7af2fb482a136b1bd494c6e4;hpb=dda88657a1548ea510f2b4945ec86cdcc464a803 diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 405e06e1..4a802c3b 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -78,14 +78,19 @@ const vector< shared_ptr >& DecodeSignal::decoder_stack() const void DecodeSignal::stack_decoder(const srd_decoder *decoder) { assert(decoder); - const shared_ptr dec = make_shared(decoder); - stack_.push_back(dec); + // Set name if this decoder is the first in the list or the name is unchanged + const srd_decoder* prev_dec = + stack_.empty() ? nullptr : stack_.back()->decoder(); + const QString prev_dec_name = + prev_dec ? QString::fromUtf8(prev_dec->name) : QString(); - // Set name if this decoder is the first in the list - if (stack_.size() == 1) + if ((stack_.empty()) || ((stack_.size() > 0) && (name() == prev_dec_name))) set_name(QString::fromUtf8(decoder->name)); + const shared_ptr dec = make_shared(decoder); + stack_.push_back(dec); + // Include the newly created decode channels in the channel lists update_channel_list(); @@ -200,12 +205,12 @@ void DecodeSignal::begin_decode() // Make sure that all assigned channels still provide logic data // (can happen when a converted signal was assigned but the // conversion removed in the meanwhile) - for (data::DecodeChannel &ch : channels_) + for (data::DecodeChannel& ch : channels_) if (ch.assigned_signal && !(ch.assigned_signal->logic_data() != nullptr)) ch.assigned_signal = nullptr; // Check that all decoders have the required channels - for (const shared_ptr &dec : stack_) + for (const shared_ptr& dec : stack_) if (!dec->have_required_channels()) { set_error_message(tr("One or more required channels " "have not been specified")); @@ -214,7 +219,7 @@ void DecodeSignal::begin_decode() // Map out all the annotation classes int row_index = 0; - for (const shared_ptr &dec : stack_) { + for (const shared_ptr& dec : stack_) { assert(dec); const srd_decoder *const decc = dec->decoder(); assert(dec->decoder()); @@ -295,7 +300,7 @@ void DecodeSignal::auto_assign_signals(const shared_ptr dec) bool new_assignment = false; // Try to auto-select channels that don't have signals assigned yet - for (data::DecodeChannel &ch : channels_) { + for (data::DecodeChannel& ch : channels_) { // If a decoder is given, auto-assign only its channels if (dec && (ch.decoder_ != dec)) continue; @@ -303,14 +308,16 @@ void DecodeSignal::auto_assign_signals(const shared_ptr dec) if (ch.assigned_signal) continue; - const QString ch_name = ch.name.toLower(); + QString ch_name = ch.name.toLower(); + ch_name = ch_name.replace(QRegExp("[-_.]"), " "); shared_ptr match; - for (shared_ptr s : session_.signalbases()) { + for (const shared_ptr& s : session_.signalbases()) { if (!s->enabled()) continue; - const QString s_name = s->name().toLower(); + QString s_name = s->name().toLower(); + s_name = s_name.replace(QRegExp("[-_.]"), " "); if (s->logic_data() && ((ch_name.contains(s_name)) || (s_name.contains(ch_name)))) { @@ -342,7 +349,7 @@ void DecodeSignal::auto_assign_signals(const shared_ptr dec) void DecodeSignal::assign_signal(const uint16_t channel_id, const SignalBase *signal) { - for (data::DecodeChannel &ch : channels_) + for (data::DecodeChannel& ch : channels_) if (ch.id == channel_id) { ch.assigned_signal = signal; logic_mux_data_invalid_ = true; @@ -363,7 +370,7 @@ int DecodeSignal::get_assigned_signal_count() const void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int init_state) { - for (data::DecodeChannel &ch : channels_) + for (data::DecodeChannel& ch : channels_) if (ch.id == channel_id) ch.initial_pin_state = init_state; @@ -403,7 +410,7 @@ int64_t DecodeSignal::get_working_sample_count(uint32_t segment_id) const int64_t count = std::numeric_limits::max(); bool no_signals_assigned = true; - for (const data::DecodeChannel &ch : channels_) + for (const data::DecodeChannel& ch : channels_) if (ch.assigned_signal) { no_signals_assigned = false; @@ -448,7 +455,7 @@ vector DecodeSignal::visible_rows() const vector rows; - for (const shared_ptr &dec : stack_) { + for (const shared_ptr& dec : stack_) { assert(dec); if (!dec->shown()) continue; @@ -529,7 +536,7 @@ void DecodeSignal::save_settings(QSettings &settings) const // Save decoder stack int decoder_idx = 0; - for (shared_ptr decoder : stack_) { + for (const shared_ptr& decoder : stack_) { settings.beginGroup("decoder" + QString::number(decoder_idx++)); settings.setValue("id", decoder->decoder()->id); @@ -542,7 +549,7 @@ void DecodeSignal::save_settings(QSettings &settings) const // Note: decode::Decoder::options() returns only the options // that differ from the default. See binding::Decoder::getter() int i = 0; - for (auto option : options) { + for (auto& option : options) { settings.beginGroup("option" + QString::number(i)); settings.setValue("name", QString::fromStdString(option.first)); GlobalSettings::store_gvariant(settings, option.second); @@ -642,7 +649,7 @@ void DecodeSignal::restore_settings(QSettings &settings) QString assigned_signal_name = settings.value("assigned_signal_name").toString(); - for (shared_ptr signal : signalbases) + for (const shared_ptr& signal : signalbases) if (signal->name() == assigned_signal_name) channel->assigned_signal = signal.get(); @@ -671,7 +678,7 @@ uint32_t DecodeSignal::get_input_segment_count() const uint64_t count = std::numeric_limits::max(); bool no_signals_assigned = true; - for (const data::DecodeChannel &ch : channels_) + for (const data::DecodeChannel& ch : channels_) if (ch.assigned_signal) { no_signals_assigned = false; @@ -691,7 +698,7 @@ uint32_t DecodeSignal::get_input_samplerate(uint32_t segment_id) const { double samplerate = 0; - for (const data::DecodeChannel &ch : channels_) + for (const data::DecodeChannel& ch : channels_) if (ch.assigned_signal) { const shared_ptr logic_data = ch.assigned_signal->logic_data(); if (!logic_data || logic_data->logic_segments().empty()) @@ -717,7 +724,7 @@ void DecodeSignal::update_channel_list() uint16_t id = 0; // Copy existing entries, create new as needed - for (shared_ptr decoder : stack_) { + for (shared_ptr& decoder : stack_) { const srd_decoder* srd_d = decoder->decoder(); const GSList *l; @@ -727,7 +734,7 @@ void DecodeSignal::update_channel_list() bool ch_added = false; // Copy but update ID if this channel was in the list before - for (data::DecodeChannel &ch : prev_channels) + for (data::DecodeChannel& ch : prev_channels) if (ch.pdch_ == pdch) { ch.id = id++; channels_.push_back(ch); @@ -750,7 +757,7 @@ void DecodeSignal::update_channel_list() bool ch_added = false; // Copy but update ID if this channel was in the list before - for (data::DecodeChannel &ch : prev_channels) + for (data::DecodeChannel& ch : prev_channels) if (ch.pdch_ == pdch) { ch.id = id++; channels_.push_back(ch); @@ -775,8 +782,8 @@ void DecodeSignal::update_channel_list() } else { // Same number but assignment may still differ, so compare all channels for (size_t i = 0; i < channels_.size(); i++) { - const data::DecodeChannel &p_ch = prev_channels[i]; - const data::DecodeChannel &ch = channels_[i]; + const data::DecodeChannel& p_ch = prev_channels[i]; + const data::DecodeChannel& ch = channels_[i]; if ((p_ch.pdch_ != ch.pdch_) || (p_ch.assigned_signal != ch.assigned_signal)) { @@ -796,7 +803,7 @@ void DecodeSignal::commit_decoder_channels() for (shared_ptr dec : stack_) { vector channel_list; - for (data::DecodeChannel &ch : channels_) + for (data::DecodeChannel& ch : channels_) if (ch.decoder_ == dec) channel_list.push_back(&ch); @@ -805,7 +812,7 @@ void DecodeSignal::commit_decoder_channels() // Channel bit IDs must be in sync with the channel's apperance in channels_ int id = 0; - for (data::DecodeChannel &ch : channels_) + for (data::DecodeChannel& ch : channels_) if (ch.assigned_signal) ch.bit_id = id++; } @@ -822,7 +829,7 @@ void DecodeSignal::mux_logic_samples(uint32_t segment_id, const int64_t start, c vector signal_in_bytepos; vector signal_in_bitpos; - for (data::DecodeChannel &ch : channels_) + for (data::DecodeChannel& ch : channels_) if (ch.assigned_signal) { const shared_ptr logic_data = ch.assigned_signal->logic_data(); @@ -1108,7 +1115,7 @@ void DecodeSignal::start_srd_session() if (samplerate) srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, g_variant_new_uint64(samplerate)); - for (const shared_ptr &dec : stack_) + for (const shared_ptr& dec : stack_) dec->apply_all_options(); srd_session_start(srd_session_); @@ -1121,7 +1128,7 @@ void DecodeSignal::start_srd_session() // Create the decoders srd_decoder_inst *prev_di = nullptr; - for (const shared_ptr &dec : stack_) { + for (const shared_ptr& dec : stack_) { srd_decoder_inst *const di = dec->create_decoder_inst(srd_session_); if (!di) { @@ -1168,7 +1175,7 @@ void DecodeSignal::terminate_srd_session() if (samplerate) srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, g_variant_new_uint64(samplerate)); - for (const shared_ptr &dec : stack_) + for (const shared_ptr& dec : stack_) dec->apply_all_options(); } } @@ -1181,7 +1188,7 @@ void DecodeSignal::stop_srd_session() srd_session_ = nullptr; // Mark the decoder instances as non-existant since they were deleted - for (const shared_ptr &dec : stack_) + for (const shared_ptr& dec : stack_) dec->invalidate_decoder_inst(); } } @@ -1193,7 +1200,7 @@ void DecodeSignal::connect_input_notifiers() disconnect(this, SLOT(on_data_received())); // Connect the currently used signals to our slot - for (data::DecodeChannel &ch : channels_) { + for (data::DecodeChannel& ch : channels_) { if (!ch.assigned_signal) continue; @@ -1211,7 +1218,7 @@ void DecodeSignal::create_decode_segment() segments_.emplace_back(DecodeSegment()); // Add annotation classes - for (const shared_ptr &dec : stack_) { + for (const shared_ptr& dec : stack_) { assert(dec); const srd_decoder *const decc = dec->decoder(); assert(dec->decoder());