Fix #811 by using a hashed annotation text backing storage

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

diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp
index 48b6a41a68a260783dd0740b8ac57f63448eb4e9..f01aa3ca81c2f71a24c61dc71f7b1d1ba67f7139 100644 (file)
--- a/pv/data/decode/rowdata.hpp
+++ b/pv/data/decode/rowdata.hpp
@@ -20,14 +20,26 @@
 #ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
 #define PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
 
+#include <unordered_map>
 #include <vector>
 
+#include <QHash>
+#include <QString>
+
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include <pv/data/decode/annotation.hpp>
 
 using std::deque;
-using std::vector;
+using std::unordered_map;
+
+namespace std {
+  template<> struct hash<QString> {
+    std::size_t operator()(const QString& s) const noexcept {
+      return (size_t) qHash(s);
+    }
+  };
+}
 
 namespace pv {
 namespace data {
@@ -40,6 +52,8 @@ class RowData
 public:
        RowData(Row* row);
 
+       const Row* row() const;
+
        uint64_t get_max_sample() const;
 
        uint64_t get_annotation_count() const;
@@ -56,6 +70,7 @@ public:
 
 private:
        deque<Annotation> annotations_;
+       unordered_map<QString, vector<QString> > ann_texts_;  // unordered_map since pointers must not change
        Row* row_;
        uint64_t prev_ann_start_sample_;
 };