Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
71c2110
simplify conditional
melonora Mar 28, 2024
93ca0ed
Merge branch 'main' of https://github.com/melonora/napari-spatialdata
melonora May 21, 2024
f363842
Merge branch 'main' of https://github.com/melonora/napari-spatialdata
melonora Jun 19, 2024
07f60a5
Merge branch 'main' of https://github.com/melonora/napari-spatialdata
melonora Jun 24, 2024
784e95b
Merge branch 'main' of https://github.com/melonora/napari-spatialdata
melonora Jun 24, 2024
79a2a50
Merge branch 'scverse:main' into main
melonora Jul 9, 2024
29b1579
Merge branch 'scverse:main' into main
melonora Jul 22, 2024
5a2de2e
Merge branch 'scverse:main' into main
melonora Aug 9, 2024
7576271
Merge branch 'scverse:main' into main
melonora Sep 7, 2024
85e5c61
Merge branch 'scverse:main' into main
melonora Sep 19, 2024
dcc6b68
Merge branch 'scverse:main' into main
melonora Oct 14, 2024
3036463
Merge branch 'scverse:main' into main
melonora Dec 2, 2024
044bd18
Merge branch 'scverse:main' into main
melonora Dec 17, 2024
788a328
Merge branch 'main' of https://github.com/scverse/napari-spatialdata
melonora Feb 13, 2025
16f8a2e
Merge branch 'main' of https://github.com/melonora/napari-spatialdata
melonora Feb 13, 2025
8bda7d0
Merge branch 'main' of https://github.com/scverse/napari-spatialdata
melonora Mar 16, 2025
851333c
merge main
melonora Apr 18, 2025
bb29dd6
merge main
melonora May 26, 2025
ed706f8
merge main
melonora Jul 4, 2025
c39d8ea
merge main
melonora Sep 13, 2025
adc9a6c
small changes for zarrv3 spatialdata
melonora Sep 13, 2025
d320309
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 13, 2025
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
4 changes: 2 additions & 2 deletions src/napari_spatialdata/_viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from spatialdata import get_element_annotators, get_element_instances
from spatialdata._core.query.relational_query import _left_join_spatialelement_table
from spatialdata._types import ArrayLike
from spatialdata.models import PointsModel, ShapesModel, TableModel, force_2d, get_channels
from spatialdata.models import PointsModel, ShapesModel, TableModel, force_2d, get_channel_names
from spatialdata.transformations import Affine, Identity

from napari_spatialdata._model import DataModel
Expand Down Expand Up @@ -473,7 +473,7 @@ def get_sdata_image(self, sdata: SpatialData, key: str, selected_cs: str, multi:
affine = _get_transform(sdata.images[original_name], selected_cs)
rgb_image, rgb = _adjust_channels_order(element=sdata.images[original_name])

channels = ("RGB(A)",) if rgb else get_channels(sdata.images[original_name])
channels = ("RGB(A)",) if rgb else get_channel_names(sdata.images[original_name])

adata = AnnData(shape=(0, len(channels)), var=pd.DataFrame(index=channels))

Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

from napari_spatialdata.utils._test_utils import export_figure, save_image

OFFSCREEN = os.environ.get('QT_QPA_PLATFORM', '') == 'offscreen'
OFFSCREEN = os.environ.get("QT_QPA_PLATFORM", "") == "offscreen"

HERE: Path = Path(__file__).parent

Expand Down
2 changes: 1 addition & 1 deletion tests/test_interactive.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from spatialdata.models import Image2DModel

from napari_spatialdata._interactive import Interactive
from tests.conftest import PlotTester, PlotTesterMeta, OFFSCREEN
from tests.conftest import OFFSCREEN, PlotTester, PlotTesterMeta

ARM_PROBLEM = (
parse_version(version("numpy")) < parse_version("2") and sys.platform == "darwin" and platform.machine() == "arm64"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def test_change_layer(
sdata_blobs: SpatialData,
) -> None:
table = sdata_blobs["table"].copy()
table.obs["region"] = "blobs_labels"
table.obs["region"] = pd.Categorical(["blobs_labels"] * table.n_obs)
table.uns["spatialdata_attrs"]["region"] = "blobs_labels"
table.var_names = pd.Index([i + "_second" for i in table.var_names])
sdata_blobs["second_table"] = table
Expand Down
Loading