Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
^\.github$
^.*\.Rproj$
^\.Rproj\.user$
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.Rproj.user
.Rhistory
.RData
.Ruserdata
*.Rproj
3 changes: 2 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ Imports:
rlang,
sf,
S4Vectors,
SingleCellExperiment
SingleCellExperiment,
Rarr
Suggests:
BiocStyle,
ggnewscale,
Expand Down
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ exportMethods(scale)
exportMethods(translation)
import(SpatialData)
importFrom(DelayedArray,realize)
importFrom(Rarr,zarr_overview)
importFrom(S4Vectors,metadata)
importFrom(SingleCellExperiment,int_colData)
importFrom(SingleCellExperiment,int_metadata)
importFrom(SpatialData,getZarrArrayPath)
importFrom(dplyr,mutate)
importFrom(dplyr,select)
importFrom(ggforce,geom_circle)
Expand Down
122 changes: 105 additions & 17 deletions R/plotImage.R
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#' @param k index of the scale of an image; by default (NULL), will auto-select
#' scale in order to minimize memory-usage and blurring for a target size of
#' 800 x 800px; use Inf to plot the lowest resolution available.
#' @param ch the image channels to be used for plotting (default: first channel)
#' @param c plotting aesthetics; color
#'
#' @return ggplot
#'
Expand All @@ -31,6 +33,89 @@ NULL
#' @export
plotSpatialData <- \() ggplot() + scale_y_reverse() + .theme

# merge/manage image channels
# if no colors and channels defined, return the first channel
#' @noRd
.manage_channels <- \(a, ch, c=NULL){
if(length(ch) > length(.DEFAULT_COLORS) && is.null(c))
stop("You can only choose at most seven default colors!")
if(!is.null(c) || (is.null(c) && length(ch) > 1)) {
if(is.null(c))
c <- .DEFAULT_COLORS[1:length(ch)]
c <- col2rgb(c)/255
a_new <- array(0, dim = c(3,dim(a)[-1]))
for(i in 1:dim(a)[1]){
a_new[1,,] <- a_new[1,,,drop = FALSE] + a[i,,,drop = FALSE]*c[1,i]
a_new[2,,] <- a_new[2,,,drop = FALSE] + a[i,,,drop = FALSE]*c[2,i]
a_new[3,,] <- a_new[3,,,drop = FALSE] + a[i,,,drop = FALSE]*c[3,i]
}
a <- pmin(a_new,1)
} else {
a <- a[rep(1,3),,]
}
a
}

# check if an image is rgb or not
#' @importFrom SpatialData getZarrArrayPath
#' @importFrom Rarr zarr_overview
#' @noRd
.get_image_dtype <- \(a){
zarray_spec <- Rarr::zarr_overview(getZarrArrayPath(a),
as_data_frame = TRUE)
if("data_type" %in% names(zarray_spec))
return(zarray_spec$data_type)
return(NULL)
}

# normalize the image data given its data type
#' @noRd
.normalize_image_array <- \(a, dt){
if(dt %in% names(.DTYPE_MAX_VALUES)) a <- a/.DTYPE_MAX_VALUES[[dt]]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can u clarify - are there missing curly brackets here? looks like the else will be evaluated in any case, which will give an error?

else if(max(a) > 1){
for(i in 1:dim(a)[1])
a[i,,] <- a[i,,]/max(a[i,,])
}
a
}

# check if an image is rgb or not
# NOTE: some rgb channels are named as 0:2
#' @noRd
.is.rgb <- \(x){
if(!is.null(md <- x@meta))
labels <- md[[2]]$channels$label
if(length(labels) == 3)
if(all(labels %in% c("r", "g", "b")) || all(labels %in% seq(0,2))) {
return(TRUE)
}
return(FALSE)
}

channelNames <- function(x){
if(!is.null(md <- attr(x, "meta")))
return(md[[2]]$channels$label)
return(NULL)
}

# check if channels are indices or channel names
#' @noRd
.ch_ind <- \(x, ch){
if(is.null(ch))
return(1)
lbs <- channelNames(x)
if(all(ch %in% lbs)){
return(match(ch,lbs))
} else if(!any(ch %in% lbs)){
warning("Some channels are not found, picking first one!")
return(1)
} else {
warning("Channels are not found, picking first one!")
return(1)
}
return(NULL)
}

.guess_scale <- \(x, w, h) {
n <- length(dim(x))
i <- ifelse(n == 3, -1, TRUE)
Expand All @@ -47,14 +132,17 @@ plotSpatialData <- \() ggplot() + scale_y_reverse() + .theme
#' @importFrom methods as
#' @importFrom grDevices rgb
#' @importFrom DelayedArray realize
.df_i <- \(x, k=NULL) {
a <- .get_plot_data(x, k)
a <- if (dim(a)[1] == 1) a[rep(1,3),,] else a
a <- realize(as(a, "DelayedArray"))
img <- rgb(
maxColorValue=max(a),
c(a[1,,]), c(a[2,,]), c(a[3,,]))
array(img, dim(a)[-1])
.df_i <- \(x, k=NULL, ch=NULL, c=NULL) {
a <- .get_plot_data(x, k)
ch_i <- .ch_ind(x, ch)
if(!.is.rgb(x))
a <- a[ch_i,,,drop = FALSE]
dt <- .get_image_dtype(a)
a <- realize(as(a, "DelayedArray"))
a <- .normalize_image_array(a, dt)
if(!.is.rgb(x))
a <- .manage_channels(a, ch_i, c)
apply(a, c(2, 3), \(.) do.call(rgb, as.list(.)))
}

.get_wh <- \(x, i, j) {
Expand All @@ -75,13 +163,13 @@ plotSpatialData <- \() ggplot() + scale_y_reverse() + .theme

#' @rdname plotImage
#' @export
setMethod("plotImage", "SpatialData", \(x, i=1, j=1, k=NULL) {
if (is.numeric(i))
i <- imageNames(x)[i]
y <- image(x, i)
if (is.numeric(j))
j <- CTname(y)[j]
df <- .df_i(y, k)
wh <- .get_wh(x, i, j)
.gg_i(df, wh$w, wh$h)
setMethod("plotImage", "SpatialData", \(x, i=1, j=1, k=NULL, ch=NULL, c=NULL) {
if (is.numeric(i))
i <- imageNames(x)[i]
y <- image(x, i)
if (is.numeric(j))
j <- CTname(y)[j]
df <- .df_i(y, k, ch, c)
wh <- .get_wh(x, i, j)
.gg_i(df, wh$w, wh$h)
})
13 changes: 12 additions & 1 deletion R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,15 @@
plot.title=element_text(hjust=0.5),
axis.text=element_text(color="grey"),
axis.ticks=element_line(color="grey"))
)
)

# default colors (from ImageJ/Fiji)
.DEFAULT_COLORS <- c("red", "green", "blue", "gray", "cyan", "magenta", "yellow")

# image data type factors (max values)
# TODO: add more cases from other data types
# https://doc.embedded-wizard.de/uint-type
.DTYPE_MAX_VALUES <- list("uint8" = 255,
"uint16" = 65535,
"uint32" = 4294967295,
"uint64" = 2^64 - 1)
6 changes: 5 additions & 1 deletion man/plotImage.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions tests/testthat/test-plotImage.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
require(SpatialData, quietly=TRUE)
x <- file.path("extdata", "blobs.zarr")
x <- system.file(x, package="SpatialData")
x <- readSpatialData(x, tables=FALSE)

test_that("get/check channel names", {

# get channel names
expect_equal(channelNames(image(x,1)), c(0,1,2))

# get indices of channels
expect_equal(.ch_ind(image(x,1), ch = c(2,0,1)), c(3,1,2))
expect_warning(expect_equal(.ch_ind(image(x,1), ch = 45), 1)) # return first if no matching channel

# .is.rgb
expect_true(.is.rgb(image(x,1)))
})

# TODO: any tests for image array normalization ?
test_that(".normalize_image_array", {
skip()
})
43 changes: 43 additions & 0 deletions vignettes/SpatialData.plot.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,49 @@ wrap_plots(nrow=1, lapply(seq(3), \(.)
plot_layout(guides="collect")
```

## CyCIF (MCMICRO)

Small lung adenocarcinoma, 250 MB; 1 image, 2 labels, 2 tables.

```{r mcmicro-read}
dir.create(td <- tempfile())
pa <- unzip_spd_demo(
zipname="mcmicro_io.zip",
dest=td, source="biocOSN")
(x <- readSpatialData(pa, anndataR=FALSE))
```

Getting channel names for the image

```{r mcmicro-channels}
# TODO: add this to SpatialData as an ImageArray method
# channelNames(image(x,1))
```

Plotting with multiple image channels.

```{r mcmicro-plot}
plotSpatialData() + plotImage(x, 1, ch = c("DNA_6", "ELANE", "CD57"), c = c("blue", "cyan", "yellow"))
```

## IMC (Steinbock)

4 different cancers (SCCHN, BCC, NSCLC, CRC), 820 MB; 14 images, 14 labels, 1 table.

```{r steinbock-read}
dir.create(td <- tempfile())
pa <- unzip_spd_demo(
zipname="steinbock_io.zip",
dest=td, source="biocOSN")
(x <- readSpatialData(pa, anndataR=FALSE))
```

Plotting with multiple image channels.

```{r steinbock-plot}
plotSpatialData() + plotImage(x, 1, ch = c(0,1,2), c = c("blue", "cyan", "yellow"))
```

# Masking

Back to blobs...
Expand Down
Loading