78 improvements to vesicle pool assignment widget #81
Conversation
…add_table function
…d overwrite intersecting vesicle pools with new ones
…es they are based upon and started adding second distance input layer for vesicle pool widget
…y for vesicle_pool_widget
There was a problem hiding this comment.
This looks good overall, only a few minor comments.
Also, I suggest we remove the "-segmentation" from the name here: https://github.com/computational-cell-analytics/synapse-net/blob/main/synapse_net/tools/segmentation_widget.py#L119
Otherwise the name of the distance layer would get quite long.
| # Add distances2 if present. | ||
| if distances2 is not None: | ||
| distance_ids = distances2.get("label", []) | ||
| if set(distance_ids) != set(morphology_ids): |
There was a problem hiding this comment.
We might not have the morphology ids here, since I made the morphology optional. You can use merged_df.label instead.
| return | ||
| distances2 = pd.DataFrame(distances2).drop(columns=["index"]) | ||
| merged_df = merged_df.merge(distances2, left_on="label", right_on="label", suffixes=("", "2")) | ||
| print(merged_df) |
There was a problem hiding this comment.
Please remove print, this would confuse users.
| @@ -87,7 +87,8 @@ def on_measure_seg_to_object(self): | |||
| seg_ids=seg_ids, | |||
| ) | |||
| table_data = self._to_table_data(distances, seg_ids, endpoints1, endpoints2) | |||
| self._add_lines_and_table(lines, table_data, name="distances") | |||
| structure_layer_name = self._get_layer_selector_layer(self.image_selector_name2).name | |||
| self._add_lines_and_table(lines, table_data, name="distances-to-" + structure_layer_name) | |||
There was a problem hiding this comment.
Let's shorten the structure_layer_name in the segmentation widget to avoid too long names here, see general comment.
| @@ -68,6 +72,8 @@ def on_pool_vesicles(self): | |||
|
|
|||
| distance_layer = self._get_layer_selector_layer(self.dist_selector_name1) | |||
| distances = None if distance_layer is None else distance_layer.properties | |||
| distance_layer2 = self._get_layer_selector_layer(self.dist_selector_name2) | |||
| distances2 = None if distance_layer2 is None else distance_layer2.properties | |||
There was a problem hiding this comment.
I would also set distances2 to None if it is the same selected layer as distances. I think this will be the default napari behavior, because the selector will always select a shape layer if it's there, so even if we only have one distance it will be selected.
…viour for selected structure2 in vesicle_pool_widget to ignore structure2 if its the same as structure1
constantinpape
deleted the
78-improvements-to-vesicle-pool-assignment-widget
branch
@constantinpape