DecodeSignal: Use name of last stacked PD unless the name was changed

[pulseview.git] / pv / data / decodesignal.cpp

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 4705b104542cef6c9875d8fa7e1922b6b6cae0c8..4a802c3b7b051b41803bb0ac22c5cfe0ce40280e 100644 (file)
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -78,14 +78,19 @@ const vector< shared_ptr<Decoder> >& DecodeSignal::decoder_stack() const
 void DecodeSignal::stack_decoder(const srd_decoder *decoder)
 {
        assert(decoder);
-       const shared_ptr<Decoder> dec = make_shared<decode::Decoder>(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<Decoder> dec = make_shared<decode::Decoder>(decoder);
+       stack_.push_back(dec);
+
        // Include the newly created decode channels in the channel lists
        update_channel_list();
 
@@ -151,8 +156,7 @@ void DecodeSignal::reset_decode(bool shutting_down)
                logic_mux_thread_.join();
        }
 
-       decode_pause_mutex_.unlock();
-       decode_paused_ = false;
+       resume_decode();  // Make sure the decode thread isn't blocked by pausing
 
        class_rows_.clear();
        current_segment_id_ = 0;
@@ -201,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<decode::Decoder> &dec : stack_)
+       for (const shared_ptr<decode::Decoder>& dec : stack_)
                if (!dec->have_required_channels()) {
                        set_error_message(tr("One or more required channels "
                                "have not been specified"));
@@ -215,7 +219,7 @@ void DecodeSignal::begin_decode()
 
        // Map out all the annotation classes
        int row_index = 0;
-       for (const shared_ptr<decode::Decoder> &dec : stack_) {
+       for (const shared_ptr<decode::Decoder>& dec : stack_) {
                assert(dec);
                const srd_decoder *const decc = dec->decoder();
                assert(dec->decoder());
@@ -296,7 +300,7 @@ void DecodeSignal::auto_assign_signals(const shared_ptr<Decoder> 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;
@@ -304,14 +308,16 @@ void DecodeSignal::auto_assign_signals(const shared_ptr<Decoder> 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<data::SignalBase> match;
-               for (shared_ptr<data::SignalBase> s : session_.signalbases()) {
+               for (const shared_ptr<data::SignalBase>& 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)))) {
@@ -343,7 +349,7 @@ void DecodeSignal::auto_assign_signals(const shared_ptr<Decoder> 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;
@@ -364,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;
 
@@ -404,7 +410,7 @@ int64_t DecodeSignal::get_working_sample_count(uint32_t segment_id) const
        int64_t count = std::numeric_limits<int64_t>::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;
 
@@ -449,7 +455,7 @@ vector<Row> DecodeSignal::visible_rows() const
 
        vector<Row> rows;
 
-       for (const shared_ptr<decode::Decoder> &dec : stack_) {
+       for (const shared_ptr<decode::Decoder>& dec : stack_) {
                assert(dec);
                if (!dec->shown())
                        continue;
@@ -530,7 +536,7 @@ void DecodeSignal::save_settings(QSettings &settings) const
 
        // Save decoder stack
        int decoder_idx = 0;
-       for (shared_ptr<decode::Decoder> decoder : stack_) {
+       for (const shared_ptr<decode::Decoder>& decoder : stack_) {
                settings.beginGroup("decoder" + QString::number(decoder_idx++));
 
                settings.setValue("id", decoder->decoder()->id);
@@ -543,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);
@@ -643,7 +649,7 @@ void DecodeSignal::restore_settings(QSettings &settings)
 
                QString assigned_signal_name = settings.value("assigned_signal_name").toString();
 
-               for (shared_ptr<data::SignalBase> signal : signalbases)
+               for (const shared_ptr<data::SignalBase>& signal : signalbases)
                        if (signal->name() == assigned_signal_name)
                                channel->assigned_signal = signal.get();
 
@@ -672,7 +678,7 @@ uint32_t DecodeSignal::get_input_segment_count() const
        uint64_t count = std::numeric_limits<uint64_t>::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;
 
@@ -692,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> logic_data = ch.assigned_signal->logic_data();
                        if (!logic_data || logic_data->logic_segments().empty())
@@ -718,7 +724,7 @@ void DecodeSignal::update_channel_list()
        uint16_t id = 0;
 
        // Copy existing entries, create new as needed
-       for (shared_ptr<Decoder> decoder : stack_) {
+       for (shared_ptr<Decoder>& decoder : stack_) {
                const srd_decoder* srd_d = decoder->decoder();
                const GSList *l;
 
@@ -728,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);
@@ -751,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);
@@ -776,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)) {
@@ -797,7 +803,7 @@ void DecodeSignal::commit_decoder_channels()
        for (shared_ptr<decode::Decoder> dec : stack_) {
                vector<data::DecodeChannel*> channel_list;
 
-               for (data::DecodeChannel &ch : channels_)
+               for (data::DecodeChannel& ch : channels_)
                        if (ch.decoder_ == dec)
                                channel_list.push_back(&ch);
 
@@ -806,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++;
 }
@@ -823,7 +829,7 @@ void DecodeSignal::mux_logic_samples(uint32_t segment_id, const int64_t start, c
        vector<uint8_t> signal_in_bytepos;
        vector<uint8_t> signal_in_bitpos;
 
-       for (data::DecodeChannel &ch : channels_)
+       for (data::DecodeChannel& ch : channels_)
                if (ch.assigned_signal) {
                        const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
 
@@ -1109,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<decode::Decoder> &dec : stack_)
+               for (const shared_ptr<decode::Decoder>& dec : stack_)
                        dec->apply_all_options();
                srd_session_start(srd_session_);
 
@@ -1122,7 +1128,7 @@ void DecodeSignal::start_srd_session()
 
        // Create the decoders
        srd_decoder_inst *prev_di = nullptr;
-       for (const shared_ptr<decode::Decoder> &dec : stack_) {
+       for (const shared_ptr<decode::Decoder>& dec : stack_) {
                srd_decoder_inst *const di = dec->create_decoder_inst(srd_session_);
 
                if (!di) {
@@ -1169,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<decode::Decoder> &dec : stack_)
+               for (const shared_ptr<decode::Decoder>& dec : stack_)
                        dec->apply_all_options();
        }
 }
@@ -1182,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<decode::Decoder> &dec : stack_)
+               for (const shared_ptr<decode::Decoder>& dec : stack_)
                        dec->invalidate_decoder_inst();
        }
 }
@@ -1194,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;
 
@@ -1212,7 +1218,7 @@ void DecodeSignal::create_decode_segment()
        segments_.emplace_back(DecodeSegment());
 
        // Add annotation classes
-       for (const shared_ptr<decode::Decoder> &dec : stack_) {
+       for (const shared_ptr<decode::Decoder>& dec : stack_) {
                assert(dec);
                const srd_decoder *const decc = dec->decoder();
                assert(dec->decoder());