X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=cd1d5ff301ea1d7d88f8498b6eb74a438211baa8;hb=8b24af15d583c1df24b49f9709ff9156a9faa16e;hp=ce38fbe3df15b90abec65378851ad20cbcae758f;hpb=feda6c6bbde575242cf01c769c0ecd3e89f9f7a0;p=pulseview.git

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index ce38fbe3..cd1d5ff3 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -141,6 +141,8 @@ bool DecodeSignal::toggle_decoder_visibility(int index)
 
 void DecodeSignal::reset_decode(bool shutting_down)
 {
+	resume_decode();  // Make sure the decode thread isn't blocked by pausing
+
 	if (stack_config_changed_ || shutting_down)
 		stop_srd_session();
 	else
@@ -158,8 +160,6 @@ void DecodeSignal::reset_decode(bool shutting_down)
 		logic_mux_thread_.join();
 	}
 
-	resume_decode();  // Make sure the decode thread isn't blocked by pausing
-
 	current_segment_id_ = 0;
 	segments_.clear();
 
@@ -478,7 +478,7 @@ uint64_t DecodeSignal::get_annotation_count(const Row* row, uint32_t segment_id)
 	return rd->get_annotation_count();
 }
 
-void DecodeSignal::get_annotation_subset(vector<const 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
 {
@@ -500,27 +500,11 @@ void DecodeSignal::get_annotation_subset(vector<const Annotation*> &dest,
 	rd->get_annotation_subset(dest, start_sample, end_sample);
 }
 
-void DecodeSignal::get_annotation_subset(vector<const 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<const Annotation*> *all_ann_list = new forward_list<const Annotation*>();
-
-	vector<const Row*> rows = get_rows();
-	for (const Row* row : rows) {
-		vector<const Annotation*> *ann_vector = new vector<const Annotation*>();
-		get_annotation_subset(*ann_vector, row, segment_id, start_sample, end_sample);
-
-		forward_list<const Annotation*> *ann_list =
-			new forward_list<const 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,
@@ -689,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();
 	}
 
@@ -754,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;
 			}
 		}
@@ -765,7 +786,7 @@ void DecodeSignal::restore_settings(QSettings &settings)
 	// Restore channel mapping
 	unsigned int channels = settings.value("channels").toInt();
 
-	const unordered_set< shared_ptr<data::SignalBase> > signalbases =
+	const vector< shared_ptr<data::SignalBase> > signalbases =
 		session_.signalbases();
 
 	for (unsigned int channel_id = 0; channel_id < channels; channel_id++) {