wip

Signed-off-by: Adrian Suciu <[email protected]>
analogdevicesinc · Mar 13, 2024 · 2c3f6df · 2c3f6df
1 parent aaab870
commit 2c3f6df
Show file tree

Hide file tree

Showing 14 changed files with 1,091 additions and 302 deletions.
diff --git a/ci/ubuntu/ubuntu22_build_process.sh b/ci/ubuntu/ubuntu22_build_process.sh
@@ -8,12 +8,12 @@ if [ "$CI_SCRIPT" == "ON" ]
 	else
 		set -x
 		SRC_DIR=$(git rev-parse --show-toplevel)
-		QT=/opt/Qt/5.15.2/gcc_64
+		QT=/home/adi/Qt/5.15.2/gcc_64
 fi
 
 USE_STAGING=$1
 
-LIBIIO_VERSION=master
+LIBIIO_VERSION=libiio-v0
 LIBAD9361_BRANCH=master
 GLOG_BRANCH=v0.4.0
 
@@ -77,7 +77,7 @@ clone() {
 	git clone --recursive https://github.com/analogdevicesinc/gr-scopy.git -b $GRSCOPY_BRANCH gr-scopy
 	git clone --recursive https://github.com/analogdevicesinc/gr-m2k.git -b $GRM2K_BRANCH gr-m2k
 	git clone --recursive https://github.com/gnuradio/volk.git -b $VOLK_BRANCH volk
-	git clone --recursive https://github.com/gnuradio/gnuradio.git -b $GNURADIO_BRANCH gnuradio
+	git clone --recursive https://github.com/adisuciu/gnuradio.git -b $GNURADIO_BRANCH gnuradio
 	git clone --recursive https://github.com/cseci/qwt.git -b $QWT_BRANCH qwt
 	git clone --recursive https://github.com/sigrokproject/libsigrokdecode.git -b $LIBSIGROKDECODE_BRANCH libsigrokdecode
 	git clone --recursive https://github.com/analogdevicesinc/libtinyiiod.git -b $LIBTINYIIOD_BRANCH libtinyiiod
@@ -301,9 +301,9 @@ build_deps(){
 	build_libtinyiiod
 }
 
-#clone
-#update
-#install_apt
-#install_qt
-#build_deps
+clone
+update
+install_apt
+install_qt
+build_deps
 #build_scopy
diff --git a/core/src/scopymainwindow.cpp b/core/src/scopymainwindow.cpp
@@ -150,11 +150,11 @@ ScopyMainWindow::ScopyMainWindow(QWidget *parent)
 
 //	 auto id = api->addDevice("m2k","ip:127.0.0.1");
 //	 auto id = api->addDevice("iio","ip:10.48.65.163");
-//	 auto id = api->addDevice("iio","ip:192.168.2.1");
-//	 auto id = api->addDevice("test","");
+	 auto id = api->addDevice("iio","ip:192.168.2.1");
+	 // auto id = api->addDevice("test","");
 
-//	 api->connectDevice(id);
-//	 api->switchTool(id, "Oscilloscope");
+	 api->connectDevice(id);
+	 api->switchTool(id, "Time_old");
 #endif
 
 	qInfo(CAT_BENCHMARK) << "ScopyMainWindow constructor took: " << timer.elapsed() << "ms";

diff --git a/main.cpp b/main.cpp
@@ -54,7 +54,8 @@ void initLogging()
 						 "CyclicalTask.debug=false\n"
 						 "SWIOTPlugin.debug=true\n"
 						 "AD74413R.debug=true\n"
-						 "ScopyTranslations.debug=true\n");
+						 "ScopyTranslations.debug=true\n"
+						 "MapStackedWidget.debug=true\n");
 	}
 	if(!getenv("QT_MESSAGE_PATTERN")) {
 		SetScopyQDebugMessagePattern();

diff --git a/plugins/adc/CMakeLists.txt b/plugins/adc/CMakeLists.txt
@@ -40,7 +40,9 @@ if(NOT "${SCOPY_PLUGIN_BUILD_PATH}" STREQUAL "")
 endif()
 
 qt_add_resources(PROJECT_RESOURCES res/resources.qrc)
-add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES})
+add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES}
+    src/plotrecipe.h src/plotrecipe.cpp
+    src/timegrplot.h src/timegrplot.cpp)
 
 generate_export_header(
 	${PROJECT_NAME} EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_export.h

diff --git a/plugins/adc/include/adcplugin/adcplugin.h b/plugins/adc/include/adcplugin/adcplugin.h
@@ -158,6 +158,7 @@ class SCOPY_ADCPLUGIN_EXPORT GRTimePlotProxy : public QObject, public PlotProxy
 	QString prefix;
 };
 
+
 class SCOPY_ADCPLUGIN_EXPORT ADCPlugin : public QObject, public PluginBase
 {
 	Q_OBJECT
@@ -179,10 +180,17 @@ class SCOPY_ADCPLUGIN_EXPORT ADCPlugin : public QObject, public PluginBase
 	void saveSettings(QSettings &) override;
 	void loadSettings(QSettings &) override;
 
+	int plotCount();
+public Q_SLOTS:
+	void addPlot(int);
+	void removePlot(QWidget *w);
+
+
 private:
 	iio_context *m_ctx;
-	QWidget *time;
-	QLineEdit *edit;
+	GRTopBlock *top;
+
+
 	PlotProxy *createRecipe(iio_context *ctx);
 	GRTimePlotProxy *recipe;
 };