move event listener to sub-controllers

Author: annie-xd-wang

src/navigate/controller/controller.py

@@ -474,6 +474,14 @@ def update_experiment_setting(self):
             "multiposition_count"
         ] = len(positions)
 
+        if self.configuration["experiment"]["MicroscopeState"]["is_multiposition"] \
+            and len(positions) == 0:
+            # Update the view and override the settings.
+            self.configuration["experiment"]["MicroscopeState"][
+                "is_multiposition"
+            ] = False
+            self.channels_tab_controller.is_multiposition_val.set(False)
+
         # TODO: validate experiment dict
 
         channel_warning = self.channels_tab_controller.verify_experiment_values()
@@ -1226,54 +1234,13 @@ def update_event(self):
                 # Display a warning that arises from the model as a top-level GUI popup
                 messagebox.showwarning(title="Navigate", message=value)
 
-            elif event == "waveform":
-                # Update the waveform plot.
-                self.waveform_tab_controller.update_waveforms(
-                    waveform_dict=value,
-                    sample_rate=self.configuration_controller.daq_sample_rate,
-                )
-
             elif event == "multiposition":
                 # Update the multi-position tab without appending to the list
                 update_table(
                     table=self.multiposition_tab_controller.table,
                     pos=value,
                 )
                 self.channels_tab_controller.is_multiposition_val.set(True)
-                self.channels_tab_controller.toggle_multiposition()
-
-            elif event == "disable_multiposition":
-                self.channels_tab_controller.is_multiposition_val.set(False)
-                self.channels_tab_controller.toggle_multiposition()
-
-            elif event == "ilastik_mask":
-                # Display the ilastik mask
-                self.camera_view_controller.display_mask(mask=value)
-
-            elif event == "autofocus":
-                # Display the autofocus plot
-                if hasattr(self, "af_popup_controller"):
-                    self.af_popup_controller.display_plot(
-                        data=value[0], line_plot=value[1], clear_data=value[2]
-                    )
-
-            elif event == "tonywilson":
-                if hasattr(self, "ao_popup_controller"):
-                    # self.ao_popup_controller.set_widgets_from_coef(value['coefs'])
-                    self.ao_popup_controller.plot_tonywilson(value)
-                    # self.ao_popup_controller.plot_mirror(value)
-                    if value["done"]:
-                        print("Tony Wilson done! Updating expt...")
-                        self.ao_popup_controller.update_experiment_values()
-
-            elif event == "mirror_update":
-                if hasattr(self, "ao_popup_controller"):
-                    self.ao_popup_controller.set_widgets_from_coef(value["coefs"])
-                    self.ao_popup_controller.plot_mirror(value)
-
-            elif event == "ao_save_report":
-                if hasattr(self, "ao_popup_controller"):
-                    self.ao_popup_controller.save_report_to_file(value)
 
             elif event == "stop":
                 # Stop the software
@@ -1288,14 +1255,6 @@ def update_event(self):
                         time.sleep(0.001)
                         pass
 
-            elif event == "remove_positions":
-                self.multiposition_tab_controller.remove_positions(value)
-
-            elif event == "exposure_time":
-                self.channels_tab_controller.set_exposure_time(value[0], value[1])
-            elif event == "display_camera_parameters":
-                self.camera_setting_controller.update_camera_parameters_silent(*value)
-
             elif event in self.event_listeners.keys():
                 try:
                     self.event_listeners[event](value)

src/navigate/controller/sub_controllers/adaptive_optics.py

@@ -370,6 +370,7 @@ def plot_mirror(self, data):
 
         try:
             coefs = data["coefs"]
+            self.set_widgets_from_coef(coefs)
             self.coefs_bar.clear()
             self.coefs_bar.bar(range(len(coefs)), coefs)
             self.coefs_bar.set_title("Current Coefs")
@@ -410,6 +411,10 @@ def plot_tonywilson(self, data):
 
         self.plot_tw_trace()
 
+        if data["done"]:
+            print("Tony Wilson done! Updating expt...")
+            self.update_experiment_values()
+
     def plot_tw_trace(self):
         """Plot the tony wilson trace data."""
         mode = self.parent_controller.configuration["experiment"][
@@ -435,3 +440,11 @@ def plot_tw_trace(self):
         # To redraw the plot
         self.fig_tw.tight_layout()
         self.fig_tw.canvas.draw_idle()
+
+    @property
+    def custom_events(self):
+        return {
+            "ao_save_report": self.save_report_to_file,
+            "mirror_update": self.plot_mirror,
+            "tonywilson": self.plot_tonywilson,
+        }

src/navigate/controller/sub_controllers/autofocus.py

@@ -204,19 +204,20 @@ def func(*args):
 
         return func
 
-    def display_plot(self, data, line_plot=False, clear_data=True):
+    def display_plot(self, data_and_flags):
         """Displays the autofocus plot
 
-        data : numpy.ndarray
-            The data to be plotted.
-        line_plot : bool
-            If True, the plot will be a line plot.
-            If False, the plot will be a scatter plot.
-        clear_data : bool
-            If True, the plot will be cleared before plotting.
-            If False, the plot will be added to the existing plot.
+        data : tuple (numpy.ndarray, bool, bool)
+            (data, line_plot, clear_data)
+            data: The data to be plotted.
+            line_plot:
+                If True, the plot will be a line plot.
+                If False, the plot will be a scatter plot.
+            clear_data:
+                If True, the plot will be cleared before plotting.
+                If False, the plot will be added to the existing plot.
         """
-
+        data, line_plot, clear_data = data_and_flags
         data = np.asarray(data)
         coarse_range = self.setting_dict.get("coarse_range", 500)
         coarse_step = self.setting_dict.get("coarse_step_size", 50)
@@ -270,3 +271,9 @@ def display_plot(self, data, line_plot=False, clear_data=True):
         self.autofocus_coarse.xaxis.set_minor_locator(tck.AutoMinorLocator())
         self.autofocus_fig.tight_layout()
         self.autofocus_fig.canvas.draw_idle()
+
+    @property
+    def custom_events(self):
+        return {
+            "autofocus": self.display_plot
+        }

src/navigate/controller/sub_controllers/camera_settings.py

@@ -580,10 +580,24 @@ def update_camera_device_related_setting(self):
         self.roi_widgets["Center_X"].set(self.default_width / 2)
         self.roi_widgets["Center_Y"].set(self.default_height / 2)
 
-    def update_camera_parameters_silent(self, sensor_mode=None, readout_direction=None, number_of_pixels=None):
+    def update_camera_parameters_silent(self, value):
+        """Update GUI camera parameters
+        
+        Parameters
+        ----------
+        value : tuple
+            (sensor_mode, readout_direction, number_of_pixels)
+        """
+        sensor_mode, readout_direction, number_of_pixels = value
         if sensor_mode:
             self.update_sensor_mode(sensor_mode)
         if readout_direction:
             self.mode_widgets["Readout"].set(readout_direction)
         if number_of_pixels:
             self.mode_widgets["Pixels"].set(number_of_pixels)
+
+    @property
+    def custom_events(self):
+        return {
+            "display_camera_parameters": self.update_camera_parameters_silent
+        }

src/navigate/controller/sub_controllers/camera_view.py

@@ -1238,3 +1238,9 @@ def try_to_display_image(self, image_id):
 
         display_thread = threading.Thread(target=self.display_image, args=(image_id,))
         display_thread.start()
+
+    @property
+    def custom_events(self):
+        return {
+            "ilastik_mask": self.display_mask
+        }

src/navigate/controller/sub_controllers/channels_tab.py

@@ -158,9 +158,8 @@ def __init__(self, view, parent_controller=None):
 
         #: bool: Whether or not the user has selected to use multiposition.
         self.is_multiposition_val = self.view.multipoint_frame.on_off
-        self.view.multipoint_frame.save_check.configure(
-            command=self.toggle_multiposition
-        )
+        self.is_multiposition_val.trace_add("write", self.toggle_multiposition)
+
         self.view.multipoint_frame.buttons["tiling"].configure(
             command=self.launch_tiling_wizard
         )
@@ -350,12 +349,10 @@ def set_mode(self, mode):
         # multi-position flag
         if mode == "stop":
             self.is_multiposition_val.set(self.is_multiposition_cache)
-            self.toggle_multiposition()
         else:
             self.is_multiposition_cache = self.is_multiposition
             if mode == "customized":
                 self.is_multiposition_val.set(False)
-                self.toggle_multiposition()
 
         if image_mode == "customized" or mode != "stop":
             self.disable_multiposition_btn()
@@ -712,7 +709,7 @@ def update_timepoint_setting(self, call_parent=False):
             "timepoint settings on channels tab have been changed and recalculated"
         )
 
-    def toggle_multiposition(self):
+    def toggle_multiposition(self, *args):
         """Toggle Multi-position Acquisition.
 
         Recalculates the experiment duration.
@@ -835,17 +832,24 @@ def verify_experiment_values(self):
                 return "Timepoints should be at least 1!"
         return None
 
-    def set_exposure_time(self, channel, exposure_time):
+    def set_exposure_time(self, channel_exposure_time):
         """Set exposure time for a specified channel
 
         Parameters
         ----------
-        channel : str
+        channel_exposure_time : tuple(str, float)
+            (channel_name, exposure_time)
             Channel name, such as "channel_1", "channel_2",...
-        exposure_time : float
             Exposure time in milliseconds.
         """
+        channel, exposure_time = channel_exposure_time
         idx = int(channel[channel.index("_") + 1 :]) - 1
         self.channel_setting_controller.in_initialization = True
         self.channel_setting_controller.view.exptime_variables[idx].set(exposure_time)
         self.channel_setting_controller.in_initialization = False
+
+    @property
+    def custom_events(self):
+        return {
+            "exposure_time": self.set_exposure_time
+        }

src/navigate/controller/sub_controllers/multiposition.py

@@ -285,3 +285,9 @@ def remove_positions(self, position_flag_list):
             p for i, p in enumerate(positions) if (i >= l or position_flag_list[i])
         ]
         self.set_positions(new_positions)
+
+    @property
+    def custom_events(self):
+        return {
+            "remove_positions": self.remove_positions
+        }

src/navigate/controller/sub_controllers/waveform_tab.py

@@ -77,6 +77,7 @@ def __init__(self, view, parent_controller=None):
                 microscope_name
             ]["daq"]["sample_rate"]
         )
+        self.update_sample_rate()
         self.view.waveform_settings.inputs["sample_rate"].get_variable().trace_add(
             "write", self.update_sample_rate
         )
@@ -127,20 +128,16 @@ def update_waveform_template(self, *args):
         event = type("MyEvent", (object,), {})
         self.plot_waveforms(event)
 
-    def update_waveforms(self, waveform_dict, sample_rate):
+    def update_waveforms(self, waveform_dict):
         """Update the waveforms in the waveform tab
 
         Parameters
         ----------
         waveform_dict : dict
             Dictionary of waveforms
-        sample_rate : int
-            Sample rate of the waveforms
         """
         #: dict: Dictionary of waveforms
         self.waveform_dict = waveform_dict
-        self.sample_rate = sample_rate
-
         event = type("MyEvent", (object,), {})
         self.plot_waveforms(event)
 
@@ -337,3 +334,9 @@ def set_waveform_template(self, template_name):
         self.parent_controller.configuration["experiment"]["MicroscopeState"][
             "waveform_template"
         ] = template_name
+
+    @property
+    def custom_events(self):
+        return {
+            "waveform": self.update_waveforms
+        }

src/navigate/model/model.py

@@ -512,15 +512,6 @@ def run_command(self, command, *args, **kwargs):
                 "is_save"
             ]
 
-            # If multiposition is selected, verify that it is not empty.
-            if self.configuration["experiment"]["MicroscopeState"]["is_multiposition"]:
-                if len(self.configuration["experiment"]["MultiPositions"]) == 0:
-                    # Update the view and override the settings.
-                    self.event_queue.put(("disable_multiposition", None))
-                    self.configuration["experiment"]["MicroscopeState"][
-                        "is_multiposition"
-                    ] = False
-
             # Calculate waveforms, turn on lasers, etc.
             self.prepare_acquisition()