Skip to content

Commit 8d0ff5d

Browse files
committed
Fixes for UI and tests
- Fix SegResNet input dims in test - Fixed all tests - Fixed issues with window inference settings for WNet in UI
1 parent 78f72dd commit 8d0ff5d

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed

napari_cellseg3d/_tests/test_models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def test_model_list():
2626
for model_name in MODEL_LIST:
2727
# if model_name=="test":
2828
# continue
29-
dims = 128
29+
dims = 64
3030
test = MODEL_LIST[model_name](
3131
input_img_size=[dims, dims, dims],
3232
in_channels=1,
@@ -114,7 +114,7 @@ def test_pretrained_weights_compatibility():
114114
for model_name in MODEL_LIST:
115115
file_name = MODEL_LIST[model_name].weights_file
116116
WeightsDownloader().download_weights(model_name, file_name)
117-
model = MODEL_LIST[model_name](input_img_size=[128, 128, 128])
117+
model = MODEL_LIST[model_name](input_img_size=[64, 64, 64])
118118
try:
119119
model.load_state_dict(
120120
torch.load(

napari_cellseg3d/code_plugins/plugin_model_inference.py

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def __init__(self, viewer: "napari.viewer.Viewer", parent=None):
112112
######################
113113
# TODO : better way to handle SegResNet size reqs ?
114114
self.model_input_size = ui.IntIncrementCounter(
115-
lower=1, upper=1024, default=128, text_label="\nModel input size"
115+
lower=1, upper=1024, default=64, text_label="\nModel input size"
116116
)
117117
self.model_choice.currentIndexChanged.connect(
118118
self._toggle_display_model_input_size
@@ -155,16 +155,7 @@ def __init__(self, viewer: "napari.viewer.Viewer", parent=None):
155155

156156
sizes_window = ["8", "16", "32", "64", "128", "256", "512"]
157157
self._default_window_size = sizes_window.index("64")
158-
# (
159-
# self.window_size_choice,
160-
# self.window_size_choice.label,
161-
# ) = ui.make_combobox(sizes_window, label="Window size and overlap")
162-
# self.window_overlap = ui.make_n_spinboxes(
163-
# max=1,
164-
# default=0.7,
165-
# step=0.05,
166-
# double=True,
167-
# )
158+
self.wnet_enabled = False
168159

169160
self.window_size_choice = ui.DropdownMenu(
170161
sizes_window, text_label="Window size"
@@ -310,16 +301,13 @@ def check_ready(self):
310301

311302
def _restrict_window_size_for_model(self):
312303
"""Sets the window size to a value that is compatible with the chosen model"""
304+
self.wnet_enabled = False
313305
if self.model_choice.currentText() == "WNet":
314306
self.window_size_choice.setCurrentIndex(self._default_window_size)
315-
self.window_size_choice.setDisabled(True)
316-
self.window_infer_box.setChecked(True)
317-
self.window_infer_box.setDisabled(True)
318-
else:
319-
self.window_size_choice.setDisabled(False)
320-
self.window_infer_box.setDisabled(False)
321-
self.window_infer_box.setChecked(True)
322-
self.window_size_choice.setCurrentIndex(self._default_window_size)
307+
self.wnet_enabled = True
308+
self.window_infer_box.setChecked(self.wnet_enabled)
309+
self.window_size_choice.setDisabled(self.wnet_enabled)
310+
self.window_infer_box.setDisabled(self.wnet_enabled)
323311

324312
def _toggle_display_model_input_size(self):
325313
if (

0 commit comments

Comments
 (0)