Merge pull request #905 from TheDeanLab/20240524-controller-tests

Update test_controller.py

Author: AdvancedImagingUTSW

src/navigate/controller/controller.py

@@ -814,8 +814,10 @@ def execute(self, command, *args):
                         feature_list_popup, self
                     )
                     self.features_popup_controller.populate_feature_list(feature_id)
+
                     # wait until close the popup windows
                     self.view.wait_window(feature_list_popup.popup)
+
                     # do not run acquisition if "cancel" is selected
                     temp = self.features_popup_controller.start_acquisiton_flag
                     delattr(self, "features_popup_controller")
@@ -852,16 +854,14 @@ def execute(self, command, *args):
 
             # clear show_img_pipe
             while self.show_img_pipe.poll():
-                # TODO: image_id never called.
                 self.show_img_pipe.recv()
-                # image_id = self.show_img_pipe.recv()
 
         elif command == "exit":
-            """Exit the program."""
-            # Save current GUI settings to .navigate/config/experiment.yml file.
-            self.sloppy_stop()
-            # self.menu_controller.feature_id_val.set(0)
+            """Exit the program.
 
+            Saves the current GUI settings to .navigate/config/experiment.yml file.
+            """
+            self.sloppy_stop()
             self.update_experiment_setting()
             file_directory = os.path.join(get_navigate_path(), "config")
             save_yaml_file(
@@ -918,7 +918,7 @@ def sloppy_stop(self):
         self.threads_pool.createThread('model', target)
         commands and the need to stop as abruptly as
         possible when the user hits stop. Here we leverage
-        ObjectInSubprocess's refusal to let us access
+        ObjectInSubprocess' refusal to let us access
         the model from two threads to our advantage, and just
         try repeatedly until we get a command in front
         of the next command in the model threads_pool resource.
@@ -940,9 +940,9 @@ def capture_image(self, command, mode, *args):
         Parameters
         ----------
         command : string
-            string = 'acquire' or 'autofocus'
+            'acquire' or 'autofocus'
         mode : string
-            string = 'continuous', 'z-stack', 'single', or 'projection'
+            'continuous', 'z-stack', 'single', or 'projection'
         args : function-specific passes.
         """
         self.camera_view_controller.image_count = 0
@@ -1009,7 +1009,16 @@ def capture_image(self, command, mode, *args):
             )
             # update framerate
             stop_time = time.time()
-            frames_per_second = images_received / (stop_time - start_time)
+            try:
+                frames_per_second = images_received / (stop_time - start_time)
+            except ZeroDivisionError:
+                frames_per_second = 1 / (
+                    self.configuration["experiment"]["MicroscopeState"]["channels"][
+                        "channel_1"
+                    ].get("camera_exposure_time", 200)
+                    / 1000
+                )
+
             # Update the Framerate in the Camera Settings Tab
             self.camera_setting_controller.framerate_widgets["max_framerate"].set(
                 frames_per_second
@@ -1210,6 +1219,7 @@ def update_event(self):
                     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(
@@ -1242,10 +1252,12 @@ def update_event(self):
                     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)
@@ -1255,29 +1267,20 @@ def update_event(self):
                 break
 
             elif event == "update_stage":
-                # ZM: I am so sorry for this.
                 for _ in range(10):
                     try:
                         self.update_stage_controller_silent(value)
                         break
                     except RuntimeError:
                         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])
 
-    # def exit_program(self):
-    #     """Exit the program.
-
-    #     This function is called when the user clicks the exit button in the GUI.
-    #     """
-    #     if messagebox.askyesno("Exit", "Are you sure?"):
-    #         logger.info("Exiting Program")
-    #         self.execute("exit")
-    #         sys.exit()
-
     def add_acquisition_mode(self, name, acquisition_obj):
         if name in self.plugin_acquisition_modes:
             print(f"*** plugin acquisition mode {name} exists, can't add another one!")

src/navigate/controller/sub_controllers/camera_view_controller.py

@@ -455,8 +455,12 @@ def mark_position(self):
             stage_flip_flags = (
                 self.parent_controller.configuration_controller.stage_flip_flags
             )
-            stage_position["x"] = float(stage_position["x"]) + offset_x * (-1 if stage_flip_flags["x"] else 1)
-            stage_position["y"] = float(stage_position["y"]) - offset_y * (-1 if stage_flip_flags["y"] else 1)
+            stage_position["x"] = float(stage_position["x"]) + offset_x * (
+                -1 if stage_flip_flags["x"] else 1
+            )
+            stage_position["y"] = float(stage_position["y"]) - offset_y * (
+                -1 if stage_flip_flags["y"] else 1
+            )
 
             # Place the stage position in the multi-position table.
             self.parent_controller.execute("mark_position", stage_position)
@@ -743,7 +747,7 @@ def populate_image(self):
             temp_img = Image.blend(img1, img2, 0.2)
         else:
             temp_img = Image.fromarray(self.cross_hair_image.astype(np.uint8))
-        
+
         # when calling ImageTk.PhotoImage() to generate a new image, it will destroy
         # what the canvas is showing and cause a blink.
         if self.image_catche_flag: