iio-widgets/DataStrategyInterface: Add signal for aboutToWrite

The aboutToWrite signal from DataStrategyInterface will be emitted before any write operation and will contain the old data (aka the data from before the write op) and the new data that will be written Signed-off-by: Andrei-Fabian-Pop <[email protected]>
analogdevicesinc · Apr 9, 2024 · 715abce · 715abce
1 parent 592b3e3
commit 715abce
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 1 deletion.
diff --git a/iio-widgets/include/iio-widgets/datastrategy/channelattrdatastrategy.h b/iio-widgets/include/iio-widgets/datastrategy/channelattrdatastrategy.h
@@ -44,6 +44,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
 	void sendData(QString data, QString dataOptions) override;
+	void aboutToWrite(QString oldData, QString newData) override;
 	void emitStatus(int status) override;
 
 private:

diff --git a/iio-widgets/include/iio-widgets/datastrategy/cmdqchannelattrdatastrategy.h b/iio-widgets/include/iio-widgets/datastrategy/cmdqchannelattrdatastrategy.h
@@ -44,6 +44,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
 	void sendData(QString data, QString dataOptions) override;
+	void aboutToWrite(QString oldData, QString newData) override;
 	void emitStatus(int status) override;
 
 private Q_SLOTS:

diff --git a/iio-widgets/include/iio-widgets/datastrategy/cmdqdeviceattrdatastrategy.h b/iio-widgets/include/iio-widgets/datastrategy/cmdqdeviceattrdatastrategy.h
@@ -24,6 +24,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
 	void sendData(QString data, QString dataOptions) override;
+	void aboutToWrite(QString oldData, QString newData) override;
 	void emitStatus(int status) override;
 
 private Q_SLOTS:

diff --git a/iio-widgets/include/iio-widgets/datastrategy/contextattrdatastrategy.h b/iio-widgets/include/iio-widgets/datastrategy/contextattrdatastrategy.h
@@ -23,6 +23,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
 	void sendData(QString data, QString dataOptions) override;
+	void aboutToWrite(QString oldData, QString newData) override;
 	void emitStatus(int status) override;
 
 private:

diff --git a/iio-widgets/include/iio-widgets/datastrategy/datastrategyinterface.h b/iio-widgets/include/iio-widgets/datastrategy/datastrategyinterface.h
@@ -63,6 +63,13 @@ public Q_SLOTS:
 	 * */
 	virtual void sendData(QString data, QString dataOptions) = 0;
 
+	/**
+	 * @brief This signal is emitted before a write operation
+	 * @param oldData String containing the data what is present before the write
+	 * @param newData String containing the data that will be written
+	 */
+	virtual void aboutToWrite(QString oldData, QString newData) = 0;
+
 	/**
 	 * @brief Emits the status of the operations (e.g. error code)
 	 * */

diff --git a/iio-widgets/include/iio-widgets/datastrategy/deviceattrdatastrategy.h b/iio-widgets/include/iio-widgets/datastrategy/deviceattrdatastrategy.h
@@ -44,6 +44,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
 	void sendData(QString data, QString dataOptions) override;
+	void aboutToWrite(QString oldData, QString newData) override;
 	void emitStatus(int status) override;
 
 private:

diff --git a/iio-widgets/include/iio-widgets/datastrategy/triggerdatastrategy.h b/iio-widgets/include/iio-widgets/datastrategy/triggerdatastrategy.h
@@ -44,6 +44,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
 	void sendData(QString data, QString dataOptions) override;
+	void aboutToWrite(QString oldData, QString newData) override;
 	void emitStatus(int status) override;
 
 private:

diff --git a/iio-widgets/src/datastrategy/channelattrdatastrategy.cpp b/iio-widgets/src/datastrategy/channelattrdatastrategy.cpp
@@ -42,6 +42,7 @@ void ChannelAttrDataStrategy::save(QString data)
 		return;
 	}
 
+	Q_EMIT aboutToWrite(m_data, data);
 	ssize_t res = iio_channel_attr_write(m_recipe.channel, m_recipe.data.toStdString().c_str(),
 					     data.toStdString().c_str());
 	if(res < 0) {

diff --git a/iio-widgets/src/datastrategy/cmdqchannelattrdatastrategy.cpp b/iio-widgets/src/datastrategy/cmdqchannelattrdatastrategy.cpp
@@ -48,6 +48,7 @@ void CmdQChannelAttrDataStrategy::save(QString data)
 		return;
 	}
 
+	Q_EMIT aboutToWrite(m_dataRead, data);
 	Command *writeCommand = new IioChannelAttributeWrite(m_recipe.channel, m_recipe.data.toStdString().c_str(),
 							     data.toStdString().c_str(), nullptr);
 	QObject::connect(

diff --git a/iio-widgets/src/datastrategy/cmdqdeviceattrdatastrategy.cpp b/iio-widgets/src/datastrategy/cmdqdeviceattrdatastrategy.cpp
@@ -49,6 +49,7 @@ void CmdQDeviceAttrDataStrategy::save(QString data)
 		return;
 	}
 
+	Q_EMIT aboutToWrite(m_dataRead, data);
 	Command *writeCommand = new IioDeviceAttributeWrite(m_recipe.device, m_recipe.data.toStdString().c_str(),
 							    data.toStdString().c_str(), nullptr);
 	QObject::connect(

diff --git a/iio-widgets/src/datastrategy/contextattrdatastrategy.cpp b/iio-widgets/src/datastrategy/contextattrdatastrategy.cpp
@@ -17,7 +17,7 @@ QString ContextAttrDataStrategy::optionalData() { return m_optionalData; }
 
 void ContextAttrDataStrategy::save(QString data)
 {
-	qDebug(CAT_CONTEXT_ATTR_DATA_STRATEGY) << "ContextAttrDataStrategy::save called, but the attr is read only";
+	qInfo(CAT_CONTEXT_ATTR_DATA_STRATEGY) << "ContextAttrDataStrategy::save called, but the attr is read only";
 	requestData();
 }
 

diff --git a/iio-widgets/src/datastrategy/deviceattrdatastrategy.cpp b/iio-widgets/src/datastrategy/deviceattrdatastrategy.cpp
@@ -41,6 +41,7 @@ void DeviceAttrDataStrategy::save(QString data)
 		return;
 	}
 
+	Q_EMIT aboutToWrite(m_data, data);
 	ssize_t res =
 		iio_device_attr_write(m_recipe.device, m_recipe.data.toStdString().c_str(), data.toStdString().c_str());
 	if(res < 0) {

diff --git a/iio-widgets/src/datastrategy/triggerdatastrategy.cpp b/iio-widgets/src/datastrategy/triggerdatastrategy.cpp
@@ -48,6 +48,7 @@ void TriggerDataStrategy::save(QString data)
 		qWarning(CAT_TRIGGER_DATA_STRATEGY) << "Invalid arguments, no trigger with name" << data << "was found";
 	}
 
+	Q_EMIT aboutToWrite(m_data, data);
 	int res;
 	if(data == "None") {
 		res = iio_device_set_trigger(m_recipe.device, nullptr);