X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.hpp;h=cfa5e5e982e54746f79cac80c15062af7cd3f66b;hb=761f8302350c52f2cf357f49e1084e7101c70497;hp=2be8e88d989e4cddacaa18d9b86156ca875c4e95;hpb=6f925ba9d6faf1077b73c5a5808259576081716a;p=pulseview.git

diff --git a/pv/data/decode/annotation.hpp b/pv/data/decode/annotation.hpp
index 2be8e88d..cfa5e5e9 100644
--- a/pv/data/decode/annotation.hpp
+++ b/pv/data/decode/annotation.hpp
@@ -20,7 +20,8 @@
 #ifndef PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
 #define PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
 
-#include <stdint.h>
+#include <cstdint>
+#include <vector>
 
 #include <QString>
 
@@ -32,21 +33,36 @@ namespace pv {
 namespace data {
 namespace decode {
 
+class Row;
+
 class Annotation
 {
 public:
-	Annotation(const srd_proto_data *const pdata);
+	typedef uint32_t Class;
+
+public:
+	Annotation(const srd_proto_data *const pdata, const Row *row);
+	Annotation(Annotation&& a);
+	Annotation& operator=(Annotation&& a);
+	~Annotation();
 
 	uint64_t start_sample() const;
 	uint64_t end_sample() const;
-	int format() const;
-	const vector<QString>& annotations() const;
+
+	Class ann_class_id() const;
+	const QString ann_class_name() const;
+
+	const vector<QString>* annotations() const;
+	const Row* row() const;
+
+	bool operator<(const Annotation &other) const;
 
 private:
 	uint64_t start_sample_;
 	uint64_t end_sample_;
-	int format_;
-	vector<QString> annotations_;
+	vector<QString>* annotations_;
+	const Row *row_;
+	Class ann_class_id_;
 };
 
 } // namespace decode