X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.cpp;h=7f2334788f70f93c2a734d680c90d6a8b957d293;hb=9d307c60d7fc2dee27bca6eaadd1e68bf7ab0cbf;hp=9f86b2bab84362e26503233c3cb516ee7ebcdf41;hpb=1dcd9b18186741d3ce3164f7e8d6cb13abb578d3;p=pulseview.git

diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
index 9f86b2ba..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<QString>* texts, Class ann_class_id, const RowData *data) :
+	const vector<QString>* texts, uint32_t ann_class_id, const RowData *data) :
 	start_sample_(start_sample),
 	end_sample_(end_sample),
 	texts_(texts),
@@ -66,8 +66,14 @@ Annotation& Annotation::operator=(Annotation&& a)
 	return *this;
 }
 
-Annotation::~Annotation()
+const RowData* Annotation::row_data() const
 {
+	return data_;
+}
+
+const Row* Annotation::row() const
+{
+	return data_->row();
 }
 
 uint64_t Annotation::start_sample() const
@@ -80,7 +86,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_;
 }
@@ -93,6 +104,14 @@ const QString Annotation::ann_class_name() const
 	return QString(ann_class->name);
 }
 
+const QString Annotation::ann_class_description() const
+{
+	const AnnotationClass* ann_class =
+		data_->row()->decoder()->get_ann_class_by_id(ann_class_id_);
+
+	return QString(ann_class->description);
+}
+
 const vector<QString>* Annotation::annotations() const
 {
 	return texts_;
@@ -103,9 +122,27 @@ const QString Annotation::longest_annotation() const
 	return texts_->front();
 }
 
-const Row* Annotation::row() const
+bool Annotation::visible() const
 {
-	return data_->row();
+	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_);
+}
+
+const QColor Annotation::bright_color() const
+{
+	return data_->row()->get_bright_class_color(ann_class_id_);
+}
+
+const QColor Annotation::dark_color() const
+{
+	return data_->row()->get_dark_class_color(ann_class_id_);
 }
 
 bool Annotation::operator<(const Annotation &other) const