X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=3420fa1c7efbed0c899de170fc4d191118c7ebdf;hb=00c975d9065466f92e865144a7f0062dd8eb6085;hp=d6eb924755b15452323c684cf2bdc285cd774a2c;hpb=5d3ca591b02ce030239ad4b86d9b172b925b4c5d;p=pulseview.git

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index d6eb9247..3420fa1c 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -35,17 +35,13 @@
 
 using std::forward_list;
 using std::lock_guard;
-using std::make_pair;
 using std::make_shared;
 using std::min;
 using std::out_of_range;
 using std::shared_ptr;
 using std::unique_lock;
-using pv::data::decode::Annotation;
 using pv::data::decode::AnnotationClass;
 using pv::data::decode::DecodeChannel;
-using pv::data::decode::Decoder;
-using pv::data::decode::Row;
 
 namespace pv {
 namespace data {
@@ -474,17 +470,15 @@ uint64_t DecodeSignal::get_annotation_count(const Row* row, uint32_t segment_id)
 	auto row_it = segment->annotation_rows.find(row);
 
 	const RowData* rd;
-	if (row_it == segment->annotation_rows.end()) {
-		// FIXME Use the fallback row, but how?
-		assert(false);
+	if (row_it == segment->annotation_rows.end())
 		return 0;
-	} else
+	else
 		rd = &(row_it->second);
 
 	return rd->get_annotation_count();
 }
 
-void DecodeSignal::get_annotation_subset(vector<Annotation> &dest,
+void DecodeSignal::get_annotation_subset(deque<const Annotation*> &dest,
 	const Row* row, uint32_t segment_id, uint64_t start_sample,
 	uint64_t end_sample) const
 {
@@ -498,37 +492,19 @@ void DecodeSignal::get_annotation_subset(vector<Annotation> &dest,
 	auto row_it = segment->annotation_rows.find(row);
 
 	const RowData* rd;
-	if (row_it == segment->annotation_rows.end()) {
-		// FIXME Use the fallback row, but how?
-		assert(false);
+	if (row_it == segment->annotation_rows.end())
 		return;
-	} else
+	else
 		rd = &(row_it->second);
 
 	rd->get_annotation_subset(dest, start_sample, end_sample);
 }
 
-void DecodeSignal::get_annotation_subset(vector<Annotation> &dest,
+void DecodeSignal::get_annotation_subset(deque<const Annotation*> &dest,
 	uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const
 {
-	// Use forward_lists for faster merging
-	forward_list<Annotation> *all_ann_list = new forward_list<Annotation>();
-
-	vector<const Row*> rows = get_rows();
-	for (const Row* row : rows) {
-		vector<Annotation> *ann_vector = new vector<Annotation>();
-		get_annotation_subset(*ann_vector, row, segment_id, start_sample, end_sample);
-
-		forward_list<Annotation> *ann_list =
-			new forward_list<Annotation>(ann_vector->begin(), ann_vector->end());
-		delete ann_vector;
-
-		all_ann_list->merge(*ann_list);
-		delete ann_list;
-	}
-
-	move(all_ann_list->begin(), all_ann_list->end(), back_inserter(dest));
-	delete all_ann_list;
+	for (const Row* row : get_rows())
+		get_annotation_subset(dest, row, segment_id, start_sample, end_sample);
 }
 
 uint32_t DecodeSignal::get_binary_data_chunk_count(uint32_t segment_id,
@@ -697,6 +673,24 @@ void DecodeSignal::save_settings(QSettings &settings) const
 			i++;
 		}
 
+		// Save row properties
+		i = 0;
+		for (const Row* row : decoder->get_rows()) {
+			settings.beginGroup("row" + QString::number(i));
+			settings.setValue("visible", row->visible());
+			settings.endGroup();
+			i++;
+		}
+
+		// Save class properties
+		i = 0;
+		for (const AnnotationClass* ann_class : decoder->ann_classes()) {
+			settings.beginGroup("ann_class" + QString::number(i));
+			settings.setValue("visible", ann_class->visible);
+			settings.endGroup();
+			i++;
+		}
+
 		settings.endGroup();
 	}
 
@@ -762,6 +756,25 @@ void DecodeSignal::restore_settings(QSettings &settings)
 
 				// Include the newly created decode channels in the channel lists
 				update_channel_list();
+
+				// Restore row properties
+				int i = 0;
+				for (Row* row : decoder->get_rows()) {
+					settings.beginGroup("row" + QString::number(i));
+					row->set_visible(settings.value("visible", true).toBool());
+					settings.endGroup();
+					i++;
+				}
+
+				// Restore class properties
+				i = 0;
+				for (AnnotationClass* ann_class : decoder->ann_classes()) {
+					settings.beginGroup("ann_class" + QString::number(i));
+					ann_class->visible = settings.value("visible", true).toBool();
+					settings.endGroup();
+					i++;
+				}
+
 				break;
 			}
 		}
@@ -1370,7 +1383,7 @@ void DecodeSignal::create_decode_segment()
 	segments_.emplace_back(DecodeSegment());
 
 	// Add annotation classes
-	for (const shared_ptr<Decoder> dec : stack_)
+	for (const shared_ptr<Decoder>& dec : stack_)
 		for (Row* row : dec->get_rows())
 			segments_.back().annotation_rows.emplace(row, RowData(row));