Skip to content

Fix deprecation GUI warnings for private napari attribute access #396

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

Merged
LucaMarconato merged 1 commit into from
May 15, 2026
Merged

Fix deprecation GUI warnings for private napari attribute access #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions src/napari_spatialdata/_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ class DataModel:
_layer: Layer = field(init=False, default=None, repr=True)
_adata: AnnData | None = field(init=False, default=None, repr=True)
_adata_layer: str | None = field(init=False, default=None, repr=False)
_region_key: str | None = field(default=None, repr=True)
_instance_key: str | None = field(default=None, repr=True)
_color_by: str = field(default="", repr=True, init=False)
_system_name: str | None = field(default=None, repr=True)

Expand Down
18 changes: 5 additions & 13 deletions src/napari_spatialdata/_view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ def __init__(
self._viewer = napari_viewer

self._model = (
model
if model is not None
else self._viewer.window._dock_widgets["SpatialData"].widget().viewer_model._model
model if model is not None else self._viewer.window.dock_widgets["SpatialData"].viewer_model._model
)

self._select_layer()
Expand Down Expand Up @@ -241,9 +239,8 @@ def export(self) -> None:

# check that the view widget is present
# and trigger its update
if "View (napari-spatialdata)" in dict(self._viewer.window._dock_widgets.items()):
view_widget = dict(self._viewer.window._dock_widgets.items())["View (napari-spatialdata)"]
qtAdataViewWidget = [x for x in view_widget.children() if isinstance(x, QtAdataViewWidget)][0]
if "View (napari-spatialdata)" in self._viewer.window.dock_widgets:
qtAdataViewWidget = self._viewer.window.dock_widgets["View (napari-spatialdata)"]
qtAdataViewWidget._on_layer_update()

# new annotation - update options
Expand Down Expand Up @@ -306,9 +303,7 @@ def save_sdata(self) -> None:
selected_table = self.table_name_widget.currentText()

# trigger saving of the table
# TODO: have to find another way to pass this as this is deprecated from 0.5.0 onwards
# it's used in the save_sdata method
self._viewer_model = self._viewer.window._dock_widgets["SpatialData"].widget().viewer_model
self._viewer_model = self._viewer.window.dock_widgets["SpatialData"].viewer_model
self._viewer_model._write_element_to_disk(
selected_layer.metadata["sdata"],
selected_table,
Expand Down Expand Up @@ -611,8 +606,6 @@ def _select_layer(self) -> None:
if self.model.adata.shape == (0, 0):
return

self.model._region_key = layer.metadata["region_key"] if isinstance(layer, Labels) else None
self.model._instance_key = layer.metadata["instance_key"] if isinstance(layer, Labels) else None
self.model.system_name = layer.metadata.get("name", None)

if hasattr(
Expand Down Expand Up @@ -695,8 +688,7 @@ class QtAdataAnnotationWidget(QWidget):
def __init__(self, napari_viewer: Viewer):
super().__init__()
self._viewer = napari_viewer
# TODO: have to find another way to pass this as this is deprecated from 0.5.0 onwards
self._viewer_model = self._viewer.window._dock_widgets["SpatialData"].widget().viewer_model
self._viewer_model = self._viewer.window.dock_widgets["SpatialData"].viewer_model

self.setLayout(QGridLayout())
self._current_color = "#FFFFFF"
Expand Down
Loading