Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing the problem #296

Merged
merged 8 commits into from
Jan 18, 2024
Merged

Fixing the problem #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c7d4bdb
Fixing the problem
Cryaaa Jan 15, 2024
8f70274
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 15, 2024
41d9a73
select the active layer instead of the first one with features
Cryaaa Jan 15, 2024
db72997
Merge branch 'Fixing-Layer-Dropdown-Preselection' of https://github.c…
Cryaaa Jan 15, 2024
141d5c1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 15, 2024
1a379c2
removing the checking for feature again
Cryaaa Jan 15, 2024
4e8b09a
Merge branch 'Fixing-Layer-Dropdown-Preselection' of https://github.c…
Cryaaa Jan 15, 2024
fe55380
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion napari_clusters_plotter/_Qt_code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def measurements_container_and_list():
return properties_container, properties_list


def layer_container_and_selection():
def layer_container_and_selection(viewer=None):
"""
Create a container and a dropdown widget to select the layer.

Expand All @@ -67,6 +67,9 @@ def layer_container_and_selection():
layer_select = create_widget(annotation=Layer, label="layer")
layer_selection_container.layout().addWidget(layer_select.native)

if viewer is not None and viewer.layers.selection.active is not None:
layer_select.value = viewer.layers.selection.active
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm speculating this crashes when two layers are selected in napari?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this and at the moment when you select two layers the selection.active returns none. I’m guessing that might change some time in the future though but I’m not sure


return layer_selection_container, layer_select


Expand Down
2 changes: 1 addition & 1 deletion napari_clusters_plotter/_clustering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def __init__(self, napari_viewer):
(
layer_selection_container,
self.layer_select,
) = layer_container_and_selection()
) = layer_container_and_selection(viewer=self.viewer)

# widget for the selection of properties to perform clustering
(
Expand Down
2 changes: 1 addition & 1 deletion napari_clusters_plotter/_dimensionality_reduction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def __init__(self, napari_viewer):
(
layer_selection_container,
self.layer_select,
) = layer_container_and_selection()
) = layer_container_and_selection(viewer=self.viewer)

# select properties of which to produce a dimensionality reduced version
(
Expand Down
2 changes: 1 addition & 1 deletion napari_clusters_plotter/_plotter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def manual_clustering_method(inside):
(
layer_selection_container,
self.layer_select,
) = layer_container_and_selection()
) = layer_container_and_selection(viewer=self.viewer)

# widget for the selection of axes
axes_container = QWidget()
Expand Down
Loading