]> sigrok.org Git - pulseview.git/blobdiff - pv/data/decodesignal.cpp
Fix typo
[pulseview.git] / pv / data / decodesignal.cpp
index 4a802c3b7b051b41803bb0ac22c5cfe0ce40280e..4a7d6ed8c60a7593773d50bf17026176f018678b 100644 (file)
@@ -449,7 +449,7 @@ int64_t DecodeSignal::get_decoded_sample_count(uint32_t segment_id,
        return result;
 }
 
-vector<Row> DecodeSignal::visible_rows() const
+vector<Row> DecodeSignal::get_rows(bool visible_only) const
 {
        lock_guard<mutex> lock(output_mutex_);
 
@@ -457,7 +457,7 @@ vector<Row> DecodeSignal::visible_rows() const
 
        for (const shared_ptr<decode::Decoder>& dec : stack_) {
                assert(dec);
-               if (!dec->shown())
+               if (visible_only && !dec->shown())
                        continue;
 
                const srd_decoder *const decc = dec->decoder();
@@ -507,7 +507,7 @@ void DecodeSignal::get_annotation_subset(
 {
        // Note: We put all vectors and lists on the heap, not the stack
 
-       const vector<Row> rows = visible_rows();
+       const vector<Row> rows = get_rows(true);
 
        // Use forward_lists for faster merging
        forward_list<Annotation> *all_ann_list = new forward_list<Annotation>();
@@ -540,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();
@@ -608,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();