X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.hpp;h=ab109001bd96d72441f5f0bff45a150e9266d861;hb=8845be3c9c7d5aca02fb2efc4038f4735a5242d6;hp=0589ec894eb444fad4f2d0d759c98a1eabc13fc7;hpb=5a914348e8c95f92fd7c1c5988d563c5fb472aa2;p=pulseview.git

diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp
index 0589ec89..ab109001 100644
--- a/pv/data/decode/rowdata.hpp
+++ b/pv/data/decode/rowdata.hpp
@@ -20,13 +20,29 @@
 #ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
 #define PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
 
+#include <unordered_map>
 #include <vector>
 
+#include <QtGlobal>
+#include <QHash>
+#include <QString>
+
 #include <libsigrokdecode/libsigrokdecode.h>
 
-#include "annotation.hpp"
+#include <pv/data/decode/annotation.hpp>
+
+using std::deque;
+using std::unordered_map;
 
-using std::vector;
+#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 {
@@ -37,24 +53,31 @@ class Row;
 class RowData
 {
 public:
-	RowData() = default;
+	RowData(Row* row);
+
+	const Row* row() const;
 
-public:
 	uint64_t get_max_sample() const;
 
+	uint64_t get_annotation_count() const;
+
 	/**
 	 * 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(
-		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 emplace_annotation(srd_proto_data *pdata, const Row *row);
+	const deque<Annotation>& annotations() const;
+
+	const Annotation* emplace_annotation(srd_proto_data *pdata);
 
 private:
-	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_;
 };
 
 }  // namespace decode