plugins/datalogger: 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 · 60f1bd7 · 60f1bd7
1 parent a6aacd2
commit 60f1bd7
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 5 deletions.
diff --git a/plugins/datalogger/include/datalogger/dataacquisitionmanager.hpp b/plugins/datalogger/include/datalogger/dataacquisitionmanager.hpp
@@ -56,6 +56,7 @@ class SCOPY_DATALOGGER_EXPORT DataAcquisitionManager : public QObject
 	void monitorAdded(DataMonitorModel *monitor);
 	void monitorRemoved(QString monitorName);
 	void deviceRemoved(QString deviceName);
+	void iioEvent(int retCode = 0);
 
 private:
 	QMap<QString, int> *m_activeMonitorsMap;

diff --git a/plugins/datalogger/include/datalogger/datamonitor/datamonitormodel.hpp b/plugins/datalogger/include/datalogger/datamonitor/datamonitormodel.hpp
@@ -83,6 +83,7 @@ class SCOPY_DATALOGGER_EXPORT DataMonitorModel : public QObject
 	void minValueUpdated(double value);
 	void maxValueUpdated(double value);
 	void dataCleared();
+	void iioEvent(int retCode = 0);
 
 protected:
 	void setDataStorageSize();

diff --git a/plugins/datalogger/include/datalogger/datamonitor/readabledatamonitormodel.hpp b/plugins/datalogger/include/datalogger/datamonitor/readabledatamonitormodel.hpp
@@ -42,8 +42,6 @@ class SCOPY_DATALOGGER_EXPORT ReadableDataMonitorModel : public DataMonitorModel
 	void setReadStrategy(IReadStrategy *newReadStrategy);
 	void resetMinMax();
 
-signals:
-
 private:
 	IReadStrategy *m_readStrategy;
 };

diff --git a/plugins/datalogger/include/datalogger/datamonitor/readstrategy/ireadstrategy.hpp b/plugins/datalogger/include/datalogger/datamonitor/readstrategy/ireadstrategy.hpp
@@ -36,6 +36,7 @@ class SCOPY_DATALOGGER_EXPORT IReadStrategy : public QObject
 Q_SIGNALS:
 	void readDone(double time, double value);
 	void readError(const char *err);
+	void iioEvent(int retCode = 0);
 };
 } // namespace datamonitor
 } // namespace scopy

diff --git a/plugins/datalogger/include/datalogger/datamonitortool.h b/plugins/datalogger/include/datalogger/datamonitortool.h
@@ -61,6 +61,7 @@ class SCOPY_DATALOGGER_EXPORT DatamonitorTool : public QWidget
 	void runToggled(bool toggled);
 	void settingsTitleChanged(QString newTitle);
 	void requestDeleteTool();
+	void iioEvent(int retCode);
 
 private:
 	MenuControlButton *monitorsButton;

diff --git a/plugins/datalogger/include/datalogger/menus/channelattributesmenu.hpp b/plugins/datalogger/include/datalogger/menus/channelattributesmenu.hpp
@@ -34,6 +34,9 @@ class SCOPY_DATALOGGER_EXPORT ChannelAttributesMenu : public QWidget
 	Q_OBJECT
 public:
 	explicit ChannelAttributesMenu(DataMonitorModel *model, QWidget *parent = nullptr);
+
+Q_SIGNALS:
+	void iioEvent(int retCode);
 };
 } // namespace datamonitor
 } // namespace scopy

diff --git a/plugins/datalogger/src/dataloggerplugin.cpp b/plugins/datalogger/src/dataloggerplugin.cpp
@@ -102,6 +102,8 @@ bool DataLoggerPlugin::onConnect()
 
 	foreach(ReadableDataMonitorModel *monitor, dmmList) {
 		m_dataAcquisitionManager->getDataMonitorMap()->insert(monitor->getName(), monitor);
+		connect(monitor, &ReadableDataMonitorModel::iioEvent, m_dataAcquisitionManager,
+			&DataAcquisitionManager::iioEvent);
 	}
 
 	Preferences *p = Preferences::GetInstance();
@@ -201,6 +203,9 @@ void DataLoggerPlugin::addNewTool()
 
 	Q_EMIT toolListChanged();
 	m_toolList.last()->setTool(datamonitorTool);
+	connect(datamonitorTool, &DatamonitorTool::iioEvent, m_toolList.last(), &ToolMenuEntry::iioEvent);
+	connect(m_dataAcquisitionManager, &DataAcquisitionManager::iioEvent, m_toolList.last(),
+		&ToolMenuEntry::iioEvent);
 	if(m_toolList.length() > 1) {
 		requestTool(tool_name);
 	}

diff --git a/plugins/datalogger/src/datamonitor/dmmdatamonitormodel.cpp b/plugins/datalogger/src/datamonitor/dmmdatamonitormodel.cpp
@@ -50,6 +50,7 @@ DmmDataMonitorModel::DmmDataMonitorModel(QString name, QColor color, UnitOfMeasu
 
 	setDataStorageSize();
 	setReadStrategy(readStrategy);
+	connect(readStrategy, &DMMReadStrategy::iioEvent, this, &DmmDataMonitorModel::iioEvent);
 }
 
 iio_channel *DmmDataMonitorModel::iioChannel() const { return m_iioChannel; }

diff --git a/plugins/datalogger/src/datamonitor/readstrategy/dmmreadstrategy.cpp b/plugins/datalogger/src/datamonitor/readstrategy/dmmreadstrategy.cpp
@@ -47,11 +47,12 @@ void DMMReadStrategy::read()
 		char err[1024];
 		iio_strerror(-(int)readRaw, err, sizeof(err));
 		qDebug() << "device read error " << err;
-
+		Q_EMIT iioEvent(readRaw);
 	} else if(readScale < 0) {
 		char err[1024];
 		iio_strerror(-(int)readScale, err, sizeof(err));
 		qDebug() << "device read error " << err;
+		Q_EMIT iioEvent(readScale);
 	} else {
 		double result = (raw + m_offset) * scale * m_umScale;
 		qDebug() << "dmm read success  ";
@@ -60,6 +61,7 @@ void DMMReadStrategy::read()
 		double currentTime = QwtDate::toDouble(timeTracker->lastReadValue());
 
 		Q_EMIT readDone(currentTime, result);
+		Q_EMIT iioEvent();
 	}
 }
 

diff --git a/plugins/datalogger/src/datamonitortool.cpp b/plugins/datalogger/src/datamonitortool.cpp
@@ -265,7 +265,9 @@ DatamonitorTool::DatamonitorTool(DataAcquisitionManager *dataAcquisitionManager,
 	////generate channel settings for compatible monitors
 	foreach(QString monitor, m_dataAcquisitionManager->getDataMonitorMap()->keys()) {
 		auto monitorModel = m_dataAcquisitionManager->getDataMonitorMap()->value(monitor);
-		tool->rightStack()->add(monitor, new ChannelAttributesMenu(monitorModel, this));
+		ChannelAttributesMenu *chnlAttrMenu = new ChannelAttributesMenu(monitorModel, this);
+		tool->rightStack()->add(monitor, chnlAttrMenu);
+		connect(chnlAttrMenu, &ChannelAttributesMenu::iioEvent, this, &DatamonitorTool::iioEvent);
 	}
 
 	/////////////////monitor selection menu ///////////////
@@ -278,7 +280,9 @@ DatamonitorTool::DatamonitorTool(DataAcquisitionManager *dataAcquisitionManager,
 	connect(m_dataAcquisitionManager, &DataAcquisitionManager::monitorAdded, this,
 		[=, this](DataMonitorModel *monitor) {
 			m_monitorSelectionMenu->addMonitor(monitor);
-			tool->rightStack()->add(monitor->getName(), new ChannelAttributesMenu(monitor, this));
+			ChannelAttributesMenu *chnlAttrMenu = new ChannelAttributesMenu(monitor, this);
+			tool->rightStack()->add(monitor->getName(), chnlAttrMenu);
+			connect(chnlAttrMenu, &ChannelAttributesMenu::iioEvent, this, &DatamonitorTool::iioEvent);
 		});
 
 	connect(m_dataAcquisitionManager, &DataAcquisitionManager::monitorRemoved, this,

diff --git a/plugins/datalogger/src/menus/channelattributesmenu.cpp b/plugins/datalogger/src/menus/channelattributesmenu.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "menus/channelattributesmenu.hpp"
+#include "datastrategy/channelattrdatastrategy.h"
 
 #include <iiowidgetbuilder.h>
 #include <menuheader.h>
@@ -66,6 +67,10 @@ ChannelAttributesMenu::ChannelAttributesMenu(DataMonitorModel *model, QWidget *p
 
 		for(auto w : attrWidgets) {
 			attrLayout->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); });
 		}
 
 	} else {