Skip to content

Commit 827ad03

Browse files
committed
cleaned up code
1 parent bc39941 commit 827ad03

File tree

3 files changed

+10
-18
lines changed

3 files changed

+10
-18
lines changed

synaptic_reconstruction/tools/distance_measure_widget.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ def _add_lines_and_table(self, lines, properties, table_data, name):
8787
blending="additive",
8888
properties=properties,
8989
)
90-
# if line_layer.metadata is None:
91-
# line_layer.metadata = table_data
92-
# else:
90+
9391
line_layer.properties["distances"] = table_data
9492

9593
if add_table is not None:
@@ -141,7 +139,7 @@ def on_measure_pairwise(self):
141139
resolution = metadata.get("voxel_size", None)
142140
if resolution is not None:
143141
resolution = [v for v in resolution.values()]
144-
# if user input is present override metadata
142+
# if user input is present, override metadata
145143
if self.voxel_size_param.value() != 0.0: # changed from default
146144
resolution = segmentation.ndim * [self.voxel_size_param.value()]
147145

synaptic_reconstruction/tools/morphology_widget.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import os
2-
31
import napari
42
import napari.layers
53
import napari.viewer
@@ -201,7 +199,8 @@ def on_measure_vesicle_morphology(self):
201199
self._add_table(coords, radii, props, name="Vesicles Morphology")
202200

203201
def on_measure_structure_morphology(self):
204-
"""add the structure measurements to the segmentation layer (via properties)
202+
"""
203+
Add the structure measurements to the segmentation layer (via properties)
205204
and visualize the properties table
206205
"""
207206
segmentation = self._get_layer_selector_data(self.image_selector_name1)

synaptic_reconstruction/tools/vesicle_pool_widget.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
import os
2-
31
import napari
42
import napari.layers
53
import napari.viewer
64
import numpy as np
75
import pandas as pd
8-
from skimage.measure import regionprops
96

107
from napari.utils.notifications import show_info
118
from qtpy.QtWidgets import QWidget, QVBoxLayout, QPushButton
129

1310
from .base_widget import BaseWidget
14-
from synaptic_reconstruction.tools.util import _save_table
1511

1612
try:
1713
from napari_skimage_regionprops import add_table
@@ -57,7 +53,6 @@ def __init__(self):
5753
self.measure_button1 = QPushButton("Create Vesicle Pool")
5854
self.measure_button1.clicked.connect(self.on_pool_vesicles)
5955

60-
6156
# Add the widgets to the layout.
6257
layout.addWidget(self.image_selector_widget)
6358
layout.addWidget(self.segmentation1_selector_widget)
@@ -96,7 +91,7 @@ def on_pool_vesicles(self):
9691
if distances is None:
9792
show_info("INFO: Distances layer could not be found or has no values.")
9893
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)
10095

10196
def _compute_vesicle_pool(self, segmentation, distances, morphology, new_layer_name, pooled_group_name, query):
10297
"""
@@ -109,9 +104,6 @@ def _compute_vesicle_pool(self, segmentation, distances, morphology, new_layer_n
109104
new_layer_name (str): Name for the new layer to be created.
110105
pooled_group_name (str): Name for the pooled group to be assigned.
111106
query (dict): Query parameters.
112-
113-
Returns:
114-
dict: Updated properties for the new vesicle pool.
115107
"""
116108

117109
distances_ids = distances.get("id", [])
@@ -137,7 +129,7 @@ def _compute_vesicle_pool(self, segmentation, distances, morphology, new_layer_n
137129
new_layer_data = np.zeros(segmentation.shape, dtype=np.uint8)
138130
pool_id = 1
139131
layer = None
140-
132+
141133
# check if group already exists
142134
if new_layer_name in self.viewer.layers:
143135
layer = self.viewer.layers[new_layer_name]
@@ -175,7 +167,10 @@ def _compute_vesicle_pool(self, segmentation, distances, morphology, new_layer_n
175167
name=new_layer_name,
176168
properties=new_properties
177169
)
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+
)
179174
if add_table is not None:
180175
add_table(self.viewer.layers[new_layer_name], self.viewer)
181176
return {

0 commit comments

Comments
 (0)