X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.hpp;h=717206a4b97b06b6f73eecb09b315002ebf6db0f;hp=8b91c4f47e066605e307ed0301fbd1871d59436d;hb=1e948182f3f9353bd74875a37cacc833312a8c8e;hpb=5a914348e8c95f92fd7c1c5988d563c5fb472aa2

diff --git a/pv/data/decode/annotation.hpp b/pv/data/decode/annotation.hpp
index 8b91c4f4..717206a4 100644
--- a/pv/data/decode/annotation.hpp
+++ b/pv/data/decode/annotation.hpp
@@ -23,8 +23,11 @@
 #include <cstdint>
 #include <vector>
 
+#include <QColor>
 #include <QString>
 
+#include "pv/data/decode/row.hpp"
+
 using std::vector;
 
 struct srd_proto_data;
@@ -33,30 +36,44 @@ namespace pv {
 namespace data {
 namespace decode {
 
-class Row;
+class RowData;
 
 class Annotation
 {
 public:
-	typedef uint32_t Class;
+	Annotation(uint64_t start_sample, uint64_t end_sample,
+		const vector<QString>* texts, uint32_t ann_class_id, const RowData *data);
+	Annotation(Annotation&& a);
+	Annotation& operator=(Annotation&& a);
 
-public:
-	Annotation(const srd_proto_data *const pdata, const Row *row);
+	const RowData* row_data() const;
+	const Row* row() const;
 
 	uint64_t start_sample() const;
 	uint64_t end_sample() const;
-	Class ann_class() const;
-	const vector<QString>& annotations() const;
-	const Row* row() const;
+	uint64_t length() const;
+
+	uint32_t ann_class_id() const;
+	const QString ann_class_name() const;
+	const QString ann_class_description() const;
+
+	const vector<QString>* annotations() const;
+	const QString longest_annotation() const;
+
+	bool visible() const;
+
+	const QColor color() const;
+	const QColor bright_color() const;
+	const QColor dark_color() const;
 
 	bool operator<(const Annotation &other) const;
 
 private:
 	uint64_t start_sample_;
 	uint64_t end_sample_;
-	Class ann_class_;
-	vector<QString> annotations_;
-	const Row *row_;
+	const vector<QString>* texts_;
+	uint32_t ann_class_id_;
+	const RowData* data_;
 };
 
 } // namespace decode