X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frow.cpp;h=12951556390c15f2a0ed5e2e647365cb567fb675;hb=cbb2e4da8042495531b406f745ee9d9e20448ef6;hp=0eee547c220ae2c80478d492645e8c7f9fd1ebd8;hpb=f9101a91fc942a28515872ae6c7285973bd54b91;p=pulseview.git

diff --git a/pv/data/decode/row.cpp b/pv/data/decode/row.cpp
index 0eee547c..12951556 100644
--- a/pv/data/decode/row.cpp
+++ b/pv/data/decode/row.cpp
@@ -14,44 +14,77 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
-#include "row.h"
+#include "decoder.hpp"
+#include "row.hpp"
+
+#include <libsigrokdecode/libsigrokdecode.h>
 
 namespace pv {
 namespace data {
 namespace decode {
 
 Row::Row() :
-	_decoder(NULL),
-	_row(NULL)
+	decoder_(nullptr),
+	row_(nullptr)
+{
+}
+
+Row::Row(int index, const Decoder* decoder, const srd_decoder_annotation_row* row) :
+	index_(index),
+	decoder_(decoder),
+	row_(row)
+{
+}
+
+const Decoder* Row::decoder() const
+{
+	return decoder_;
+}
+
+const srd_decoder_annotation_row* Row::srd_row() const
+{
+	return row_;
+}
+
+const QString Row::title() const
 {
+	if (decoder_ && decoder_->name() && row_ && 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);
+	return QString();
 }
 
-Row::Row(const srd_decoder *decoder, const srd_decoder_annotation_row *row) :
-	_decoder(decoder),
-	_row(row)
+const QString Row::class_name() const
 {
+	if (row_ && row_->desc)
+		return QString::fromUtf8(row_->desc);
+	return QString();
 }
 
-const srd_decoder* Row::decoder() const
+int Row::index() const
 {
-	return _decoder;
+	return index_;
 }
 
-const srd_decoder_annotation_row* Row::row() const
+bool Row::operator<(const Row& other) const
 {
-	return _row;
+	return (decoder_ < other.decoder_) ||
+		(decoder_ == other.decoder_ && row_ < other.row_);
 }
 
-bool Row::operator<(const Row &other) const
+bool Row::operator==(const Row& other) const
 {
-	return (_decoder < other._decoder) ||
-		(_decoder == other._decoder && _row < other._row);
+	return ((decoder_ == other.decoder()) && (row_ == other.srd_row()));
 }
 
-} // decode
-} // data
-} // pv
+}  // namespace decode
+}  // namespace data
+}  // namespace pv