From 054b4a645ba2b000d18d47a33b19cd978af36d23 Mon Sep 17 00:00:00 2001 From: Mehdi Seifi Date: Thu, 16 Jan 2025 11:21:15 +0100 Subject: [PATCH] Fixed train/predict layer is none issue (#14) * fixed module test run: replaced name with algorithm * added checkpoints, csv_logs, and tb_logs to be ignored * fixed layer is none when image was loaded before the plugin --- .gitignore | 4 ++++ src/careamics_napari/widgets/algorithm_choice.py | 2 +- src/careamics_napari/widgets/predict_data_widget.py | 3 +++ src/careamics_napari/widgets/train_data_widget.py | 12 ++++++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 63e1918..70f3442 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +checkpoints +csv_logs +tb_logs + # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/src/careamics_napari/widgets/algorithm_choice.py b/src/careamics_napari/widgets/algorithm_choice.py index 8d1a9a2..947627e 100644 --- a/src/careamics_napari/widgets/algorithm_choice.py +++ b/src/careamics_napari/widgets/algorithm_choice.py @@ -69,7 +69,7 @@ def algorithm_changed(self, index: int) -> None: myalgo = TrainingSignal() # type: ignore - @myalgo.events.name.connect + @myalgo.events.algorithm.connect def print_algorithm(name: str): """Print the selected algorithm.""" print(f"Selected algorithm: {name}") diff --git a/src/careamics_napari/widgets/predict_data_widget.py b/src/careamics_napari/widgets/predict_data_widget.py index c165333..5b9e594 100644 --- a/src/careamics_napari/widgets/predict_data_widget.py +++ b/src/careamics_napari/widgets/predict_data_widget.py @@ -98,6 +98,9 @@ def _set_layer_tab( # connection actions for images self.img_pred.changed.connect(self._update_pred_layer) + # to cover the case when image was loaded before the plugin + if self.img_pred.value is not None: + self._update_pred_layer(self.img_pred.value) else: # simply remove the tab diff --git a/src/careamics_napari/widgets/train_data_widget.py b/src/careamics_napari/widgets/train_data_widget.py index 569e292..c7d323a 100644 --- a/src/careamics_napari/widgets/train_data_widget.py +++ b/src/careamics_napari/widgets/train_data_widget.py @@ -105,6 +105,12 @@ def _set_layer_tab( self.img_train.changed.connect(self._update_train_layer) self.img_val.changed.connect(self._update_val_layer) + # to cover the case when image was loaded before the plugin + if self.img_train.value is not None: + self._update_train_layer(self.img_train.value) + if self.img_val.value is not None: + self._update_val_layer(self.img_val.value) + if self.use_target: # get the target layers self.target_train = layer_choice() @@ -118,6 +124,12 @@ def _set_layer_tab( self.target_train.changed.connect(self._update_train_target_layer) self.target_val.changed.connect(self._update_val_target_layer) + # to cover the case when image was loaded before the plugin + if self.target_train.value is not None: + self._update_train_target_layer(self.target_train.value) + if self.target_val.value is not None: + self._update_val_target_layer(self.target_val.value) + widget_layers.layout().addRow("Train", self.img_train.native) widget_layers.layout().addRow("Val", self.img_val.native) widget_layers.layout().addRow("Train target", self.target_train.native)