diff --git a/example/sACN Explorer/CMakeLists.txt b/example/sACN Explorer/CMakeLists.txt index 19dbaa8..9bf1612 100644 --- a/example/sACN Explorer/CMakeLists.txt +++ b/example/sACN Explorer/CMakeLists.txt @@ -30,9 +30,9 @@ target_sources(${PROJECT_NAME} sacnexplorer.cpp universemodel.cpp universemodel.h - universeview.h - universeview.cpp - universeview.ui + universewindow.h + universewindow.cpp + universewindow.ui ) target_link_libraries(${PROJECT_NAME} diff --git a/example/sACN Explorer/multiverseview.cpp b/example/sACN Explorer/multiverseview.cpp index f722d3f..3f3897c 100644 --- a/example/sACN Explorer/multiverseview.cpp +++ b/example/sACN Explorer/multiverseview.cpp @@ -3,7 +3,7 @@ #include "multiverseview.h" #include "multiversemodel.h" #include "ui_multiverseview.h" -#include "universeview.h" +#include "universewindow.h" #include /** @@ -216,7 +216,7 @@ void MultiverseView::createEditor(const QModelIndex &index) foreach (const auto & inspector, mInspectors) if (inspector->universe() == univ) return inspector->show(); - auto view = new UniverseView(this, univ); + auto view = new UniverseInspector(this, univ); mInspectors.insert(view); connect(view, &QObject::destroyed, this, [this, view](){mInspectors.remove(view);}); connect(univ, &QObject::destroyed, view, &QMainWindow::close); diff --git a/example/sACN Explorer/multiverseview.h b/example/sACN Explorer/multiverseview.h index 08415e1..bfe0322 100644 --- a/example/sACN Explorer/multiverseview.h +++ b/example/sACN Explorer/multiverseview.h @@ -25,7 +25,7 @@ #include "multiversemodel.h" #include "qsacnnode.h" -#include "universeview.h" +#include "universewindow.h" #include #include @@ -62,5 +62,5 @@ private: QSacnNode * node; MultiverseModel * model; QSortFilterProxyModel *sortProxy; - QSet mInspectors; + QSet mInspectors; }; diff --git a/example/sACN Explorer/universeview.cpp b/example/sACN Explorer/universewindow.cpp similarity index 87% rename from example/sACN Explorer/universeview.cpp rename to example/sACN Explorer/universewindow.cpp index 6c8d359..b646eb5 100644 --- a/example/sACN Explorer/universeview.cpp +++ b/example/sACN Explorer/universewindow.cpp @@ -1,5 +1,5 @@ -#include "universeview.h" -#include "ui_universeview.h" +#include "universewindow.h" +#include "ui_universewindow.h" #include "universemodel.h" #include @@ -10,9 +10,9 @@ * @brief UniverseView::UniverseView * @param parent */ -UniverseView::UniverseView(QWidget *parent, QSacnUniverse *universe) +UniverseInspector::UniverseInspector(QWidget *parent, QSacnUniverse *universe) : QMainWindow(parent) - , ui(new Ui::UniverseView()) + , ui(new Ui::UniverseInspector()) , mUniverse(universe) { ui->setupUi(this); @@ -24,7 +24,7 @@ UniverseView::UniverseView(QWidget *parent, QSacnUniverse *universe) // update the status bar whenever the universe refreshes connect(model, &UniverseModel::recievedUpdate, - this, &UniverseView::updateStatus); + this, &UniverseInspector::updateStatus); // add data format combobox to toolbar auto formatLabel = new QLabel(this); @@ -65,7 +65,7 @@ UniverseView::UniverseView(QWidget *parent, QSacnUniverse *universe) /** * @brief UniverseView::~UniverseView */ -UniverseView::~UniverseView() +UniverseInspector::~UniverseInspector() { delete ui; } @@ -75,7 +75,7 @@ UniverseView::~UniverseView() * @brief UniverseView::updateStatusBar * @param universe */ -void UniverseView::updateStatus(QSacnUniverse* universe) +void UniverseInspector::updateStatus(QSacnUniverse* universe) { // window title this->setWindowTitle(QString("%1 '%2' : "+tr("Universe")+" %3").arg( diff --git a/example/sACN Explorer/universeview.h b/example/sACN Explorer/universewindow.h similarity index 73% rename from example/sACN Explorer/universeview.h rename to example/sACN Explorer/universewindow.h index 2b7937d..90e0717 100644 --- a/example/sACN Explorer/universeview.h +++ b/example/sACN Explorer/universewindow.h @@ -7,19 +7,19 @@ QT_BEGIN_NAMESPACE namespace Ui { - class UniverseView; + class UniverseInspector; } QT_END_NAMESPACE -class UniverseView +class UniverseInspector : public QMainWindow { Q_OBJECT public: - explicit UniverseView(QWidget *parent = nullptr, + explicit UniverseInspector(QWidget *parent = nullptr, QSacnUniverse* universe = nullptr); - virtual ~UniverseView(); + virtual ~UniverseInspector(); /** * @brief universe @@ -31,7 +31,7 @@ public slots: void updateStatus(QSacnUniverse *); private: - Ui::UniverseView *ui; + Ui::UniverseInspector *ui; QSpinBox *prioritySpinBox; QSacnUniverse *mUniverse; }; diff --git a/example/sACN Explorer/universeview.ui b/example/sACN Explorer/universewindow.ui similarity index 83% rename from example/sACN Explorer/universeview.ui rename to example/sACN Explorer/universewindow.ui index 0f2831e..7222f98 100644 --- a/example/sACN Explorer/universeview.ui +++ b/example/sACN Explorer/universewindow.ui @@ -1,7 +1,7 @@ - UniverseView - + UniverseInspector + 0 @@ -39,7 +39,16 @@ - + + + + 0 + 0 + 400 + 25 + + +