rfpowermeter: added rf powermeter package

IonutMuthi · IonutMuthi · commit 53edcabbe40b · 2025-11-14T08:58:13.000+02:00
Signed-off-by: IonutMuthi &lt;ionut.muthi@analog.com&gt;
diff --git a/packages/generic-plugins/plugins/datalogger/include/datalogger/datalogger_api.hpp b/packages/generic-plugins/plugins/datalogger/include/datalogger/datalogger_api.hpp
@@ -23,13 +23,12 @@
 #define DATALOGGER_API_H
 
 #include "scopy-datalogger_export.h"
-
-#include <dataloggerplugin.h>
-#include <sevensegmentdisplay.hpp>
-#include <sevensegmentmonitorsettings.hpp>
+#include <pluginbase/apiobject.h>
 
 namespace scopy::datamonitor {
 
+class DataLoggerPlugin;
+
 class SCOPY_DATALOGGER_EXPORT DataLogger_API : public ApiObject
 {
 	Q_OBJECT
diff --git a/packages/generic-plugins/plugins/datalogger/include/datalogger/dataloggerplugin.h b/packages/generic-plugins/plugins/datalogger/include/datalogger/dataloggerplugin.h
@@ -55,6 +55,8 @@ class SCOPY_DATALOGGER_EXPORT DataLoggerPlugin : public QObject, public PluginBa
 	QString description() override;
 	QString pkgName() override;
 
+	DataLogger_API *getApi() const;
+
 public Q_SLOTS:
 	bool onConnect() override;
 	bool onDisconnect() override;
diff --git a/packages/generic-plugins/plugins/datalogger/include/datalogger/menus/channelattributesmenu.hpp b/packages/generic-plugins/plugins/datalogger/include/datalogger/menus/channelattributesmenu.hpp
@@ -25,6 +25,7 @@
 #include <QBoxLayout>
 #include <QWidget>
 #include <datamonitor/dmmdatamonitormodel.hpp>
+#include <datamonitor/unitofmeasurement.hpp>
 #include "scopy-datalogger_export.h"
 #include <QComboBox>
 #include <monitorplotmanager.h>
diff --git a/packages/generic-plugins/plugins/datalogger/src/datalogger_api.cpp b/packages/generic-plugins/plugins/datalogger/src/datalogger_api.cpp
@@ -21,6 +21,9 @@
 
 #include "datalogger_api.hpp"
 #include "menus/datamonitorsettings.hpp"
+#include <dataloggerplugin.h>
+#include <sevensegmentdisplay.hpp>
+#include <sevensegmentmonitorsettings.hpp>
 
 using namespace scopy::datamonitor;
 
diff --git a/packages/generic-plugins/plugins/datalogger/src/dataloggerplugin.cpp b/packages/generic-plugins/plugins/datalogger/src/dataloggerplugin.cpp
@@ -129,7 +129,6 @@ bool DataLoggerPlugin::onConnect()
 	removeTool("DataMonitorPreview");
 	addNewTool();
 	initApi();
-
 	return true;
 }
 
@@ -257,6 +256,8 @@ void DataLoggerPlugin::initApi()
 	js->registerApi(api);
 }
 
+DataLogger_API *DataLoggerPlugin::getApi() const { return api; }
+
 void DataLoggerPlugin::initMetadata()
 {
 	loadMetadata(
diff --git a/packages/generic-plugins/plugins/datalogger/src/datamonitortool.cpp b/packages/generic-plugins/plugins/datalogger/src/datamonitortool.cpp
@@ -398,15 +398,15 @@ void DatamonitorTool::setEnableAddRemoveInstrument(bool en) { addMonitorToolButt
 void DatamonitorTool::setDisplayMode(int mode)
 {
 	if(mode == 0) {
-		Q_EMIT showPlot->clicked();
+		showPlot->click();
 		return;
 	}
 	if(mode == 1) {
-		Q_EMIT showText->clicked();
+		showText->click();
 		return;
 	}
 	if(mode == 2) {
-		Q_EMIT showSegments->clicked();
+		showSegments->click();
 		return;
 	}
 }
diff --git a/packages/generic-plugins/plugins/datalogger/src/menus/channelattributesmenu.cpp b/packages/generic-plugins/plugins/datalogger/src/menus/channelattributesmenu.cpp
@@ -269,10 +269,19 @@ ChannelAttributesMenu::ChannelAttributesMenu(DataMonitorModel *model, MonitorPlo
 	umSymbol->setPlaceholderText("Symbol");
 
 	connect(umName, &QLineEdit::textChanged, this, [=](QString text) { model->getUnitOfMeasure()->setName(text); });
+	connect(model->getUnitOfMeasure(), &UnitOfMeasurement::unitChanged, this, [=]() {
+		umName->blockSignals(true);
+		umName->setText(model->getUnitOfMeasure()->getName());
+		umName->blockSignals(false);
+	});
 
 	connect(umSymbol, &QLineEdit::textChanged, this,
 		[=](QString text) { model->getUnitOfMeasure()->setSymbol(text); });
-
+	connect(model->getUnitOfMeasure(), &UnitOfMeasurement::unitChanged, this, [=]() {
+		umSymbol->blockSignals(true);
+		umSymbol->setText(model->getUnitOfMeasure()->getSymbol());
+		umSymbol->blockSignals(false);
+	});
 	umLayout->addWidget(umName);
 	umLayout->addWidget(umSymbol);
 
diff --git a/packages/rfpowermeter/CMakeLists.txt b/packages/rfpowermeter/CMakeLists.txt
@@ -0,0 +1,42 @@
+#
+# Copyright (c) 2024 Analog Devices Inc.
+#
+# This file is part of Scopy
+# (see https://www.github.com/analogdevicesinc/scopy).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+
+cmake_minimum_required(VERSION 3.9)
+
+set(SCOPY_MODULE rfpowermeter)
+set(CURRENT_PKG_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+set(PACKAGE_NAME ${SCOPY_MODULE})
+
+message(STATUS "building package: " ${SCOPY_MODULE})
+
+project(scopy-package-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX)
+
+configure_file(manifest.json.cmakein ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/MANIFEST.json @ONLY)
+
+include_resources(${CMAKE_CURRENT_SOURCE_DIR}/resources ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/resources)
+message("Including plugins")
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
+	add_plugins(${CMAKE_CURRENT_SOURCE_DIR}/plugins ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/plugins)
+	install_plugins(
+		${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/plugins
+		${SCOPY_PACKAGE_INSTALL_PATH}/${SCOPY_MODULE}/plugins "scopy"
+	)
+endif()
+install_pkg(${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE} ${SCOPY_PACKAGE_INSTALL_PATH}/${SCOPY_MODULE})
diff --git a/packages/rfpowermeter/manifest.json.cmakein b/packages/rfpowermeter/manifest.json.cmakein
@@ -0,0 +1,13 @@
+{
+    "id": "rfpowermeter",
+    "title": "RF Power Meter",
+    "version": "@PROJECT_VERSION@",
+    "description": "RF Power Meter plugin package",
+    "license": "LGPL",
+    "author": "Analog Devices Inc.",
+    "download_link": "",
+    "zip_checksum": "",
+    "scopy_compatibility": ["@CMAKE_PROJECT_VERSION@"],
+    "category": ["iio", "plugin"]
+  }
+  
diff --git a/packages/rfpowermeter/plugins/rfpowermeter/.gitignore b/packages/rfpowermeter/plugins/rfpowermeter/.gitignore
@@ -0,0 +1,2 @@
+include/rfpowermeter/scopy-rfpowermeter_export.h
+include/rfpowermeter/scopy-rfpowermeter_config.h
diff --git a/packages/rfpowermeter/plugins/rfpowermeter/CMakeLists.txt b/packages/rfpowermeter/plugins/rfpowermeter/CMakeLists.txt
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2024 Analog Devices Inc.
+#
+# This file is part of Scopy
+# (see https://www.github.com/analogdevicesinc/scopy).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+
+cmake_minimum_required(VERSION 3.9)
+
+set(SCOPY_MODULE rfpowermeter)
+
+message(STATUS "building plugin: " ${SCOPY_MODULE})
+
+project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX)
+
+set(PLUGIN_DISPLAY_NAME RF POWER METER)
+set(PLUGIN_DESCRIPTION RF POWER METER PLUGIN)
+
+include(GenerateExportHeader)
+
+# TODO: split stylesheet/resources and add here TODO: export header files correctly
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
+
+file(GLOB SRC_LIST src/*.cpp src/*.cc)
+file(GLOB HEADER_LIST include/${SCOPY_MODULE}/*.h include/${SCOPY_MODULE}/*.hpp)
+file(GLOB UI_LIST ui/*.ui)
+
+set(ENABLE_TESTING ON)
+if(ENABLE_TESTING)
+	add_subdirectory(test)
+endif()
+
+set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST} ${UI_LIST})
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS REQUIRED Widgets Core)
+
+add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES})
+
+generate_export_header(
+	${PROJECT_NAME} EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_export.h
+)
+
+message("Generate plugin style:")
+include(ScopyStyle)
+file(MAKE_DIRECTORY ${SCOPY_PACKAGE_BUILD_PATH}/${PACKAGE_NAME}/style/qss)
+generate_style(
+	"--plugin" ${CMAKE_CURRENT_SOURCE_DIR}/style ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}
+	${SCOPY_PACKAGE_BUILD_PATH}/${PACKAGE_NAME}
+)
+
+configure_file(
+	include/${SCOPY_MODULE}/scopy-${SCOPY_MODULE}_config.h.cmakein
+	${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/scopy-${SCOPY_MODULE}_config.h @ONLY
+)
+
+target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE})
+
+target_include_directories(${PROJECT_NAME} PUBLIC ${CURRENT_PKG_PATH}/include)
+target_include_directories(${PROJECT_NAME} PUBLIC scopy-pluginbase scopy-gui scopy-core scopy-datalogger)
+target_include_directories(${PROJECT_NAME} PRIVATE ${IIO_INCLUDE_DIRS} scopy-gui scopy-iioutil)
+
+target_include_directories(
+	${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/packages/generic-plugins/plugins/datalogger/include
+				${CMAKE_SOURCE_DIR}/packages/generic-plugins/plugins/datalogger/include/datalogger
+)
+
+target_link_libraries(
+	${PROJECT_NAME}
+	PUBLIC Qt::Widgets
+	       Qt::Core
+	       scopy-pluginbase
+	       scopy-gui
+	       scopy-iioutil
+	       scopy-core
+	       scopy-datalogger
+)
+
+# Set RPATH to find scopy-datalogger in generic-plugins directory
+set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../../generic-plugins/plugins")
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	configureinstallersettings(${SCOPY_MODULE} ${PLUGIN_DESCRIPTION} FALSE)
+endif()
+
+set(RFPOWERMETER_TARGET_NAME ${PROJECT_NAME} PARENT_SCOPE)
diff --git a/packages/rfpowermeter/plugins/rfpowermeter/include/rfpowermeter/rfpowermeter.h b/packages/rfpowermeter/plugins/rfpowermeter/include/rfpowermeter/rfpowermeter.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2024 Analog Devices Inc.
+ *
+ * This file is part of Scopy
+ * (see https://www.github.com/analogdevicesinc/scopy).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef RFPOWERMETERPLUGIN_H
+#define RFPOWERMETERPLUGIN_H
+
+#define SCOPY_PLUGIN_NAME RFPowerMeterPlugin
+
+#include "scopy-rfpowermeter_export.h"
+#include <QObject>
+#include <pluginbase/plugin.h>
+#include <pluginbase/pluginbase.h>
+
+namespace scopy {
+namespace rfpowermeter {
+class SCOPY_RFPOWERMETER_EXPORT RFPowerMeterPlugin : public QObject, public PluginBase
+{
+	Q_OBJECT
+	SCOPY_PLUGIN;
+
+public:
+	bool compatible(QString m_param, QString category) override;
+	bool loadPage() override;
+	bool loadIcon() override;
+	void loadToolList() override;
+	void unload() override;
+	void initMetadata() override;
+	QString description() override;
+
+public Q_SLOTS:
+	bool onConnect() override;
+	bool onDisconnect() override;
+};
+} // namespace rfpowermeter
+} // namespace scopy
+#endif // RFPOWERMETERPLUGIN_H
diff --git a/packages/rfpowermeter/plugins/rfpowermeter/include/rfpowermeter/scopy-rfpowermeter_config.h.cmakein b/packages/rfpowermeter/plugins/rfpowermeter/include/rfpowermeter/scopy-rfpowermeter_config.h.cmakein
@@ -0,0 +1,10 @@
+#ifndef SCOPY_RFPOWERMETER_CONFIG_H_CMAKEIN
+#define SCOPY_RFPOWERMETER_CONFIG_H_CMAKEIN
+
+#define RFPOWERMETER_PLUGIN_DISPLAY_NAME "@PLUGIN_DISPLAY_NAME@"
+#define RFPOWERMETER_PLUGIN_SCOPY_MODULE "@SCOPY_MODULE@"
+#define RFPOWERMETER_PLUGIN_DESCRIPTION "@PLUGIN_DESCRIPTION@"
+
+#cmakedefine ENABLE_SCOPYJS
+
+#endif // SCOPY_RFPOWERMETER_CONFIG_H_CMAKEIN
diff --git a/packages/rfpowermeter/plugins/rfpowermeter/src/rfpowermeter.cpp b/packages/rfpowermeter/plugins/rfpowermeter/src/rfpowermeter.cpp
diff --git a/packages/rfpowermeter/plugins/rfpowermeter/test/CMakeLists.txt b/packages/rfpowermeter/plugins/rfpowermeter/test/CMakeLists.txt
diff --git a/packages/rfpowermeter/plugins/rfpowermeter/test/tst_pluginloader.cpp b/packages/rfpowermeter/plugins/rfpowermeter/test/tst_pluginloader.cpp
diff --git a/packages/rfpowermeter/resources/translations.qrc b/packages/rfpowermeter/resources/translations.qrc

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ bool DataLoggerPlugin::onConnect()`
`129`	`129`	`removeTool("DataMonitorPreview");`
`130`	`130`	`addNewTool();`
`131`	`131`	`initApi();`
`132`		`-`
`133`	`132`	`return true;`
`134`	`133`	`}`
`135`	`134`
`@@ -257,6 +256,8 @@ void DataLoggerPlugin::initApi()`
`257`	`256`	`js->registerApi(api);`
`258`	`257`	`}`
`259`	`258`
	`259`	`+DataLogger_API *DataLoggerPlugin::getApi() const { return api; }`
	`260`	`+`
`260`	`261`	`void DataLoggerPlugin::initMetadata()`
`261`	`262`	`{`
`262`	`263`	`loadMetadata(`
Original file line number	Diff line number	Diff line change
`@@ -398,15 +398,15 @@ void DatamonitorTool::setEnableAddRemoveInstrument(bool en) { addMonitorToolButt`
`398`	`398`	`void DatamonitorTool::setDisplayMode(int mode)`
`399`	`399`	`{`
`400`	`400`	`if(mode == 0) {`
`401`		`- Q_EMIT showPlot->clicked();`
	`401`	`+ showPlot->click();`
`402`	`402`	`return;`
`403`	`403`	`}`
`404`	`404`	`if(mode == 1) {`
`405`		`- Q_EMIT showText->clicked();`
	`405`	`+ showText->click();`
`406`	`406`	`return;`
`407`	`407`	`}`
`408`	`408`	`if(mode == 2) {`
`409`		`- Q_EMIT showSegments->clicked();`
	`409`	`+ showSegments->click();`
`410`	`410`	`return;`
`411`	`411`	`}`
`412`	`412`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+include/rfpowermeter/scopy-rfpowermeter_export.h`
	`2`	`+include/rfpowermeter/scopy-rfpowermeter_config.h`