1
- import os
2
-
3
1
import napari
4
2
import napari .layers
5
3
import napari .viewer
6
4
import numpy as np
7
5
import pandas as pd
8
- from skimage .measure import regionprops
9
6
10
7
from napari .utils .notifications import show_info
11
8
from qtpy .QtWidgets import QWidget , QVBoxLayout , QPushButton
12
9
13
10
from .base_widget import BaseWidget
14
- from synaptic_reconstruction .tools .util import _save_table
15
11
16
12
try :
17
13
from napari_skimage_regionprops import add_table
@@ -57,7 +53,6 @@ def __init__(self):
57
53
self .measure_button1 = QPushButton ("Create Vesicle Pool" )
58
54
self .measure_button1 .clicked .connect (self .on_pool_vesicles )
59
55
60
-
61
56
# Add the widgets to the layout.
62
57
layout .addWidget (self .image_selector_widget )
63
58
layout .addWidget (self .segmentation1_selector_widget )
@@ -96,7 +91,7 @@ def on_pool_vesicles(self):
96
91
if distances is None :
97
92
show_info ("INFO: Distances layer could not be found or has no values." )
98
93
return
99
- vesicle_pool = self ._compute_vesicle_pool (segmentation , distances , morphology , new_layer_name , pooled_group_name , query )
94
+ self ._compute_vesicle_pool (segmentation , distances , morphology , new_layer_name , pooled_group_name , query )
100
95
101
96
def _compute_vesicle_pool (self , segmentation , distances , morphology , new_layer_name , pooled_group_name , query ):
102
97
"""
@@ -109,9 +104,6 @@ def _compute_vesicle_pool(self, segmentation, distances, morphology, new_layer_n
109
104
new_layer_name (str): Name for the new layer to be created.
110
105
pooled_group_name (str): Name for the pooled group to be assigned.
111
106
query (dict): Query parameters.
112
-
113
- Returns:
114
- dict: Updated properties for the new vesicle pool.
115
107
"""
116
108
117
109
distances_ids = distances .get ("id" , [])
@@ -137,7 +129,7 @@ def _compute_vesicle_pool(self, segmentation, distances, morphology, new_layer_n
137
129
new_layer_data = np .zeros (segmentation .shape , dtype = np .uint8 )
138
130
pool_id = 1
139
131
layer = None
140
-
132
+
141
133
# check if group already exists
142
134
if new_layer_name in self .viewer .layers :
143
135
layer = self .viewer .layers [new_layer_name ]
@@ -175,7 +167,10 @@ def _compute_vesicle_pool(self, segmentation, distances, morphology, new_layer_n
175
167
name = new_layer_name ,
176
168
properties = new_properties
177
169
)
178
- show_info (f"Added new layer '{ new_layer_name } ' with { len (valid_vesicle_ids )} vesicles in group '{ pooled_group_name } '." )
170
+ show_info (
171
+ f"Added new layer '{ new_layer_name } ' with { len (valid_vesicle_ids )} "
172
+ f"vesicles in group '{ pooled_group_name } '."
173
+ )
179
174
if add_table is not None :
180
175
add_table (self .viewer .layers [new_layer_name ], self .viewer )
181
176
return {
0 commit comments