X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fdecode%2Fannotation.cpp;h=f8a5c47b66236a8be66327a2c9ea05568970749f;hb=HEAD;hp=1a331b3e143aeb46e0969b5936dac60e7fa314aa;hpb=86d4b8e3e52a422fe3a6956d6bbef27f1859717b;p=pulseview.git
diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
index 1a331b3e..f8a5c47b 100644
--- a/pv/data/decode/annotation.cpp
+++ b/pv/data/decode/annotation.cpp
@@ -17,9 +17,7 @@
* along with this program; if not, see .
*/
-extern "C" {
#include
-}
#include
#include
@@ -35,7 +33,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 +89,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_;
}
@@ -126,7 +124,8 @@ bool Annotation::visible() const
{
const Row* row = data_->row();
- return (row->visible() && row->class_is_visible(ann_class_id_));
+ return (row->visible() && row->class_is_visible(ann_class_id_)
+ && row->decoder()->visible());
}
const QColor Annotation::color() const