X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frow.cpp;h=f1895ae4ef7c71bb100c46d645fc356cc4d78b57;hb=38b77a3ba1738aebf516491cc95e25219938a877;hp=31e4cc8e9add3233cb3f3296554d1d224da5b770;hpb=c6b4e925a8c5d855a70ab2815e8bc1c371d5801a;p=pulseview.git

diff --git a/pv/data/decode/row.cpp b/pv/data/decode/row.cpp
index 31e4cc8e..f1895ae4 100644
--- a/pv/data/decode/row.cpp
+++ b/pv/data/decode/row.cpp
@@ -17,6 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <cassert>
+
 #include "decoder.hpp"
 #include "row.hpp"
 
@@ -27,15 +29,17 @@ namespace data {
 namespace decode {
 
 Row::Row() :
+	index_(0),
 	decoder_(nullptr),
-	row_(nullptr)
+	srd_row_(nullptr),
+	visible_(true)
 {
 }
 
-Row::Row(int index, const Decoder* decoder, const srd_decoder_annotation_row* row) :
+Row::Row(uint32_t index, Decoder* decoder, const srd_decoder_annotation_row* srd_row) :
 	index_(index),
 	decoder_(decoder),
-	row_(row),
+	srd_row_(srd_row),
 	visible_(true)
 {
 }
@@ -45,32 +49,55 @@ const Decoder* Row::decoder() const
 	return decoder_;
 }
 
-const srd_decoder_annotation_row* Row::srd_row() const
+const srd_decoder_annotation_row* Row::get_srd_row() const
 {
-	return row_;
+	return srd_row_;
 }
 
 const QString Row::title() const
 {
-	if (decoder_ && decoder_->name() && row_ && row_->desc)
+	if (decoder_ && decoder_->name() && srd_row_ && srd_row_->desc)
 		return QString("%1: %2")
 			.arg(QString::fromUtf8(decoder_->name()),
-			     QString::fromUtf8(row_->desc));
+			     QString::fromUtf8(srd_row_->desc));
 	if (decoder_ && decoder_->name())
 		return QString::fromUtf8(decoder_->name());
-	if (row_ && row_->desc)
-		return QString::fromUtf8(row_->desc);
+	if (srd_row_ && srd_row_->desc)
+		return QString::fromUtf8(srd_row_->desc);
+
 	return QString();
 }
 
-const QString Row::class_name() const
+const QString Row::description() const
 {
-	if (row_ && row_->desc)
-		return QString::fromUtf8(row_->desc);
+	if (srd_row_ && srd_row_->desc)
+		return QString::fromUtf8(srd_row_->desc);
 	return QString();
 }
 
-int Row::index() const
+vector<AnnotationClass*> Row::ann_classes() const
+{
+	assert(decoder_);
+
+	vector<AnnotationClass*> result;
+
+	if (!srd_row_) {
+		if (index_ == 0) {
+			// When operating as the fallback row, all annotation classes belong to it
+			return decoder_->ann_classes();
+		}
+		return result;
+	}
+
+	for (GSList *l = srd_row_->ann_classes; l; l = l->next) {
+		size_t class_id = (size_t)l->data;
+		result.push_back(decoder_->get_ann_class_by_id(class_id));
+	}
+
+	return result;
+}
+
+uint32_t Row::index() const
 {
 	return index_;
 }
@@ -85,15 +112,24 @@ void Row::set_visible(bool visible)
 	visible_ = visible;
 }
 
+bool Row::has_hidden_classes() const
+{
+	for (const AnnotationClass* c : ann_classes())
+		if (!c->visible)
+			return true;
+
+	return false;
+}
+
 bool Row::operator<(const Row& other) const
 {
 	return (decoder_ < other.decoder_) ||
-		(decoder_ == other.decoder_ && row_ < other.row_);
+		(decoder_ == other.decoder_ && srd_row_ < other.srd_row_);
 }
 
 bool Row::operator==(const Row& other) const
 {
-	return ((decoder_ == other.decoder()) && (row_ == other.srd_row()));
+	return ((decoder_ == other.decoder()) && (srd_row_ == other.srd_row_));
 }
 
 }  // namespace decode