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 8b91c4f47e066605e307ed0301fbd1871d59436d..df99ecb980676247cf62ae6c891505af273ada16 100644 (file)
--- a/pv/data/decode/annotation.hpp
+++ b/pv/data/decode/annotation.hpp
@@ -34,6 +34,7 @@ namespace data {
 namespace decode {
 
 class Row;
+class RowData;
 
 class Annotation
 {
@@ -41,12 +42,20 @@ public:
        typedef uint32_t Class;
 
 public:
-       Annotation(const srd_proto_data *const pdata, const Row *row);
+       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;
-       Class ann_class() 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;
@@ -54,9 +63,9 @@ public:
 private:
        uint64_t start_sample_;
        uint64_t end_sample_;
-       Class ann_class_;
-       vector<QString> annotations_;
-       const Row *row_;
+       const vector<QString>* texts_;
+       Class ann_class_id_;
+       const RowData* data_;
 };
 
 } // namespace decode