From 59bba1429c1f8aeeb562b539583e71303506bd58 Mon Sep 17 00:00:00 2001
From: wyzula-jan <133381102+wyzula-jan@users.noreply.github.com>
Date: Thu, 12 Oct 2023 15:37:52 +0200
Subject: [PATCH] fix: scan_mode for BECDeviceMonitor fixed init_ui

---
 bec_widgets/examples/modular_app/modular.ui   | 24 ++---
 .../examples/modular_app/modular_app.py       | 90 +++++++++++++++++++
 bec_widgets/widgets/device_monitor.py         |  2 +-
 3 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/bec_widgets/examples/modular_app/modular.ui b/bec_widgets/examples/modular_app/modular.ui
index f9c2dcce..73398ca6 100644
--- a/bec_widgets/examples/modular_app/modular.ui
+++ b/bec_widgets/examples/modular_app/modular.ui
@@ -15,33 +15,33 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
+    <item row="2" column="1">
+     <widget class="QGraphicsView" name="glw_2"/>
+    </item>
     <item row="1" column="1">
-     <widget class="QLabel" name="label_2">
+     <widget class="QLabel" name="label_3">
       <property name="text">
-       <string>Table </string>
+       <string>Plot  Config 2</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="2">
-     <widget class="QLabel" name="label_3">
+    <item row="1" column="0">
+     <widget class="QLabel" name="label">
       <property name="text">
-       <string>Plot 2</string>
+       <string>Plot Config 1</string>
       </property>
      </widget>
     </item>
     <item row="2" column="0">
      <widget class="QGraphicsView" name="glw_1"/>
     </item>
-    <item row="2" column="1">
-     <widget class="QTableWidget" name="tableWidget"/>
-    </item>
     <item row="2" column="2">
-     <widget class="QGraphicsView" name="glw_2"/>
+     <widget class="QGraphicsView" name="glw_3"/>
     </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label">
+    <item row="1" column="2">
+     <widget class="QLabel" name="label_2">
       <property name="text">
-       <string>Plot 1</string>
+       <string>Plot Scan Types = True</string>
       </property>
      </widget>
     </item>
diff --git a/bec_widgets/examples/modular_app/modular_app.py b/bec_widgets/examples/modular_app/modular_app.py
index d27b78e7..f2353ba5 100644
--- a/bec_widgets/examples/modular_app/modular_app.py
+++ b/bec_widgets/examples/modular_app/modular_app.py
@@ -68,6 +68,92 @@ config_2 = {
         },
     ],
 }
+config_scan_mode = config = {
+    "plot_settings": {
+        "background_color": "white",
+        "num_columns": 3,
+        "colormap": "plasma",
+        "scan_types": True,
+    },
+    "plot_data": {
+        "grid_scan": [
+            {
+                "plot_name": "Grid plot 1",
+                "x": {"label": "Motor X", "signals": [{"name": "samx", "entry": "samx"}]},
+                "y": {
+                    "label": "BPM",
+                    "signals": [
+                        {"name": "gauss_bpm", "entry": "gauss_bpm"},
+                        {"name": "gauss_adc1", "entry": "gauss_adc1"},
+                    ],
+                },
+            },
+            {
+                "plot_name": "Grid plot 2",
+                "x": {"label": "Motor X", "signals": [{"name": "samx", "entry": "samx"}]},
+                "y": {
+                    "label": "BPM",
+                    "signals": [
+                        {"name": "gauss_bpm", "entry": "gauss_bpm"},
+                        {"name": "gauss_adc1", "entry": "gauss_adc1"},
+                    ],
+                },
+            },
+            {
+                "plot_name": "Grid plot 3",
+                "x": {"label": "Motor Y", "signals": [{"name": "samx", "entry": "samx"}]},
+                "y": {
+                    "label": "BPM",
+                    "signals": [{"name": "gauss_bpm", "entry": "gauss_bpm"}],
+                },
+            },
+            {
+                "plot_name": "Grid plot 4",
+                "x": {"label": "Motor Y", "signals": [{"name": "samx", "entry": "samx"}]},
+                "y": {
+                    "label": "BPM",
+                    "signals": [{"name": "gauss_adc3", "entry": "gauss_adc3"}],
+                },
+            },
+        ],
+        "line_scan": [
+            {
+                "plot_name": "BPM plot",
+                "x": {"label": "Motor X", "signals": [{"name": "samx"}]},
+                "y": {
+                    "label": "BPM",
+                    "signals": [
+                        {"name": "gauss_bpm", "entry": "gauss_bpm"},
+                        {"name": "gauss_adc1", "entry": "gauss_adc1"},
+                        {"name": "gauss_adc2", "entry": "gauss_adc2"},
+                    ],
+                },
+            },
+            {
+                "plot_name": "Multi",
+                "x": {"label": "Motor X", "signals": [{"name": "samx", "entry": "samx"}]},
+                "y": {
+                    "label": "Multi",
+                    "signals": [
+                        {"name": "gauss_bpm", "entry": "gauss_bpm"},
+                        {"name": "samx", "entry": ["samx", "samx_setpoint"]},
+                    ],
+                },
+            },
+            {
+                "plot_name": "Multi",
+                "x": {"label": "Motor X", "signals": [{"name": "samx", "entry": "samx"}]},
+                "y": {
+                    "label": "Multi",
+                    "signals": [
+                        {"name": "gauss_bpm", "entry": "gauss_bpm"},
+                        {"name": "samx", "entry": ["samx", "samx_setpoint"]},
+                    ],
+                },
+            },
+        ],
+    },
+}
 
 
 class ModularApp(QMainWindow):
@@ -92,6 +178,10 @@ class ModularApp(QMainWindow):
         self.bec_device_monitor_2 = BECDeviceMonitor(parent=self, config=config_2)
         self.glw_2_layout.addWidget(self.bec_device_monitor_2)  # Add BECDeviceMonitor to the layout
 
+        self.glw_3_layout = QVBoxLayout(self.glw_3)  # Create a new QVBoxLayout
+        self.bec_device_monitor_3 = BECDeviceMonitor(parent=self, config=config_scan_mode)
+        self.glw_3_layout.addWidget(self.bec_device_monitor_3)  # Add BECDeviceMonitor to the layout
+
 
 if __name__ == "__main__":
     from bec_widgets.bec_dispatcher import bec_dispatcher
diff --git a/bec_widgets/widgets/device_monitor.py b/bec_widgets/widgets/device_monitor.py
index 094a2295..b056c5d4 100644
--- a/bec_widgets/widgets/device_monitor.py
+++ b/bec_widgets/widgets/device_monitor.py
@@ -259,7 +259,7 @@ class BECDeviceMonitor(pg.GraphicsLayoutWidget):
                     )
 
                 # Init UI
-                self.init_ui(self.plot_settings["num_columns"])
+                self._init_ui(self.plot_settings["num_columns"])
 
             self.scanID = current_scanID
             self.data = {}