Turn SineSource into a regular GP block

fair-acc · Jan 31, 2024 · 57bdc1a · 57bdc1a
1 parent 232abc4
commit 57bdc1a
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 53 deletions.
diff --git a/src/service/dashboard/defaultDashboard.flowgraph b/src/service/dashboard/defaultDashboard.flowgraph
@@ -4,7 +4,7 @@ blocks:
   - name: sum sigs
     id: Arithmetic
   - name: sine source 1
-    id: sine_source
+    id: opendigitizer::SineSource
     parameters:
       frequency: 0.100000
   - name: source for sink 1

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
@@ -11,18 +11,17 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
 set(sources
-    main.cpp
-    app.cpp
-    flowgraph.cpp
-    flowgraphitem.cpp
-    dashboard.cpp
-    flowgraph/datasource.cpp
-    flowgraph/datasink.cpp
-    flowgraph/arithmetic_block.cpp
-    dashboardpage.cpp
-    opendashboardpage.cpp
-    imguiutils.cpp
-    remotesignalsources.cpp)
+  main.cpp
+  app.cpp
+  flowgraph.cpp
+  flowgraphitem.cpp
+  dashboard.cpp
+  flowgraph/datasink.cpp
+  flowgraph/arithmetic_block.cpp
+  dashboardpage.cpp
+  opendashboardpage.cpp
+  imguiutils.cpp
+  remotesignalsources.cpp)
 
 set(GNURADIO_PREFIX
     "/usr/"

diff --git a/src/ui/assets/sampleDashboards/DemoDashboard.grc b/src/ui/assets/sampleDashboards/DemoDashboard.grc
@@ -4,11 +4,11 @@ blocks:
   - name: FFT
     id: FFT
   - name: sine source 1
-    id: sine_source
+    id: opendigitizer::SineSource
     parameters:
       frequency: 1.000000
   - name: sine source 3
-    id: sine_source
+    id: opendigitizer::SineSource
     parameters:
       frequency: 1.300000
   - name: sink 1

diff --git a/src/ui/assets/sampleDashboards/ExtendedDemoDashboard.grc b/src/ui/assets/sampleDashboards/ExtendedDemoDashboard.grc
@@ -8,19 +8,19 @@ blocks:
   - name: FFT
     id: FFT
   - name: sine source 3
-    id: sine_source
+    id: opendigitizer::SineSource
     parameters:
       frequency: 0.100000
   - name: sine source 4
-    id: sine_source
+    id: opendigitizer::SineSource
     parameters:
       frequency: 0.200000
   - name: sine source 5
-    id: sine_source
+    id: opendigitizer::SineSource
     parameters:
       frequency: 0.300000
   - name: sine source 6
-    id: sine_source
+    id: opendigitizer::SineSource
     parameters:
       frequency: 0.400000
   - name: source for sink 1

diff --git a/src/ui/RemoteSource.hpp → src/ui/blocks/RemoteSource.hpp b/src/ui/RemoteSource.hpp → src/ui/blocks/RemoteSource.hpp
diff --git a/src/ui/flowgraph/datasource.cpp → src/ui/blocks/SineSource.hpp b/src/ui/flowgraph/datasource.cpp → src/ui/blocks/SineSource.hpp
@@ -1,13 +1,12 @@
-#include "datasource.h"
 
-#include <fmt/format.h>
-#include <math.h>
-#include <mutex>
+#ifndef OPENDIGITIZER_SINESOURCE_HPP
+#define OPENDIGITIZER_SINESOURCE_HPP
 
-#include <fmt/format.h>
 #include <gnuradio-4.0/Block.hpp>
 
-#include "../flowgraph.h"
+#include <mutex>
+
+namespace opendigitizer {
 
 template<typename T>
     requires std::is_arithmetic_v<T>
@@ -57,14 +56,8 @@ struct SineSource : public gr::Block<SineSource<T>, gr::BlockingIO<true>> {
     }
 };
 
-ENABLE_REFLECTION_FOR_TEMPLATE_FULL((typename T), (SineSource<T>), out, frequency);
-static_assert(gr::traits::block::can_processOne<SineSource<float>>);
-static_assert(gr::traits::block::can_processOne<SineSource<double>>);
-
-namespace DigitizerUi {
+} // namespace opendigitizer
 
-void DataSource::registerBlockType() {
-    BlockType::registry().addBlockType<SineSource>("sine_source");
-}
+ENABLE_REFLECTION_FOR_TEMPLATE(opendigitizer::SineSource, out, frequency)
 
-} // namespace DigitizerUi
+#endif
diff --git a/src/ui/flowgraph/datasource.h b/src/ui/flowgraph/datasource.h
diff --git a/src/ui/flowgraphitem.cpp b/src/ui/flowgraphitem.cpp
@@ -12,8 +12,6 @@
 #include "flowgraph.h"
 #include "imguiutils.h"
 
-#include "flowgraph/datasource.h"
-
 namespace DigitizerUi {
 
 FlowGraphItem::FlowGraphItem() {

diff --git a/src/ui/main.cpp b/src/ui/main.cpp
@@ -24,15 +24,15 @@
 #include <gnuradio-4.0/Scheduler.hpp>
 
 #include "app.h"
+#include "blocks/RemoteSource.hpp"
+#include "blocks/SineSource.hpp"
 #include "dashboard.h"
 #include "dashboardpage.h"
 #include "fair_header.h"
 #include "flowgraph.h"
 #include "flowgraph/arithmetic_block.h"
 #include "flowgraph/datasink.h"
-#include "flowgraph/datasource.h"
 #include "flowgraphitem.h"
-#include "RemoteSource.hpp"
 #include "utils/TouchHandler.hpp"
 
 CMRC_DECLARE(ui_assets);
@@ -237,10 +237,10 @@ int main(int argc, char **argv) {
     DigitizerUi::BlockType::registry().loadBlockDefinitions(BLOCKS_DIR);
 #endif
 
-    DigitizerUi::DataSource::registerBlockType();
     DigitizerUi::DataSink::registerBlockType();
     DigitizerUi::DataSinkSource::registerBlockType();
     DigitizerUi::ArithmeticBlock::registerBlockType();
+    DigitizerUi::BlockType::registry().addBlockType<opendigitizer::SineSource>("opendigitizer::SineSource");
     DigitizerUi::BlockType::registry().addBlockType<opendigitizer::RemoteSource>("opendigitizer::RemoteSource");
     DigitizerUi::BlockType::registry().addBlockType<SpecFFT>("FFT");