Fix service default dashboard to show FFT

Signed-off-by: Frank Osterfeld <[email protected]>
fair-acc · Oct 2, 2024 · fe610f8 · fe610f8
1 parent d11dea7
commit fe610f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/src/service/dashboard/defaultDashboard.dashboard b/src/service/dashboard/defaultDashboard.dashboard
@@ -25,7 +25,7 @@ plots:
         min: -1.1052913129824811
         max: 1.2526563780175193
     sources:
-      - sink 3
+      - sink 2
     rect:
       - 0
       - 0
@@ -40,7 +40,6 @@ plots:
         min: -1.7225485895235
         max: 1.7593722791967299
     sources:
-      - sink 2
       - sink 1
     rect:
       - 0
@@ -56,10 +55,10 @@ plots:
         min: 0
         max: 1
     sources:
-      - sink 4
+      - sink 3
     rect:
       - 8
       - 0
       - 8
       - 6
-flowgraphLayout: "{\"nodes\":{\"node:94017877764736\":{\"location\":{\"x\":22,\"y\":-35},\"name\":\"FFT\"},\"node:94017878239328\":{\"location\":{\"x\":492,\"y\":0},\"name\":\"sink 1\"},\"node:94017878270656\":{\"location\":{\"x\":492,\"y\":91},\"name\":\"sink 2\"},\"node:94017879131664\":{\"location\":{\"x\":-442,\"y\":0},\"name\":\"sine source 1\"},\"node:94017879138960\":{\"location\":{\"x\":-9,\"y\":201},\"name\":\"sum sigs\"},\"node:94017879141824\":{\"location\":{\"x\":-442,\"y\":182},\"name\":\"source for sink 2\"},\"node:94017879144160\":{\"location\":{\"x\":-442,\"y\":91},\"name\":\"source for sink 1\"},\"node:94017880719440\":{\"location\":{\"x\":-442,\"y\":273},\"name\":\"remote source 1\"}},\"selection\":null,\"view\":{\"scroll\":{\"x\":-674.0001220703125,\"y\":-19.0000267028808594},\"visible_rect\":{\"max\":{\"x\":594.6666259765625,\"y\":484.00006103515625},\"min\":{\"x\":-449.333465576171875,\"y\":-12.6666860580444336}},\"zoom\":1.4999997615814209}}"
+flowgraphLayout: "{\"nodes\":{\"node:94017877764736\":{\"location\":{\"x\":22,\"y\":-35},\"name\":\"FFT\"},\"node:94017878239328\":{\"location\":{\"x\":492,\"y\":0},\"name\":\"sink 1\"},\"node:94017879131664\":{\"location\":{\"x\":-442,\"y\":0},\"name\":\"sine source 1\"},\"node:94017879141824\":{\"location\":{\"x\":-442,\"y\":182},\"name\":\"source for sink 2\"},\"node:94017879144160\":{\"location\":{\"x\":-442,\"y\":91},\"name\":\"source for sink 1\"},\"node:94017880719440\":{\"location\":{\"x\":-442,\"y\":273},\"name\":\"remote source 1\"}},\"selection\":null,\"view\":{\"scroll\":{\"x\":-674.0001220703125,\"y\":-19.0000267028808594},\"visible_rect\":{\"max\":{\"x\":594.6666259765625,\"y\":484.00006103515625},\"min\":{\"x\":-449.333465576171875,\"y\":-12.6666860580444336}},\"zoom\":1.4999997615814209}}"
diff --git a/src/service/dashboard/defaultDashboard.flowgraph b/src/service/dashboard/defaultDashboard.flowgraph
@@ -1,8 +1,6 @@
 blocks:
   - name: FFT
     id: gr::blocks::fft::FFT
-  - name: sum sigs
-    id: opendigitizer::Arithmetic
   - name: sine source 1
     id: opendigitizer::SineSource
     parameters:
@@ -12,26 +10,19 @@ blocks:
     parameters:
       remote_uri: https://localhost:8080/GnuRadio/Acquisition?channelNameFilter=test
   - name: sink 1
-    id: opendigitizer::ImPlotSink
+    id: opendigitizer::ImPlotSinkDataSet
     parameters:
       color: 0xff0000
   - name: sink 2
-    id: opendigitizer::ImPlotSink
-    parameters:
-      color: 0x00ff00
-  - name: sink 3
     id: opendigitizer::ImPlotSink
     parameters:
       color: 0x0000ff
-  - name: sink 4
+  - name: sink 3
     id: opendigitizer::ImPlotSink
     parameters:
       color: 0xffff00
 connections:
   - [sine source 1, 0, FFT, 0]
   - [FFT, 0, sink 1, 0]
-  - [sine source 1, 0, sum sigs, 0]
-  - [FFT, 0, sum sigs, 1]
-  - [sum sigs, 0, sink 2, 0]
-  - [sine source 1, 0, sink 3, 0]
-  - [remote source 1, 0, sink 4, 0]
+  - [sine source 1, 0, sink 2, 0]
+  - [remote source 1, 0, sink 3, 0]