rowdata.hpp: Minor indentation fixes.

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

diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp
index f0e3534f7e2507cb54899a581b05d1d3b63f39c0..ab109001bd96d72441f5f0bff45a150e9266d861 100644 (file)
--- a/pv/data/decode/rowdata.hpp
+++ b/pv/data/decode/rowdata.hpp
@@ -20,37 +20,68 @@
 #ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
 #define PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
 
+#include <unordered_map>
 #include <vector>
 
-#include "annotation.hpp"
+#include <QtGlobal>
+#include <QHash>
+#include <QString>
+
+#include <libsigrokdecode/libsigrokdecode.h>
+
+#include <pv/data/decode/annotation.hpp>
+
+using std::deque;
+using std::unordered_map;
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+namespace std {
+       template<> struct hash<QString> {
+               std::size_t operator()(const QString& s) const noexcept {
+                       return (size_t) qHash(s);
+               }
+       };
+}
+#endif
 
 namespace pv {
 namespace data {
 namespace decode {
 
+class Row;
+
 class RowData
 {
 public:
-       RowData();
+       RowData(Row* row);
+
+       const Row* row() const;
 
-public:
        uint64_t get_max_sample() const;
 
+       uint64_t get_annotation_count() const;
+
        /**
-        * Extracts sorted annotations between two period into a vector.
+        * Extracts annotations between the given sample range into a vector.
+        * Note: The annotations are unsorted and only annotations that fully
+        * fit into the sample range are considered.
         */
-       void get_annotation_subset(
-               std::vector<pv::data::decode::Annotation> &dest,
+       void get_annotation_subset(deque<const pv::data::decode::Annotation*> &dest,
                uint64_t start_sample, uint64_t end_sample) const;
 
-       void push_annotation(const Annotation &a);
+       const deque<Annotation>& annotations() const;
+
+       const Annotation* emplace_annotation(srd_proto_data *pdata);
 
 private:
-       std::vector<Annotation> annotations_;
+       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_;
 };
 
-}
-} // data
-} // pv
+}  // namespace decode
+}  // namespace data
+}  // namespace pv
 
 #endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP