Skip to content

Commit 0d6eec2

Browse files
authored
Merge pull request #120 from Artur-man/multiscale_subset
fixing multiscale/check bugs
2 parents 18a25d6 + 30ead51 commit 0d6eec2

10 files changed

Lines changed: 13 additions & 14 deletions

File tree

‎DESCRIPTION‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ Suggests:
6565
testthat,
6666
DT
6767
Enhances:
68-
patchwork,
6968
anndataR,
7069
pizzarr
7170
Remotes:

‎R/ImageArray.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#' @examples
1717
#' library(SpatialData.data)
1818
#' dir.create(td <- tempfile())
19-
#' pa <- unzip_merfish_demo(td)
19+
#' pa <- SpatialData.data:::.unzip_merfish_demo(td)
2020
#' pa <- file.path(pa, "images", "rasterized")
2121
#' (ia <- readImage(pa))
2222
#'
@@ -128,8 +128,8 @@ setMethod("[", "ImageArray", \(x, i, j, k, ..., drop=FALSE) {
128128
if (missing(k)) k <- TRUE else if (isFALSE(k)) k <- 0 else .check_jk(k, "k")
129129
ijk <- list(i, j, k)
130130
n <- length(data(x, NULL))
131+
d <- dim(data(x))
131132
x@data <- lapply(seq_len(n), \(.) {
132-
d <- dim(data(x, .))
133133
j <- if (isTRUE(j)) seq_len(d[2]) else j
134134
k <- if (isTRUE(k)) seq_len(d[3]) else k
135135
jk <- lapply(list(j, k), \(jk) {

‎R/PointFrame.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#' @examples
3434
#' library(SpatialData.data)
3535
#' dir.create(tf <- tempfile())
36-
#' base <- unzip_merfish_demo(tf)
36+
#' base <- SpatialData.data:::.unzip_merfish_demo(tf)
3737
#' x <- file.path(base, "points", "single_molecule")
3838
#' (p <- readPoint(x))
3939
#'

‎R/ShapeFrame.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#' @examples
1818
#' library(SpatialData.data)
1919
#' dir.create(tf <- tempfile())
20-
#' base <- unzip_merfish_demo(tf)
20+
#' base <- SpatialData.data:::.unzip_merfish_demo(tf)
2121
#' y <- file.path(base, "shapes", "cells")
2222
#' (s <- readShape(y))
2323
#' plot(sf::st_as_sf(data(s)), cex=0.2)

‎R/read.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ allp = c("session_info==1.0.0", "spatialdata==0.3.0", "spatialdata_io==0.1.7",
6363
#' @examples
6464
#' library(SpatialData.data)
6565
#' dir.create(tf <- tempfile())
66-
#' base <- unzip_merfish_demo(tf)
66+
#' base <- SpatialData.data:::.unzip_merfish_demo(tf)
6767
#' (x <- readSpatialData(base))
6868
NULL
6969

‎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/PointFrame.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/ShapeFrame.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.

‎man/readSpatialData.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.

0 commit comments

Comments
 (0)