From a699210d770882aa33fab0447b7e08372ceb52bf Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Wed, 8 Sep 2021 09:55:38 -0400 Subject: [PATCH] add column for channel count --- example/sACN Explorer/multiverseitem.cpp | 8 ++++++-- example/sACN Explorer/multiversemodel.cpp | 8 +++++--- example/sACN Explorer/multiversemodel.h | 1 + example/sACN Explorer/sacnexplorer.cpp | 6 +++--- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/example/sACN Explorer/multiverseitem.cpp b/example/sACN Explorer/multiverseitem.cpp index 2258849..ff581cf 100644 --- a/example/sACN Explorer/multiverseitem.cpp +++ b/example/sACN Explorer/multiverseitem.cpp @@ -140,6 +140,11 @@ QVariant MultiverseItem::data(int column, int role) const return QVariant(); return v; } + case MultiverseModel::Channels: + { + auto active = universe_->activeSlots(); + return active ? active - 1 : active; + } case MultiverseModel::Description: return universe_->description(); default: @@ -196,9 +201,8 @@ Qt::ItemFlags MultiverseItem::flags(int column, Qt::ItemFlags base) const switch (static_cast(column)) { case MultiverseModel::Universe: - return base; case MultiverseModel::Priority: - return base; + case MultiverseModel::Channels: case MultiverseModel::Description: return base; default: diff --git a/example/sACN Explorer/multiversemodel.cpp b/example/sACN Explorer/multiversemodel.cpp index d239662..8b24ca8 100644 --- a/example/sACN Explorer/multiversemodel.cpp +++ b/example/sACN Explorer/multiversemodel.cpp @@ -83,11 +83,13 @@ QVariant MultiverseModel::headerData(int section, Qt::Orientation orientation, if (role == Qt::DisplayRole && orientation == Qt::Horizontal) { switch (static_cast(section)) { case Universe: - return QString(tr("Universe")); + return tr("Universe"); case Priority: - return QString(tr("Priority")); + return tr("Priority"); + case Channels: + return tr("Channels"); case Description: - return QString(tr("Description")); + return tr("Description"); } } return QVariant(); diff --git a/example/sACN Explorer/multiversemodel.h b/example/sACN Explorer/multiversemodel.h index eb0ff49..185fbb0 100644 --- a/example/sACN Explorer/multiversemodel.h +++ b/example/sACN Explorer/multiversemodel.h @@ -27,6 +27,7 @@ public: enum Column { Universe, Priority, + Channels, Description }; Q_ENUM(Column) diff --git a/example/sACN Explorer/sacnexplorer.cpp b/example/sACN Explorer/sacnexplorer.cpp index 3965509..acbefdb 100644 --- a/example/sACN Explorer/sacnexplorer.cpp +++ b/example/sACN Explorer/sacnexplorer.cpp @@ -27,11 +27,11 @@ SacnExplorer::SacnExplorer(int argc, char *argv[]) node_->subscribe(4); node_->create(1); - node_->sACN::Source::universe(1)->setValue(100, 1); + node_->sACN::Source::universe(1)->setValue(1, 1); node_->create(2); - node_->sACN::Source::universe(2)->setValue(100, 2); + node_->sACN::Source::universe(2)->setValue(128, 2); node_->create(3); - node_->sACN::Source::universe(3)->setValue(100, 3); + node_->sACN::Source::universe(3)->setValue(512, 3); }