From 829bdc11c16046989f6ee5d109593af84aa8569e Mon Sep 17 00:00:00 2001 From: Holler Mirko Date: Thu, 9 Jan 2025 14:20:29 +0100 Subject: [PATCH] adjusted to new gui manager --- .../plugins/omny/gui_tools.py | 47 ++++++++----------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/csaxs_bec/bec_ipython_client/plugins/omny/gui_tools.py b/csaxs_bec/bec_ipython_client/plugins/omny/gui_tools.py index 14140fe..2ce910f 100644 --- a/csaxs_bec/bec_ipython_client/plugins/omny/gui_tools.py +++ b/csaxs_bec/bec_ipython_client/plugins/omny/gui_tools.py @@ -19,6 +19,7 @@ class OMNYGuiTools: def __init__(self, client): self.gui = getattr(client, "gui", None) + self.gui_window = self.gui.windows['main'].widget self.fig200 = None self.fig201 = None self.fig202 = None @@ -27,35 +28,27 @@ class OMNYGuiTools: self.text_box = None self.idle_text_box = None - def omnygui_start_gui(self): - if self.gui is None or self.gui.gui_is_alive() is False: - self.gui = BECDockArea() - self.gui.show() # Dieses Kommado braucht in etwa ~3s. Dabei gibt aber einen print - self.fig200 = None - self.fig201 = None - self.fig202 = None - self.fig203 = None - self.text_box = None - self.idle_text_box = None + def omnygui_show_gui(self): + self.gui_window.show() def omnygui_stop_gui(self): - self.gui.close() + self.gui_window.hide() def _omnycam_parking(self): self.omnygui_show_omnycam_parking() def omnygui_show_omnycam_parking(self): - self.omnygui_start_gui() + self.omnygui_show_gui() if self.fig200 is None: self._omnycam_clear() - self.fig200 = self.gui.add_dock(name="omnycam200").add_widget("BECImageWidget") + self.fig200 = self.gui_window.add_dock(name="omnycam200").add_widget("BECImageWidget") if self._omnycam_check_device_exists(dev.cam200): fig = self.fig200.image("cam200") fig.set_rotation(deg_90=3) self.fig200.lock_aspect_ratio(True) else: print("Cannot open cam200. Device does not exist.") - self.fig203 = self.gui.add_dock(name="omnycam203").add_widget("BECImageWidget") + self.fig203 = self.gui_window.add_dock(name="omnycam203").add_widget("BECImageWidget") if self._omnycam_check_device_exists(dev.cam203): fig = self.fig203.image("cam203") fig.set_rotation(deg_90=3) @@ -63,12 +56,12 @@ class OMNYGuiTools: else: print("Cannot open cam203. Device does not exist.") try: - self.gui.remove_dock(name="default_figure") + self.gui_window.remove_dock(name="default_figure") except: pass def omnygui_remove_all_docks(self): - self.gui.clear_all() + self.gui_window.clear_all() self.fig200 = None self.fig201 = None self.fig202 = None @@ -78,12 +71,12 @@ class OMNYGuiTools: self.idle_text_box = None def omnygui_idle(self): - self.omnygui_start_gui() + self.omnygui_show_gui() if self.idle_text_box is None: self.omnygui_remove_all_docks() - self.idle_text_box = self.gui.add_dock(name="idle_text").add_widget("TextBox") + self.idle_text_box = self.gui_window.add_dock(name="idle_text").add_widget("TextBox") try: - self.gui.remove_dock(name="default_figure") + self.gui_window.remove_dock(name="default_figure") except: pass text = ( @@ -117,17 +110,17 @@ class OMNYGuiTools: self.omnygui_show_omnycam_samplestage() def omnygui_show_omnycam_samplestage(self): - self.omnygui_start_gui() + self.omnygui_show_gui() if self.fig201 is None: self.omnygui_remove_all_docks() - self.fig201 = self.gui.add_dock(name="omnycam201").add_widget("BECImageWidget") + self.fig201 = self.gui_window.add_dock(name="omnycam201").add_widget("BECImageWidget") if self._omnycam_check_device_exists(dev.cam201): fig = self.fig201.image("cam201") fig.set_rotation(deg_90=3) self.fig201.lock_aspect_ratio(True) else: print("Cannot open cam201. Device does not exist.") - self.fig202 = self.gui.add_dock(name="omnycam202").add_widget("BECImageWidget") + self.fig202 = self.gui_window.add_dock(name="omnycam202").add_widget("BECImageWidget") if self._omnycam_check_device_exists(dev.cam202): fig = self.fig202.image("cam202") fig.set_rotation(deg_90=3) @@ -135,16 +128,16 @@ class OMNYGuiTools: else: print("Cannot open cam202. Device does not exist.") try: - self.gui.remove_dock(name="default_figure") + self.gui_window.remove_dock(name="default_figure") except: pass def omnygui_show_progress(self): - self.omnygui_start_gui() + self.omnygui_show_gui() if self.progressbar is None: self.omnygui_remove_all_docks() # Add a new dock with a RingProgressBar widget - self.progressbar = self.gui.add_dock(name="progress").add_widget("RingProgressBar") + self.progressbar = self.gui_window.add_dock(name="progress").add_widget("RingProgressBar") # Customize the size of the progress ring self.progressbar.set_line_widths(20) # Disable automatic updates and manually set the self.progressbar value @@ -157,9 +150,9 @@ class OMNYGuiTools: # Set the values of the rings to 50, 75, and 25 from outer to inner ring # self.progressbar.set_value([50, 75]) # Add a new dock with a TextBox widget - self.text_box = self.gui.add_dock(name="progress_text").add_widget("TextBox") + self.text_box = self.gui_window.add_dock(name="progress_text").add_widget("TextBox") try: - self.gui.remove_dock(name="default_figure") + self.gui_window.remove_dock(name="default_figure") except: pass self._omnygui_update_progress()