X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frow.cpp;h=8195f3e2d00f023c0cdfb91f4b0464c8065d5eab;hb=dda88657a1548ea510f2b4945ec86cdcc464a803;hp=8e3a6512f8b55119f38219333165a686e98d62f9;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git diff --git a/pv/data/decode/row.cpp b/pv/data/decode/row.cpp index 8e3a6512..8195f3e2 100644 --- a/pv/data/decode/row.cpp +++ b/pv/data/decode/row.cpp @@ -14,11 +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 "row.h" +#include "row.hpp" #include @@ -27,12 +26,13 @@ namespace data { namespace decode { Row::Row() : - decoder_(NULL), - row_(NULL) + decoder_(nullptr), + row_(nullptr) { } -Row::Row(const srd_decoder *decoder, const srd_decoder_annotation_row *row) : +Row::Row(int index, const srd_decoder *decoder, const srd_decoder_annotation_row *row) : + index_(index), decoder_(decoder), row_(row) { @@ -52,8 +52,8 @@ const QString Row::title() const { if (decoder_ && decoder_->name && row_ && row_->desc) return QString("%1: %2") - .arg(QString::fromUtf8(decoder_->name)) - .arg(QString::fromUtf8(row_->desc)); + .arg(QString::fromUtf8(decoder_->name), + QString::fromUtf8(row_->desc)); if (decoder_ && decoder_->name) return QString::fromUtf8(decoder_->name); if (row_ && row_->desc) @@ -61,12 +61,24 @@ const QString Row::title() const return QString(); } +const QString Row::class_name() const +{ + if (row_ && row_->desc) + return QString::fromUtf8(row_->desc); + return QString(); +} + +int Row::index() const +{ + return index_; +} + bool Row::operator<(const Row &other) const { return (decoder_ < other.decoder_) || (decoder_ == other.decoder_ && row_ < other.row_); } -} // decode -} // data -} // pv +} // namespace decode +} // namespace data +} // namespace pv