official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

whitespace cleanups

This commit is contained in:
Kevin Matz 2021-09-10 11:47:48 -04:00
parent 7b0cb3d268
commit b5c099af35
10 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/sACN Explorer/multiverseitem.cpp
View File

@ -12,7 +12,7 @@
* @param parent
*/
MultiverseItem::MultiverseItem(MultiverseItem* parent,
QSacnUniverse *universe,
QSacnUniverse* universe,
discoveredUniverse *discovery)
: universe_(universe)
, discovery_(discovery)

4
example/sACN Explorer/multiverseitem.h
View File

@ -16,8 +16,8 @@ class MultiverseItem
{
public:
explicit MultiverseItem(MultiverseItem* parentItem = nullptr,
QSacnUniverse * universe = nullptr,
discoveredUniverse * discovery = nullptr);
QSacnUniverse* universe = nullptr,
discoveredUniverse* discovery = nullptr);
virtual ~MultiverseItem();
void appendChild(MultiverseItem* child);

7
example/sACN Explorer/multiversemodel.cpp
View File

@ -211,20 +211,21 @@ Qt::ItemFlags MultiverseModel::flags(const QModelIndex &index) const
* @return
*/
void MultiverseModel::insert(const QModelIndex &parent,
QSacnUniverse *universe,
QSacnUniverse* universe,
discoveredUniverse *discovery)
{
auto item = getItem(parent);
beginInsertRows(parent, item->childCount(), item->childCount());
auto child = new MultiverseItem(item, universe, discovery);
endInsertRows();
auto index = QPersistentModelIndex(createIndex(item->childCount(), 0, child));
connect(universe, &QSacnUniverse::changed,
this, [this, index] () {
auto begin = index.sibling(index.row(), 0);
auto end = begin.siblingAtColumn(columnCount() - 1);
emit dataChanged(begin, end);
});
endInsertRows();
}
@ -301,7 +302,7 @@ void MultiverseModel::doCreation(QSacnUniverse* universe)
* @brief MultiverseModel::doTerminate
* @param universe
*/
void MultiverseModel::doTerminate(QSacnUniverse* universe)
void MultiverseModel::doTerminate(QSacnUniverse *universe)
{
auto parentIndex = categoryIndexes.value(MultiverseModel::Source);
remove(parentIndex, QVariant::fromValue(universe));

6
example/sACN Explorer/universemodel.h
View File

@ -31,17 +31,17 @@ public:
Qt::ItemFlags flags(const QModelIndex& index) const override;
// Data source:
void setUniverse(QSacnUniverse *universe);
void setUniverse(QSacnUniverse* universe);
data_modes dataMode();
signals:
void recievedUpdate(const QSacnUniverse*);
void recievedUpdate(QSacnUniverse*);
public slots:
void universeRefreshed();
void setDataMode(const QString mode);
private:
QSacnUniverse * universe_;
QSacnUniverse* universe_;
data_modes data_mode_;
};

2
example/sACN Explorer/universeview.cpp
View File

@ -75,7 +75,7 @@ UniverseView::~UniverseView()
* @brief UniverseView::updateStatusBar
* @param universe
*/
void UniverseView::updateStatus(const QSacnUniverse * universe)
void UniverseView::updateStatus(QSacnUniverse* universe)
{
// window title
QString titlestring = QString("%1 " + tr("Universe") + " %2 - \"%3\"").arg(

2
example/sACN Explorer/universeview.h
View File

@ -23,7 +23,7 @@ public:
virtual ~UniverseView();
public slots:
void updateStatus(const QSacnUniverse*);
void updateStatus(QSacnUniverse *);
private:
Ui::UniverseView *ui;

4
platform/qt/qsacnnode.cpp
View File

@ -162,7 +162,7 @@ void QSacnNode::rlpSend(const ACN::PDU::Stream stream,
* @param u
* @return
*/
QSacnUniverse * QSacnNode::universe(const uint16_t u)
QSacnUniverse* QSacnNode::universe(const uint16_t u)
{
return rx_universes.value(u);
}
@ -173,7 +173,7 @@ QSacnUniverse * QSacnNode::universe(const uint16_t u)
* @param u
* @return
*/
QSacnUniverse * QSacnNode::source(const uint16_t u)
QSacnUniverse *QSacnNode::source(const uint16_t u)
{
return tx_universes.value(u);
}

4
platform/qt/qsacnnode.h
View File

@ -26,8 +26,8 @@ public:
// rlp component
void rlpSend(const ACN::PDU::Stream, const ACN::SDT::UDP::ipAddress&) override;
QSacnUniverse * universe(const uint16_t u);
QSacnUniverse * source(const uint16_t u);
QSacnUniverse* universe(const uint16_t u);
QSacnUniverse* source(const uint16_t u);
public slots:
void subscribe(const uint16_t) override;

8
platform/qt/qsacnuniverse.cpp
View File

@ -18,6 +18,14 @@ QSacnUniverse::QSacnUniverse(QObject *parent, std::shared_ptr<sACN::Universe> un
};
/**
* @brief QSacnUniverse::~QSacnUniverse
*/
QSacnUniverse::~QSacnUniverse()
{
}
/**
* @brief QSacnUniverse::description
* @return

32
platform/qt/qsacnuniverse.h
View File

@ -15,26 +15,28 @@ class QT_EXPORT QSacnUniverse
public:
explicit QSacnUniverse(QObject *parent = nullptr,
std::shared_ptr<sACN::Universe> universe = nullptr);
virtual ~QSacnUniverse();
const QString description() const;
uint16_t number() const;
uint8_t priority() const;
double rxRate() const;
uint8_t slot(const u_int16_t) const;
uint16_t activeSlots() const;
bool isEditable() const;
const QString description() const;
uint16_t number() const;
uint8_t priority() const;
double rxRate() const;
uint8_t slot(const u_int16_t) const;
uint16_t activeSlots() const;
bool isEditable() const;
public slots:
void setDescription(std::string desc);
void setOptions(sACN::DATA::data_options o);
void setPriority(uint8_t p);
void setSyncAddress(uint16_t a);
void setValue (const uint16_t addr, const uint8_t level);
void setValue (const uint16_t addr, const uint16_t size,
const uint8_t* profile);
void setDescription(std::string desc);
void setOptions(sACN::DATA::data_options o);
void setPriority(uint8_t p);
void setSyncAddress(uint16_t a);
void setValue (const uint16_t addr, const uint8_t level);
void setValue (const uint16_t addr, const uint16_t size,
const uint8_t* profile);
void syncSources();
signals:
void changed();
void changed();
private:
std::shared_ptr<sACN::Universe> universe_;