Make Arithmetic a normal GR block

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

Hide file tree

Showing 7 changed files with 18 additions and 32 deletions.
diff --git a/src/service/dashboard/defaultDashboard.flowgraph b/src/service/dashboard/defaultDashboard.flowgraph
@@ -2,7 +2,7 @@ blocks:
   - name: FFT
     id: FFT
   - name: sum sigs
-    id: Arithmetic
+    id: opendigitizer::Arithmetic
   - name: sine source 1
     id: opendigitizer::SineSource
     parameters:

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
@@ -17,7 +17,6 @@ set(sources
   flowgraphitem.cpp
   dashboard.cpp
   flowgraph/datasink.cpp
-  flowgraph/arithmetic_block.cpp
   dashboardpage.cpp
   opendashboardpage.cpp
   imguiutils.cpp

diff --git a/src/ui/assets/sampleDashboards/DemoDashboard.grc b/src/ui/assets/sampleDashboards/DemoDashboard.grc
@@ -1,6 +1,6 @@
 blocks:
   - name: sum sigs
-    id: Arithmetic
+    id: opendigitizer::Arithmetic
   - name: FFT
     id: FFT
   - name: sine source 1

diff --git a/src/ui/assets/sampleDashboards/ExtendedDemoDashboard.grc b/src/ui/assets/sampleDashboards/ExtendedDemoDashboard.grc
@@ -1,10 +1,10 @@
 blocks:
   - name: sum sigs1
-    id: Arithmetic
+    id: opendigitizer::Arithmetic
   - name: sum sigs2
-    id: Arithmetic
+    id: opendigitizer::Arithmetic
   - name: sum sigs3
-    id: Arithmetic
+    id: opendigitizer::Arithmetic
   - name: FFT
     id: FFT
   - name: sine source 3

diff --git a/src/ui/flowgraph/arithmetic_block.cpp → src/ui/blocks/Arithmetic.hpp b/src/ui/flowgraph/arithmetic_block.cpp → src/ui/blocks/Arithmetic.hpp
@@ -1,16 +1,17 @@
-#include "arithmetic_block.h"
+#ifndef OPENDIGITIZER_ARITHMETIC_HPP
+#define OPENDIGITIZER_ARITHMETIC_HPP
 
-#include <type_traits>
+#include <gnuradio-4.0/Block.hpp>
 
-#include "../flowgraph.h"
+namespace opendigitizer {
 
 template<typename T>
     requires std::is_arithmetic_v<T>
-struct MathNode : public gr::Block<MathNode<T>> {
-    gr::PortIn<T>                           in1{};
-    gr::PortIn<T>                           in2{};
+struct Arithmetic : public gr::Block<Arithmetic<T>> {
+    gr::PortIn<T>                           in1;
+    gr::PortIn<T>                           in2;
 
-    gr::PortOut<T>                          out{};
+    gr::PortOut<T>                          out;
 
     gr::Annotated<std::string, "operation"> operation = std::string("+");
 
@@ -33,12 +34,8 @@ struct MathNode : public gr::Block<MathNode<T>> {
     }
 };
 
-ENABLE_REFLECTION_FOR_TEMPLATE_FULL((typename T), (MathNode<T>), in1, in2, out, operation);
+} // namespace opendigitizer
 
-namespace DigitizerUi {
+ENABLE_REFLECTION_FOR_TEMPLATE(opendigitizer::Arithmetic, in1, in2, out, operation)
 
-void ArithmeticBlock::registerBlockType() {
-    BlockType::registry().addBlockType<MathNode>("Arithmetic");
-}
-
-} // namespace DigitizerUi
+#endif
diff --git a/src/ui/flowgraph/arithmetic_block.h b/src/ui/flowgraph/arithmetic_block.h
diff --git a/src/ui/main.cpp b/src/ui/main.cpp
@@ -24,13 +24,13 @@
 #include <gnuradio-4.0/Scheduler.hpp>
 
 #include "app.h"
+#include "blocks/Arithmetic.hpp"
 #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 "flowgraphitem.h"
 #include "utils/TouchHandler.hpp"
@@ -239,9 +239,9 @@ int main(int argc, char **argv) {
 
     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<opendigitizer::Arithmetic>("opendigitizer::Arithmetic");
     DigitizerUi::BlockType::registry().addBlockType<SpecFFT>("FFT");
 
     loadFonts(app);