channelwidget.cpp

@@ -32,9 +32,7 @@ ChannelWidget::ChannelWidget(uint16_t deviceSerial, uint16_t channelNumber,
 	hlayout.addWidget(&ganglabel);
 	hlayout.addWidget(&gangcombo);
 	hlayout.addWidget(&checkbox);
-
 	connect(&checkbox, &QCheckBox::toggled, this, &ChannelWidget::onChannelToggled);
-        connect(&gangcombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ChannelWidget::onGangComboChanged);
 
 	setFixedHeight(96);
 	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
@@ -44,7 +42,7 @@ ChannelWidget::ChannelWidget(uint16_t deviceSerial, uint16_t channelNumber,
 
 ChannelWidget::~ChannelWidget()
 {
-
+	// Nothing to clean up
 }
 
 uint16_t ChannelWidget::getDeviceSerial() const
@@ -80,7 +78,7 @@ void ChannelWidget::onChannelToggled(bool checked)
 			qWarning() << "Failed to connect channel" << channelNumber << "on device" << deviceSerial;
 			checkbox.blockSignals(true);
 			checkbox.setChecked(false);
-                        setEnabled(false);
+			setEnabled(false); // Gray out the widget
 		}
 	}
 	else
@@ -92,74 +90,8 @@ void ChannelWidget::onChannelToggled(bool checked)
 			qWarning() << "Failed to disconnect channel" << channelNumber << "on device" << deviceSerial;
 			checkbox.blockSignals(true);
 			checkbox.setChecked(true);
-                        setEnabled(false);
+			setEnabled(false); // Gray out the widget
-                }
-        }
-
-        // Emit state change signal for other channels that might be ganged to this one
-        emit channelStateChanged(deviceSerial, channelNumber, checked);
-}
-
-void ChannelWidget::onGangComboChanged(int index)
-{
-        if (index == 0) {
-            // Unganged selected - reset ganged channel tracking
-            gangedDeviceSerial = -1;
-            gangedChannelNumber = -1;
-            checkbox.setEnabled(true);
-            checkbox.setChecked(false);
-            checkbox.setChecked(false);
-        } else {
-            // A ganged channel was selected
-            QString currentText = gangcombo.currentText();
-            QStringList parts = currentText.split(", ");
-            if (parts.size() == 2) {
-                bool ok1, ok2;
-                uint16_t gangedSerial = parts[0].toUInt(&ok1);
-                uint16_t gangedChannel = parts[1].toUInt(&ok2);
-
-                if (ok1 && ok2) {
-                    setGangedChannel(gangedSerial, gangedChannel);
-                }
 		}
 	}
 }
 
-void ChannelWidget::onOtherChannelStateChanged(uint16_t deviceSerial, uint16_t channelNumber, bool checked)
-{
-        // If this channel is ganged to the channel that changed state
-        if (gangedDeviceSerial == deviceSerial && gangedChannelNumber == channelNumber) {
-            // Update our checkbox state to follow the ganged channel
-            checkbox.blockSignals(true);
-            checkbox.setChecked(checked);
-            checkbox.blockSignals(false);
-        }
-}
-
-void ChannelWidget::updateGangCombo()
-{
-        // Clear existing items except "Unganged"
-        while (gangcombo.count() > 1) {
-            gangcombo.removeItem(1);
-        }
-}
-
-void ChannelWidget::updateCheckboxState()
-{
-        if (gangedDeviceSerial >= 0 && gangedChannelNumber >= 0) {
-            checkbox.setEnabled(false);
-            // TODO check current ganged channel state
-        } else {
-            checkbox.setEnabled(true);
-        }
-}
-
-void ChannelWidget::setGangedChannel(uint16_t gangedDeviceSerial, uint16_t gangedChannelNumber)
-{
-        this->gangedDeviceSerial = gangedDeviceSerial;
-        this->gangedChannelNumber = gangedChannelNumber;
-
-        // Update checkbox state to follow the ganged channel
-        updateCheckboxState();
-}
-

channelwidget.h

@@ -23,25 +23,13 @@ public:
 	uint16_t getChannelNumber() const;
 	bool isChecked() const;
 
-        // Accessors for MainWindow to populate and access the gang combo
+signals:
-        QComboBox* getGangCombo() { return &gangcombo; }
+	void channelAboutToBeTurnedOn(uint16_t deviceSerial, uint16_t channelNumber);
-        void setGangedChannel(uint16_t deviceSerial, uint16_t channelNumber);
-
-public slots:
-        void onOtherChannelStateChanged(uint16_t deviceSerial, uint16_t channelNumber, bool checked);
 
 private slots:
 	void onChannelToggled(bool checked);
-        void onGangComboChanged(int index);
-
-signals:
-        void channelAboutToBeTurnedOn(uint16_t deviceSerial, uint16_t channelNumber);
-        void channelStateChanged(uint16_t deviceSerial, uint16_t channelNumber, bool checked);
 
 private:
-        void updateGangCombo();
-        void updateCheckboxState();
-
 	uint16_t deviceSerial;
 	uint16_t channelNumber;
 	std::shared_ptr<struct eismultiplexer> multiplexer;
@@ -54,11 +42,8 @@ private:
 	QVBoxLayout vlayout;
 	QHBoxLayout hlayout;
 	QVBoxLayout labellayout;
-
-        // Track the channel this one is ganged to (if any)
-        int gangedDeviceSerial = -1;
-        int gangedChannelNumber = -1;
 };
 
 #endif // CHANNELWIDGET_H
 
+

mainwindow.cpp

@@ -35,7 +35,6 @@ void MainWindow::enumerateDevices()
 		return;
 	}
 
-        // First pass: create all widgets without connecting signals
 	for (size_t i = 0; i < count; i++)
 	{
 		uint16_t serial = serials[i];
@@ -62,33 +61,9 @@ void MainWindow::enumerateDevices()
 			                     tr("Failed to connect to device with serial %1").arg(serial));
 			qWarning()<<"Failed to connect to device with serial"<<serial<<"eismultiplexer_connect returned"<<ret;
 		}
-        }
 		ui->channelLayout->addStretch();
-
-        // Second pass: populate gang combos and connect signals
-        for (const auto& widget : channels) {
-            // Populate gang combo with all other channels
-            for (const auto& otherWidget : channels) {
-                if (widget->getDeviceSerial() != otherWidget->getDeviceSerial() ||
-                    widget->getChannelNumber() != otherWidget->getChannelNumber()) {
-                    QString channelText = QString::asprintf("%04u, %u",
-                                                           otherWidget->getDeviceSerial(),
-                                                           otherWidget->getChannelNumber());
-                    widget->getGangCombo()->addItem(channelText);
 	}
-            }
-
-            // Connect state change signals
-            for (const auto& otherWidget : channels) {
-                if (widget.get() != otherWidget.get()) {
-                    connect(otherWidget.get(), &ChannelWidget::channelStateChanged,
-                            widget.get(), &ChannelWidget::onOtherChannelStateChanged);
-                }
-            }
-        }
-
 	ui->statusbar->showMessage("Ready");
 
 	free(serials);
 }
-