Skip to content

Commit

Permalink
Colourbar transparency (#5550)
Browse files Browse the repository at this point in the history
* Add `alpha` to set colourbar/steps transparency

* incorporate `alpha` in tests

* document `alpha`

* add news bullet

* resolve merge conflict

* add alpha to coloursteps (constructors were separated)
  • Loading branch information
teunbrand authored Dec 14, 2023
1 parent abc70e2 commit 9d1f81c
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 15 deletions.
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# ggplot2 (development version)

* `guide_colourbar()` and `guide_coloursteps()` gain an `alpha` argument to
set the transparency of the bar (#5085).

* `stat_count()` treats `x` as unique in the same manner `unique()` does
(#4609).

Expand Down
11 changes: 9 additions & 2 deletions R/guide-colorbar.R
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ NULL
#' raster object. If `FALSE` then the colourbar is rendered as a set of
#' rectangles. Note that not all graphics devices are capable of rendering
#' raster image.
#' @param alpha A numeric between 0 and 1 setting the colour transparency of
#' the bar. Use `NA` to preserve the alpha encoded in the colour itself
#' (default).
#' @param draw.ulim A logical specifying if the upper limit tick marks should
#' be visible.
#' @param draw.llim A logical specifying if the lower limit tick marks should
Expand Down Expand Up @@ -107,6 +110,7 @@ guide_colourbar <- function(
theme = NULL,
nbin = 300,
raster = TRUE,
alpha = NA,
draw.ulim = TRUE,
draw.llim = TRUE,
position = NULL,
Expand All @@ -121,12 +125,14 @@ guide_colourbar <- function(
if (!is.null(position)) {
position <- arg_match0(position, c(.trbl, "inside"))
}
check_number_decimal(alpha, min = 0, max = 1, allow_na = TRUE)

new_guide(
title = title,
theme = theme,
nbin = nbin,
raster = raster,
alpha = alpha,
draw_lim = c(isTRUE(draw.llim), isTRUE(draw.ulim)),
position = position,
direction = direction,
Expand Down Expand Up @@ -162,6 +168,7 @@ GuideColourbar <- ggproto(
# bar
nbin = 300,
raster = TRUE,
alpha = NA,

draw_lim = c(TRUE, TRUE),

Expand Down Expand Up @@ -204,15 +211,15 @@ GuideColourbar <- ggproto(
Guide$extract_key(scale, aesthetic, ...)
},

extract_decor = function(scale, aesthetic, nbin = 300, reverse = FALSE, ...) {
extract_decor = function(scale, aesthetic, nbin = 300, reverse = FALSE, alpha = NA, ...) {

limits <- scale$get_limits()
bar <- seq(limits[1], limits[2], length.out = nbin)
if (length(bar) == 0) {
bar <- unique0(limits)
}
bar <- data_frame0(
colour = scale$map(bar),
colour = alpha(scale$map(bar), alpha),
value = bar,
.size = length(bar)
)
Expand Down
9 changes: 6 additions & 3 deletions R/guide-colorsteps.R
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
guide_coloursteps <- function(
title = waiver(),
theme = NULL,
alpha = NA,
even.steps = TRUE,
show.limits = NULL,
direction = NULL,
Expand All @@ -56,10 +57,12 @@ guide_coloursteps <- function(
) {

theme <- deprecated_guide_args(theme, ...)
check_number_decimal(alpha, min = 0, max = 1, allow_na = TRUE)

new_guide(
title = title,
theme = theme,
alpha = alpha,
even.steps = even.steps,
show.limits = show.limits,
direction = direction,
Expand Down Expand Up @@ -120,11 +123,11 @@ GuideColoursteps <- ggproto(

extract_decor = function(scale, aesthetic, key,
reverse = FALSE, even.steps = TRUE,
nbin = 100, ...) {
nbin = 100, alpha = NA,...) {
if (even.steps) {
bin_at <- attr(key, "bin_at", TRUE)
bar <- data_frame0(
colour = scale$map(bin_at),
colour = alpha(scale$map(bin_at), alpha),
min = seq_along(bin_at) - 1,
max = seq_along(bin_at),
.size = length(bin_at)
Expand All @@ -134,7 +137,7 @@ GuideColoursteps <- ggproto(
n <- length(breaks)
bin_at <- (breaks[-1] + breaks[-n]) / 2
bar <- data_frame0(
colour = scale$map(bin_at),
colour = alpha(scale$map(bin_at), alpha),
min = head(breaks, -1),
max = tail(breaks, -1),
.size = length(bin_at)
Expand Down
6 changes: 6 additions & 0 deletions man/guide_colourbar.Rd

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

6 changes: 6 additions & 0 deletions man/guide_coloursteps.Rd

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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions tests/testthat/test-guides.R
Original file line number Diff line number Diff line change
Expand Up @@ -900,15 +900,15 @@ test_that("colorbar can be styled", {
p + scale_color_gradient(low = 'white', high = 'red')
)

expect_doppelganger("white-to-red colorbar, long thick black ticks, green frame",
expect_doppelganger("white-to-red semitransparent colorbar, long thick black ticks, green frame",
p + scale_color_gradient(
low = 'white', high = 'red',
guide = guide_colorbar(
theme = theme(
legend.frame = element_rect(colour = "green", linewidth = 1.5 / .pt),
legend.ticks = element_line("black", linewidth = 2.5 / .pt),
legend.ticks.length = unit(0.4, "npc")
)
), alpha = 0.75
)
)
)
Expand Down Expand Up @@ -977,8 +977,9 @@ test_that("coloursteps guide can be styled correctly", {
expect_doppelganger("guide_coloursteps can have bins relative to binsize",
p + guides(colour = guide_coloursteps(even.steps = FALSE))
)
expect_doppelganger("guide_bins can show ticks",
expect_doppelganger("guide_bins can show ticks and transparancy",
p + guides(colour = guide_coloursteps(
alpha = 0.75,
theme = theme(legend.ticks = element_line(linewidth = 0.5 / .pt, colour = "white"))
))
)
Expand Down

0 comments on commit 9d1f81c

Please sign in to comment.