official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

it's the name of the source, not a description of the universe

This commit is contained in:
Kevin Matz 2022-11-24 11:31:51 -05:00
parent 29fd1fc9ed
commit 24ba41a73f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
example/sACN Explorer/multiverseitem.cpp
View File

@ -182,7 +182,7 @@ QVariant MultiverseItem::data(int column, int role) const
auto active = universe_->activeSlots();
return active ? active - 1 : active;
}
case MultiverseModel::Description:
case MultiverseModel::SourceName:
return universe_->description();
default:
return QVariant();
@ -194,7 +194,7 @@ QVariant MultiverseItem::data(int column, int role) const
{
case MultiverseModel::Universe:
return discovery_->universe;
case MultiverseModel::Description:
case MultiverseModel::SourceName:
return QString::fromUtf8(discovery_->description.c_str());
default:
return QVariant();
@ -218,7 +218,7 @@ QVariant MultiverseItem::data(int column, int role) const
{
case MultiverseModel::Priority:
return universe_->priority();
case MultiverseModel::Description:
case MultiverseModel::SourceName:
return universe_->description();
default:
return QVariant(QVariant::fromValue(universe_));
@ -260,7 +260,7 @@ bool MultiverseItem::setData(int column, const QVariant &value, int role)
universe_->setPriority(p);
return true;
}
case MultiverseModel::Description:
case MultiverseModel::SourceName:
{
if (!value.canConvert<QString>())
return false;
@ -297,7 +297,7 @@ Qt::ItemFlags MultiverseItem::flags(int column, Qt::ItemFlags base) const
case MultiverseModel::Channels:
return base;
case MultiverseModel::Priority:
case MultiverseModel::Description:
case MultiverseModel::SourceName:
if (universe_ && universe_->isEditable())
return base | Qt::ItemIsEditable;
else

4
example/sACN Explorer/multiversemodel.cpp
View File

@ -91,8 +91,8 @@ QVariant MultiverseModel::headerData(int section, Qt::Orientation orientation,
return tr("Priority");
case Channels:
return tr("Channels");
case Description:
return tr("Description");
case SourceName:
return tr("Source Name");
}
}
return QVariant();

2
example/sACN Explorer/multiversemodel.h
View File

@ -28,7 +28,7 @@ public:
Universe,
Priority,
Channels,
Description
SourceName
};
Q_ENUM(Column)

2
protocol/sacn/source.cpp
View File

@ -58,7 +58,7 @@ void Source::create(const uint16_t num)
return;
auto metadata = std::make_shared<DATA::data_header>();
metadata->source_name = this->name() + " Universe " + std::to_string(num);
metadata->source_name = this->name();
metadata->universe = num;
universes_mutext_.lock();