X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fdecode%2Frow.cpp;h=72a6869f94250abcbe731a75d5ebcaffc3b028a2;hb=4526de63ae7ed0c3d1a708a84be16acbb9b62356;hp=ca16ae69fd0d496d7be33bb3e2cb73ea49d2ce1e;hpb=744aa24fc5a7084461e4e70595b96f1c3eac65e4;p=pulseview.git
diff --git a/pv/data/decode/row.cpp b/pv/data/decode/row.cpp
index ca16ae69..72a6869f 100644
--- a/pv/data/decode/row.cpp
+++ b/pv/data/decode/row.cpp
@@ -14,10 +14,10 @@
* 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 "decoder.hpp"
#include "row.hpp"
#include
@@ -27,46 +27,94 @@ namespace data {
namespace decode {
Row::Row() :
+ index_(0),
decoder_(nullptr),
- row_(nullptr)
+ srd_row_(nullptr),
+ visible_(true)
{
}
-Row::Row(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::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
+{
+ vector result;
+
+ if (!srd_row_)
+ return result;
+ assert(decoder_);
+
+ 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::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_));
}
-} // decode
-} // data
-} // pv
+} // namespace decode
+} // namespace data
+} // namespace pv