cleaned up inference + added toggle visibility

Author: C-Achard

docs/res/code/interface.rst

@@ -19,9 +19,9 @@ make_group
 .. autofunction:: napari_cellseg3d.interface::make_group
 
 
-make_container_widget
+make_container
 **************************************
-.. autofunction:: napari_cellseg3d.interface::make_container_widget
+.. autofunction:: napari_cellseg3d.interface::make_container
 
 
 make_button

docs/res/code/model_framework.rst

@@ -12,7 +12,7 @@ Class : ModelFramework
 Methods
 **********************
 .. autoclass:: napari_cellseg3d.model_framework::ModelFramework
-   :members:  __init__,load_dataset_paths,save_log, save_log_to_path,get_model, get_loss,display_status_report,load_dataset_paths,create_train_dataset_dict, load_image_dataset, load_label_dataset,load_results_path,load_model_path,get_device, update_default, remove_from_viewer
+   :members:  __init__,toggle_visibility, load_dataset_paths,save_log, save_log_to_path,get_model, get_loss,display_status_report,load_dataset_paths,create_train_dataset_dict, load_image_dataset, load_label_dataset,load_results_path,load_model_path,get_device, update_default, remove_from_viewer
    :noindex:
 
 

napari_cellseg3d/interface.py

@@ -233,7 +233,7 @@ def make_group(title, L=7, T=20, R=7, B=11, solo_dict=None):
     return group, layout
 
 
-def make_container_widget(L=0, T=0, R=1, B=11, vertical=True):
+def make_container(L=0, T=0, R=1, B=11, vertical=True):
     """Creates a QWidget and a layout for the purpose of containing other modules, with a Fixed layout.
 
     Args:

napari_cellseg3d/model_framework.py

@@ -94,7 +94,7 @@ def __init__(self, viewer: "napari.viewer.Viewer"):
         self.lbl_weights_path.setReadOnly(True)
 
         self.weights_path_container = ui.combine_blocks(
-            self.btn_weights_path, self.lbl_weights_path
+            self.btn_weights_path, self.lbl_weights_path, b=0
         )
         self.weights_path_container.setVisible(False)
 
@@ -107,7 +107,7 @@ def __init__(self, viewer: "napari.viewer.Viewer"):
         (
             self.container_report,
             self.container_report_layout,
-        ) = ui.make_container_widget(10, 5, 5, 5)
+        ) = ui.make_container(10, 5, 5, 5)
         self.container_report.setSizePolicy(
             QSizePolicy.Fixed, QSizePolicy.Minimum
         )
@@ -130,7 +130,17 @@ def __init__(self, viewer: "napari.viewer.Viewer"):
         self.btn_save_log.setVisible(False)
         #####################################################
 
+    def toggle_visibility(self, checkbox, widget):
+        """Toggles the visibility of a widget based on the status of a checkbox.
+
+        Args:
+            checkbox: The QCheckbox that determines whether to show or not
+            widget: The widget to hide or show
+        """
+        widget.setVisible(checkbox.isChecked())
+
     def send_log(self, text):
+        """Emit a signal to print in a Log"""
         self.log.print_and_log(text)
 
     def save_log(self):
@@ -223,10 +233,9 @@ def display_status_report(self):
         self.progress.setValue(0)
 
     def toggle_weights_path(self):
-        if self.custom_weights_choice.isChecked():
-            self.weights_path_container.setVisible(True)
-        else:
-            self.weights_path_container.setVisible(False)
+        self.toggle_visibility(
+            self.custom_weights_choice, self.weights_path_container
+        )
 
     def create_train_dataset_dict(self):
         """Creates data dictionary for MONAI transforms and training.

napari_cellseg3d/model_workers.py

@@ -164,7 +164,7 @@ def log_parameters(self):
         if self.use_window:
             status = "enabled"
         else:
-            status="disabled"
+            status = "disabled"
 
         self.log(f"Window inference is {status}")
 
@@ -282,7 +282,9 @@ def inference(self):
         self.log("Done")
         # print(f"wh dir : {WEIGHTS_DIR}")
         # print(weights)
-        self.log("\nLoading weights...")
+        self.log(
+            "\nLoading weights..."
+        )  # TODO add try/except for invalid weights
 
         if self.weights_dict["custom"]:
             weights = self.weights_dict["path"]
@@ -306,13 +308,12 @@ def inference(self):
 
                 inputs = inf_data["image"]
                 # print(inputs.shape)
-                #  TODO figure out sliding window device
+
                 inputs = inputs.to("cpu")
 
                 model_output = lambda inputs: post_process_transforms(
                     self.model_dict["class"].get_output(model, inputs)
                 )
-                # TODO add more params
 
                 if self.keep_on_cpu:
                     dataset_device = "cpu"

napari_cellseg3d/plugin_convert.py

@@ -80,7 +80,7 @@ def build(self):
 
         l, t, r, b = 7, 20, 7, 11
 
-        w, layout = ui.make_container_widget()
+        w, layout = ui.make_container()
 
         results_widget = ui.combine_blocks(
             right_or_below=self.btn_result_path,

napari_cellseg3d/plugin_crop.py

@@ -97,7 +97,7 @@ def toggle_label_path(self):
     def build(self):
         """Build buttons in a layout and add them to the napari Viewer"""
 
-        w, layout = ui.make_container_widget(0, 0, 1, 11)
+        w, layout = ui.make_container(0, 0, 1, 11)
 
         data_group_w, data_group_l = ui.make_group("Data")
         data_group_l.addWidget(

napari_cellseg3d/plugin_dock.py

@@ -48,7 +48,7 @@ def __init__(self, parent: "napari.viewer.Viewer"):
         self.time_label = ui.make_label("", self)
         self.time_label.setVisible(False)
 
-        io_panel, io_layout = ui.make_container_widget(vertical=False)
+        io_panel, io_layout = ui.make_container(vertical=False)
         io_layout.addWidget(
             ui.combine_blocks(
                 left_or_above=self.button,

napari_cellseg3d/plugin_metrics.py

@@ -79,7 +79,7 @@ def build(self):
 
         self.lbl_filetype.setVisible(False)
 
-        w, self.layout = ui.make_container_widget()
+        w, self.layout = ui.make_container()
 
         metrics_group_w, metrics_group_l = ui.make_group("Data")