X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.cpp;fp=pv%2Fdata%2Fdecode%2Fannotation.cpp;h=9f86b2bab84362e26503233c3cb516ee7ebcdf41;hb=1dcd9b18186741d3ce3164f7e8d6cb13abb578d3;hp=689c08dec6eaf16a1ba9a52acc259fd38c30f36e;hpb=02c87df7336eb81b770457b4153cf2dc649ffdab;p=pulseview.git

diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
index 689c08de..9f86b2ba 100644
--- a/pv/data/decode/annotation.cpp
+++ b/pv/data/decode/annotation.cpp
@@ -26,6 +26,7 @@ extern "C" {
 
 #include <pv/data/decode/annotation.hpp>
 #include <pv/data/decode/decoder.hpp>
+#include "pv/data/decode/rowdata.hpp"
 
 using std::vector;
 
@@ -33,52 +34,33 @@ namespace pv {
 namespace data {
 namespace decode {
 
-Annotation::Annotation(const srd_proto_data *const pdata, const Row *row) :
-	start_sample_(pdata->start_sample),
-	end_sample_(pdata->end_sample),
-	row_(row)
+Annotation::Annotation(uint64_t start_sample, uint64_t end_sample,
+	const vector<QString>* texts, Class ann_class_id, const RowData *data) :
+	start_sample_(start_sample),
+	end_sample_(end_sample),
+	texts_(texts),
+	ann_class_id_(ann_class_id),
+	data_(data)
 {
-	assert(pdata);
-	const srd_proto_data_annotation *const pda =
-		(const srd_proto_data_annotation*)pdata->data;
-	assert(pda);
-
-	ann_class_id_ = (Class)(pda->ann_class);
-
-	annotations_ = new vector<QString>();
-
-	const char *const *annotations = (char**)pda->ann_text;
-	while (*annotations) {
-		annotations_->push_back(QString::fromUtf8(*annotations));
-		annotations++;
-	}
-
-	annotations_->shrink_to_fit();
 }
 
 Annotation::Annotation(Annotation&& a) :
 	start_sample_(a.start_sample_),
 	end_sample_(a.end_sample_),
-	annotations_(a.annotations_),
-	row_(a.row_),
-	ann_class_id_(a.ann_class_id_)
+	texts_(a.texts_),
+	ann_class_id_(a.ann_class_id_),
+	data_(a.data_)
 {
-	a.annotations_ = nullptr;
 }
 
 Annotation& Annotation::operator=(Annotation&& a)
 {
 	if (&a != this) {
-		if (annotations_)
-			delete annotations_;
-
 		start_sample_ = a.start_sample_;
 		end_sample_ = a.end_sample_;
-		annotations_ = a.annotations_;
-		row_ = a.row_;
+		texts_ = a.texts_;
 		ann_class_id_ = a.ann_class_id_;
-
-		a.annotations_ = nullptr;
+		data_ = a.data_;
 	}
 
 	return *this;
@@ -86,7 +68,6 @@ Annotation& Annotation::operator=(Annotation&& a)
 
 Annotation::~Annotation()
 {
-	delete annotations_;
 }
 
 uint64_t Annotation::start_sample() const
@@ -107,24 +88,24 @@ Annotation::Class Annotation::ann_class_id() const
 const QString Annotation::ann_class_name() const
 {
 	const AnnotationClass* ann_class =
-		row_->decoder()->get_ann_class_by_id(ann_class_id_);
+		data_->row()->decoder()->get_ann_class_by_id(ann_class_id_);
 
 	return QString(ann_class->name);
 }
 
 const vector<QString>* Annotation::annotations() const
 {
-	return annotations_;
+	return texts_;
 }
 
 const QString Annotation::longest_annotation() const
 {
-	return annotations_->front();
+	return texts_->front();
 }
 
 const Row* Annotation::row() const
 {
-	return row_;
+	return data_->row();
 }
 
 bool Annotation::operator<(const Annotation &other) const