feat: more geoms

DESCRIPTION

@@ -40,6 +40,7 @@ Imports:
     fansi, 
     pillar, 
     rlang, 
+    scales, 
     cli, 
     purrr, 
     vctrs, 

NAMESPACE

@@ -12,6 +12,9 @@ export(as_tibble)
 export(coarsen)
 export(expand)
 export(geom_aggrcoverage)
+export(geom_coverage)
+export(scale_x_genome)
+export(scale_y_coverage)
 export(show)
 exportMethods(CoverageExperiment)
 exportMethods(aggregate)
@@ -45,6 +48,8 @@ importFrom(purrr,map_chr)
 importFrom(rlang,names2)
 importFrom(rtracklayer,BigWigFile)
 importFrom(rtracklayer,BigWigFileList)
+importFrom(scales,oob_squish)
+importFrom(scales,unit_format)
 importFrom(stats,qt)
 importFrom(stats,setNames)
 importFrom(tidyr,all_of)

R/geoms.R

@@ -1,22 +1,29 @@
-#' geom_aggrcoverage
+#' Plotting functions
 #'
 #' #' @description
 #' 
-#' `geom_aggrcoverage()`
+#' Plotting functions for tidyCoverage objects
 #' 
-#' @name geom_aggrcoverage
-#' @rdname geom_aggrcoverage
+#' @name ggplot-tidyCoverage
+#' @rdname ggplot-tidyCoverage
 #' 
-#' @param mapping mapping
-#' @param data data
-#' @param ... ...
-#' @param ci ci
-#' @param na.rm na.rm
-#' @param show.legend show.legend
-#' @param inherit.aes inherit.aes
+#' @param mapping Aesthetics for geom_*. By default, no color/fill aesthetic 
+#'     is specified, but they can be assigned to a variable with `mapping = aes(...)`. 
+#'     Note that `x` and `y` are automatically filled. 
+#' @param data Data frame passed to geom_*. Typically a `CoverageExperiment` object 
+#'     (expanded to a tibble) or a `AggregatedCoverage` object. 
+#' @param type Choose between "line" and "area" style for `geom_coverage()`.
+#' @param ci Should the confidence interval be plotted by `geom_aggrcoverage()`?
+#'     (default: TRUE)
+#' @param unit Rounding of x axis (any of c('b', 'kb', 'Mb')).
+#' @param grid Should the plot grid by displayed? (default: FALSE).
+#' @param ...,na.rm,show.legend,inherit.aes Argument passed to `ggplot` 
+#'     internal functions
 #' @return A `ggplot` object`
 #'
 #' @import ggplot2
+#' @importFrom scales oob_squish
+#' @importFrom scales unit_format
 #'
 #' @examples
 #' library(rtracklayer)
@@ -26,15 +33,42 @@
 #' TSSs_bed <- system.file("extdata", "TSSs.bed", package = "tidyCoverage")
 #' features <- list(
 #'     TSS_fwd = import(TSSs_bed) |> filter(strand == '+'), 
-#'     TSS_rev = import(TSSs_bed) |> filter(strand == '-')
+#'     TSS_rev = import(TSSs_bed) |> filter(strand == '-'), 
+#'     conv_sites = import(system.file("extdata", "conv_transcription_loci.bed", package = "tidyCoverage"))
 #' )
 #' tracks <- list(
 #'     RNA_fwd = system.file("extdata", "RNA.fwd.bw", package = "tidyCoverage"),
-#'     RNA_rev = system.file("extdata", "RNA.rev.bw", package = "tidyCoverage")
+#'     RNA_rev = system.file("extdata", "RNA.rev.bw", package = "tidyCoverage"), 
+#'     Scc1 = system.file("extdata", "Scc1.bw", package = "tidyCoverage")
 #' ) |> map(import, as = 'Rle')
-#' df <- CoverageExperiment(tracks, features, width = 5000, ignore.strand = FALSE) |> 
-#'  aggregate() |> 
-#'  as_tibble()
+#' ce <- CoverageExperiment(tracks, features, width = 5000, center = TRUE, scale = TRUE)
+#' ac <- aggregate(ce) 
+#' 
+#' #############################################################################
+#' ## 1. Plotting aggregated coverage
+#' #############################################################################
+#' 
+#' ac |> 
+#'     as_tibble() |> 
+#'     ggplot() + 
+#'     geom_aggrcoverage(aes(col = track)) + 
+#'     facet_grid(track ~ features) + 
+#'     geom_vline(xintercept = 0, color = 'black', linetype = 'dashed', linewidth = 0.5)
+#' 
+#' #############################################################################
+#' ## 2. Plotting track coverages over individual loci
+#' #############################################################################
+#' 
+#' ce2 <- CoverageExperiment(
+#'     tracks, 
+#'     GRangesList(list(locus1 = "II:400001-455000", locus2 = "IV:720001-775000")), 
+#'     window = 50
+#' )
+#' expand(ce2) |> 
+#'     mutate(coverage = ifelse(track != 'Scc1', scales::oob_squish(coverage, c(0, 50)), coverage)) |>
+#'     ggplot() + 
+#'     geom_coverage(aes(fill = track)) + 
+#'     facet_grid(track~features, scales = 'free')
 NULL 
 
 GeomAggrCoverage <- ggplot2::ggproto("GeomAggrCoverage", ggplot2::Geom,
@@ -66,30 +100,218 @@ GeomAggrCoverage <- ggplot2::ggproto("GeomAggrCoverage", ggplot2::Geom,
     draw_key = ggplot2::draw_key_smooth
 )
 
-#' @rdname geom_aggrcoverage
+GeomCoverage <- ggplot2::ggproto("GeomCoverage", ggplot2::Geom,
+    setup_params = function(data, params) {
+        params$type <- params$type
+        params
+    },
+    extra_params = c("na.rm"),
+    required_aes = c("x", "y"), 
+    default_aes = ggplot2::aes(
+        colour = "black", 
+        fill = "grey",
+        linewidth = 0.4, 
+        linetype = 1, 
+        alpha = 1
+    ),
+
+    draw_group = function(data, params, coord, type, ...) {
+
+        forArea <- transform(data, ymax = y, ymin = 0, colour = NA)
+
+        grid::gList(
+            if (type == 'line') ggplot2::GeomLine$draw_panel(data, params, coord, ...), 
+            if (type == 'area') ggplot2::GeomArea$draw_panel(forArea, params, coord, ...)
+        )
+
+    }, 
+
+    draw_key = function(data, params, type, ...) { 
+        if (params$type == 'line') { 
+            ggplot2::draw_key_path(data, params)
+        } 
+        else {
+            data <- transform(data, colour = NA)
+            ggplot2::draw_key_rect(data, params)
+        }
+    }
+)
+
+#' @rdname ggplot-tidyCoverage
 #' @export
 
 geom_aggrcoverage <- function(
     mapping = NULL, 
     data = NULL, 
     ..., 
+    unit = c('kb', 'Mb', 'b'), 
     ci = TRUE, 
+    grid = FALSE, 
     na.rm = FALSE, 
     show.legend = NA, 
     inherit.aes = TRUE
 ) {
     m <- ggplot2::aes(x = coord, y = mean, ymin = ci_low, ymax = ci_high, group = interaction(.sample, .feature))
     if (!is.null(mapping)) m <- utils::modifyList(m, mapping)
 
-    ggplot2::layer(
-        data = data, 
-        mapping = m,  
-        stat = "identity", 
-        geom = GeomAggrCoverage, 
-        position = "identity", 
-        show.legend = show.legend, 
-        inherit.aes = inherit.aes,
-        params = list(na.rm = na.rm, ci = ci, ...)
+    unit = match.arg(unit, c('kb', 'Mb', 'b'))
+
+    list(
+        ggplot2::layer(
+            data = data, 
+            mapping = m,  
+            stat = "identity", 
+            geom = GeomAggrCoverage, 
+            position = "identity", 
+            show.legend = show.legend, 
+            inherit.aes = inherit.aes,
+            params = list(na.rm = na.rm, ci = ci, ...)
+        ), 
+        theme_coverage2(grid = grid),
+        scale_x_genome(unit = unit)
+    )
+}
+
+#' @rdname ggplot-tidyCoverage
+#' @export
+
+geom_coverage <- function(
+    mapping = NULL, 
+    data = NULL, 
+    ..., 
+    type = c('area', 'line'), 
+    unit = c('kb', 'Mb', 'b'), 
+    grid = FALSE, 
+    na.rm = FALSE, 
+    show.legend = NA, 
+    inherit.aes = TRUE
+) {
+    m <- ggplot2::aes(x = coord, y = coverage, group = interaction(track, features), fill = track)
+    if (!is.null(mapping)) m <- utils::modifyList(m, mapping)
+
+    unit = match.arg(unit, c('kb', 'Mb', 'b'))
+    type <- match.arg(type, c('area', 'line'))
+
+    list(
+        ggplot2::layer(
+            data = data, 
+            mapping = m,  
+            stat = "identity", 
+            geom = GeomCoverage, 
+            position = "identity", 
+            show.legend = show.legend, 
+            inherit.aes = inherit.aes,
+            params = list(na.rm = na.rm, type = type, ...)
+        ), 
+        scale_x_genome(unit = unit),
+        scale_y_coverage(), 
+        theme_coverage(grid = grid), 
+        ggplot2::guides(y = ggplot2::guide_axis(cap = "both"))
     )
+
 }
 
+#' @rdname ggplot-tidyCoverage
+#' @export
+
+scale_y_coverage <- function() {
+    ggplot2::scale_y_continuous(
+        expand = ggplot2::expansion(mult = c(0, 0)), 
+        n.breaks = 3
+    )
+}
+
+#' @rdname ggplot-tidyCoverage
+#' @export
+
+scale_x_genome <- function(unit = c('kb', 'Mb', 'b')) {
+    unit = match.arg(unit, c('kb', 'Mb', 'b'))
+    scale = dplyr::case_when(
+        unit == 'b' ~ 1, 
+        unit == 'kb' ~ 1e-3, 
+        unit == 'Mb' ~ 1e-6
+    )
+    ggplot2::scale_x_continuous(
+        expand = c(0, 0), 
+        labels = scales::unit_format(
+            unit = unit, scale = scale, 
+            sep = "", 
+            big.mark = ""
+        )
+    )
+}
+
+.theme_coverage <- function(
+    grid = TRUE, 
+    base_size = 11, 
+    base_family = "", 
+    base_line_size = base_size/22, 
+    base_rect_size = base_size/22
+) {
+    th <- ggplot2::theme_bw(
+        base_size = base_size, 
+        base_family = base_family, 
+        base_line_size = base_line_size, 
+        base_rect_size = base_rect_size
+    ) 
+    if (!grid) th <- th %+replace% ggplot2::theme(
+        panel.grid = ggplot2::element_blank(), 
+        panel.grid.major = ggplot2::element_blank(), 
+        panel.grid.minor = ggplot2::element_blank()
+    )
+    th <- th %+replace% 
+        ggplot2::theme(
+            legend.position = 'top', 
+            legend.background = ggplot2::element_blank(), 
+            legend.key = ggplot2::element_blank(), 
+            panel.spacing = unit(8, "pt"), 
+            panel.background = ggplot2::element_blank(), 
+            strip.background = ggplot2::element_blank(), 
+            plot.background = ggplot2::element_blank(), 
+            complete = TRUE
+        )
+    th
+}
+
+theme_coverage <- function(
+        grid = TRUE, 
+        base_size = 11, 
+        base_family = "", 
+        base_line_size = base_size/22, 
+        base_rect_size = base_size/22
+) {
+    th <- .theme_coverage(
+        grid = grid, 
+        base_size = base_size, 
+        base_family = base_family, 
+        base_line_size = base_line_size, 
+        base_rect_size = base_rect_size
+    ) %+replace% 
+        ggplot2::theme(
+            #panel.border = ggplot2::element_blank(), 
+            axis.line = element_line(color = 'black'), 
+            complete = TRUE
+        )
+    th
+}
+
+theme_coverage2 <- function(
+    grid = TRUE, 
+    base_size = 11, 
+    base_family = "", 
+    base_line_size = base_size/22, 
+    base_rect_size = base_size/22
+) {
+    th <- .theme_coverage(
+        grid = grid, 
+        base_size = base_size, 
+        base_family = base_family, 
+        base_line_size = base_line_size, 
+        base_rect_size = base_rect_size
+    ) %+replace% 
+        ggplot2::theme(
+            axis.ticks = ggplot2::element_blank(), 
+            complete = TRUE
+        )
+    th
+}

R/globals.R

@@ -4,6 +4,7 @@ utils::globalVariables(c(
     "ci_high", 
     "coord", 
     "feature", 
+    "features", 
     ".feature", 
     ".sample", 
     "track"  

README.md

@@ -42,7 +42,7 @@ tracks <- list(
 ## Extract coverage for each track over each set of features
 
 ```r
-CE <- CoverageExperiment(tracks, features, width = 1000, ignore.strand = FALSE) 
+CE <- CoverageExperiment(tracks, features, width = 5000, ignore.strand = FALSE) 
 ```
 
 ## Plot tracks coverage aggregated over genomic features
@@ -55,9 +55,7 @@ CE |>
     ggplot() + 
     geom_aggrcoverage(aes(col = track)) + 
     facet_grid(track ~ ., scales = "free") + 
-    labs(x = 'Distance from TSS', y = 'Signal coverage') + 
-    theme_bw() + 
-    theme(legend.position = 'top')
+    labs(x = 'Distance from TSS', y = 'Signal coverage')
 ```
 
 ![](man/figures/aggr-cov.png)
@@ -68,11 +66,8 @@ CE |>
 CoverageExperiment(tracks, GRanges("II:450001-455000")) |> 
     expand() |> 
     ggplot() + 
-        geom_aggrcoverage(aes(col = track)) + 
-        facet_grid(track~., scales = 'free') + 
-        scale_x_continuous(expand = c(0, 0)) + 
-        theme_bw() + 
-        theme(legend.position = "none", aspect.ratio = 0.1)
+    geom_coverage(aes(fill = track)) + 
+    facet_grid(track~., scales = 'free')
 ```
 
 ![](man/figures/cov.png)