Skip to content

theta/r guides get theta/r theme elements #5680

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Feb 13, 2024
Merged

theta/r guides get theta/r theme elements #5680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
62557b0
swap theme suffix depending on `theta`
teunbrand Feb 6, 2024
6b9a826
pass theme properly in `guide_axis_theta()`
teunbrand Feb 8, 2024
b2e53f2
add `theta` and `r` theme elements
teunbrand Feb 8, 2024
d10680a
axis.text.r has symmetrical margins
teunbrand Feb 8, 2024
a144bd4
use new suffixes
teunbrand Feb 8, 2024
167f2f0
update tests
teunbrand Feb 8, 2024
4a952c5
update docs
teunbrand Feb 8, 2024
804c7b6
resolve merge conflict
teunbrand Feb 13, 2024
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
6 changes: 6 additions & 0 deletions R/coord-radial.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@ CoordRadial <- ggproto("CoordRadial", Coord,
gdefs[[r]] <- guides[[r]]$get_layer_key(gdefs[[r]], layers)
}

# Set theme suffixes
gdefs$theta$theme_suffix <- "theta"
gdefs$theta.sec$theme_suffix <- "theta"
gdefs$r$theme_suffix <- "r"
gdefs$r.sec$theme_suffix <- "r"

panel_params$guides$update_params(gdefs)
panel_params
},
Expand Down
6 changes: 3 additions & 3 deletions R/guide-axis-theta.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ guide_axis_theta <- function(title = waiver(), theme = NULL, angle = waiver(),
angle = angle,
cap = cap,
minor.ticks = minor.ticks,
theme = theme,

# parameter
available_aes = c("x", "y", "theta"),
Expand Down Expand Up @@ -85,8 +86,6 @@ GuideAxisTheta <- ggproto(
key <- params$key
n <- nrow(key)

params$theme_aes <- coord$theta %||% params$aesthetic

if (!("theta" %in% names(key))) {
# We likely have a linear coord, so we match the text angles to
# standard axes to be visually similar.
Expand Down Expand Up @@ -129,12 +128,13 @@ GuideAxisTheta <- ggproto(
},

setup_elements = function(params, elements, theme) {
theme <- add_theme(theme, params$theme)

axis_elem <- c("line", "text", "ticks", "minor", "major_length", "minor_length")
is_char <- vapply(elements[axis_elem], is.character, logical(1))
axis_elem <- axis_elem[is_char]

aes <- switch(
aes <- params$theme_suffix %||% switch(
params$position,
theta = "x.bottom",
theta.sec = "x.top",
Expand Down
3 changes: 2 additions & 1 deletion R/guide-axis.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ GuideAxis <- ggproto(

setup_elements = function(params, elements, theme) {
is_char <- vapply(elements, is.character, logical(1))
suffix <- paste(params$aes, params$position, sep = ".")
suffix <- params$theme_suffix %||%
paste(params$aes, params$position, sep = ".")
elements[is_char] <- vapply(
elements[is_char],
function(x) paste(x, suffix, sep = "."),
Expand Down
2 changes: 2 additions & 0 deletions R/theme-defaults.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ theme_grey <- function(base_size = 11, base_family = "",
axis.text.x.top = element_text(margin = margin(b = 0.8 * half_line / 2), vjust = 0),
axis.text.y = element_text(margin = margin(r = 0.8 * half_line / 2), hjust = 1),
axis.text.y.right = element_text(margin = margin(l = 0.8 * half_line / 2), hjust = 0),
axis.text.r = element_text(margin = margin(l = 0.8 * half_line / 2, r = 0.8 * half_line / 2),
hjust = 0.5),
axis.ticks = element_line(colour = "grey20"),
axis.ticks.length = unit(half_line / 2, "pt"),
axis.ticks.length.x = NULL,
Expand Down
16 changes: 16 additions & 0 deletions R/theme-elements.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,13 +441,17 @@ el_def <- function(class = NULL, inherit = NULL, description = NULL) {
axis.line.y = el_def("element_line", "axis.line"),
axis.line.y.left = el_def("element_line", "axis.line.y"),
axis.line.y.right = el_def("element_line", "axis.line.y"),
axis.line.theta = el_def("element_line", "axis.line.x"),
axis.line.r = el_def("element_line", "axis.line.y"),

axis.text.x = el_def("element_text", "axis.text"),
axis.text.x.top = el_def("element_text", "axis.text.x"),
axis.text.x.bottom = el_def("element_text", "axis.text.x"),
axis.text.y = el_def("element_text", "axis.text"),
axis.text.y.left = el_def("element_text", "axis.text.y"),
axis.text.y.right = el_def("element_text", "axis.text.y"),
axis.text.theta = el_def("element_text", "axis.text.x"),
axis.text.r = el_def("element_text", "axis.text.y"),

axis.ticks.length = el_def("unit"),
axis.ticks.length.x = el_def(c("unit", "rel"), "axis.ticks.length"),
Expand All @@ -456,13 +460,17 @@ el_def <- function(class = NULL, inherit = NULL, description = NULL) {
axis.ticks.length.y = el_def(c("unit", "rel"), "axis.ticks.length"),
axis.ticks.length.y.left = el_def(c("unit", "rel"), "axis.ticks.length.y"),
axis.ticks.length.y.right = el_def(c("unit", "rel"), "axis.ticks.length.y"),
axis.ticks.length.theta = el_def(c("unit", "rel"), "axis.ticks.length.x"),
axis.ticks.length.r = el_def(c("unit", "rel"), "axis.ticks.length.y"),

axis.ticks.x = el_def("element_line", "axis.ticks"),
axis.ticks.x.top = el_def("element_line", "axis.ticks.x"),
axis.ticks.x.bottom = el_def("element_line", "axis.ticks.x"),
axis.ticks.y = el_def("element_line", "axis.ticks"),
axis.ticks.y.left = el_def("element_line", "axis.ticks.y"),
axis.ticks.y.right = el_def("element_line", "axis.ticks.y"),
axis.ticks.theta = el_def("element_line", "axis.ticks.x"),
axis.ticks.r = el_def("element_line", "axis.ticks.y"),

axis.title.x = el_def("element_text", "axis.title"),
axis.title.x.top = el_def("element_text", "axis.title.x"),
Expand All @@ -475,6 +483,8 @@ el_def <- function(class = NULL, inherit = NULL, description = NULL) {
axis.minor.ticks.x.bottom = el_def("element_line", "axis.ticks.x.bottom"),
axis.minor.ticks.y.left = el_def("element_line", "axis.ticks.y.left"),
axis.minor.ticks.y.right = el_def("element_line", "axis.ticks.y.right"),
axis.minor.ticks.theta = el_def("element_line", "axis.ticks.theta"),
axis.minor.ticks.r = el_def("element_line", "axis.ticks.r"),

axis.minor.ticks.length = el_def(c("unit", "rel")),
axis.minor.ticks.length.x = el_def(c("unit", "rel"), "axis.minor.ticks.length"),
Expand All @@ -491,6 +501,12 @@ el_def <- function(class = NULL, inherit = NULL, description = NULL) {
axis.minor.ticks.length.y.right = el_def(
c("unit", "rel"), c("axis.minor.ticks.length.y", "axis.ticks.length.y.right")
),
axis.minor.ticks.length.theta = el_def(
c("unit", "rel"), c("axis.minor.ticks.length.x", "axis.ticks.length.theta"),
),
axis.minor.ticks.length.r = el_def(
c("unit", "rel"), c("axis.minor.ticks.length.y", "axis.ticks.length.r")
),

legend.background = el_def("element_rect", "rect"),
legend.margin = el_def("margin"),
Expand Down
24 changes: 18 additions & 6 deletions R/theme.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,28 @@
#' `axis.title.y.left`, `axis.title.y.right`). `axis.title.*.*` inherits from
#' `axis.title.*` which inherits from `axis.title`, which in turn inherits
#' from `text`
#' @param axis.text,axis.text.x,axis.text.y,axis.text.x.top,axis.text.x.bottom,axis.text.y.left,axis.text.y.right
#' @param axis.text,axis.text.x,axis.text.y,axis.text.x.top,axis.text.x.bottom,axis.text.y.left,axis.text.y.right,axis.text.theta,axis.text.r
#' tick labels along axes ([element_text()]). Specify all axis tick labels (`axis.text`),
#' tick labels by plane (using `axis.text.x` or `axis.text.y`), or individually
#' for each axis (using `axis.text.x.bottom`, `axis.text.x.top`,
#' `axis.text.y.left`, `axis.text.y.right`). `axis.text.*.*` inherits from
#' `axis.text.*` which inherits from `axis.text`, which in turn inherits
#' from `text`
#' @param axis.ticks,axis.ticks.x,axis.ticks.x.top,axis.ticks.x.bottom,axis.ticks.y,axis.ticks.y.left,axis.ticks.y.right
#' @param axis.ticks,axis.ticks.x,axis.ticks.x.top,axis.ticks.x.bottom,axis.ticks.y,axis.ticks.y.left,axis.ticks.y.right,axis.ticks.theta,axis.ticks.r
#' tick marks along axes ([element_line()]). Specify all tick marks (`axis.ticks`),
#' ticks by plane (using `axis.ticks.x` or `axis.ticks.y`), or individually
#' for each axis (using `axis.ticks.x.bottom`, `axis.ticks.x.top`,
#' `axis.ticks.y.left`, `axis.ticks.y.right`). `axis.ticks.*.*` inherits from
#' `axis.ticks.*` which inherits from `axis.ticks`, which in turn inherits
#' from `line`
#' @param axis.minor.ticks.x.top,axis.minor.ticks.x.bottom,axis.minor.ticks.y.left,axis.minor.ticks.y.right,
#' @param axis.minor.ticks.x.top,axis.minor.ticks.x.bottom,axis.minor.ticks.y.left,axis.minor.ticks.y.right,axis.minor.ticks.theta,axis.minor.ticks.r,
#' minor tick marks along axes ([element_line()]). `axis.minor.ticks.*.*`
#' inherit from the corresponding major ticks `axis.ticks.*.*`.
#' @param axis.ticks.length,axis.ticks.length.x,axis.ticks.length.x.top,axis.ticks.length.x.bottom,axis.ticks.length.y,axis.ticks.length.y.left,axis.ticks.length.y.right
#' @param axis.ticks.length,axis.ticks.length.x,axis.ticks.length.x.top,axis.ticks.length.x.bottom,axis.ticks.length.y,axis.ticks.length.y.left,axis.ticks.length.y.right,axis.ticks.length.theta,axis.ticks.length.r
#' length of tick marks (`unit`)
#' @param axis.minor.ticks.length,axis.minor.ticks.length.x,axis.minor.ticks.length.x.top,axis.minor.ticks.length.x.bottom,axis.minor.ticks.length.y,axis.minor.ticks.length.y.left,axis.minor.ticks.length.y.right
#' @param axis.minor.ticks.length,axis.minor.ticks.length.x,axis.minor.ticks.length.x.top,axis.minor.ticks.length.x.bottom,axis.minor.ticks.length.y,axis.minor.ticks.length.y.left,axis.minor.ticks.length.y.right,axis.minor.ticks.length.theta,axis.minor.ticks.length.r
#' length of minor tick marks (`unit`), or relative to `axis.ticks.length` when provided with `rel()`.
#' @param axis.line,axis.line.x,axis.line.x.top,axis.line.x.bottom,axis.line.y,axis.line.y.left,axis.line.y.right
#' @param axis.line,axis.line.x,axis.line.x.top,axis.line.x.bottom,axis.line.y,axis.line.y.left,axis.line.y.right,axis.line.theta,axis.line.r
#' lines along axes ([element_line()]). Specify lines along all axes (`axis.line`),
#' lines for each plane (using `axis.line.x` or `axis.line.y`), or individually
#' for each axis (using `axis.line.x.bottom`, `axis.line.x.top`,
Expand Down Expand Up @@ -323,38 +323,50 @@ theme <- function(...,
axis.text.y,
axis.text.y.left,
axis.text.y.right,
axis.text.theta,
axis.text.r,
axis.ticks,
axis.ticks.x,
axis.ticks.x.top,
axis.ticks.x.bottom,
axis.ticks.y,
axis.ticks.y.left,
axis.ticks.y.right,
axis.ticks.theta,
axis.ticks.r,
axis.minor.ticks.x.top,
axis.minor.ticks.x.bottom,
axis.minor.ticks.y.left,
axis.minor.ticks.y.right,
axis.minor.ticks.theta,
axis.minor.ticks.r,
axis.ticks.length,
axis.ticks.length.x,
axis.ticks.length.x.top,
axis.ticks.length.x.bottom,
axis.ticks.length.y,
axis.ticks.length.y.left,
axis.ticks.length.y.right,
axis.ticks.length.theta,
axis.ticks.length.r,
axis.minor.ticks.length,
axis.minor.ticks.length.x,
axis.minor.ticks.length.x.top,
axis.minor.ticks.length.x.bottom,
axis.minor.ticks.length.y,
axis.minor.ticks.length.y.left,
axis.minor.ticks.length.y.right,
axis.minor.ticks.length.theta,
axis.minor.ticks.length.r,
axis.line,
axis.line.x,
axis.line.x.top,
axis.line.x.bottom,
axis.line.y,
axis.line.y.left,
axis.line.y.right,
axis.line.theta,
axis.line.r,
legend.background,
legend.margin,
legend.spacing,
Expand Down
24 changes: 18 additions & 6 deletions man/theme.Rd
View file
Open in desktop

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

Loading