iio-widgets: Add empty data strategy

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

Author: Andrei-Fabian-Pop

gr-util/src/grdeviceaddon.cpp

@@ -27,15 +27,14 @@ QWidget *GRDeviceAddon::createAttrMenu(QWidget *parent)
 	MenuSectionWidget *attrContainer = new MenuSectionWidget(parent);
 	MenuCollapseSection *attr =
 		new MenuCollapseSection("ATTRIBUTES", MenuCollapseSection::MHCW_NONE, attrContainer);
-	QList<IIOWidget *> attrWidgets = IIOWidgetBuilder().device(m_src->iioDev()).parent(parent).buildAll();
+	QList<IIOWidget *> attrWidgets = IIOWidgetBuilder(parent).device(m_src->iioDev()).buildAll();
 	const struct iio_context *ctx = iio_device_get_context(m_src->iioDev());
-	attrWidgets.append(IIOWidgetBuilder()
+	attrWidgets.append(IIOWidgetBuilder(parent)
 				   .context(const_cast<iio_context *>(ctx))
 				   .device(m_src->iioDev())
 				   .attribute("Triggers")
 				   .uiStrategy(IIOWidgetBuilder::UIS::ComboUi)
 				   .dataStrategy(IIOWidgetBuilder::DS::TriggerData)
-				   .parent(parent)
 				   .buildSingle());
 
 	auto layout = new QVBoxLayout();

gr-util/src/grtimechanneladdon.cpp

@@ -193,7 +193,7 @@ QWidget *GRTimeChannelAddon::createAttrMenu(QWidget *parent)
 	MenuSectionWidget *attrcontainer = new MenuSectionWidget(parent);
 	MenuCollapseSection *attr =
 		new MenuCollapseSection("ATTRIBUTES", MenuCollapseSection::MHCW_NONE, attrcontainer);
-	QList<IIOWidget *> attrWidgets = IIOWidgetBuilder().channel(grch()->channel()).parent(parent).buildAll();
+	QList<IIOWidget *> attrWidgets = IIOWidgetBuilder(parent).channel(grch()->channel()).buildAll();
 
 	auto layout = new QVBoxLayout();
 	layout->setSpacing(10);

iio-widgets/include/iio-widgets/datastrategy/emptydatastrategy.h

@@ -0,0 +1,36 @@
+#ifndef EMPTYDATASTRATEGY_H
+#define EMPTYDATASTRATEGY_H
+
+#include <QObject>
+#include "datastrategy/datastrategyinterface.h"
+#include "scopy-iio-widgets_export.h"
+
+namespace scopy {
+class SCOPY_IIO_WIDGETS_EXPORT EmptyDataStrategy : public QObject, public DataStrategyInterface
+{
+	Q_OBJECT
+	Q_INTERFACES(scopy::DataStrategyInterface)
+public:
+	explicit EmptyDataStrategy(QObject *parent = nullptr);
+
+	QString data() override;
+	QString optionalData() override;
+
+public Q_SLOTS:
+	int write(QString data) override;
+	QPair<QString, QString> read() override;
+	void writeAsync(QString data) override;
+	void readAsync() override;
+
+Q_SIGNALS:
+	void sendData(QString data, QString dataOptions) override;
+	void aboutToWrite(QString oldData, QString newData) override;
+	void emitStatus(QDateTime timestamp, QString oldData, QString newData, int returnCode, bool isReadOp) override;
+
+private:
+	QString m_data;
+	QString m_previousData;
+};
+} // namespace scopy
+
+#endif // EMPTYDATASTRATEGY_H

iio-widgets/include/iio-widgets/iioconfigurationpopup.h

@@ -25,6 +25,7 @@ class SCOPY_IIO_WIDGETS_EXPORT IIOConfigurationPopup : public QWidget
 
 Q_SIGNALS:
 	void selectButtonClicked(IIOItem *selected);
+	void emptyButtonClicked();
 	void exitButtonClicked();
 
 protected Q_SLOTS:
@@ -39,6 +40,7 @@ protected Q_SLOTS:
 	IIOWidgetSelector *m_widgetSelector;
 	QPushButton *m_exitButton;
 	QPushButton *m_selectButton;
+	QPushButton *m_emptyButton;
 	IIOItem *m_root;
 };
 } // namespace scopy

iio-widgets/include/iio-widgets/iiowidget.h

@@ -124,7 +124,20 @@ class SCOPY_IIO_WIDGETS_EXPORT IIOWidget : public QWidget
 	 */
 	int lastReturnCode();
 
+	/**
+	 * @brief setUItoDataConversion Adds a function that is called before sending the data given as imput by the
+	 * user and modifies this data. The function receives as parameter a QString, converts it and returns the
+	 * converted string that will be sent to the DS after.
+	 * @param func std::function<QString(QString)>
+	 */
 	void setUItoDataConversion(std::function<QString(QString)> func);
+
+	/**
+	 * @brief setDataToUIConversion Adds a function that is called before sending the data read by the IIOWidget
+	 * and modifies this data. The function receives as parameter a QString, converts it and returns the
+	 * converted string that will be sent to the UI after.
+	 * @param func std::function<QString(QString)>
+	 */
 	void setDataToUIConversion(std::function<QString(QString)> func);
 
 	/**
@@ -239,12 +252,12 @@ protected Q_SLOTS:
 	void setLastOperationTimestamp(QDateTime timestamp);
 	void setLastOperationState(IIOWidget::State state);
 
-	// Core variables
+	/* Core variables */
 	GuiStrategyInterface *m_uiStrategy;
 	DataStrategyInterface *m_dataStrategy;
 	IIOWidgetFactoryRecipe m_recipe;
 
-	// Logged data
+	/* Logged data */
 	QString m_lastData;
 	SmallProgressBar *m_progressBar;
 	QDateTime *m_lastOpTimestamp;
@@ -255,7 +268,7 @@ protected Q_SLOTS:
 	std::function<QString(QString)> m_UItoDS;
 	std::function<QString(QString)> m_DStoUI;
 
-	// Optional configuration
+	/* Optional configuration */
 	QPushButton *m_configBtn;
 	IIOConfigurationPopup *m_configPopup;
 	bool m_isConfigurable;

iio-widgets/include/iio-widgets/iiowidgetbuilder.h

@@ -42,6 +42,7 @@ class SCOPY_IIO_WIDGETS_EXPORT IIOWidgetBuilder : public QObject
 		TriggerData,
 		DeviceAttrData,
 		ContextAttrData,
+		EmptyData,
 	};
 
 	enum UIS
@@ -53,7 +54,7 @@ class SCOPY_IIO_WIDGETS_EXPORT IIOWidgetBuilder : public QObject
 		RangeUi,
 	};
 
-	explicit IIOWidgetBuilder(QObject *parent = nullptr);
+	explicit IIOWidgetBuilder(QWidget *parent = nullptr);
 	~IIOWidgetBuilder();
 
 	/**
@@ -101,6 +102,13 @@ class SCOPY_IIO_WIDGETS_EXPORT IIOWidgetBuilder : public QObject
 	 */
 	IIOWidgetBuilder &configMode(bool isConfigurable);
 
+	/**
+	 * @brief title Sets the title of the IIOWidget
+	 * @param title QString
+	 * @return
+	 */
+	IIOWidgetBuilder &title(QString title);
+
 	/**
 	 * @brief Sets the context that will be used, if no iio_device or iio_channel
 	 * is set, the build functions will work with the context.
@@ -160,12 +168,6 @@ class SCOPY_IIO_WIDGETS_EXPORT IIOWidgetBuilder : public QObject
 	 */
 	IIOWidgetBuilder &uiStrategy(IIOWidgetBuilder::UIS uiStrategy);
 
-	/**
-	 * @brief Sets the parent of the IIOWidget that will be built.
-	 * @param parent
-	 */
-	IIOWidgetBuilder &parent(QWidget *parent);
-
 private:
 	DataStrategyInterface *createDS();
 	GuiStrategyInterface *createUIS();
@@ -179,6 +181,7 @@ class SCOPY_IIO_WIDGETS_EXPORT IIOWidgetBuilder : public QObject
 	QString m_attribute;
 	QString m_optionsAttribute;
 	QString m_optionsValues;
+	QString m_title;
 	IIOWidgetBuilder::DS m_dataStrategy;
 	IIOWidgetBuilder::UIS m_uiStrategy;
 	QWidget *m_widgetParent;

iio-widgets/src/datastrategy/emptydatastrategy.cpp

@@ -0,0 +1,38 @@
+#include "emptydatastrategy.h"
+
+using namespace scopy;
+
+EmptyDataStrategy::EmptyDataStrategy(QObject *parent)
+	: QObject{parent}
+	, m_data("")
+	, m_previousData("")
+{}
+
+QString EmptyDataStrategy::data() { return m_data; }
+
+QString EmptyDataStrategy::optionalData() { return ""; }
+
+int EmptyDataStrategy::write(QString data)
+{
+	m_previousData = data;
+	m_data = data;
+	return 0;
+}
+
+QPair<QString, QString> EmptyDataStrategy::read() { return {m_data, ""}; }
+
+void EmptyDataStrategy::writeAsync(QString data)
+{
+	int res = write(data);
+	Q_EMIT emitStatus(QDateTime::currentDateTime(), m_data, data, (int)(res), false);
+	readAsync();
+}
+
+void EmptyDataStrategy::readAsync()
+{
+	QPair<QString, QString> res = read();
+	Q_EMIT emitStatus(QDateTime::currentDateTime(), m_previousData, m_data, 0, true);
+	Q_EMIT sendData(res.first, res.second);
+}
+
+#include "moc_emptydatastrategy.cpp"

iio-widgets/src/iioconfigurationpopup.cpp

@@ -134,6 +134,7 @@ void IIOConfigurationPopup::init()
 
 		Q_EMIT selectButtonClicked(iioItem);
 	});
+	QObject::connect(m_emptyButton, &QPushButton::clicked, this, &IIOConfigurationPopup::emptyButtonClicked);
 	QObject::connect(m_exitButton, &QPushButton::clicked, this, &IIOConfigurationPopup::exitButtonClicked);
 	m_selectButton->setDisabled(true);
 }
@@ -161,12 +162,11 @@ void IIOConfigurationPopup::initUI()
 	buttonGroupLayout->setSpacing(10);
 
 	m_selectButton = new QPushButton("Select", buttonGroup);
-	m_selectButton->setObjectName("selectButton");
-
+	m_emptyButton = new QPushButton("No Data", buttonGroup);
 	m_exitButton = new QPushButton("Exit", buttonGroup);
-	m_exitButton->setObjectName("exitButton");
 
 	buttonGroupLayout->addWidget(m_exitButton);
+	buttonGroupLayout->addWidget(m_emptyButton);
 	buttonGroupLayout->addWidget(m_selectButton);
 
 	backgroundLayout->addWidget(m_titleLabel);
@@ -175,9 +175,10 @@ void IIOConfigurationPopup::initUI()
 
 	backgroundWidget->setLayout(backgroundLayout);
 
-	StyleHelper::TutorialChapterTitleLabel(m_titleLabel, "titleLabel");
-	StyleHelper::BlueButton(m_selectButton, "selectButton");
-	StyleHelper::BlueButton(m_exitButton, "exitButton");
+	StyleHelper::TutorialChapterTitleLabel(m_titleLabel, "TitleLabel");
+	StyleHelper::BlueButton(m_selectButton, "SelectButton");
+	StyleHelper::BlueButton(m_emptyButton, "EmptyButton");
+	StyleHelper::BlueButton(m_exitButton, "ExitButton");
 	StyleHelper::OverlayMenu(this, "IIOConfigurationPopupOverlay");
 }