official/OpenLCP
1
0
Fork 0
Code Releases 1 Activity

rename the status indicator class

Browse Source
This commit is contained in:
Kevin Matz 2023-04-16 11:28:17 -04:00
parent 1563e620b9
commit b18823a009
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/sACN Explorer/universewindow.cpp
View File

@ -1,7 +1,7 @@
#include "universewindow.h" #include "universewindow.h"
#include "ui_universewindow.h" #include "ui_universewindow.h"
#include "universemodel.h" #include "universemodel.h"
#include "statusindicatorwidget.h" #include "universestatuswidget.h"
#include <QActionGroup> #include <QActionGroup>
#include <QComboBox> #include <QComboBox>
@ -77,7 +77,7 @@ UniverseWindow::UniverseWindow(QWidget *parent, QSacnUniverse *universe)
}); });
// status indicator // status indicator
auto indicator = new StatusIndicatorWidget(this, mUniverse->get()); auto indicator = new UniverseStatusWidget(this, mUniverse->get());
ui->statusbar->addPermanentWidget(indicator); ui->statusbar->addPermanentWidget(indicator);
update_status_(); update_status_();

4
platform/qt/sacn/CMakeLists.txt
View File

@ -10,8 +10,8 @@ target_sources(${PROJECT_NAME}
multiversemodel.h multiversemodel.h
qsacnnode.h qsacnnode.h
qsacnuniverse.h qsacnuniverse.h
statusindicatorwidget.h
universemodel.h universemodel.h
universestatuswidget.h
PRIVATE PRIVATE
multiverseitem.h multiverseitem.h
multiverseitem.cpp multiverseitem.cpp
@ -19,8 +19,8 @@ target_sources(${PROJECT_NAME}
qsacn_global.h qsacn_global.h
qsacnnode.cpp qsacnnode.cpp
qsacnuniverse.cpp qsacnuniverse.cpp
statusindicatorwidget.cpp
universemodel.cpp universemodel.cpp
universestatuswidget.cpp
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}

4
platform/qt/sacn/multiverseitem.cpp
View File

@ -1,6 +1,6 @@
#include "multiverseitem.h" #include "multiverseitem.h"
#include "multiversemodel.h" #include "multiversemodel.h"
#include "statusindicatorwidget.h" #include "universestatuswidget.h"
#include <QFont> #include <QFont>
#include <QMetaEnum> #include <QMetaEnum>
@ -28,7 +28,7 @@ MultiverseItem::MultiverseItem(MultiverseItem* parent,
parent->appendChild(this); parent->appendChild(this);
if (universe) if (universe)
mIndicator = new StatusIndicatorWidget(nullptr, universe->get()); mIndicator = new UniverseStatusWidget(nullptr, universe->get());
} }

14
platform/qt/sacn/statusindicatorwidget.cpp → platform/qt/sacn/universestatuswidget.cpp
View File

@ -1,5 +1,5 @@
/* /*
statusindicatorwidget.cpp universestatuswidget.cpp
Copyright (c) 2022 Kevin Matz (kevin.matz@gmail.com) Copyright (c) 2022 Kevin Matz (kevin.matz@gmail.com)
@ -21,11 +21,11 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "statusindicatorwidget.h" #include "universestatuswidget.h"
#include <QPainter> #include <QPainter>
#include <QTimer> #include <QTimer>
StatusIndicatorWidget::StatusIndicatorWidget(QWidget *parent, UniverseStatusWidget::UniverseStatusWidget(QWidget *parent,
std::shared_ptr<DMX::Universe> universe) std::shared_ptr<DMX::Universe> universe)
: QWidget{parent} : QWidget{parent}
, mUniverse(universe) , mUniverse(universe)
@ -52,7 +52,7 @@ StatusIndicatorWidget::StatusIndicatorWidget(QWidget *parent,
/** /**
* @brief StatusIndicatorWidget::statusChanged * @brief StatusIndicatorWidget::statusChanged
*/ */
void StatusIndicatorWidget::statusChanged() void UniverseStatusWidget::statusChanged()
{ {
switch (mUniverse->status()) { switch (mUniverse->status()) {
case DMX::Universe::DMX_LOST: case DMX::Universe::DMX_LOST:
@ -73,7 +73,7 @@ void StatusIndicatorWidget::statusChanged()
/** /**
* @brief StatusIndicatorWidget::dataActivity * @brief StatusIndicatorWidget::dataActivity
*/ */
void StatusIndicatorWidget::dataActivity() void UniverseStatusWidget::dataActivity()
{ {
if (!mBlinkState) if (!mBlinkState)
return; // already in a blink state return; // already in a blink state
@ -91,7 +91,7 @@ void StatusIndicatorWidget::dataActivity()
* @brief StatusIndicatorWidget::statusText * @brief StatusIndicatorWidget::statusText
* @return * @return
*/ */
const QString StatusIndicatorWidget::statusText() const const QString UniverseStatusWidget::statusText() const
{ {
switch (mUniverse->status()) switch (mUniverse->status())
{ {
@ -109,7 +109,7 @@ const QString StatusIndicatorWidget::statusText() const
} }
void StatusIndicatorWidget::paintEvent(QPaintEvent *) void UniverseStatusWidget::paintEvent(QPaintEvent *)
{ {
QColor stroke(127,127,127); // neutral QColor stroke(127,127,127); // neutral
QColor fill(64,64,64); // grey QColor fill(64,64,64); // grey

8
platform/qt/sacn/statusindicatorwidget.h → platform/qt/sacn/universestatuswidget.h
View File

@ -1,5 +1,5 @@
/* /*
statusindicatorwidget.h universestatuswidget.h
Copyright (c) 2022 Kevin Matz (kevin.matz@gmail.com) Copyright (c) 2022 Kevin Matz (kevin.matz@gmail.com)
@ -23,15 +23,15 @@
*/ */
#pragma once #pragma once
#include <QStyledItemDelegate> #include <QWidget>
#include <universe.h> #include <universe.h>
class StatusIndicatorWidget class UniverseStatusWidget
: public QWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit StatusIndicatorWidget(QWidget *parent = nullptr, explicit UniverseStatusWidget(QWidget *parent = nullptr,
std::shared_ptr<DMX::Universe> universe = nullptr); std::shared_ptr<DMX::Universe> universe = nullptr);
const QString statusText() const; const QString statusText() const;