Fix #1107 by implementing a copy-to-clipboard menu entry

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

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 68b17a65d076668b182172bee71f5a30605cb232..ec2b6a23f6e1aac6487ef0629d28e77b45a6218f 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();
 
@@ -535,6 +540,7 @@ void DecodeSignal::save_settings(QSettings &settings) const
                settings.beginGroup("decoder" + QString::number(decoder_idx++));
 
                settings.setValue("id", decoder->decoder()->id);
+               settings.setValue("shown", decoder->shown());
 
                // Save decoder options
                const map<string, GVariant*>& options = decoder->options();
@@ -603,6 +609,7 @@ void DecodeSignal::restore_settings(QSettings &settings)
                                        make_shared<decode::Decoder>(dec);
 
                                stack_.push_back(decoder);
+                               decoder->show(settings.value("shown", true).toBool());
 
                                // Restore decoder options that differ from their default
                                int options = settings.value("options").toInt();