Skip to content

Commit 1e757c6

Browse files
committed
switch from Rarr to ZarrArray
1 parent 0279358 commit 1e757c6

8 files changed

Lines changed: 14 additions & 14 deletions

File tree

DESCRIPTION

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Imports:
4343
jsonlite,
4444
Matrix,
4545
methods,
46-
Rarr,
46+
ZarrArray,
4747
RBGL,
4848
reticulate,
4949
sf,
@@ -70,7 +70,8 @@ Remotes:
7070
keller-mark/pizzarr,
7171
keller-mark/anndataR@spatialdata,
7272
HelenaLC/SpatialData.data,
73-
HelenaLC/SpatialData.plot
73+
HelenaLC/SpatialData.plot,
74+
Bioconductor/ZarrArray
7475
biocViews:
7576
DataImport,
7677
DataRepresentation,

NAMESPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ importFrom(Matrix,rowSums)
9191
importFrom(Matrix,sparseVector)
9292
importFrom(Matrix,t)
9393
importFrom(RBGL,sp.between)
94-
importFrom(Rarr,ZarrArray)
9594
importFrom(S4Arrays,as.array.Array)
9695
importFrom(S4Vectors,"metadata<-")
9796
importFrom(S4Vectors,coolcat)
@@ -107,6 +106,7 @@ importFrom(SingleCellExperiment,int_metadata)
107106
importFrom(SummarizedExperiment,"colData<-")
108107
importFrom(SummarizedExperiment,assay)
109108
importFrom(SummarizedExperiment,colData)
109+
importFrom(ZarrArray,ZarrArray)
110110
importFrom(arrow,open_dataset)
111111
importFrom(basilisk,BasiliskEnvironment)
112112
importFrom(basilisk,basiliskRun)

R/ImageArray.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#' @title The `ImageArray` class
33
#'
44
#' @param x \code{ImageArray}
5-
#' @param data list of \code{\link[Rarr]{ZarrArray}}s
5+
#' @param data list of \code{\link[ZarrArray]{ZarrArray}}s
66
#' @param meta \code{\link{Zattrs}}
77
#' @param metadata optional list of arbitrary
88
#' content describing the overall object.

R/LabelArray.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#' }
1515
#'
1616
#' @param x \code{LabelArray}
17-
#' @param data list of \code{\link[Rarr]{ZarrArray}}s
17+
#' @param data list of \code{\link[ZarrArray]{ZarrArray}}s
1818
#' @param meta \code{\link{Zattrs}}
1919
#' @param metadata optional list of arbitrary
2020
#' content describing the overall object.

R/read.R

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ allp = c("zarr==3.1.5", "spatialdata==0.7.0", "spatialdata_io==0.6.0",
6969
#' (x <- readSpatialData(base))
7070
NULL
7171

72+
#' @importFrom ZarrArray ZarrArray
7273
readsdlayer <- function(x, ...) {
7374
md <- fromJSON(file.path(x, ".zattrs"))
7475
ps <- .get_multiscales_dataset_paths(md)
75-
list(array = lapply(ps, \(.) ZarrArray(file.path(x, as.character(.)))),
76+
list(array = lapply(ps, \(.) ZarrArray::ZarrArray(file.path(x, as.character(.)))),
7677
md = md)
7778
}
7879

7980
#' @rdname readSpatialData
80-
#' @importFrom Rarr ZarrArray
8181
#' @importFrom jsonlite fromJSON
8282
#' @export
8383
readImage <- function(x, ...) {
@@ -86,7 +86,6 @@ readImage <- function(x, ...) {
8686
}
8787

8888
#' @rdname readSpatialData
89-
#' @importFrom Rarr ZarrArray
9089
#' @importFrom jsonlite fromJSON
9190
#' @export
9291
readLabel <- function(x, ...) {

man/ImageArray.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/LabelArray.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/SpatialData.Rd

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)