X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fdecodesignal.cpp;h=28157794208c6fbf4a7b65be20b76773bb21b189;hb=f9a0fd83226d97af7458d8c9dac0b88c83a54d29;hp=6f0e0fa7c50594632bf3305d3a01a56179f21f43;hpb=02c87df7336eb81b770457b4153cf2dc649ffdab;p=pulseview.git

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 6f0e0fa7..28157794 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -86,6 +86,9 @@ void DecodeSignal::stack_decoder(const srd_decoder *decoder, bool restart_decode
 	const shared_ptr<Decoder> dec = make_shared<Decoder>(decoder, stack_.size());
 	stack_.push_back(dec);
 
+	connect(dec.get(), SIGNAL(annotation_visibility_changed()),
+		this, SLOT(on_annotation_visibility_changed()));
+
 	// Include the newly created decode channels in the channel lists
 	update_channel_list();
 
@@ -105,11 +108,12 @@ void DecodeSignal::remove_decoder(int index)
 	assert(index < (int)stack_.size());
 
 	// Find the decoder in the stack
-	auto iter = stack_.begin();
-	for (int i = 0; i < index; i++, iter++)
-		assert(iter != stack_.end());
+	auto iter = stack_.begin() + index;
+	assert(iter != stack_.end());
 
-	decoder_removed(iter->get());
+	shared_ptr<Decoder> dec = *iter;
+
+	decoder_removed(dec.get());
 
 	// Delete the element
 	stack_.erase(iter);
@@ -358,7 +362,7 @@ void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int in
 	begin_decode();
 }
 
-double DecodeSignal::samplerate() const
+double DecodeSignal::get_samplerate() const
 {
 	double result = 0;
 
@@ -698,7 +702,7 @@ void DecodeSignal::save_settings(QSettings &settings) const
 		i = 0;
 		for (const AnnotationClass* ann_class : decoder->ann_classes()) {
 			settings.beginGroup("ann_class" + QString::number(i));
-			settings.setValue("visible", ann_class->visible);
+			settings.setValue("visible", ann_class->visible());
 			settings.endGroup();
 			i++;
 		}
@@ -752,6 +756,9 @@ void DecodeSignal::restore_settings(QSettings &settings)
 			if (QString::fromUtf8(dec->id) == id) {
 				shared_ptr<Decoder> decoder = make_shared<Decoder>(dec, stack_.size());
 
+				connect(decoder.get(), SIGNAL(annotation_visibility_changed()),
+					this, SLOT(on_annotation_visibility_changed()));
+
 				stack_.push_back(decoder);
 				decoder->set_visible(settings.value("visible", true).toBool());
 
@@ -782,7 +789,7 @@ void DecodeSignal::restore_settings(QSettings &settings)
 				i = 0;
 				for (AnnotationClass* ann_class : decoder->ann_classes()) {
 					settings.beginGroup("ann_class" + QString::number(i));
-					ann_class->visible = settings.value("visible", true).toBool();
+					ann_class->set_visible(settings.value("visible", true).toBool());
 					settings.endGroup();
 					i++;
 				}
@@ -1456,10 +1463,62 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa
 	// Add the annotation to the row
 	const Annotation* ann = row_data.emplace_annotation(pdata);
 
-	// Add the annotation to the global annotation list
+	// We insert the annotation into the global annotation list in a way so that
+	// the annotation list is sorted by start sample and length. Otherwise, we'd
+	// have to sort the model, which is expensive
 	deque<const Annotation*>& all_annotations =
 		ds->segments_[ds->current_segment_id_].all_annotations;
-	all_annotations.emplace_back(ann);
+
+	if (all_annotations.empty()) {
+		all_annotations.emplace_back(ann);
+	} else {
+		const uint64_t new_ann_len = (pdata->end_sample - pdata->start_sample);
+		bool ann_has_earlier_start = (pdata->start_sample < all_annotations.back()->start_sample());
+		bool ann_is_longer = (new_ann_len >
+			(all_annotations.back()->end_sample() - all_annotations.back()->start_sample()));
+
+		if (ann_has_earlier_start && ann_is_longer) {
+			bool ann_has_same_start;
+			auto it = all_annotations.end();
+
+			do {
+				it--;
+				ann_has_earlier_start = (pdata->start_sample < (*it)->start_sample());
+				ann_has_same_start = (pdata->start_sample == (*it)->start_sample());
+				ann_is_longer = (new_ann_len > (*it)->length());
+			} while ((ann_has_earlier_start || (ann_has_same_start && ann_is_longer)) && (it != all_annotations.begin()));
+
+			// Allow inserting at the front
+			if (it != all_annotations.begin())
+				it++;
+
+			all_annotations.emplace(it, ann);
+		} else
+			all_annotations.emplace_back(ann);
+	}
+
+	// When emplace_annotation() inserts instead of appends an annotation,
+	// the pointers in all_annotations that follow the inserted annotation and
+	// point to annotations for this row are off by one and must be updated
+	if (&(row_data.annotations().back()) != ann) {
+		// Search backwards until we find the annotation we just added
+		auto row_it = row_data.annotations().end();
+		auto all_it = all_annotations.end();
+		do {
+			all_it--;
+			if ((*all_it)->row_data() == &row_data)
+				row_it--;
+		} while (&(*row_it) != ann);
+
+		// Update the annotation addresses for this row's annotations until the end
+		do {
+			if ((*all_it)->row_data() == &row_data) {
+				*all_it = &(*row_it);
+				row_it++;
+			}
+			all_it++;
+		} while (all_it != all_annotations.end());
+	}
 }
 
 void DecodeSignal::binary_callback(srd_proto_data *pdata, void *decode_signal)
@@ -1539,5 +1598,10 @@ void DecodeSignal::on_data_received()
 		logic_mux_cond_.notify_one();
 }
 
+void DecodeSignal::on_annotation_visibility_changed()
+{
+	annotation_visibility_changed();
+}
+
 } // namespace data
 } // namespace pv