X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.cpp;fp=pv%2Fdata%2Fdecode%2Frowdata.cpp;h=7b6ec2d3f8b71bb0728cd1381a2867bb072f55c5;hb=10f5e6f54e0c36582e846a769b67b1e7e5a371f8;hp=2a26169eb6cc0f14adb5a107726c40ee891838b6;hpb=05a4de8abd5810cf8219077259ffa44adb08043e;p=pulseview.git

diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index 2a26169e..7b6ec2d3 100644
--- a/pv/data/decode/rowdata.cpp
+++ b/pv/data/decode/rowdata.cpp
@@ -17,7 +17,11 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rowdata.hpp"
+#include <cassert>
+
+#include <pv/data/decode/decoder.hpp>
+#include <pv/data/decode/row.hpp>
+#include <pv/data/decode/rowdata.hpp>
 
 using std::vector;
 
@@ -25,6 +29,13 @@ namespace pv {
 namespace data {
 namespace decode {
 
+RowData::RowData(Row* row) :
+	row_(row),
+	prev_ann_start_sample_(0)
+{
+	assert(row);
+}
+
 uint64_t RowData::get_max_sample() const
 {
 	if (annotations_.empty())
@@ -32,19 +43,76 @@ uint64_t RowData::get_max_sample() const
 	return annotations_.back().end_sample();
 }
 
+uint64_t RowData::get_annotation_count() const
+{
+	return annotations_.size();
+}
+
 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
 {
-	for (const auto& annotation : annotations_)
-		if (annotation.end_sample() > start_sample &&
-			annotation.start_sample() <= end_sample)
-			dest.push_back(annotation);
+	// Determine whether we must apply per-class filtering or not
+	bool all_ann_classes_enabled = true;
+	bool all_ann_classes_disabled = true;
+
+	uint32_t max_ann_class_id = 0;
+	for (AnnotationClass* c : row_->ann_classes()) {
+		if (!c->visible)
+			all_ann_classes_enabled = false;
+		else
+			all_ann_classes_disabled = false;
+		if (c->id > max_ann_class_id)
+			max_ann_class_id = c->id;
+	}
+
+	if (all_ann_classes_enabled) {
+		// No filtering, send everyting out as-is
+		for (const auto& annotation : annotations_)
+			if ((annotation.end_sample() > start_sample) &&
+				(annotation.start_sample() <= end_sample))
+				dest.push_back(&annotation);
+	} else {
+		if (!all_ann_classes_disabled) {
+			// Filter out invisible annotation classes
+			vector<size_t> class_visible;
+			class_visible.resize(max_ann_class_id + 1, 0);
+			for (AnnotationClass* c : row_->ann_classes())
+				if (c->visible)
+					class_visible[c->id] = 1;
+
+			for (const auto& annotation : annotations_)
+				if ((class_visible[annotation.ann_class_id()]) &&
+					(annotation.end_sample() > start_sample) &&
+					(annotation.start_sample() <= end_sample))
+					dest.push_back(&annotation);
+		}
+	}
 }
 
-void RowData::emplace_annotation(srd_proto_data *pdata, const Row *row)
+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