X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.cpp;h=f8a5c47b66236a8be66327a2c9ea05568970749f;hp=fe0350d03b1643a4aedba1623a27ba23981c83b0;hb=HEAD;hpb=88a2597864920ecdbe66cf0cd4b8172bdabb2263
diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
index fe0350d0..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),
@@ -86,7 +84,12 @@ uint64_t Annotation::end_sample() const
return end_sample_;
}
-Annotation::Class Annotation::ann_class_id() const
+uint64_t Annotation::length() const
+{
+ return end_sample_ - start_sample_;
+}
+
+uint32_t Annotation::ann_class_id() const
{
return ann_class_id_;
}
@@ -117,6 +120,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_);