Skip to content

Commit 1231b3b

Browse files
Reviewing PR
A typo was found in the gui sub-controller. All other changes are negligible.
1 parent d6c70ed commit 1231b3b

File tree

10 files changed

+65
-39
lines changed

10 files changed

+65
-39
lines changed

src/navigate/controller/controller.py

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -174,28 +174,24 @@ def __init__(
174174
logger.info(f"Spec - Waveform Constants Path: {waveform_constants_path}")
175175
logger.info(f"Spec - Rest API Path: {rest_api_path}")
176176

177-
# Wire up pipes
178177
#: mp.Pipe: Pipe for sending images from model to view.
179178
self.show_img_pipe = self.model.create_pipe("show_img_pipe")
180179

181-
# save default experiment file
182180
#: string: Path to the default experiment yaml file.
183181
self.default_experiment_file = experiment_path
184182

185-
# waveform setting file
186183
#: string: Path to the waveform constants yaml file.
187184
self.waveform_constants_path = waveform_constants_path
188185

189-
# Configuration Reader
190186
#: ConfigurationController: Configuration Controller object.
191187
self.configuration_controller = ConfigurationController(self.configuration)
192188

193-
# Initialize the View
194189
#: View: View object in MVC architecture.
195190
self.view = view(root)
196191

197-
# Sub Gui Controllers
192+
#: dict: Event listeners for the controller.
198193
self.event_listeners = {}
194+
199195
#: AcquireBarController: Acquire Bar Sub-Controller.
200196
self.acquire_bar_controller = AcquireBarController(self.view.acqbar, self)
201197

@@ -235,7 +231,7 @@ def __init__(
235231
#: KeystrokeController: Keystroke Sub-Controller.
236232
self.keystroke_controller = KeystrokeController(self.view, self)
237233

238-
# Exit
234+
# Exit the program when the window is closed
239235
self.view.root.protocol(
240236
"WM_DELETE_WINDOW", self.acquire_bar_controller.exit_program
241237
)
@@ -249,22 +245,19 @@ def __init__(
249245
# self.microscope = self.configuration['configuration']
250246
# ['microscopes'].keys()[0] # Default to the first microscope
251247

252-
# Initialize the menus
253248
#: MenuController: Menu Sub-Controller.
254249
self.menu_controller = MenuController(view=self.view, parent_controller=self)
255250
self.menu_controller.initialize_menus()
256251

257252
#: dict: acquisition modes from plugins
258253
self.plugin_acquisition_modes = {}
259254

260-
# add plugin menus
261255
#: PluginsController: Plugin Sub-Controller
262256
self.plugin_controller = PluginsController(
263257
view=self.view, parent_controller=self
264258
)
265259
self.plugin_controller.load_plugins()
266260

267-
# Create default data buffer
268261
#: int: Number of x_pixels from microscope configuration file.
269262
self.img_width = 0
270263

@@ -474,8 +467,10 @@ def update_experiment_setting(self):
474467
"multiposition_count"
475468
] = len(positions)
476469

477-
if self.configuration["experiment"]["MicroscopeState"]["is_multiposition"] \
478-
and len(positions) == 0:
470+
if (
471+
self.configuration["experiment"]["MicroscopeState"]["is_multiposition"]
472+
and len(positions) == 0
473+
):
479474
# Update the view and override the settings.
480475
self.configuration["experiment"]["MicroscopeState"][
481476
"is_multiposition"
@@ -1262,15 +1257,40 @@ def update_event(self):
12621257
print(f"*** unhandled event: {event}, {value}")
12631258

12641259
def add_acquisition_mode(self, name, acquisition_obj):
1260+
"""Add and Acquisition Mode.
1261+
1262+
Parameters
1263+
----------
1264+
name : string
1265+
Name of the acquisition mode.
1266+
acquisition_obj : object
1267+
Object of the acquisition mode.
1268+
"""
12651269
if name in self.plugin_acquisition_modes:
12661270
print(f"*** plugin acquisition mode {name} exists, can't add another one!")
12671271
return
12681272
self.plugin_acquisition_modes[name] = acquisition_obj(name)
12691273
self.acquire_bar_controller.add_mode(name)
12701274

12711275
def register_event_listener(self, event_name, event_handler):
1276+
"""Register an event listener.
1277+
1278+
Parameters
1279+
----------
1280+
event_name : string
1281+
Name of the event.
1282+
event_handler : function
1283+
Function to handle the event.
1284+
"""
12721285
self.event_listeners[event_name] = event_handler
12731286

12741287
def register_event_listeners(self, events):
1288+
"""Register multiple event listeners.
1289+
1290+
Parameters
1291+
----------
1292+
events : dict
1293+
Dictionary of event names and handlers.
1294+
"""
12751295
for event_name, event_handler in events.items():
12761296
self.register_event_listener(event_name, event_handler)

src/navigate/controller/sub_controllers/adaptive_optics.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,7 @@ def plot_tw_trace(self):
443443

444444
@property
445445
def custom_events(self):
446+
"""dict: Custom events for this controller"""
446447
return {
447448
"ao_save_report": self.save_report_to_file,
448449
"mirror_update": self.plot_mirror,

src/navigate/controller/sub_controllers/autofocus.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,5 @@ def display_plot(self, data_and_flags):
274274

275275
@property
276276
def custom_events(self):
277-
return {
278-
"autofocus": self.display_plot
279-
}
277+
"""dict: Custom events for this controller"""
278+
return {"autofocus": self.display_plot}

src/navigate/controller/sub_controllers/camera_settings.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ def update_camera_device_related_setting(self):
582582

583583
def update_camera_parameters_silent(self, value):
584584
"""Update GUI camera parameters
585-
585+
586586
Parameters
587587
----------
588588
value : tuple
@@ -598,6 +598,5 @@ def update_camera_parameters_silent(self, value):
598598

599599
@property
600600
def custom_events(self):
601-
return {
602-
"display_camera_parameters": self.update_camera_parameters_silent
603-
}
601+
"""dict: Custom events for this controller"""
602+
return {"display_camera_parameters": self.update_camera_parameters_silent}

src/navigate/controller/sub_controllers/camera_view.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,6 +1241,5 @@ def try_to_display_image(self, image_id):
12411241

12421242
@property
12431243
def custom_events(self):
1244-
return {
1245-
"ilastik_mask": self.display_mask
1246-
}
1244+
"""dict: Custom events for this controller"""
1245+
return {"ilastik_mask": self.display_mask}

src/navigate/controller/sub_controllers/channels_tab.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,8 @@ def __init__(self, view, parent_controller=None):
103103
self.stack_acq_vals["step_size"].trace_add("write", self.update_z_steps)
104104
self.stack_acq_vals["start_position"].trace_add("write", self.update_z_steps)
105105
self.stack_acq_vals["end_position"].trace_add("write", self.update_z_steps)
106-
self.stack_acq_vals["start_focus"].trace_add(
107-
"write", self.update_z_steps
108-
) # TODO: could be remove later
106+
# TODO: could be remove later
107+
self.stack_acq_vals["start_focus"].trace_add("write", self.update_z_steps)
109108
self.stack_acq_buttons["set_start"].configure(
110109
command=self.update_start_position
111110
)
@@ -850,6 +849,5 @@ def set_exposure_time(self, channel_exposure_time):
850849

851850
@property
852851
def custom_events(self):
853-
return {
854-
"exposure_time": self.set_exposure_time
855-
}
852+
"""Custom events for the channels tab."""
853+
return {"exposure_time": self.set_exposure_time}

src/navigate/controller/sub_controllers/gui.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,20 @@ def show_verbose_info(self, *info):
117117
logger.info(f"{self.__class__.__name__} : {info}")
118118

119119
def register_event_listener(self, event_name, event_handler):
120-
"""Register event listner in the parent_controller
120+
"""Register event listener in the parent_controller
121+
122+
Parameters
123+
----------
124+
event_name : str
125+
event name
126+
event_handler : function
127+
event handler
121128
"""
122-
if not hasattr(self.parent_controller, "event_listners"):
123-
self.parent_controller.event_listerners = {}
129+
if not hasattr(self.parent_controller, "event_listeners"):
130+
self.parent_controller.event_listeners = {}
124131
self.parent_controller.event_listeners[event_name] = event_handler
125132

126133
@property
127134
def custom_events(self):
135+
"""Custom events for the controller"""
128136
return {}

src/navigate/controller/sub_controllers/multiposition.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,5 @@ def remove_positions(self, position_flag_list):
288288

289289
@property
290290
def custom_events(self):
291-
return {
292-
"remove_positions": self.remove_positions
293-
}
291+
"""Return custom events for the Multi-Position Controller."""
292+
return {"remove_positions": self.remove_positions}

src/navigate/controller/sub_controllers/plugins.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@ def build_tab_window(self, plugin_name, frame, controller):
223223
plugin_frame = frame(self.view.settings)
224224
self.view.settings.add(plugin_frame, text=plugin_name, sticky=tk.NSEW)
225225
plugin_controller = controller(plugin_frame, self.parent_controller)
226-
self.parent_controller.register_event_listeners(getattr(plugin_controller, "custom_events", {}))
226+
self.parent_controller.register_event_listeners(
227+
getattr(plugin_controller, "custom_events", {})
228+
)
227229
controller_name = (
228230
"__plugin" + "_".join(plugin_name.lower().split()) + "_controller"
229231
)
@@ -273,7 +275,9 @@ def func(*args, **kwargs):
273275
plugin_frame.grid(row=0, column=0, sticky=tk.NSEW, padx=10, pady=10)
274276

275277
plugin_controller = controller(plugin_frame, self.parent_controller)
276-
self.parent_controller.register_event_listeners(getattr(plugin_controller, "custom_events", {}))
278+
self.parent_controller.register_event_listeners(
279+
getattr(plugin_controller, "custom_events", {})
280+
)
277281

278282
plugin_controller.popup = popup
279283
popup.deiconify()

src/navigate/controller/sub_controllers/waveform_tab.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,5 @@ def set_waveform_template(self, template_name):
337337

338338
@property
339339
def custom_events(self):
340-
return {
341-
"waveform": self.update_waveforms
342-
}
340+
"""Custom events for the waveform tab"""
341+
return {"waveform": self.update_waveforms}

0 commit comments

Comments
 (0)