ADC: genalyzer: fix panel update on ch enable

Signed-off-by: Andrei Popa <[email protected]>

Author: andrei47w

gui/include/gui/widgets/genalyzerpanel.h

@@ -67,6 +67,7 @@ public Q_SLOTS:
 			   double *rvalues);
 	void clear();
 	void clearChannel(const QString &channelName);
+	void setChannelVisible(const QString &channelName, bool visible);
 
 private:
 	GenalyzerChannelDisplay *findOrCreateChannelDisplay(const QString &channelName, QColor channelColor);

gui/src/widgets/genalyzerpanel.cpp

@@ -160,4 +160,12 @@ void GenalyzerPanel::clear()
 	m_channelDisplays.clear();
 }
 
+void GenalyzerPanel::setChannelVisible(const QString &channelName, bool visible)
+{
+	if(m_channelDisplays.contains(channelName)) {
+		GenalyzerChannelDisplay *display = m_channelDisplays[channelName];
+		display->setVisible(visible);
+	}
+}
+
 #include "moc_genalyzerpanel.cpp"

packages/generic-plugins/plugins/adc/src/adcfftinstrumentcontroller.cpp

@@ -264,6 +264,16 @@ void ADCFFTInstrumentController::createIIOComplexChannel(AcqTreeNode *node_I, Ac
 	connect(c, &GRFFTChannelComponent::genalyzerDataUpdated, m_plotComponentManager->genalyzerPanel(),
 		&GenalyzerPanel::updateResults);
 
+	// Connect channel enable/disable signals to update genalyzer panel visibility
+	connect(c, &GRFFTChannelComponent::genalyzerChannelEnabled, m_plotComponentManager->genalyzerPanel(),
+		[=](const QString &channelName) {
+			m_plotComponentManager->genalyzerPanel()->setChannelVisible(channelName, true);
+		});
+	connect(c, &GRFFTChannelComponent::genalyzerChannelDisabled, m_plotComponentManager->genalyzerPanel(),
+		[=](const QString &channelName) {
+			m_plotComponentManager->genalyzerPanel()->setChannelVisible(channelName, false);
+		});
+
 	connect(c->chData(), &ChannelData::newData, this,
 		[=](const float *xData_, const float *yData_, size_t size, bool copy) {
 			if(m_ui->m_complex->isChecked() && m_measureComponent->measureSettings()->genalyzerEnabled() &&
@@ -302,6 +312,15 @@ void ADCFFTInstrumentController::createFFTSink(AcqTreeNode *node)
 		if(isComplex) {
 			m_plotComponentManager->selectChannel(m_defaultComplexCh);
 			Q_EMIT m_defaultComplexCh->requestChannelMenu(false);
+
+			// Show all enabled complex channels in genalyzer panel
+			for(auto component : components()) {
+				GRFFTChannelComponent *channelComponent =
+					dynamic_cast<GRFFTChannelComponent *>(component);
+				if(channelComponent) {
+					channelComponent->emitGenalyzerEnabledIfAppropriate();
+				}
+			}
 		} else {
 			m_plotComponentManager->selectChannel(m_defaultRealCh);
 			Q_EMIT m_defaultRealCh->requestChannelMenu(false);

packages/generic-plugins/plugins/adc/src/freq/grfftchannelcomponent.cpp

@@ -401,6 +401,16 @@ void GRFFTChannelComponent::enable()
 		m_grtch->sigpath()->setEnabled(true);
 	}
 	Q_EMIT m_node->top()->src()->requestRebuild(); // sigpath()->requestRebuild();
+
+	// Emit signal for genalyzer panel to show this channel
+	if(m_complex && enabled()) {
+		QString uniqueChannelName = this->name();
+		if(m_node && m_node->treeParent()) {
+			QString deviceName = m_node->treeParent()->name();
+			uniqueChannelName = deviceName + ":" + this->name();
+		}
+		Q_EMIT genalyzerChannelEnabled(uniqueChannelName);
+	}
 }
 
 void GRFFTChannelComponent::disable()
@@ -411,6 +421,16 @@ void GRFFTChannelComponent::disable()
 		m_grtch->sigpath()->setEnabled(false);
 	}
 	Q_EMIT m_node->top()->src()->requestRebuild(); // sigpath()->requestRebuild();
+
+	// Emit signal for genalyzer panel to hide this channel
+	if(m_complex) {
+		QString uniqueChannelName = this->name();
+		if(m_node && m_node->treeParent()) {
+			QString deviceName = m_node->treeParent()->name();
+			uniqueChannelName = deviceName + ":" + this->name();
+		}
+		Q_EMIT genalyzerChannelDisabled(uniqueChannelName);
+	}
 }
 
 // MeasureManagerInterface *GRFFTChannelComponent::getMeasureManager() { return m_measureMgr; }
@@ -493,3 +513,15 @@ void GRFFTChannelComponent::triggerGenalyzerAnalysis()
 		}
 	}
 }
+
+void GRFFTChannelComponent::emitGenalyzerEnabledIfAppropriate()
+{
+	if(m_complex && enabled()) {
+		QString uniqueChannelName = this->name();
+		if(m_node && m_node->treeParent()) {
+			QString deviceName = m_node->treeParent()->name();
+			uniqueChannelName = deviceName + ":" + this->name();
+		}
+		Q_EMIT genalyzerChannelEnabled(uniqueChannelName);
+	}
+}

packages/generic-plugins/plugins/adc/src/freq/grfftchannelcomponent.h

@@ -212,6 +212,9 @@ public Q_SLOTS:
 	// Method to trigger genalyzer analysis (only when needed)
 	void triggerGenalyzerAnalysis();
 
+	// Method to emit genalyzer channel enabled signal if channel is complex and enabled
+	void emitGenalyzerEnabledIfAppropriate();
+
 Q_SIGNALS:
 	void yModeChanged();
 	void fftSizeChanged();
@@ -220,6 +223,8 @@ public Q_SLOTS:
 	void windowCorrectionChanged(bool);
 	void genalyzerDataUpdated(const QString &channelName, QColor channelColor, size_t results_size, char **rkeys,
 				  double *rvalues);
+	void genalyzerChannelEnabled(const QString &channelName);
+	void genalyzerChannelDisabled(const QString &channelName);
 
 private:
 	double m_powerOffset;