More responsive widget updates for AO Feature

Author: conorhughmcfadden

src/navigate/controller/sub_controllers/adaptive_optics.py

@@ -63,9 +63,11 @@ def __init__(self, view, parent_controller):
 
         self.view.popup.protocol("WM_DELETE_WINDOW", self.view.popup.dismiss)
 
-        self.parent_controller.configuration["experiment"]["AdaptiveOpticsParameters"][
-            "HighlightedMode"
-        ] = None
+        self.mirror_params = self.parent_controller.configuration["experiment"]["MirrorParameters"]
+        self.ao_params = self.parent_controller.configuration["experiment"]["AdaptiveOpticsParameters"]
+        self.tw_params = self.ao_params["TonyWilson"]
+
+        self.ao_params["HighlightedMode"] = None
 
         #: list of dicts: list of dicts containing trace data
         self.trace_list = []
@@ -79,16 +81,6 @@ def __init__(self, view, parent_controller):
         #: dict: dictionary of mode labels
         self.mode_labels = self.view.get_labels()
 
-        # TODO: just for testing, remove later...
-        #: list: list of cameras
-        self.camera_list = self.view.camera_list
-        self.camera_list[
-            "values"
-        ] = self.parent_controller.configuration_controller.microscope_list
-        self.camera_list.bind(
-            "<<ComboboxSelected>>", lambda evt: self.change_camera(evt)
-        )
-
         #: Figure: figure for mirror plot
         self.fig = self.view.fig
 
@@ -129,20 +121,27 @@ def __init__(self, view, parent_controller):
                 "<Leave>", lambda evt: evt.widget.config(background="SystemButtonFace")
             )
 
-        self.populate_experiment_values()
+        # update all experiment values each time one is changed
+        # from navigate.view.custom_widgets.LabelInputWidgetFactory import LabelInput
+        # for k in self.widgets:
+        #     input = self.widgets[k]
+        #     if type(input) == LabelInput:
+        #         input.widget.bind(
+        #             "<KeyRelease>", self.on_input_change
+        #         )
 
-    def change_camera(self, evt):
-        """Change the camera to the selected camera
+        self.widgets["iterations"].widget.bind( "<KeyRelease>", self.on_input_change)
+        self.widgets["steps"].widget.bind(      "<KeyRelease>", self.on_input_change)
+        self.widgets["amplitude"].widget.bind(  "<KeyRelease>", self.on_input_change)
 
-        Parameters
-        ----------
-        evt : Event
-            The event that triggered this function
-        """
-        # cam_id = evt.widget.get().split("_")[-1]
-        # self.parent_controller.execute("change_camera", int(cam_id))
-        cam_name = evt.widget.get()
-        self.parent_controller.execute("resolution", cam_name)
+        self.widgets["from"]["button"].bind(    "<<ComboboxSelected>>", self.on_input_change)
+        self.widgets["metric"]["button"].bind(  "<<ComboboxSelected>>", self.on_input_change)
+        self.widgets["fitfunc"]["button"].bind( "<<ComboboxSelected>>", self.on_input_change)
+
+        self.populate_experiment_values()
+
+    def on_input_change(self, evt):
+        self.update_experiment_values()
 
     def set_highlighted_mode(self, evt, mode):
         """Set the highlighted mode
@@ -155,7 +154,7 @@ def set_highlighted_mode(self, evt, mode):
             The mode to highlight
         """
         evt.widget.config(background="red")
-        self.parent_controller.configuration["experiment"]["AdaptiveOpticsParameters"][
+        self.ao_params[
             "HighlightedMode"
         ] = mode
         self.plot_tw_trace()
@@ -172,11 +171,7 @@ def deselect_all_modes(self):
 
     def populate_experiment_values(self):
         """Populate the experiment values"""
-        self.camera_list.set(
-            self.parent_controller.configuration["experiment"]["MicroscopeState"][
-                "microscope_name"
-            ]
-        )
+
         self.widgets["save_report"]["variable"].set(
             self.parent_controller.configuration["experiment"][
                 "AdaptiveOpticsParameters"
@@ -217,41 +212,26 @@ def update_experiment_values(self):
         modes_dict = {}
         coef_list = self.get_coef_from_widgets()
         keys = self.view.mode_names
+        
         for i, coef in enumerate(coef_list):
             modes_dict[keys[i]] = coef
-        self.parent_controller.configuration["experiment"]["MirrorParameters"][
-            "modes"
-        ] = modes_dict
-
-        self.parent_controller.configuration["experiment"]["AdaptiveOpticsParameters"][
-            "TonyWilson"
-        ]["iterations"] = int(self.widgets["iterations"].get())
-        self.parent_controller.configuration["experiment"]["AdaptiveOpticsParameters"][
-            "TonyWilson"
-        ]["steps"] = int(self.widgets["steps"].get())
-        self.parent_controller.configuration["experiment"]["AdaptiveOpticsParameters"][
-            "TonyWilson"
-        ]["amplitude"] = float(self.widgets["amplitude"].get())
-        self.parent_controller.configuration["experiment"]["AdaptiveOpticsParameters"][
-            "TonyWilson"
-        ]["from"] = self.widgets["from"]["variable"].get()
-        self.parent_controller.configuration["experiment"]["AdaptiveOpticsParameters"][
-            "TonyWilson"
-        ]["metric"] = self.widgets["metric"]["variable"].get()
-        self.parent_controller.configuration["experiment"]["AdaptiveOpticsParameters"][
-            "TonyWilson"
-        ]["fitfunc"] = self.widgets["fitfunc"]["variable"].get()
-
-        self.parent_controller.configuration["experiment"]["AdaptiveOpticsParameters"][
-            "save_report"
-        ] = self.widgets["save_report"]["variable"].get()
+        
+        self.mirror_params["modes"] = modes_dict
 
-        for k in self.modes_armed.keys():
-            self.parent_controller.configuration["experiment"][
-                "AdaptiveOpticsParameters"
-            ]["TonyWilson"]["modes_armed"][k] = self.modes_armed[k]["variable"].get()
+        try:
+            self.tw_params["iterations"] = int(self.widgets["iterations"].get())
+            self.tw_params["steps"] = int(self.widgets["steps"].get())
+            self.tw_params["amplitude"] = float(self.widgets["amplitude"].get())
+            self.tw_params["from"] = self.widgets["from"]["variable"].get()
+            self.tw_params["metric"] = self.widgets["metric"]["variable"].get()
+            self.tw_params["fitfunc"] = self.widgets["fitfunc"]["variable"].get()
+        except ValueError:
+            pass
+
+        self.ao_params["save_report"] = self.widgets["save_report"]["variable"].get()
 
-        # print(self.parent_controller.configuration['experiment']['MirrorParameters']['modes'])
+        for k in self.modes_armed.keys():
+            self.tw_params["modes_armed"][k] = self.modes_armed[k]["variable"].get()
 
     def get_coef_from_widgets(self):
         """Get the coefficients from the widgets

src/navigate/model/features/adaptive_optics.py

@@ -159,9 +159,7 @@ class TonyWilson:
 
     def __init__(self, 
                  model, 
-                 n_iter=None, 
-                 n_steps=None, 
-                 coef_amp=None
+                 verbose=False
                  ):
         """Initialize the Tony Wilson iterative AO routine
 
@@ -173,15 +171,6 @@ def __init__(self,
         #: int: Number of modes
         self.n_modes = None
 
-        #: int: Number of iterations
-        self.n_iter = n_iter
-
-        #: int: Number of steps
-        self.n_steps = n_steps
-
-        #: float: Coefficient amplitude
-        self.coef_amp = coef_amp
-
         #: bool: True if all iterations are done, False otherwise
         self.done_all = False
 
@@ -191,6 +180,8 @@ def __init__(self,
         #: list: detailed report to save as JSON after
         self.report = []
 
+        self.verbose = verbose
+
         # TODO: I don't think these are used...
         self.laser = None
         self.laser_power = 0
@@ -371,7 +362,7 @@ def pre_func_signal(self):
         self.target_signal_id = 0
         self.total_frame_num = self.get_tw_frame_num()
 
-        print(f"Total frame num: {self.total_frame_num}")
+        # print(f"Total frame num: {self.total_frame_num}")
 
         if self.start_from == "flat":
             self.best_coefs = np.zeros(self.n_modes, dtype=np.float32)
@@ -395,8 +386,8 @@ def in_func_signal(self):
         bool
             True if the signal is done, False otherwise
         """
+        
         out_str = "in_func_signal\n"
-
         out_str += f"\tSignal:\t{self.signal_id}\n"
 
         step = self.signal_id % self.n_steps
@@ -427,6 +418,7 @@ def in_func_signal(self):
 
         try:
             curr_mirror_coefs = self.mirror_controller.get_modal_coefs()[0]
+            
             out_str += (
                 f"\tCoefs:\t[{' '.join([f'{c:.2f}' for c in curr_mirror_coefs])}]\n"
             )
@@ -445,7 +437,6 @@ def in_func_signal(self):
         if (applied_coefs == curr_mirror_coefs).all() or (applied_coefs == 0).all():
             self.signal_id += 1
 
-            out_str += "\tSending tw_frame_queue...\n"
             self.tw_frame_queue.put(
                 (
                     self.model.frame_id,
@@ -458,7 +449,8 @@ def in_func_signal(self):
         else:
             out_str += "\tMirror update failed...\n"
 
-        print(out_str)
+        if self.verbose:
+            print(out_str)
 
         return self.signal_id >= self.total_frame_num
 
@@ -470,8 +462,6 @@ def end_func_signal(self):
         bool
             True if the signal is done, False otherwise
         """
-        print("end_func_signal() called!!!")
-
         if self.model.stop_acquisition:
             return True
 
@@ -642,13 +632,14 @@ def in_func_data(self, frame_ids=[]):
                         self.done_all = True
                         out_str += "\tDone all!!!\n"
 
-        out_str += "\tSending tw_data_queue...\n"
         self.tw_data_queue.put((self.frames_done,))
 
-        print(out_str)
+        if self.verbose:
+            print(out_str)
+        elif self.done_itr:
+            print(f"Done iteration {itr + 1} / {self.n_iter} ...")
 
         if self.frames_done >= self.total_frame_num:
-            print(">>> in_func_data ended!!!")
             return frame_ids
 
     def build_report(self):
@@ -680,8 +671,6 @@ def end_func_data(self):
         bool
             True if the data is done, False otherwise
         """
-        print("end_func_data() called!!!")
-
         if self.done_all:
             self.best_coefs = self.best_coefs_overall
             # self.model.stop_acquisition = True

src/navigate/model/features/common_features.py

@@ -219,13 +219,6 @@ def toggle_projection_mode(self):
         else:
             self.disable_projection()
 
-        # debugging
-        print(f"------- galvo_stage (enabled = {self.enable}) --------\n")
-        mems = vars(self.galvo_stage)
-        for mem in mems:
-            print(f"{mem}:\t{mems[mem]}")
-        print("----------------------------------------------------\n")
-
         return True
 
     def setup_projection(self):

src/navigate/model/model.py

@@ -730,8 +730,16 @@ def run_command(
             coefficients = self.active_microscope.mirror.set_from_wcs_file(path=args[0])
             self.update_mirror(coef=coefficients)
         elif command == "tony_wilson":
-            tony_wilson = TonyWilson(self)
-            tony_wilson.run(*args)
+            # tony_wilson = TonyWilson(self)
+            # tony_wilson.run(*args)
+            self.configuration["experiment"]["MicroscopeState"][
+                "image_mode"
+            ] = "customized"
+            self.addon_feature = [
+                    {"name": PrepareNextChannel},
+                    {"name": TonyWilson}
+                ]
+            self.run_command("acquire")            
 
         elif command == "load_feature":
             """