X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.hpp;h=ab109001bd96d72441f5f0bff45a150e9266d861;hb=9d307c60d7fc2dee27bca6eaadd1e68bf7ab0cbf;hp=568b1bb0ad554c6806eaf3d21b2b2fd4bafe526f;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git
diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp
index 568b1bb0..ab109001 100644
--- a/pv/data/decode/rowdata.hpp
+++ b/pv/data/decode/rowdata.hpp
@@ -14,44 +14,74 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
-#ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
-#define PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
+#ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
+#define PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
+#include
#include
-#include "annotation.hpp"
+#include
+#include
+#include
+
+#include
+
+#include
+
+using std::deque;
+using std::unordered_map;
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+namespace std {
+ template<> struct hash {
+ 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 &dest,
+ void get_annotation_subset(deque &dest,
uint64_t start_sample, uint64_t end_sample) const;
- void push_annotation(const Annotation &a);
+ const deque& annotations() const;
+
+ const Annotation* emplace_annotation(srd_proto_data *pdata);
private:
- std::vector annotations_;
+ deque annotations_;
+ unordered_map > 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_H
+#endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP