From 3e2995041c9f184b732d7cc05300f5153d77f284 Mon Sep 17 00:00:00 2001 From: Artur-man Date: Mon, 12 Jan 2026 16:52:33 +0100 Subject: [PATCH 1/7] update read basilisk --- R/read.R | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/R/read.R b/R/read.R index 929fd14..45ab2a6 100644 --- a/R/read.R +++ b/R/read.R @@ -128,25 +128,30 @@ readShape <- function(x, ...) { #' @importFrom SingleCellExperiment int_metadata #' @importFrom basilisk basiliskStart basiliskStop basiliskRun .readTables_basilisk <- function(x) { - proc <- basiliskStart(.env) - on.exit(basiliskStop(proc)) - basiliskRun(proc, x=x, \(x) { - # read in 'SpatialData' from .zarr store - sd <- import("spatialdata") - zs <- sd$read_zarr(x) - # return (named) list of SCEs - names(ts) <- ts <- names(zs$tables$data) - lapply(ts, \(z) { - se <- AnnData2SCE(zs$tables[z]) - nm <- "spatialdata_attrs" - md <- metadata(se)[[nm]] - int_metadata(se)[[nm]] <- md - metadata(se)[[nm]] <- NULL - se - }) - }) + proc <- basiliskStart(.env) + on.exit(basiliskStop(proc)) + basiliskRun(proc, x=x, \(x) { + # read in 'SpatialData' from .zarr store + # sd <- import("spatialdata") + sd <- import("anndata") + z <- import("zarr") + # zs <- sd$read_zarr(x) + # return (named) list of SCEs + # names(ts) <- ts <- names(zs$tables$data) + names(ts) <- ts <- list.dirs(file.path(x,"tables/"), + recursive = FALSE, + full.names = FALSE) + lapply(ts, \(z) { + zs <- sd$read_zarr(file.path(x, "tables", ts)) + se <- AnnData2SCE(zs) + nm <- "spatialdata_attrs" + md <- metadata(se)[[nm]] + int_metadata(se)[[nm]] <- md + metadata(se)[[nm]] <- NULL + se + }) + }) } - .readTable_anndataR <- function(x) { if (!requireNamespace('anndataR', quietly=TRUE)) { stop("To use this function, install the 'anndataR' package via\n", From af96e7f90c1940ea97659c79f26c300f721f89c7 Mon Sep 17 00:00:00 2001 From: Artur-man Date: Thu, 29 Jan 2026 16:31:16 +0100 Subject: [PATCH 2/7] fix indent --- R/read.R | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/R/read.R b/R/read.R index 45ab2a6..dce2ec0 100644 --- a/R/read.R +++ b/R/read.R @@ -128,29 +128,29 @@ readShape <- function(x, ...) { #' @importFrom SingleCellExperiment int_metadata #' @importFrom basilisk basiliskStart basiliskStop basiliskRun .readTables_basilisk <- function(x) { - proc <- basiliskStart(.env) - on.exit(basiliskStop(proc)) - basiliskRun(proc, x=x, \(x) { - # read in 'SpatialData' from .zarr store - # sd <- import("spatialdata") - sd <- import("anndata") - z <- import("zarr") - # zs <- sd$read_zarr(x) - # return (named) list of SCEs - # names(ts) <- ts <- names(zs$tables$data) - names(ts) <- ts <- list.dirs(file.path(x,"tables/"), - recursive = FALSE, - full.names = FALSE) - lapply(ts, \(z) { - zs <- sd$read_zarr(file.path(x, "tables", ts)) - se <- AnnData2SCE(zs) - nm <- "spatialdata_attrs" - md <- metadata(se)[[nm]] - int_metadata(se)[[nm]] <- md - metadata(se)[[nm]] <- NULL - se - }) - }) + proc <- basiliskStart(.env) + on.exit(basiliskStop(proc)) + basiliskRun(proc, x=x, \(x) { + # read in 'SpatialData' from .zarr store + # sd <- import("spatialdata") + sd <- import("anndata") + z <- import("zarr") + # zs <- sd$read_zarr(x) + # return (named) list of SCEs + # names(ts) <- ts <- names(zs$tables$data) + names(ts) <- ts <- list.dirs(file.path(x,"tables/"), + recursive = FALSE, + full.names = FALSE) + lapply(ts, \(z) { + zs <- sd$read_zarr(file.path(x, "tables", ts)) + se <- AnnData2SCE(zs) + nm <- "spatialdata_attrs" + md <- metadata(se)[[nm]] + int_metadata(se)[[nm]] <- md + metadata(se)[[nm]] <- NULL + se + }) + }) } .readTable_anndataR <- function(x) { if (!requireNamespace('anndataR', quietly=TRUE)) { From 2a2d892217257b81a990fb18209130281073f8d8 Mon Sep 17 00:00:00 2001 From: Artur-man Date: Thu, 29 Jan 2026 16:48:44 +0100 Subject: [PATCH 3/7] fix lapply bug in readBasilisk --- .Rbuildignore | 2 ++ .gitignore | 2 ++ R/read.R | 8 ++------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index 824fa78..c5b2efa 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -4,3 +4,5 @@ vignettes/*html vignettes/*cache vignettes/*files +^doc$ +^Meta$ diff --git a/.gitignore b/.gitignore index 7ac4af5..ad437a8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ inst/extdata/xenium1.zarr inst/extdata/visiumhd.zarr *.Rproj *.html +/doc/ +/Meta/ diff --git a/R/read.R b/R/read.R index dce2ec0..bead6e4 100644 --- a/R/read.R +++ b/R/read.R @@ -132,17 +132,13 @@ readShape <- function(x, ...) { on.exit(basiliskStop(proc)) basiliskRun(proc, x=x, \(x) { # read in 'SpatialData' from .zarr store - # sd <- import("spatialdata") sd <- import("anndata") - z <- import("zarr") - # zs <- sd$read_zarr(x) - # return (named) list of SCEs - # names(ts) <- ts <- names(zs$tables$data) + za <- import("zarr") names(ts) <- ts <- list.dirs(file.path(x,"tables/"), recursive = FALSE, full.names = FALSE) lapply(ts, \(z) { - zs <- sd$read_zarr(file.path(x, "tables", ts)) + zs <- sd$read_zarr(file.path(x, "tables", z)) se <- AnnData2SCE(zs) nm <- "spatialdata_attrs" md <- metadata(se)[[nm]] From fcea8955cf5244db1e03a8d8d0e726596da13573 Mon Sep 17 00:00:00 2001 From: Artur-man Date: Thu, 29 Jan 2026 16:51:01 +0100 Subject: [PATCH 4/7] fix comments --- R/read.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/R/read.R b/R/read.R index bead6e4..0ae40ec 100644 --- a/R/read.R +++ b/R/read.R @@ -131,9 +131,10 @@ readShape <- function(x, ...) { proc <- basiliskStart(.env) on.exit(basiliskStop(proc)) basiliskRun(proc, x=x, \(x) { - # read in 'SpatialData' from .zarr store + # read in 'AnnData' tables from .zarr store sd <- import("anndata") za <- import("zarr") + # return (named) list of SCEs names(ts) <- ts <- list.dirs(file.path(x,"tables/"), recursive = FALSE, full.names = FALSE) From 5faf495daccfa79dc09cb9031b98a65e56f79201 Mon Sep 17 00:00:00 2001 From: Artur-man Date: Thu, 29 Jan 2026 16:52:09 +0100 Subject: [PATCH 5/7] more redundant fixes --- .Rbuildignore | 4 +- .gitignore | 4 +- Meta/vignette.rds | Bin 0 -> 197 bytes doc/SpatialData.R | 70 ++++++++++++++++++++ doc/SpatialData.Rmd | 157 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 229 insertions(+), 6 deletions(-) create mode 100644 Meta/vignette.rds create mode 100644 doc/SpatialData.R create mode 100644 doc/SpatialData.Rmd diff --git a/.Rbuildignore b/.Rbuildignore index c5b2efa..448e34d 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -3,6 +3,4 @@ ^\.github$ vignettes/*html vignettes/*cache -vignettes/*files -^doc$ -^Meta$ +vignettes/*files \ No newline at end of file diff --git a/.gitignore b/.gitignore index ad437a8..af4f780 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,4 @@ inst/extdata/mibitof.zarr inst/extdata/xenium1.zarr inst/extdata/visiumhd.zarr *.Rproj -*.html -/doc/ -/Meta/ +*.html \ No newline at end of file diff --git a/Meta/vignette.rds b/Meta/vignette.rds new file mode 100644 index 0000000000000000000000000000000000000000..1e01f0673518e3f5073ec7d2250b80f92491e5de GIT binary patch literal 197 zcmV;$06PC4iwFP!000001B>8dU|?WkU||K4%s?iyFpyvaVgVp#WME<71k(J$1&Jk@ zi8(HbC5d`LxhZJU+(^=BQUb_2GfHxE(ByehOa{6^7%T}<1OzNhNQznW5_40F(M(`> zNi9gtO92W0!>*t4KbjT}@6^ij{34hh6g6y6H7stKIjJyvLo!R?9OeKQHz<=a2;B`B z=A*cuvnan@59SA6P`Eb$iT^-=?$P9&#A0-ha;1R6D6I&nALMQT2} Date: Thu, 29 Jan 2026 16:53:10 +0100 Subject: [PATCH 6/7] add back some lines --- .Rbuildignore | 2 +- .gitignore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index 448e34d..824fa78 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -3,4 +3,4 @@ ^\.github$ vignettes/*html vignettes/*cache -vignettes/*files \ No newline at end of file +vignettes/*files diff --git a/.gitignore b/.gitignore index af4f780..7ac4af5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ inst/extdata/mibitof.zarr inst/extdata/xenium1.zarr inst/extdata/visiumhd.zarr *.Rproj -*.html \ No newline at end of file +*.html From cdf4eb83507f822030956584880d6b7da8e9e41c Mon Sep 17 00:00:00 2001 From: Artur-man Date: Thu, 29 Jan 2026 16:54:29 +0100 Subject: [PATCH 7/7] remove doc and meta --- Meta/vignette.rds | Bin 197 -> 0 bytes doc/SpatialData.R | 70 -------------------- doc/SpatialData.Rmd | 157 -------------------------------------------- 3 files changed, 227 deletions(-) delete mode 100644 Meta/vignette.rds delete mode 100644 doc/SpatialData.R delete mode 100644 doc/SpatialData.Rmd diff --git a/Meta/vignette.rds b/Meta/vignette.rds deleted file mode 100644 index 1e01f0673518e3f5073ec7d2250b80f92491e5de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmV;$06PC4iwFP!000001B>8dU|?WkU||K4%s?iyFpyvaVgVp#WME<71k(J$1&Jk@ zi8(HbC5d`LxhZJU+(^=BQUb_2GfHxE(ByehOa{6^7%T}<1OzNhNQznW5_40F(M(`> zNi9gtO92W0!>*t4KbjT}@6^ij{34hh6g6y6H7stKIjJyvLo!R?9OeKQHz<=a2;B`B z=A*cuvnan@59SA6P`Eb$iT^-=?$P9&#A0-ha;1R6D6I&nALMQT2}