X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frow.cpp;h=f1895ae4ef7c71bb100c46d645fc356cc4d78b57;hb=d5e790204dcc9a6aa8626294aa505634c179261f;hp=2aabf0f93fc0fc5dfa1237dd48d759126df28d9c;hpb=88908838c9682423c83da4cf1ab07e3aa43fc47e;p=pulseview.git
diff --git a/pv/data/decode/row.cpp b/pv/data/decode/row.cpp
index 2aabf0f9..f1895ae4 100644
--- a/pv/data/decode/row.cpp
+++ b/pv/data/decode/row.cpp
@@ -14,11 +14,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
-#include "row.h"
+#include
+
+#include "decoder.hpp"
+#include "row.hpp"
#include
@@ -27,46 +29,109 @@ namespace data {
namespace decode {
Row::Row() :
- _decoder(NULL),
- _row(NULL)
+ index_(0),
+ decoder_(nullptr),
+ srd_row_(nullptr),
+ visible_(true)
{
}
-Row::Row(const srd_decoder *decoder, const srd_decoder_annotation_row *row) :
- _decoder(decoder),
- _row(row)
+Row::Row(uint32_t index, Decoder* decoder, const srd_decoder_annotation_row* srd_row) :
+ index_(index),
+ decoder_(decoder),
+ srd_row_(srd_row),
+ visible_(true)
{
}
-const srd_decoder* Row::decoder() const
+const Decoder* Row::decoder() const
{
- return _decoder;
+ 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))
- .arg(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::description() const
+{
+ if (srd_row_ && srd_row_->desc)
+ return QString::fromUtf8(srd_row_->desc);
return QString();
}
-bool Row::operator<(const Row &other) const
+vector Row::ann_classes() const
+{
+ assert(decoder_);
+
+ vector 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::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_ && srd_row_ < other.srd_row_);
+}
+
+bool Row::operator==(const Row& other) const
{
- return (_decoder < other._decoder) ||
- (_decoder == other._decoder && _row < other._row);
+ return ((decoder_ == other.decoder()) && (srd_row_ == other.srd_row_));
}
-} // decode
-} // data
-} // pv
+} // namespace decode
+} // namespace data
+} // namespace pv