fix multicamera issues

Co-Authored-By: Annie Wang <[email protected]>

Author: DaetwylerStephan

src/navigate/controller/controller.py

@@ -1175,6 +1175,7 @@ def display_images(
             camera_view_controller.data_buffer = self.additional_microscopes[
                 microscope_name
             ]["data_buffer"]
+            camera_view_controller.microscope_name = microscope_name
             popup_window.popup.bind("<Configure>", camera_view_controller.resize)
             self.additional_microscopes[microscope_name]["popup_window"] = popup_window
             self.additional_microscopes[microscope_name][

src/navigate/controller/sub_controllers/camera_settings.py

@@ -666,10 +666,12 @@ def update_camera_device_related_setting(self):
         self.min_height = camera_config_dict.get("y_pixels_min", 4)
 
         self.default_pixel_size = camera_config_dict["pixel_size_in_microns"]
-        (
-            self.default_width,
-            self.default_height,
-        ) = self.parent_controller.configuration_controller.camera_pixels
+        self.default_height = camera_config_dict["y_pixels"]
+        self.default_width = camera_config_dict["x_pixels"]
+        # (
+        #     self.default_width,
+        #     self.default_height,
+        # ) = self.parent_controller.configuration_controller.camera_pixels
         self.trigger_source = camera_config_dict["trigger_source"]
         self.trigger_active = camera_config_dict["trigger_active"]
         self.readout_speed = camera_config_dict["readout_speed"]

src/navigate/controller/sub_controllers/camera_view.py

@@ -146,6 +146,9 @@ def __init__(self, view, parent_controller=None):
         #: str: The mode of the camera view controller.
         self.mode = "stop"
 
+        #: str: The microscope name
+        self.microscope_name = None
+
         #: dict: The flip flags for the camera.
         self.flip_flags = None
 
@@ -491,9 +494,18 @@ def initialize_non_live_display(self, microscope_state, camera_parameters):
         self.original_image_width = int(camera_parameters["img_x_pixels"])
         self.original_image_height = int(camera_parameters["img_y_pixels"])
 
-        self.flip_flags = (
-            self.parent_controller.configuration_controller.camera_flip_flags
-        )
+        if self.microscope_name is None:
+            self.flip_flags = (
+                self.parent_controller.configuration_controller.camera_flip_flags
+            )
+        else:
+            camera_config = self.parent_controller.configuration["configuration"][
+                "microscopes"
+            ][self.microscope_name]["camera"]
+            self.flip_flags = {
+                "x": camera_config.get("flip_x", False),
+                "y": camera_config.get("flip_y", False)
+            }
 
         self.update_canvas_size()
         self.reset_display(False)
@@ -915,9 +927,9 @@ def try_to_display_image(self, image):
         self.image_metrics["Channel"].set(int(self.selected_channels[channel_idx][2:]))
 
         # Save the image to the spooled image loader.
-        self.spooled_images.save_image(
-            image=image, channel=channel_idx, slice_index=slice_idx
-        )
+        # self.spooled_images.save_image(
+        #     image=image, channel=channel_idx, slice_index=slice_idx
+        # )
 
         # Update image according to the display state.
         self.display_state = self.view.live_frame.live.get()

src/navigate/model/features/common_features.py

@@ -973,6 +973,8 @@ def __init__(
         self.image_writer = None
         if saving_flag:
             self.image_writer = ImageWriter(model, sub_dir=saving_dir)
+        
+        self.prepare_next_channel = PrepareNextChannel(model)
 
         #: dict: A dictionary defining the configuration for the z-stack acquisition
         self.config_table = {
@@ -1060,7 +1062,9 @@ def pre_signal_func(self):
         # restore f_pos, positions
         self.model.active_microscope.central_focus = None
         self.model.active_microscope.current_channel = 0
-        self.model.active_microscope.prepare_next_channel()
+        # prepare next channel
+        self.prepare_next_channel.signal_func()
+        # self.model.active_microscope.prepare_next_channel()
 
         self.model.logger.debug(
             f"*** ZStack pre_signal_func: {self.positions}, {self.start_focus}, "
@@ -1276,6 +1280,7 @@ def update_channel(self):
             self.current_channel_in_list + 1
         ) % self.channels
         # not update DAQ tasks if there is a NI Galvo stage
+        self.prepare_next_channel.signal_func()
         self.model.active_microscope.prepare_next_channel()
         if self.defocus is not None:
             self.current_focus_position += self.defocus[self.current_channel_in_list]