X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.cpp;h=7b6ec2d3f8b71bb0728cd1381a2867bb072f55c5;hb=e094bcb296efa6066b546c580b398acb37b7efc1;hp=83a8021ef5a11136f747b02ac2724644ac7eb280;hpb=81dc02212c05c99554194a15f9b584e6b500cda9;p=pulseview.git

diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index 83a8021e..7b6ec2d3 100644
--- a/pv/data/decode/rowdata.cpp
+++ b/pv/data/decode/rowdata.cpp
@@ -17,6 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <cassert>
+
 #include <pv/data/decode/decoder.hpp>
 #include <pv/data/decode/row.hpp>
 #include <pv/data/decode/rowdata.hpp>
@@ -28,7 +30,8 @@ namespace data {
 namespace decode {
 
 RowData::RowData(Row* row) :
-	row_(row)
+	row_(row),
+	prev_ann_start_sample_(0)
 {
 	assert(row);
 }
@@ -46,7 +49,7 @@ uint64_t RowData::get_annotation_count() const
 }
 
 void RowData::get_annotation_subset(
-	vector<pv::data::decode::Annotation> &dest,
+	deque<const pv::data::decode::Annotation*> &dest,
 	uint64_t start_sample, uint64_t end_sample) const
 {
 	// Determine whether we must apply per-class filtering or not
@@ -68,7 +71,7 @@ void RowData::get_annotation_subset(
 		for (const auto& annotation : annotations_)
 			if ((annotation.end_sample() > start_sample) &&
 				(annotation.start_sample() <= end_sample))
-				dest.push_back(annotation);
+				dest.push_back(&annotation);
 	} else {
 		if (!all_ann_classes_disabled) {
 			// Filter out invisible annotation classes
@@ -79,17 +82,37 @@ void RowData::get_annotation_subset(
 					class_visible[c->id] = 1;
 
 			for (const auto& annotation : annotations_)
-				if ((class_visible[annotation.ann_class()]) &&
+				if ((class_visible[annotation.ann_class_id()]) &&
 					(annotation.end_sample() > start_sample) &&
 					(annotation.start_sample() <= end_sample))
-					dest.push_back(annotation);
+					dest.push_back(&annotation);
 		}
 	}
 }
 
 void RowData::emplace_annotation(srd_proto_data *pdata)
 {
-	annotations_.emplace_back(pdata, row_);
+	// We insert the annotation in a way so that the annotation list
+	// is sorted by start sample. Otherwise, we'd have to sort when
+	// painting, which is expensive
+
+	if (pdata->start_sample < prev_ann_start_sample_) {
+		// Find location to insert the annotation at
+
+		auto it = annotations_.end();
+		do {
+			it--;
+		} while ((it->start_sample() > pdata->start_sample) && (it != annotations_.begin()));
+
+		// Allow inserting at the front
+		if (it != annotations_.begin())
+			it++;
+
+		annotations_.emplace(it, pdata, row_);
+	} else {
+		annotations_.emplace_back(pdata, row_);
+		prev_ann_start_sample_ = pdata->start_sample;
+	}
 }
 
 }  // namespace decode