Fix #811 by using a hashed annotation text backing storage

[pulseview.git] / pv / data / decode / annotation.hpp

diff --git a/pv/data/decode/annotation.hpp b/pv/data/decode/annotation.hpp
index 42a291a2134a5d7eb439b6a2c7dda7ffcac1238d..df99ecb980676247cf62ae6c891505af273ada16 100644 (file)
--- a/pv/data/decode/annotation.hpp
+++ b/pv/data/decode/annotation.hpp
@@ -33,21 +33,39 @@ namespace pv {
 namespace data {
 namespace decode {
 
+class Row;
+class RowData;
+
 class Annotation
 {
 public:
-       Annotation(const srd_proto_data *const pdata);
+       typedef uint32_t Class;
+
+public:
+       Annotation(uint64_t start_sample, uint64_t end_sample,
+               const vector<QString>* texts, Class ann_class_id, const RowData *data);
+       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 QString longest_annotation() 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_;
+       const vector<QString>* texts_;
+       Class ann_class_id_;
+       const RowData* data_;
 };
 
 } // namespace decode