X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.hpp;fp=pv%2Fdata%2Fdecode%2Fannotation.hpp;h=8b91c4f47e066605e307ed0301fbd1871d59436d;hb=3782d8609d2f4bd66855dc4f72c0f74d9bc11c23;hp=2be8e88d989e4cddacaa18d9b86156ca875c4e95;hpb=4deee4de1660cd5cdc100f3130a3e68af97212d9;p=pulseview.git diff --git a/pv/data/decode/annotation.hpp b/pv/data/decode/annotation.hpp index 2be8e88d..8b91c4f4 100644 --- a/pv/data/decode/annotation.hpp +++ b/pv/data/decode/annotation.hpp @@ -20,7 +20,8 @@ #ifndef PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP #define PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP -#include +#include +#include #include @@ -32,21 +33,30 @@ namespace pv { namespace data { namespace decode { +class Row; + class Annotation { public: - Annotation(const srd_proto_data *const pdata); + typedef uint32_t Class; + +public: + Annotation(const srd_proto_data *const pdata, const Row *row); uint64_t start_sample() const; uint64_t end_sample() const; - int format() const; + Class ann_class() const; const vector& annotations() const; + const Row* row() const; + + bool operator<(const Annotation &other) const; private: uint64_t start_sample_; uint64_t end_sample_; - int format_; + Class ann_class_; vector annotations_; + const Row *row_; }; } // namespace decode