damc_gui: only show widgets with OSC value

Hide widgets that didn't received an OSC value. When an OSC value is not received, this means that it is not supported.
amurzeau · Aug 19, 2023 · 4bedbb7 · 4bedbb7
1 parent 48b1a58
commit 4bedbb7
Show file tree

Hide file tree

Showing 21 changed files with 322 additions and 45 deletions.
diff --git a/damc_gui/BalanceController.cpp b/damc_gui/BalanceController.cpp
@@ -5,14 +5,15 @@
 #include <QHideEvent>
 
 BalanceController::BalanceController(OutputController* parent, OscContainer* oscParent)
-    : QDialog(parent), ui(new Ui::BalanceController), oscBalances(oscParent, "balance") {
+    : ManagedVisibilityWidget<QDialog>(parent), ui(new Ui::BalanceController), oscBalances(oscParent, "balance") {
 	ui->setupUi(this);
 	oscBalances.setWidget(
 	    this, ui->verticalLayout, [parent](QWidget* parentWidget, OscContainer* oscParent, int name) -> QWidget* {
 		    Balance* balance = new Balance(parentWidget, oscParent, std::to_string(name));
 		    balance->addChangeCallback([parent](bool) { parent->updateBalanceEnable(); });
 		    return balance;
 	    });
+	manageWidgetsVisiblity();
 }
 
 BalanceController::~BalanceController() {

diff --git a/damc_gui/BalanceController.h b/damc_gui/BalanceController.h
@@ -2,6 +2,7 @@
 
 #include "OscWidgetArray.h"
 #include <QDialog>
+#include "ManagedVisibilityWidget.h"
 
 namespace Ui {
 class BalanceController;
@@ -11,7 +12,7 @@ class Balance;
 class Balance;
 class OutputController;
 
-class BalanceController : public QDialog {
+class BalanceController : public ManagedVisibilityWidget<QDialog> {
 	Q_OBJECT
 
 public:

diff --git a/damc_gui/CompressorController.cpp b/damc_gui/CompressorController.cpp
@@ -3,7 +3,7 @@
 #include <QHideEvent>
 
 CompressorController::CompressorController(QWidget* parent, OscContainer* oscParent, const std::string& name)
-    : QDialog(parent),
+    : ManagedVisibilityWidget<QDialog>(parent),
       OscContainer(oscParent, name),
       ui(new Ui::CompressorController),
       oscEnablePeak(this, "enable"),
@@ -38,6 +38,8 @@ CompressorController::CompressorController(QWidget* parent, OscContainer* oscPar
 	oscReleaseTime.setScale(1000);
 	oscAttackTime.setScale(1000);
 	oscLufsIntegrationTime.setScale(1000);
+
+	manageWidgetsVisiblity();
 }
 
 CompressorController::~CompressorController() {

diff --git a/damc_gui/CompressorController.h b/damc_gui/CompressorController.h
@@ -1,14 +1,16 @@
 #pragma once
 
+#include "ManagedVisibilityWidget.h"
 #include "OscWidgetMapper.h"
+#include "WidgetAutoHidden.h"
 #include <Osc/OscContainer.h>
 #include <QDialog>
 
 namespace Ui {
 class CompressorController;
 }
 
-class CompressorController : public QDialog, public OscContainer {
+class CompressorController : public ManagedVisibilityWidget<QDialog>, public OscContainer {
 public:
 	explicit CompressorController(QWidget* parent, OscContainer* oscParent, const std::string& name);
 	~CompressorController();

diff --git a/damc_gui/GlobalConfigDialog.cpp b/damc_gui/GlobalConfigDialog.cpp
@@ -3,7 +3,7 @@
 #include <Osc/OscContainer.h>
 
 GlobalConfigDialog::GlobalConfigDialog(QWidget* parent, OscContainer* oscParent)
-    : QDialog(parent),
+    : ManagedVisibilityWidget<QDialog>(parent),
       ui(new Ui::GlobalConfigDialog),
       oscEnableAutoConnect(oscParent, "enableAutoConnect"),
       oscMonitorConnections(oscParent, "enableConnectionMonitoring"),
@@ -59,6 +59,8 @@ GlobalConfigDialog::GlobalConfigDialog(QWidget* parent, OscContainer* oscParent)
 
 	memoryAvailable.setWidget(ui->availableMemorySpinBox, false);
 	memoryAvailable.addChangeCallback([this](int32_t value) { updateMemoryUsagePercent(); });
+
+	manageWidgetsVisiblity();
 }
 
 GlobalConfigDialog::~GlobalConfigDialog() {

diff --git a/damc_gui/GlobalConfigDialog.h b/damc_gui/GlobalConfigDialog.h
@@ -1,13 +1,15 @@
 #pragma once
 
+#include "ManagedVisibilityWidget.h"
 #include "OscWidgetMapper.h"
+#include "WidgetAutoHidden.h"
 #include <QDialog>
 
 namespace Ui {
 class GlobalConfigDialog;
 }
 
-class GlobalConfigDialog : public QDialog {
+class GlobalConfigDialog : public ManagedVisibilityWidget<QDialog> {
 	Q_OBJECT
 
 public:

diff --git a/damc_gui/MainWindow.cpp b/damc_gui/MainWindow.cpp
@@ -4,24 +4,31 @@
 #include "ui_MainWindow.h"
 #include <QInputDialog>
 
-MainWindow::MainWindow(OscRoot* oscRoot, QWidget* parent)
+MainWindow::MainWindow(OscRoot* oscRoot, bool isMicrocontrollerDamc, QWidget* parent)
     : QWidget(parent),
       ui(new Ui::MainWindow),
       oscRoot(oscRoot),
+      isMicrocontrollerDamc(isMicrocontrollerDamc),
       outputInterfaces(oscRoot, "strip"),
       oscTypeArray(oscRoot, "type_list"),
       oscPortaudioDeviceArray(oscRoot, "device_list"),
       oscWasapiDeviceArray(oscRoot, "device_list_wasapi") {
 	ui->setupUi(this);
 
+	if(isMicrocontrollerDamc) {
+		ui->showDisabledCheckBox->hide();
+		ui->addButton->hide();
+		ui->removeButton->hide();
+	}
+
 	globalConfigDialog = new GlobalConfigDialog(this, oscRoot);
 	connect(globalConfigDialog, &GlobalConfigDialog::showStateChanged, [this](bool shown) {
 		ui->globalConfigButton->setChecked(shown);
 	});
 
 	outputInterfaces.setWidget(
 	    this, ui->horizontalLayout, [this](QWidget*, OscContainer* oscParent, int name) -> QWidget* {
-		    return new OutputController(this, oscParent, std::to_string(name));
+		    return new OutputController(this, oscParent, std::to_string(name), this->isMicrocontrollerDamc);
 	    });
 
 	connect(ui->globalConfigButton, &QAbstractButton::clicked, this, &MainWindow::onShowGlobalConfig);

diff --git a/damc_gui/MainWindow.h b/damc_gui/MainWindow.h
@@ -15,7 +15,7 @@ class MainWindow : public QWidget {
 	Q_OBJECT
 
 public:
-	explicit MainWindow(OscRoot* oscRoot, QWidget* parent = 0);
+	explicit MainWindow(OscRoot* oscRoot, bool isMicrocontrollerDamc, QWidget* parent = 0);
 	~MainWindow();
 
 	void removeInstance(int key);
@@ -41,6 +41,8 @@ protected slots:
 	Ui::MainWindow* ui;
 
 	OscRoot* oscRoot;
+	bool isMicrocontrollerDamc;
+
 	OscWidgetArray outputInterfaces;
 
 	GlobalConfigDialog* globalConfigDialog;

diff --git a/damc_gui/MainWindow.ui b/damc_gui/MainWindow.ui
@@ -6,22 +6,36 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>271</width>
-    <height>409</height>
+    <width>410</width>
+    <height>451</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Digital Audio Mixing Console - DAMC</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="3">
-    <widget class="QPushButton" name="removeButton">
+    <widget class="QPushButton" name="addButton">
      <property name="text">
-      <string>Remove</string>
+      <string>Add</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QCheckBox" name="showDisabledCheckBox">
+     <property name="text">
+      <string>Show disabled</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QPushButton" name="globalConfigButton">
+     <property name="text">
+      <string>Config</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="4">
+   <item row="1" column="0" colspan="5">
     <widget class="QWidget" name="outputsWidgets" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="spacing">
@@ -42,26 +56,25 @@
      </layout>
     </widget>
    </item>
-   <item row="0" column="2">
-    <widget class="QPushButton" name="addButton">
-     <property name="text">
-      <string>Add</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QCheckBox" name="showDisabledCheckBox">
+   <item row="0" column="4">
+    <widget class="QPushButton" name="removeButton">
      <property name="text">
-      <string>Show disabled</string>
+      <string>Remove</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="QPushButton" name="globalConfigButton">
-     <property name="text">
-      <string>Config</string>
+    <spacer name="buttonsSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-    </widget>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
    </item>
   </layout>
  </widget>

diff --git a/damc_gui/ManagedVisibilityWidget.h b/damc_gui/ManagedVisibilityWidget.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "WidgetAutoHidden.h"
+
+template<class T> class ManagedVisibilityWidget : public T {
+public:
+	using T::T;
+	void manageWidgetsVisiblity() { widgetAutoHidden.addContainerWidgets({this}); }
+
+private:
+	WidgetAutoHidden widgetAutoHidden;
+};
diff --git a/damc_gui/OscWidgetMapper.cpp b/damc_gui/OscWidgetMapper.cpp
@@ -12,6 +12,8 @@ template<class T, class UnderlyingType>
 void OscWidgetMapper<T, UnderlyingType>::setWidget(T* widget, bool updateOnChange) {
 	this->widgets.push_back(widget);
 
+	widget->setVisible(false);
+
 	updateWidget(widget);
 
 	if(updateOnChange) {
@@ -22,6 +24,8 @@ void OscWidgetMapper<T, UnderlyingType>::setWidget(T* widget, bool updateOnChang
 					notifyChanged(widget);
 				});
 			} else {
+				// Stateless buttons won't receive any value, so never hide them
+				widget->setVisible(true);
 				connect(widget, &T::clicked, [this, widget](bool value) {
 					this->value = 1;
 					notifyChanged(widget);
@@ -80,6 +84,12 @@ void OscWidgetMapper<T, UnderlyingType>::execute(const std::vector<OscArgument>&
 	if(!getArgumentAs<UnderlyingType>(arguments[0], value))
 		return;
 
+	for(T* widget : widgets) {
+		if(widget->isHidden()) {
+			widget->setVisible(true);
+		}
+	}
+
 	this->defaultValue = false;
 
 	if(this->value == value)

diff --git a/damc_gui/OscWidgetMapper.h b/damc_gui/OscWidgetMapper.h
@@ -14,13 +14,27 @@
 
 template<class T> struct OscWidgetMapperType {};
 
-template<> struct OscWidgetMapperType<QAbstractSlider> { using type = int32_t; };
-template<> struct OscWidgetMapperType<QAbstractButton> { using type = bool; };
-template<> struct OscWidgetMapperType<QDoubleSpinBox> { using type = float; };
-template<> struct OscWidgetMapperType<QSpinBox> { using type = int32_t; };
-template<> struct OscWidgetMapperType<QComboBox> { using type = int32_t; };
-template<> struct OscWidgetMapperType<QGroupBox> { using type = bool; };
-template<> struct OscWidgetMapperType<QLineEdit> { using type = std::string; };
+template<> struct OscWidgetMapperType<QAbstractSlider> {
+	using type = int32_t;
+};
+template<> struct OscWidgetMapperType<QAbstractButton> {
+	using type = bool;
+};
+template<> struct OscWidgetMapperType<QDoubleSpinBox> {
+	using type = float;
+};
+template<> struct OscWidgetMapperType<QSpinBox> {
+	using type = int32_t;
+};
+template<> struct OscWidgetMapperType<QComboBox> {
+	using type = int32_t;
+};
+template<> struct OscWidgetMapperType<QGroupBox> {
+	using type = bool;
+};
+template<> struct OscWidgetMapperType<QLineEdit> {
+	using type = std::string;
+};
 
 template<class T, class UnderlyingType = typename OscWidgetMapperType<T>::type>
 class OscWidgetMapper : public QObject, public OscContainer {

diff --git a/damc_gui/OutputController.cpp b/damc_gui/OutputController.cpp
@@ -16,7 +16,10 @@
 
 #define DRAG_FORMAT "application/x-dndwaveoutputinstancewidget"
 
-OutputController::OutputController(MainWindow* parent, OscContainer* oscParent, const std::string& name)
+OutputController::OutputController(MainWindow* parent,
+                                   OscContainer* oscParent,
+                                   const std::string& name,
+                                   bool isMicrocontrollerDamc)
     : QWidget(parent),
       OscContainer(oscParent, name),
       ui(new Ui::OutputController),
@@ -38,6 +41,11 @@ OutputController::OutputController(MainWindow* parent, OscContainer* oscParent,
 	// By default hide, it will be shown if enabled
 	hide();
 
+	if(isMicrocontrollerDamc) {
+		// No add/remove with microcontroller DAMC
+		ui->removeButton->hide();
+	}
+
 	oscEnable.setWidget(ui->enableCheckBox);
 	oscMute.setWidget(ui->muteButton);
 	oscDelay.setWidget(ui->delaySpinBox);

diff --git a/damc_gui/OutputController.h b/damc_gui/OutputController.h
@@ -22,7 +22,10 @@ class LevelMeterWidget;
 class OutputController : public QWidget, public OscContainer {
 	Q_OBJECT
 public:
-	explicit OutputController(MainWindow* parent, OscContainer* oscParent, const std::string& name);
+	explicit OutputController(MainWindow* parent,
+	                          OscContainer* oscParent,
+	                          const std::string& name,
+	                          bool isMicrocontrollerDamc);
 	~OutputController();
 
 	void showConfigDialog();

diff --git a/damc_gui/OutputController.ui b/damc_gui/OutputController.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>70</width>
+    <width>77</width>
     <height>391</height>
    </rect>
   </property>
@@ -50,7 +50,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
-       <height>20</height>
+       <height>0</height>
       </size>
      </property>
     </spacer>
@@ -95,7 +95,7 @@
           <number>0</number>
          </property>
          <item>
-          <spacer name="horizontalSpacer">
+          <spacer name="volumeLevelSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -217,7 +217,7 @@
           </widget>
          </item>
          <item>
-          <spacer name="horizontalSpacer_2">
+          <spacer name="levelLabelSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>