X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.cpp;h=7f2334788f70f93c2a734d680c90d6a8b957d293;hp=27a44fe4808208b09240d575910ff4f72b68cc42;hb=1e948182f3f9353bd74875a37cacc833312a8c8e;hpb=d656b01007629b239b51ab34e5a0219ef4f2595a diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp index 27a44fe4..7f233478 100644 --- a/pv/data/decode/annotation.cpp +++ b/pv/data/decode/annotation.cpp @@ -35,7 +35,7 @@ namespace data { namespace decode { Annotation::Annotation(uint64_t start_sample, uint64_t end_sample, - const vector* texts, Class ann_class_id, const RowData *data) : + const vector* texts, uint32_t ann_class_id, const RowData *data) : start_sample_(start_sample), end_sample_(end_sample), texts_(texts), @@ -91,7 +91,7 @@ uint64_t Annotation::length() const return end_sample_ - start_sample_; } -Annotation::Class Annotation::ann_class_id() const +uint32_t Annotation::ann_class_id() const { return ann_class_id_; } @@ -122,6 +122,14 @@ const QString Annotation::longest_annotation() const return texts_->front(); } +bool Annotation::visible() const +{ + const Row* row = data_->row(); + + return (row->visible() && row->class_is_visible(ann_class_id_) + && row->decoder()->visible()); +} + const QColor Annotation::color() const { return data_->row()->get_class_color(ann_class_id_);