projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Logging: Write messages from qDebug() and friends also to stdout
[pulseview.git]
/
pv
/
data
/
decode
/
row.cpp
diff --git
a/pv/data/decode/row.cpp
b/pv/data/decode/row.cpp
index 70a060938aedb11642ae2eb8e7526ac8054d295c..8195f3e2d00f023c0cdfb91f4b0464c8065d5eab 100644
(file)
--- a/
pv/data/decode/row.cpp
+++ b/
pv/data/decode/row.cpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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.hpp"
*/
#include "row.hpp"
@@
-32,7
+31,8
@@
Row::Row() :
{
}
{
}
-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)
{
decoder_(decoder),
row_(row)
{
@@
-52,8
+52,8
@@
const QString Row::title() const
{
if (decoder_ && decoder_->name && row_ && row_->desc)
return QString("%1: %2")
{
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)
if (decoder_ && decoder_->name)
return QString::fromUtf8(decoder_->name);
if (row_ && row_->desc)
@@
-61,12
+61,24
@@
const QString Row::title() const
return QString();
}
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_);
}
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