From 2ce0432ed6157db51f2f89fe9ec9abfbe621d940 Mon Sep 17 00:00:00 2001 From: Florian M Date: Tue, 10 Oct 2023 12:03:02 +0200 Subject: [PATCH 1/2] Fix reading zarr2 data with channel --- .../datastore/dataformats/zarr/ZarrBucketProvider.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webknossos-datastore/app/com/scalableminds/webknossos/datastore/dataformats/zarr/ZarrBucketProvider.scala b/webknossos-datastore/app/com/scalableminds/webknossos/datastore/dataformats/zarr/ZarrBucketProvider.scala index c4dad706174..b1b0815754e 100644 --- a/webknossos-datastore/app/com/scalableminds/webknossos/datastore/dataformats/zarr/ZarrBucketProvider.scala +++ b/webknossos-datastore/app/com/scalableminds/webknossos/datastore/dataformats/zarr/ZarrBucketProvider.scala @@ -24,9 +24,9 @@ class ZarrCubeHandle(zarrArray: ZarrArray) extends DataCubeHandle with LazyLoggi val offset = Vec3Int(bucket.topLeft.voxelXInMag, bucket.topLeft.voxelYInMag, bucket.topLeft.voxelZInMag) bucket.additionalCoordinates match { - case Some(additionalCoordinates) => + case Some(additionalCoordinates) if additionalCoordinates.nonEmpty => zarrArray.readBytesWithAdditionalCoordinates(shape, offset, additionalCoordinates, dataLayer.additionalAxisMap) - case None => zarrArray.readBytesXYZ(shape, offset) + case _ => zarrArray.readBytesXYZ(shape, offset) } } From c18e688a86bfff7f601a72fccb1c5805aae3b0cf Mon Sep 17 00:00:00 2001 From: Florian M Date: Tue, 10 Oct 2023 12:04:03 +0200 Subject: [PATCH 2/2] changelog --- CHANGELOG.unreleased.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 8beff189839..020c06f12cf 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -21,6 +21,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released ### Fixed - Fixed that segment statistics were requested in the wrong resolution and without properly considering the dataset scale. [#7355](https://github.com/scalableminds/webknossos/pull/7355) - Fixed that some segment (group) actions were not properly disabled for non-editable segmentation layers. [#7207](https://github.com/scalableminds/webknossos/issues/7207) +- Fixed a bug where data from zarr2 datasets that have a channel axis was broken. [#7374](https://github.com/scalableminds/webknossos/pull/7374) ### Removed