X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.hpp;h=0589ec894eb444fad4f2d0d759c98a1eabc13fc7;hp=b62711117d0c1a0066ad05570ca6ad7623e3073b;hb=b571a8e7e0dc3e3b6daa58f27050e76466f006dd;hpb=8b2eb22ed4f467f5364e8e9824a12137e2433b7e diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp index b6271111..0589ec89 100644 --- a/pv/data/decode/rowdata.hpp +++ b/pv/data/decode/rowdata.hpp @@ -22,12 +22,18 @@ #include +#include + #include "annotation.hpp" +using std::vector; + namespace pv { namespace data { namespace decode { +class Row; + class RowData { public: @@ -37,20 +43,22 @@ public: uint64_t get_max_sample() 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, + vector &dest, uint64_t start_sample, uint64_t end_sample) const; - void push_annotation(const Annotation &a); + void emplace_annotation(srd_proto_data *pdata, const Row *row); private: - std::vector annotations_; + vector annotations_; }; -} -} // data -} // pv +} // namespace decode +} // namespace data +} // namespace pv #endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP