Skip to content

Commit 083ebbf

Browse files
committed
Update model_workers.py
Fixed ref before assignment error
1 parent d4d257d commit 083ebbf

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

napari_cellseg3d/model_workers.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ def warn(self, warning):
275275
def log_parameters(self):
276276

277277
self.log("-" * 20)
278-
self.log("Parameters summary :")
278+
self.log("\nParameters summary :")
279279

280280
self.log(f"Model is : {self.model_dict['name']}")
281281
if self.transforms["thresh"][0]:
@@ -288,7 +288,7 @@ def log_parameters(self):
288288
else:
289289
status = "disabled"
290290

291-
self.log(f"Window inference is {status}")
291+
self.log(f"Window inference is {status}\n")
292292

293293
if self.keep_on_cpu:
294294
self.log(f"Dataset loaded to CPU")
@@ -302,9 +302,10 @@ def log_parameters(self):
302302
self.log(
303303
f"Instance segmentation enabled, method : {self.instance_params['method']}\n"
304304
f"Probability threshold is {self.instance_params['threshold']:.2f}\n"
305-
f"Objects smaller than {self.instance_params['size_small']} pixels will be removed"
305+
f"Objects smaller than {self.instance_params['size_small']} pixels will be removed\n"
306306
)
307307
# self.log(f"")
308+
self.log("\n")
308309
self.log("-" * 20)
309310

310311
def load_folder(self):
@@ -360,7 +361,7 @@ def load_layer(self):
360361
volume = np.swapaxes(
361362
volume, 0, 2
362363
) # for anisotropy to be monai-like, i.e. zyx # FIXME rotation not always correct
363-
print("Loading layer")
364+
print("Loading layer\n")
364365
dims_check = volume.shape
365366
self.log("\nChecking dimensions...")
366367
pad = utils.get_padding_dim(dims_check)
@@ -609,6 +610,7 @@ def inference_on_layer(self, image, model, post_process_transforms):
609610
#################
610611
if self.instance_params["do_instance"]:
611612
instance_labels = self.instance_seg(to_instance)
613+
instance_labels = np.swapaxes(instance_labels, 0, 2) #FIXME always required ?
612614
data_dict = self.stats_csv(instance_labels)
613615
else:
614616
instance_labels = None
@@ -617,7 +619,7 @@ def inference_on_layer(self, image, model, post_process_transforms):
617619
result = {
618620
"image_id": 0,
619621
"original": None,
620-
"instance_labels": np.swapaxes(instance_labels, 0, 2),
622+
"instance_labels": instance_labels,
621623
"object stats": data_dict,
622624
"result": np.swapaxes(out, 0, 2),
623625
"model_name": self.model_dict["name"],

0 commit comments

Comments
 (0)