plugins/swiotrefactor: Max14906 tool refactoring.

Created diodigitalchannel without .ui file. I changed the widget layout and implemented the entire functionalities for the plot. Also made the widget dockable. Signed-off-by: andrei.danila <[email protected]>
analogdevicesinc · Mar 26, 2024 · 250a487 · 250a487
1 parent b4e7e2b
commit 250a487
Show file tree

Hide file tree

Showing 19 changed files with 419 additions and 5,798 deletions.
diff --git a/.gitignore b/.gitignore
@@ -66,3 +66,4 @@ plugins/adc/include/adcplugin/scopy-adcplugin_export.h
 plugins/pqm/include/pqmplugin/scopy-pqmplugin_export.h
 plugins/testplugin/include/testplugin/scopy-testplugin_export.h
 plugins/testplugin2/include/testplugin2/scopy-testplugin2_export.h
+plugins/swiotrefactor/include/swiotrefactor/scopy-swiotrefactor_export.h
diff --git a/gui/include/gui/stylehelper.h b/gui/include/gui/stylehelper.h
@@ -102,6 +102,7 @@ class SCOPY_GUI_EXPORT StyleHelper : public QObject
 	static void HoverToolTip(QWidget *w, QString info, QString objectName = "");
 	static void WarningLabel(QLabel *w, QString objectName = "");
 	static void NoBackgroundIconButton(QPushButton *w, QIcon icon, QString objectName = "");
+	static void OrangeWidget(QWidget *w, QString objectName = "");
 
 private:
 	QMap<QString, QString> colorMap;

diff --git a/gui/src/stylehelper.cpp b/gui/src/stylehelper.cpp
@@ -1263,4 +1263,17 @@ void StyleHelper::NoBackgroundIconButton(QPushButton *w, QIcon icon, QString obj
 	w->setStyleSheet(style);
 }
 
+void StyleHelper::OrangeWidget(QWidget *w, QString objectName)
+{
+	if(!objectName.isEmpty())
+		w->setObjectName(objectName);
+	QString style = QString(R"css(
+			QWidget{
+				color:&&orange&&
+			}
+			)css");
+	style.replace("&&orange&&", StyleHelper::getColor("CH0"));
+	w->setStyleSheet(style);
+}
+
 #include "moc_stylehelper.cpp"
diff --git a/plugins/swiotrefactor/CMakeLists.txt b/plugins/swiotrefactor/CMakeLists.txt
@@ -66,12 +66,6 @@ else()
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH})
 endif()
 
-if(ANDROID)
-	find_library(QWT_LIBRARIES REQUIRED NAMES qwt_${ANDROID_ABI})
-else()
-	find_library(QWT_LIBRARIES REQUIRED NAMES qwt)
-endif()
-
 qt_add_resources(PROJECT_RESOURCES res/resources.qrc ../../resources/resources.qrc)
 
 add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES})
@@ -97,7 +91,6 @@ target_link_libraries(
 	       scopy-gui
 	       scopy-core
 	       scopy-iio-widgets
-	       ${QWT_LIBRARIES}
 )
 
 set(PLUGIN_NAME ${PROJECT_NAME} PARENT_SCOPE)
diff --git a/plugins/swiotrefactor/include/swiotrefactor/max14906/diocontroller.h b/plugins/swiotrefactor/include/swiotrefactor/max14906/diocontroller.h
@@ -21,8 +21,8 @@
 #ifndef SCOPY_DIOCONTROLLER_H
 #define SCOPY_DIOCONTROLLER_H
 
-#include <iio.h>
 #include "scopy-swiotrefactor_export.h"
+#include <iio.h>
 #include <QString>
 #include <QThread>
 #include <QTimer>

diff --git a/plugins/swiotrefactor/include/swiotrefactor/max14906/diodigitalchannel.h b/plugins/swiotrefactor/include/swiotrefactor/max14906/diodigitalchannel.h
@@ -21,11 +21,14 @@
 #ifndef SCOPY_DIODIGITALCHANNEL_H
 #define SCOPY_DIODIGITALCHANNEL_H
 
-#include "ui_diodigitalchannel.h"
 #include "scopy-swiotrefactor_export.h"
-#include <QDockWidget>
 #include <QWidget>
+#include <gui/lcdNumber.hpp>
+#include <gui/smallOnOffSwitch.h>
+#include <gui/plotwidget.h>
 #include <gui/generic_menu.hpp>
+#include <gui/customSwitch.h>
+#include <gui/widgets/menucombo.h>
 
 namespace scopy::swiotrefactor {
 class SCOPY_SWIOTREFACTOR_EXPORT DioDigitalChannel : public QWidget
@@ -37,24 +40,44 @@ class SCOPY_SWIOTREFACTOR_EXPORT DioDigitalChannel : public QWidget
 
 	void updateTimeScale(double newMax);
 	void addDataSample(double value);
-	const std::vector<std::string> getConfigModes() const;
-	void setConfigModes(std::vector<std::string> &configModes);
+	const QStringList getConfigModes() const;
+	void setConfigModes(QStringList &configModes);
 	const QString &getSelectedConfigMode() const;
 	void setSelectedConfigMode(const QString &selectedConfigMode);
-	void resetSismograph();
+	void resetPlot();
 
 private:
 	void connectSignalsAndSlots();
 
-	Ui::DioDigitalChannel *ui;
 	QString m_deviceName;
 	QString m_deviceType;
 
-	std::vector<std::string> m_configModes;
+	QStringList m_configModes;
 	QString m_selectedConfigMode;
 
 	friend class DioDigitalChannelController;
+	static std::mutex mutex_;
 
+	// plot
+	PlotWidget *m_plot;
+	QVector<double> m_yValues;
+	QVector<double> m_xTime;
+	PlotChannel *m_plotCh;
+	int m_timeSpan = 10;
+
+	// bottom container
+	MenuCombo *m_configModesCombo;
+	MenuCombo *m_currentLimitsCombo;
+	LcdNumber *m_lcdNumber;
+	SmallOnOffSwitch *m_valueSwitch;
+	// top container
+	QLabel *m_channelName;
+	QLabel *m_channelType;
+
+	void initData();
+	void initPlot();
+	QWidget *createBottomContainer(QWidget *parent);
+	QWidget *createTopContainer(QWidget *parent);
 Q_SIGNALS:
 	void outputValueChanged(bool value);
 };

diff --git a/plugins/swiotrefactor/include/swiotrefactor/max14906/diodigitalchannelcontroller.h b/plugins/swiotrefactor/include/swiotrefactor/max14906/diodigitalchannelcontroller.h
@@ -21,14 +21,11 @@
 #ifndef SCOPY_DIODIGITALCHANNELCONTROLLER_H
 #define SCOPY_DIODIGITALCHANNELCONTROLLER_H
 
-#include "diodigitalchannel.h"
 #include "scopy-swiotrefactor_export.h"
+#include "diodigitalchannel.h"
 #include <iio.h>
 
 #include <iioutil/commandqueue.h>
-#include <string>
-
-#define ATTR_BUFFER_LEN 200
 
 namespace scopy::swiotrefactor {
 class SCOPY_SWIOTREFACTOR_EXPORT DioDigitalChannelController : public QWidget
@@ -45,17 +42,25 @@ private Q_SLOTS:
 	void createWriteRawCommand(bool value);
 	void createWriteTypeCommand(int index);
 
+	void readAvailableTypeCmdFinished(scopy::Command *cmd);
+	void readTypeCmdFinished(scopy::Command *cmd);
+	void readRawCmdFinished(scopy::Command *cmd);
+	void readCurrentLimitCmdFinished(scopy::Command *cmd);
+	void readCurrentLimitAvailableCmdFinished(scopy::Command *cmd);
+	void writeCurrentLimitCmdFinished(scopy::Command *cmd);
+	void writeTypeCmdFinished(scopy::Command *cmd);
+
 private:
 	DioDigitalChannel *m_digitalChannel;
 
 	QString m_channelName;
 	QString m_channelType; // output or input
 
-	std::string m_iioAttrAvailableTypes; // iio attribute
-	std::vector<std::string> m_availableTypes;
+	QString m_iioAttrAvailableTypes; // iio attribute
+	QStringList m_availableTypes;
 
-	std::string m_iioAttrType; // iio attribute
-	std::string m_type;
+	QString m_iioAttrType; // iio attribute
+	QString m_type;
 
 	CommandQueue *m_cmdQueue;
 

diff --git a/plugins/swiotrefactor/include/swiotrefactor/max14906/diosettingstab.h b/plugins/swiotrefactor/include/swiotrefactor/max14906/diosettingstab.h
@@ -23,7 +23,6 @@
 
 #include "scopy-swiotrefactor_export.h"
 #include <QWidget>
-
 #include <gui/spinbox_a.hpp>
 
 namespace scopy::swiotrefactor {
@@ -32,13 +31,11 @@ class SCOPY_SWIOTREFACTOR_EXPORT DioSettingsTab : public QWidget
 	Q_OBJECT
 public:
 	explicit DioSettingsTab(QWidget *parent = nullptr);
-
 	~DioSettingsTab();
 
 	double getTimeValue() const;
 
 Q_SIGNALS:
-
 	void timeValueChanged(double value);
 
 private:

diff --git a/plugins/swiotrefactor/include/swiotrefactor/max14906/max14906.h b/plugins/swiotrefactor/include/swiotrefactor/max14906/max14906.h
@@ -1,18 +1,19 @@
 #ifndef MAX14906_H
 #define MAX14906_H
 
+#include "scopy-swiotrefactor_export.h"
+
 #include "diocontroller.h"
 #include "diodigitalchannelcontroller.h"
 #include "diosettingstab.h"
-#include "scopy-swiotrefactor_export.h"
-#include <QPushButton>
-#include <QWidget>
 #include <readerthread.h>
+#include <QWidget>
+#include <QPushButton>
 #include <gui/tooltemplate.h>
 #include <gui/widgets/toolbuttons.h>
+#include <pluginbase/toolmenuentry.h>
 #include <iioutil/commandqueue.h>
 #include <iioutil/connection.h>
-#include <pluginbase/toolmenuentry.h>
 
 #define MAX_NAME "max14906"
 #define MAX14906_POLLING_TIME 1000
@@ -44,8 +45,8 @@ private Q_SLOTS:
 	GearBtn *m_gearBtn;
 
 	int m_nbDioChannels;
-	DioController *max14906ToolController;
-	DioSettingsTab *m_max14906SettingsTab;
+	DioController *m_max14906ToolController;
+	DioSettingsTab *m_max14906SettingsTab = nullptr;
 
 	QTimer *m_qTimer;
 

diff --git a/plugins/swiotrefactor/include/swiotrefactor/scopy-swiotrefactor_export.h b/plugins/swiotrefactor/include/swiotrefactor/scopy-swiotrefactor_export.h