construct the model around the universe

example/sACN Explorer/universemodel.cpp

@@ -8,12 +8,16 @@
 /**
  * @brief UniverseModel::UniverseModel
  * @param parent
+ * @param universe
  */
-UniverseModel::UniverseModel(QObject *parent)
+UniverseModel::UniverseModel(QObject *parent, QSacnUniverse *universe)
     : QAbstractTableModel(parent)
-    , universe_(nullptr)
+    , universe_(universe)
     , data_mode_(Decimal)
 {
+  if (universe_)
+    connect(universe_, &QSacnUniverse::dataChanged,
+            this, &UniverseModel::universeRefreshed);
 }
 
 
@@ -206,20 +210,6 @@ void UniverseModel::setDataMode(const QString mode)
 }
 
 
-/**
- * @brief UniverseModel::setUniverse
- * @param universe
- */
-void UniverseModel::setUniverse(QSacnUniverse *universe)
-{
-  if (universe_)
-    disconnect(universe_, 0, this, 0);
-  universe_ = universe;
-  connect(universe_, &QSacnUniverse::dataChanged,
-          this, &UniverseModel::universeRefreshed);
-}
-
-
 /**
  * @brief UniverseModel::dataMode
  * @return

example/sACN Explorer/universemodel.h

@@ -17,7 +17,8 @@ public:
     };
     Q_ENUM(data_modes)
 
-    explicit UniverseModel(QObject *parent = nullptr);
+    explicit UniverseModel(QObject *parent = nullptr,
+                           QSacnUniverse *universe = nullptr);
 
     // Model overrides:
     QVariant headerData(int section, Qt::Orientation orientation,
@@ -31,7 +32,6 @@ public:
     Qt::ItemFlags flags(const QModelIndex& index) const override;
 
     // Data source:
-    void setUniverse(QSacnUniverse* universe);
     data_modes dataMode();
 
 signals:

example/sACN Explorer/universewindow.cpp

@@ -17,11 +17,9 @@ UniverseInspector::UniverseInspector(QWidget *parent, QSacnUniverse *universe)
 {
   ui->setupUi(this);
 
-  auto model = new UniverseModel(this);
+  auto model = new UniverseModel(this, universe);
   ui->tableView->setModel(model);
 
-  model->setUniverse(universe);
-
   // update the status bar whenever the universe refreshes
   connect(model, &UniverseModel::recievedUpdate,
           this, &UniverseInspector::updateStatus);