the source name is not a per/universe property

This commit is contained in:
Kevin Matz 2022-11-24 14:57:11 -05:00
parent 4ad13317fd
commit d57a6a31ad
5 changed files with 7 additions and 52 deletions

View File

@ -183,7 +183,7 @@ QVariant MultiverseItem::data(int column, int role) const
return active ? active - 1 : active; return active ? active - 1 : active;
} }
case MultiverseModel::SourceName: case MultiverseModel::SourceName:
return universe_->description(); return universe_->sourceName();
default: default:
return QVariant(); return QVariant();
} }
@ -218,8 +218,6 @@ QVariant MultiverseItem::data(int column, int role) const
{ {
case MultiverseModel::Priority: case MultiverseModel::Priority:
return universe_->priority(); return universe_->priority();
case MultiverseModel::SourceName:
return universe_->description();
default: default:
return QVariant(QVariant::fromValue(universe_)); return QVariant(QVariant::fromValue(universe_));
} }
@ -260,16 +258,6 @@ bool MultiverseItem::setData(int column, const QVariant &value, int role)
universe_->setPriority(p); universe_->setPriority(p);
return true; return true;
} }
case MultiverseModel::SourceName:
{
if (!value.canConvert<QString>())
return false;
auto d = value.toString();
if (d.size() > 64)
return false;
universe_->setDescription(d);
return true;
}
default: default:
return false; return false;
} }
@ -295,9 +283,9 @@ Qt::ItemFlags MultiverseItem::flags(int column, Qt::ItemFlags base) const
{ {
case MultiverseModel::Universe: case MultiverseModel::Universe:
case MultiverseModel::Channels: case MultiverseModel::Channels:
case MultiverseModel::SourceName:
return base; return base;
case MultiverseModel::Priority: case MultiverseModel::Priority:
case MultiverseModel::SourceName:
if (universe_ && universe_->isEditable()) if (universe_ && universe_->isEditable())
return base | Qt::ItemIsEditable; return base | Qt::ItemIsEditable;
else else

View File

@ -25,14 +25,6 @@ UniverseView::UniverseView(QWidget *parent, QSacnUniverse *universe)
connect(model, &UniverseModel::recievedUpdate, connect(model, &UniverseModel::recievedUpdate,
this, &UniverseView::updateStatus); this, &UniverseView::updateStatus);
// add universe description editor
descriptionEdit = new QLineEdit(this);
descriptionEdit->setMaxLength(64);
descriptionEdit->setEnabled(false);
ui->toolBar->addWidget(descriptionEdit);
ui->toolBar->addSeparator();
// add data format combobox to toolbar // add data format combobox to toolbar
auto formatLabel = new QLabel(this); auto formatLabel = new QLabel(this);
formatLabel->setText(tr("Data Format") + ": "); formatLabel->setText(tr("Data Format") + ": ");
@ -61,10 +53,6 @@ UniverseView::UniverseView(QWidget *parent, QSacnUniverse *universe)
updateStatus(universe); updateStatus(universe);
if (universe->isEditable()) if (universe->isEditable())
{ {
descriptionEdit->setText(universe->description());
descriptionEdit->setEnabled(true);
connect(descriptionEdit, &QLineEdit::textChanged,
universe, &QSacnUniverse::setDescription);
prioritySpinBox->setValue(universe->priority()); prioritySpinBox->setValue(universe->priority());
prioritySpinBox->setEnabled(true); prioritySpinBox->setEnabled(true);
connect(prioritySpinBox, &QSpinBox::valueChanged, connect(prioritySpinBox, &QSpinBox::valueChanged,
@ -89,10 +77,10 @@ UniverseView::~UniverseView()
void UniverseView::updateStatus(QSacnUniverse* universe) void UniverseView::updateStatus(QSacnUniverse* universe)
{ {
// window title // window title
QString titlestring = QString("%1 " + tr("Universe") + " %2").arg( this->setWindowTitle(QString("%1 '%2' : "+tr("Universe")+" %3").arg(
universe->isEditable() ? tr("Editing") : tr("Viewing"), universe->isEditable() ? tr("Editing") : tr("Viewing"),
QString::number(universe->number())); universe->sourceName(),
this->setWindowTitle(titlestring); QString::number(universe->number())));
if (!universe->isEditable()) if (!universe->isEditable())
{ {
@ -101,10 +89,6 @@ void UniverseView::updateStatus(QSacnUniverse* universe)
QString message = QString("%1 " + tr("Hz")).arg( QString message = QString("%1 " + tr("Hz")).arg(
QString::number(universe->rxRate())); QString::number(universe->rxRate()));
ui->statusbar->showMessage(message, 2500); ui->statusbar->showMessage(message, 2500);
// component name
descriptionEdit->setText(universe->description());
// priority spinbox // priority spinbox
prioritySpinBox->setValue(universe->priority()); prioritySpinBox->setValue(universe->priority());
} }

View File

@ -2,7 +2,6 @@
#include "qsacnuniverse.h" #include "qsacnuniverse.h"
#include <QMainWindow> #include <QMainWindow>
#include <QLineEdit>
#include <QSpinBox> #include <QSpinBox>
@ -27,6 +26,5 @@ public slots:
private: private:
Ui::UniverseView *ui; Ui::UniverseView *ui;
QLineEdit *descriptionEdit;
QSpinBox *prioritySpinBox; QSpinBox *prioritySpinBox;
}; };

View File

@ -41,7 +41,7 @@ QSacnUniverse::~QSacnUniverse()
* @brief QSacnUniverse::description * @brief QSacnUniverse::description
* @return * @return
*/ */
const QString QSacnUniverse::description() const const QString QSacnUniverse::sourceName() const
{ {
auto metadata = universe_->provenance(); auto metadata = universe_->provenance();
if (!metadata) if (!metadata)
@ -153,20 +153,6 @@ uint16_t QSacnUniverse::activeSlots() const
} }
/**
* @brief QSacnUniverse::setDescription
* @param desc
*/
void QSacnUniverse::setDescription(const QString &desc)
{
if (!isEditable())
return;
universe_->provenance()->source_name = desc.toStdString();
emit changed();
}
/** /**
* @brief QSacnUniverse::setOptions * @brief QSacnUniverse::setOptions
* @param o * @param o

View File

@ -22,7 +22,7 @@ public:
std::shared_ptr<sACN::Universe> universe = nullptr); std::shared_ptr<sACN::Universe> universe = nullptr);
virtual ~QSacnUniverse(); virtual ~QSacnUniverse();
const QString description() const; const QString sourceName() const;
uint16_t number() const; uint16_t number() const;
uint8_t priority() const; uint8_t priority() const;
double rxRate() const; double rxRate() const;
@ -33,7 +33,6 @@ public:
QSacnUniverse* sourceUniverse(const sACN::DATA::data_header&); QSacnUniverse* sourceUniverse(const sACN::DATA::data_header&);
public slots: public slots:
void setDescription(const QString &desc);
void setOptions(sACN::DATA::data_options o); void setOptions(sACN::DATA::data_options o);
void setPriority(uint8_t p); void setPriority(uint8_t p);
void setSyncAddress(uint16_t a); void setSyncAddress(uint16_t a);