From b18823a009cdd55893ed63aad75eba3feda3bd07 Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Sun, 16 Apr 2023 11:28:17 -0400 Subject: [PATCH] rename the status indicator class --- example/sACN Explorer/universewindow.cpp | 4 ++-- platform/qt/sacn/CMakeLists.txt | 4 ++-- platform/qt/sacn/multiverseitem.cpp | 4 ++-- ...ndicatorwidget.cpp => universestatuswidget.cpp} | 14 +++++++------- ...tusindicatorwidget.h => universestatuswidget.h} | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) rename platform/qt/sacn/{statusindicatorwidget.cpp => universestatuswidget.cpp} (92%) rename platform/qt/sacn/{statusindicatorwidget.h => universestatuswidget.h} (91%) diff --git a/example/sACN Explorer/universewindow.cpp b/example/sACN Explorer/universewindow.cpp index 450b7a3..5bc11ba 100644 --- a/example/sACN Explorer/universewindow.cpp +++ b/example/sACN Explorer/universewindow.cpp @@ -1,7 +1,7 @@ #include "universewindow.h" #include "ui_universewindow.h" #include "universemodel.h" -#include "statusindicatorwidget.h" +#include "universestatuswidget.h" #include #include @@ -77,7 +77,7 @@ UniverseWindow::UniverseWindow(QWidget *parent, QSacnUniverse *universe) }); // status indicator - auto indicator = new StatusIndicatorWidget(this, mUniverse->get()); + auto indicator = new UniverseStatusWidget(this, mUniverse->get()); ui->statusbar->addPermanentWidget(indicator); update_status_(); diff --git a/platform/qt/sacn/CMakeLists.txt b/platform/qt/sacn/CMakeLists.txt index 4872075..5ff68d4 100644 --- a/platform/qt/sacn/CMakeLists.txt +++ b/platform/qt/sacn/CMakeLists.txt @@ -10,8 +10,8 @@ target_sources(${PROJECT_NAME} multiversemodel.h qsacnnode.h qsacnuniverse.h - statusindicatorwidget.h universemodel.h + universestatuswidget.h PRIVATE multiverseitem.h multiverseitem.cpp @@ -19,8 +19,8 @@ target_sources(${PROJECT_NAME} qsacn_global.h qsacnnode.cpp qsacnuniverse.cpp - statusindicatorwidget.cpp universemodel.cpp + universestatuswidget.cpp ) target_link_libraries(${PROJECT_NAME} diff --git a/platform/qt/sacn/multiverseitem.cpp b/platform/qt/sacn/multiverseitem.cpp index 999c55e..f0c4d8e 100644 --- a/platform/qt/sacn/multiverseitem.cpp +++ b/platform/qt/sacn/multiverseitem.cpp @@ -1,6 +1,6 @@ #include "multiverseitem.h" #include "multiversemodel.h" -#include "statusindicatorwidget.h" +#include "universestatuswidget.h" #include #include @@ -28,7 +28,7 @@ MultiverseItem::MultiverseItem(MultiverseItem* parent, parent->appendChild(this); if (universe) - mIndicator = new StatusIndicatorWidget(nullptr, universe->get()); + mIndicator = new UniverseStatusWidget(nullptr, universe->get()); } diff --git a/platform/qt/sacn/statusindicatorwidget.cpp b/platform/qt/sacn/universestatuswidget.cpp similarity index 92% rename from platform/qt/sacn/statusindicatorwidget.cpp rename to platform/qt/sacn/universestatuswidget.cpp index 37e017e..8cb2743 100644 --- a/platform/qt/sacn/statusindicatorwidget.cpp +++ b/platform/qt/sacn/universestatuswidget.cpp @@ -1,5 +1,5 @@ /* - statusindicatorwidget.cpp + universestatuswidget.cpp 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 SOFTWARE. */ -#include "statusindicatorwidget.h" +#include "universestatuswidget.h" #include #include -StatusIndicatorWidget::StatusIndicatorWidget(QWidget *parent, +UniverseStatusWidget::UniverseStatusWidget(QWidget *parent, std::shared_ptr universe) : QWidget{parent} , mUniverse(universe) @@ -52,7 +52,7 @@ StatusIndicatorWidget::StatusIndicatorWidget(QWidget *parent, /** * @brief StatusIndicatorWidget::statusChanged */ -void StatusIndicatorWidget::statusChanged() +void UniverseStatusWidget::statusChanged() { switch (mUniverse->status()) { case DMX::Universe::DMX_LOST: @@ -73,7 +73,7 @@ void StatusIndicatorWidget::statusChanged() /** * @brief StatusIndicatorWidget::dataActivity */ -void StatusIndicatorWidget::dataActivity() +void UniverseStatusWidget::dataActivity() { if (!mBlinkState) return; // already in a blink state @@ -91,7 +91,7 @@ void StatusIndicatorWidget::dataActivity() * @brief StatusIndicatorWidget::statusText * @return */ -const QString StatusIndicatorWidget::statusText() const +const QString UniverseStatusWidget::statusText() const { 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 fill(64,64,64); // grey diff --git a/platform/qt/sacn/statusindicatorwidget.h b/platform/qt/sacn/universestatuswidget.h similarity index 91% rename from platform/qt/sacn/statusindicatorwidget.h rename to platform/qt/sacn/universestatuswidget.h index 2bedb82..acbdd0a 100644 --- a/platform/qt/sacn/statusindicatorwidget.h +++ b/platform/qt/sacn/universestatuswidget.h @@ -1,5 +1,5 @@ /* - statusindicatorwidget.h + universestatuswidget.h Copyright (c) 2022 Kevin Matz (kevin.matz@gmail.com) @@ -23,15 +23,15 @@ */ #pragma once -#include +#include #include -class StatusIndicatorWidget +class UniverseStatusWidget : public QWidget { Q_OBJECT public: - explicit StatusIndicatorWidget(QWidget *parent = nullptr, + explicit UniverseStatusWidget(QWidget *parent = nullptr, std::shared_ptr universe = nullptr); const QString statusText() const;