Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Give midpoint argument to gradient scales #5824

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@

# ggplot2 (development version)

* `scale_{fill/colour}_gradientn()` and `scale_{fill/colour}_stepsn()` gain
a `midpoint` argument to make it easier to build divergent scales
(@teunbrand, #3738).
* When facets coerce the faceting variables to factors, the 'ordered' class
is dropped (@teunbrand, #5666).
* `update_geom_defaults()` and `update_stat_defaults()` have a reset mechanism
Expand Down
20 changes: 14 additions & 6 deletions R/scale-gradient.R
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,9 @@ scale_fill_gradient <- function(name = waiver(), ..., low = "#132B43",

#' @inheritParams scales::pal_div_gradient
#' @inheritParams continuous_scale
#' @param midpoint The midpoint (in data value) of the diverging scale.
#' Defaults to 0.
#' @param midpoint The midpoint (in data value) for diverging scales.
#' Can be set to `NULL` to skip centering the palette. The `midpoint` argument
#' is incompatible with setting a `rescaler` argument.
#' @rdname scale_gradient
#' @export
scale_colour_gradient2 <- function(name = waiver(), ..., low = muted("red"),
Expand Down Expand Up @@ -137,6 +138,9 @@ scale_fill_gradient2 <- function(name = waiver(), ..., low = muted("red"),

mid_rescaler <- function(mid, transform = "identity",
arg = caller_arg(mid), call = caller_env()) {
if (is.null(mid)) {
return(rescale)
}
transform <- as.trans(transform)
trans_mid <- transform$transform(mid)
check_transformation(
Expand All @@ -155,26 +159,30 @@ mid_rescaler <- function(mid, transform = "identity",
scale_colour_gradientn <- function(name = waiver(), ..., colours, values = NULL,
space = "Lab", na.value = "grey50",
guide = "colourbar", aesthetics = "colour",
colors) {
midpoint = NULL, transform = "identity",
rescaler = NULL, colors) {
colours <- if (missing(colours)) colors else colours

continuous_scale(
aesthetics, name = name,
palette = pal_gradient_n(colours, values, space),
na.value = na.value, guide = guide, ...
rescaler = rescaler %||% mid_rescaler(midpoint, transform),
na.value = na.value, guide = guide, transform = transform, ...
)
}
#' @rdname scale_gradient
#' @export
scale_fill_gradientn <- function(name = waiver(), ..., colours, values = NULL,
space = "Lab", na.value = "grey50",
guide = "colourbar", aesthetics = "fill",
colors) {
midpoint = NULL, transform = "identity",
rescaler = NULL, colors) {
colours <- if (missing(colours)) colors else colours

continuous_scale(
aesthetics, name = name,
palette = pal_gradient_n(colours, values, space),
na.value = na.value, guide = guide, ...
rescaler = rescaler %||% mid_rescaler(midpoint, transform),
na.value = na.value, guide = guide, transform = transform, ...
)
}
13 changes: 9 additions & 4 deletions R/scale-steps.R
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,14 @@ scale_colour_steps2 <- function(name = waiver(), ..., low = muted("red"),
scale_colour_stepsn <- function(name = waiver(), ..., colours, values = NULL,
space = "Lab", na.value = "grey50",
guide = "coloursteps", aesthetics = "colour",
colors) {
midpoint = NULL, transform = "identity",
rescaler = NULL, colors) {
colours <- if (missing(colours)) colors else colours
binned_scale(
aesthetics, name = name,
palette = pal_gradient_n(colours, values, space),
na.value = na.value, guide = guide,
na.value = na.value, guide = guide, transform = transform,
rescaler = rescaler %||% mid_rescaler(midpoint, transform),
...
)
}
Expand Down Expand Up @@ -119,11 +121,14 @@ scale_fill_steps2 <- function(name = waiver(), ..., low = muted("red"),
scale_fill_stepsn <- function(name = waiver(), ..., colours, values = NULL,
space = "Lab", na.value = "grey50",
guide = "coloursteps", aesthetics = "fill",
colors) {
transform = "identity", midpoint = NULL,
rescaler = NULL, colors) {
colours <- if (missing(colours)) colors else colours
binned_scale(
aesthetics, name = name,
palette = pal_gradient_n(colours, values, space),
na.value = na.value, guide = guide, ...
na.value = na.value, guide = guide, transform = transform,
rescaler = rescaler %||% mid_rescaler(midpoint, transform),
...
)
}
24 changes: 16 additions & 8 deletions man/scale_gradient.Rd

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

18 changes: 16 additions & 2 deletions man/scale_steps.Rd

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