Backport recent changes from mainline.

[pulseview.git] / pv / data / decode / row.cpp

diff --git a/pv/data/decode/row.cpp b/pv/data/decode/row.cpp
index 8195f3e2d00f023c0cdfb91f4b0464c8065d5eab..f1895ae4ef7c71bb100c46d645fc356cc4d78b57 100644 (file)
--- a/pv/data/decode/row.cpp
+++ b/pv/data/decode/row.cpp
@@ -17,6 +17,9 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <cassert>
+
+#include "decoder.hpp"
 #include "row.hpp"
 
 #include <libsigrokdecode/libsigrokdecode.h>
@@ -26,57 +29,107 @@ namespace data {
 namespace decode {
 
 Row::Row() :
+       index_(0),
        decoder_(nullptr),
-       row_(nullptr)
+       srd_row_(nullptr),
+       visible_(true)
 {
 }
 
-Row::Row(int index, const srd_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)
 {
 }
 
-const srd_decoder* Row::decoder() const
+const Decoder* Row::decoder() const
 {
        return decoder_;
 }
 
-const srd_decoder_annotation_row* Row::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));
-       if (decoder_ && decoder_->name)
-               return QString::fromUtf8(decoder_->name);
-       if (row_ && row_->desc)
-               return QString::fromUtf8(row_->desc);
+                       .arg(QString::fromUtf8(decoder_->name()),
+                            QString::fromUtf8(srd_row_->desc));
+       if (decoder_ && decoder_->name())
+               return QString::fromUtf8(decoder_->name());
+       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_;
 }
 
-bool Row::operator<(const Row &other) const
+bool Row::visible() const
+{
+       return visible_;
+}
+
+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()) && (srd_row_ == other.srd_row_));
 }
 
 }  // namespace decode