plugins/adc: Emit iioEvent when needed.

The signal is received by the tool menu through the ToolMenuEntry. Signed-off-by: andreidanila1 <[email protected]>
analogdevicesinc · Nov 21, 2024 · 6691907 · 6691907
1 parent 60f1bd7
commit 6691907
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 1 deletion.
diff --git a/plugins/adc/src/adcfftinstrumentcontroller.cpp b/plugins/adc/src/adcfftinstrumentcontroller.cpp
@@ -122,13 +122,13 @@ void ADCFFTInstrumentController::createIIODevice(AcqTreeNode *node)
 {
 	GRIIODeviceSourceNode *griiodsn = dynamic_cast<GRIIODeviceSourceNode *>(node);
 	GRDeviceComponent *d = new GRDeviceComponent(griiodsn);
-	addComponent(d);
 	m_ui->addDevice(d->ctrl(), d);
 
 	m_acqNodeComponentMap[griiodsn] = (d);
 	m_fftPlotSettingsComponent->addSampleRateProvider(d);
 	addComponent(d);
 
+	connect(d, &GRDeviceComponent::iioEvent, this, &ADCInstrumentController::iioEvent);
 	connect(m_fftPlotSettingsComponent, &FFTPlotManagerSettings::samplingInfoChanged, this,
 		[=](SamplingInfo p) { d->setBufferSize(p.bufferSize); });
 }
@@ -141,6 +141,7 @@ void ADCFFTInstrumentController::createIIOFloatChannel(AcqTreeNode *node)
 	GRFFTChannelComponent *c =
 		new GRFFTChannelComponent(griiofcn, dynamic_cast<FFTPlotComponent *>(m_plotComponentManager->plot(0)),
 					  grtsc, chIdP->pen(idx), m_ui->rightStack);
+	connect(c, &GRFFTChannelComponent::iioEvent, this, &ADCInstrumentController::iioEvent);
 	Q_ASSERT(grtsc);
 
 	m_plotComponentManager->addChannel(c);
@@ -164,6 +165,7 @@ void ADCFFTInstrumentController::createIIOFloatChannel(AcqTreeNode *node)
 
 	m_ui->addChannel(c->ctrl(), c, cw);
 
+	connect(dc, &GRDeviceComponent::iioEvent, this, &ADCInstrumentController::iioEvent);
 	connect(c->ctrl(), &QAbstractButton::clicked, this, [=]() { m_plotComponentManager->selectChannel(c); });
 
 	grtsc->addChannel(c);			   // For matching Sink To Channels
@@ -228,6 +230,7 @@ void ADCFFTInstrumentController::createIIOComplexChannel(AcqTreeNode *node_I, Ac
 
 	m_ui->addChannel(c->ctrl(), c, cw);
 
+	connect(dc, &GRDeviceComponent::iioEvent, this, &ADCInstrumentController::iioEvent);
 	connect(c->ctrl(), &QAbstractButton::clicked, this, [=]() { m_plotComponentManager->selectChannel(c); });
 
 	grtsc->addChannel(c);			   // For matching Sink To Channels

diff --git a/plugins/adc/src/adcinstrumentcontroller.cpp b/plugins/adc/src/adcinstrumentcontroller.cpp
@@ -57,10 +57,12 @@ ADCInstrumentController::ADCInstrumentController(ToolMenuEntry *tme, QString uri
 			update();
 			if(m_refreshTimerRunning)
 				m_plotTimer->start();
+			Q_EMIT iioEvent();
 		},
 		Qt::QueuedConnection);
 
 	m_ui = new ADCInstrument(tme, nullptr);
+	connect(this, &ADCInstrumentController::iioEvent, m_tme, &ToolMenuEntry::iioEvent);
 }
 
 ADCInstrumentController::~ADCInstrumentController() {}
@@ -110,6 +112,7 @@ void ADCInstrumentController::start()
 	ResourceManager::open("adc" + m_uri, this);
 	bool ret = m_dataProvider->start();
 	if(!ret) {
+		Q_EMIT iioEvent(IIO_ERROR);
 		Q_EMIT requestDisconnect();
 	}
 }

diff --git a/plugins/adc/src/adcinstrumentcontroller.h b/plugins/adc/src/adcinstrumentcontroller.h
@@ -71,6 +71,9 @@ public Q_SLOTS:
 	virtual void start();
 	virtual void stop() override;
 
+Q_SIGNALS:
+	void iioEvent(int retCode = 0);
+
 protected Q_SLOTS:
 	virtual void stopUpdates();
 	virtual void startUpdates();
@@ -117,6 +120,7 @@ protected Q_SLOTS:
 
 	ToolMenuEntry *m_tme;
 	QString m_uri;
+	const int IIO_ERROR = -1;
 };
 
 } // namespace adc

diff --git a/plugins/adc/src/adctimeinstrumentcontroller.cpp b/plugins/adc/src/adctimeinstrumentcontroller.cpp
@@ -167,6 +167,7 @@ void ADCTimeInstrumentController::createIIODevice(AcqTreeNode *node)
 	m_timePlotSettingsComponent->addSampleRateProvider(d);
 	addComponent(d);
 
+	connect(d, &GRDeviceComponent::iioEvent, this, &ADCInstrumentController::iioEvent);
 	connect(m_timePlotSettingsComponent, &TimePlotManagerSettings::bufferSizeChanged, d,
 		&GRDeviceComponent::setBufferSize);
 }
@@ -179,6 +180,7 @@ void ADCTimeInstrumentController::createIIOFloatChannel(AcqTreeNode *node)
 	GRTimeChannelComponent *c =
 		new GRTimeChannelComponent(griiofcn, dynamic_cast<TimePlotComponent *>(m_plotComponentManager->plot(0)),
 					   grtsc, chIdP->pen(idx), m_ui->rightStack);
+	connect(c, &GRTimeChannelComponent::iioEvent, this, &ADCInstrumentController::iioEvent);
 	Q_ASSERT(grtsc);
 
 	m_plotComponentManager->addChannel(c);
@@ -215,6 +217,7 @@ void ADCTimeInstrumentController::createIIOFloatChannel(AcqTreeNode *node)
 		m_defaultCh = c;
 		m_plotComponentManager->selectChannel(c);
 	}
+	connect(dc, &GRDeviceComponent::iioEvent, this, &ADCInstrumentController::iioEvent);
 }
 
 void ADCTimeInstrumentController::createImportFloatChannel(AcqTreeNode *node)

diff --git a/plugins/adc/src/freq/grfftchannelcomponent.cpp b/plugins/adc/src/freq/grfftchannelcomponent.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "grfftchannelcomponent.h"
+#include "datastrategy/channelattrdatastrategy.h"
 #include <pluginbase/preferences.h>
 #include <gui/widgets/menusectionwidget.h>
 #include <gui/widgets/menucollapsesection.h>
@@ -286,6 +287,11 @@ QWidget *GRFFTChannelComponent::createChAttrMenu(iio_channel *ch, QString title,
 
 	for(auto w : attrWidgets) {
 		layout->addWidget(w);
+		connect(dynamic_cast<ChannelAttrDataStrategy *>(w->getDataStrategy()),
+			&ChannelAttrDataStrategy::emitStatus, this,
+			[this](QDateTime timestamp, QString oldData, QString newData, int returnCode, bool isReadOp) {
+				Q_EMIT iioEvent(returnCode);
+			});
 	}
 
 	section->contentLayout()->addLayout(layout);

diff --git a/plugins/adc/src/freq/grfftchannelcomponent.h b/plugins/adc/src/freq/grfftchannelcomponent.h
@@ -198,6 +198,7 @@ public Q_SLOTS:
 	void powerOffsetChanged(double);
 	void windowChanged(int);
 	void windowCorrectionChanged(bool);
+	void iioEvent(int retCode);
 
 private:
 	double m_powerOffset;

diff --git a/plugins/adc/src/grdevicecomponent.cpp b/plugins/adc/src/grdevicecomponent.cpp
@@ -20,13 +20,15 @@
  */
 
 #include "grdevicecomponent.h"
+#include "datastrategy/deviceattrdatastrategy.h"
 #include <gui/channelcomponent.h>
 #include <widgets/menucollapsesection.h>
 #include <widgets/menusectionwidget.h>
 #include <widgets/menuheader.h>
 #include <iio-widgets/iiowidget.h>
 #include <iio-widgets/iiowidgetbuilder.h>
 #include <style.h>
+#include <datastrategy/multidatastrategy.h>
 
 using namespace scopy;
 using namespace scopy::adc;
@@ -116,6 +118,10 @@ QWidget *GRDeviceComponent::createChCommonAttrMenu(QWidget *parent)
 
 	for(auto w : attrWidgets) {
 		layout->addWidget(w);
+		connect(dynamic_cast<MultiDataStrategy *>(w->getDataStrategy()), &MultiDataStrategy::emitStatus, this,
+			[this](QDateTime timestamp, QString oldData, QString newData, int returnCode, bool isReadOp) {
+				Q_EMIT iioEvent(returnCode);
+			});
 	}
 
 	attr->contentLayout()->addLayout(layout);
@@ -145,6 +151,11 @@ QWidget *GRDeviceComponent::createAttrMenu(QWidget *parent)
 
 	for(auto w : attrWidgets) {
 		layout->addWidget(w);
+		connect(dynamic_cast<DeviceAttrDataStrategy *>(w->getDataStrategy()),
+			&DeviceAttrDataStrategy::emitStatus, this,
+			[this](QDateTime timestamp, QString oldData, QString newData, int returnCode, bool isReadOp) {
+				Q_EMIT iioEvent(returnCode);
+			});
 	}
 
 	attr->contentLayout()->addLayout(layout);

diff --git a/plugins/adc/src/grdevicecomponent.h b/plugins/adc/src/grdevicecomponent.h
@@ -61,6 +61,9 @@ public Q_SLOTS:
 	void removeChannel(ChannelComponent *c);
 	void addChannel(ChannelComponent *c);
 
+Q_SIGNALS:
+	void iioEvent(int retCode);
+
 private:
 	QString name;
 	QWidget *widget;

diff --git a/plugins/adc/src/time/grtimechannelcomponent.cpp b/plugins/adc/src/time/grtimechannelcomponent.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "grtimechannelcomponent.h"
+#include "datastrategy/channelattrdatastrategy.h"
 #include <pluginbase/preferences.h>
 #include <gui/widgets/menusectionwidget.h>
 #include <gui/widgets/menucollapsesection.h>
@@ -95,6 +96,11 @@ QWidget *GRTimeChannelComponent::createYAxisMenu(QWidget *parent)
 					.channel(m_src->channel())
 					.attribute(m_src->scaleAttribute())
 					.buildSingle();
+		connect(dynamic_cast<ChannelAttrDataStrategy *>(m_scaleWidget->getDataStrategy()),
+			&ChannelAttrDataStrategy::emitStatus, this,
+			[this](QDateTime timestamp, QString oldData, QString newData, int returnCode, bool isReadOp) {
+				Q_EMIT iioEvent(returnCode);
+			});
 	}
 
 	m_yCtrl = new MenuPlotAxisRangeControl(m_timePlotComponentChannel->m_timePlotYAxis, m_yaxisMenu);
@@ -210,6 +216,11 @@ QWidget *GRTimeChannelComponent::createAttrMenu(QWidget *parent)
 
 	for(auto w : attrWidgets) {
 		layout->addWidget(w);
+		connect(dynamic_cast<ChannelAttrDataStrategy *>(w->getDataStrategy()),
+			&ChannelAttrDataStrategy::emitStatus, this,
+			[this](QDateTime timestamp, QString oldData, QString newData, int returnCode, bool isReadOp) {
+				Q_EMIT iioEvent(returnCode);
+			});
 	}
 
 	section->contentLayout()->addLayout(layout);

diff --git a/plugins/adc/src/time/grtimechannelcomponent.h b/plugins/adc/src/time/grtimechannelcomponent.h
@@ -129,6 +129,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
 	void yModeChanged();
+	void iioEvent(int retCode);
 
 private:
 	GRIIOFloatChannelNode *m_node;