diff --git a/src/aslm/controller/controller.py b/src/aslm/controller/controller.py index 70b8bfae6..c3163d97f 100644 --- a/src/aslm/controller/controller.py +++ b/src/aslm/controller/controller.py @@ -289,7 +289,7 @@ def change_microscope(self, microscope_name): ] = microscope_name if self.configuration_controller.change_microscope(): # update widgets - self.stage_controller.initialize(f"{microscope_name}") + self.stage_controller.initialize() self.channels_tab_controller.initialize() def initialize_cam_view(self): @@ -334,6 +334,7 @@ def populate_experiment_setting(self, file_name=None, in_initialize=False): microscope_name = self.configuration["experiment"]["MicroscopeState"][ "microscope_name" ] + self.configuration_controller.change_microscope() self.menu_controller.resolution_value.set( f"{microscope_name} " f"{self.configuration['experiment']['MicroscopeState']['zoom']}" @@ -353,7 +354,7 @@ def populate_experiment_setting(self, file_name=None, in_initialize=False): # set widget modes self.set_mode_of_sub("stop") - self.stage_controller.initialize(f"{microscope_name}") + self.stage_controller.initialize() def update_experiment_setting(self): """Update model.experiment according to values in the GUI diff --git a/src/aslm/controller/sub_controllers/stage_controller.py b/src/aslm/controller/sub_controllers/stage_controller.py index 4dc30054a..1f70429d0 100644 --- a/src/aslm/controller/sub_controllers/stage_controller.py +++ b/src/aslm/controller/sub_controllers/stage_controller.py @@ -126,7 +126,7 @@ def __init__(self, view, main_view, canvas, parent_controller): self.joystick_is_on = False self.joystick_axes = self.parent_controller.configuration["configuration"][ "microscopes" - ][self.default_microscope]["stage"]["joystick_axes"] + ][self.default_microscope]["stage"].get("joystick_axes", []) self.main_view = main_view self.canvas = canvas @@ -194,14 +194,9 @@ def stage_key_press(self, event): current_position["x"] += xy_increment self.set_position(current_position) - def initialize(self, microscope_name=None): + def initialize(self): """Initialize the Stage limits of steps and positions - Parameters - ---------- - microscope_name : str - Name of the microscope at the time of initialization - Returns ------- None @@ -230,13 +225,11 @@ def initialize(self, microscope_name=None): widgets[step_axis + "_step"].set(step_dict[axis]) # Joystick - - if microscope_name is None: - microscope_name = self.default_microscope + microscope_name = config.microscope_name self.new_joystick_axes = self.parent_controller.configuration["configuration"][ "microscopes" - ][f"{microscope_name}"]["stage"]["joystick_axes"] + ][f"{microscope_name}"]["stage"].get("joystick_axes", []) if self.view.stop_frame.joystick_btn.winfo_ismapped(): if self.new_joystick_axes is None or list(self.new_joystick_axes) == []: