X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=f00a9f1cabaefc35de74ea66ede5544f15d99a56;hp=9bbdd2c4e2c9d68e21d69782f5d2e78ecc0e7000;hb=5a914348e8c95f92fd7c1c5988d563c5fb472aa2;hpb=1ed996b433f3391f54846784d76da4fe6b07500f diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp index 9bbdd2c..f00a9f1 100644 --- a/pv/data/decodesignal.hpp +++ b/pv/data/decodesignal.hpp @@ -134,8 +134,8 @@ public: vector visible_rows() const; /** - * Extracts annotations between the given sample range into a vector. - * Note: The annotations are unsorted and only annotations that fully + * Extracts annotations from a single row into a vector. + * Note: The annotations may be unsorted and only annotations that fully * fit into the sample range are considered. */ void get_annotation_subset( @@ -143,6 +143,15 @@ public: const decode::Row &row, uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const; + /** + * Extracts annotations from all rows into a vector. + * Note: The annotations may be unsorted and only annotations that fully + * fit into the sample range are considered. + */ + void get_annotation_subset( + vector &dest, + uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const; + virtual void save_settings(QSettings &settings) const; virtual void restore_settings(QSettings &settings);