Make position guides customizable #3398
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,6 +103,73 @@ CoordCartesian <- ggproto("CoordCartesian", Coord, | |
| ) | ||
| }, | ||
|
|
||
| setup_panel_guides = function(self, panel_params, guides, params = list()) { | ||
| aesthetics <- c("x", "y", "x.sec", "y.sec") | ||
| names(aesthetics) <- aesthetics | ||
|
|
||
| # resolve the specified guide from the scale and/or guides | ||
| guides <- lapply(aesthetics, function(aesthetic) { | ||
| resolve_guide( | ||
| aesthetic, | ||
| panel_params[[aesthetic]], | ||
| guides, | ||
| default = guide_axis(), | ||
| null = guide_none() | ||
| ) | ||
| }) | ||
|
|
||
| # resolve the guide definition as a "guide" S3 | ||
| guides <- lapply(guides, validate_guide) | ||
|
|
||
| # if there is an "position" specification in the scale, pass this on to the guide | ||
| # ideally, this should be specified in the guide | ||
| guides <- lapply(aesthetics, function(aesthetic) { | ||
| guide <- guides[[aesthetic]] | ||
| scale <- panel_params[[aesthetic]] | ||
| # position could be NULL here for an empty scale | ||
| guide$position <- guide$position %|W|% scale$position | ||
| guide | ||
| }) | ||
|
|
||
| panel_params$guides <- guides | ||
| panel_params | ||
| }, | ||
|
|
||
| train_panel_guides = function(self, panel_params, layers, default_mapping, params = list()) { | ||
| aesthetics <- c("x", "y", "x.sec", "y.sec") | ||
| names(aesthetics) <- aesthetics | ||
|
|
||
| panel_params$guides <- lapply(aesthetics, function(aesthetic) { | ||
| axis <- substr(aesthetic, 1, 1) | ||
| guide <- panel_params$guides[[aesthetic]] | ||
| guide <- guide_train(guide, panel_params[[aesthetic]]) | ||
| guide <- guide_transform(guide, self, panel_params) | ||
| guide <- guide_geom(guide, layers, default_mapping) | ||
| guide | ||
| }) | ||
|
|
||
| panel_params | ||
| }, | ||
|
|
||
| labels = function(self, labels, panel_params) { | ||
| positions_x <- c("top", "bottom") | ||
| positions_y <- c("left", "right") | ||
|
|
||
| list( | ||
| x = lapply(c(1, 2), function(i) panel_guide_label( | ||
| panel_params$guides, | ||
| position = positions_x[[i]], | ||
| default_label = labels$x[[i]] | ||
| ) | ||
| ), | ||
| y = lapply(c(1, 2), function(i) panel_guide_label( | ||
| panel_params$guides, | ||
| position = positions_y[[i]], | ||
| default_label = labels$y[[i]]) | ||
| ) | ||
| ) | ||
| }, | ||
|
|
||
| render_bg = function(panel_params, theme) { | ||
| guide_grid( | ||
| theme, | ||
|
|
@@ -114,24 +181,16 @@ CoordCartesian <- ggproto("CoordCartesian", Coord, | |
| }, | ||
|
|
||
| render_axis_h = function(panel_params, theme) { | ||
| list( | ||
| top = panel_guides_grob(panel_params$guides, position = "top", theme = theme), | ||
| bottom = panel_guides_grob(panel_params$guides, position = "bottom", theme = theme) | ||
| ) | ||
| }, | ||
|
|
||
| render_axis_v = function(panel_params, theme) { | ||
| list( | ||
| left = panel_guides_grob(panel_params$guides, position = "left", theme = theme), | ||
| right = panel_guides_grob(panel_params$guides, position = "right", theme = theme) | ||
| ) | ||
| } | ||
| ) | ||
|
|
@@ -153,10 +212,41 @@ view_scales_from_scale <- function(scale, coord_limits = NULL, expand = TRUE) { | |
| view_scales | ||
| } | ||
|
|
||
| panel_guide_label <- function(guides, position, default_label) { | ||
|
There was a problem hiding this comment. Shouldn't all these helpers below be placed in There was a problem hiding this comment. Right now |
||
| guides <- guides_filter_by_position(guides, position) | ||
|
|
||
| if (length(guides) == 0) { | ||
| default_label | ||
| } else { | ||
| guides[[1]]$title %||% waiver() %|W|% default_label | ||
paleolimbot marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
|
|
||
| panel_guides_grob <- function(guides, position, theme) { | ||
| guides <- guides_filter_by_position(guides, position) | ||
| grobs <- lapply(guides, guide_gengrob, theme) | ||
|
|
||
| if (length(grobs) == 0) { | ||
| return(zeroGrob()) | ||
| } else if (length(grobs) == 1) { | ||
| grobs[[1]] | ||
| } else { | ||
| warning( | ||
|
There was a problem hiding this comment. There is something weird going on with the logic here... If I modify your own examples I get: p <- ggplot(mpg, aes(cty * 100, hwy * 100)) +
geom_point() +
facet_wrap(vars(class))
# axis guides can be customized in the scale_* functions or
# using guides()
p + scale_x_continuous(guide = guide_axis(position = 'top'))
#> Warning messages:
#> 1: In panel_guides_grob(panel_params$guides, position = "top", theme = theme) :
#> More than one position guide found at `position = "top". Only showing the first guide.
#> 2: In panel_guides_grob(panel_params$guides, position = "top", theme = theme) :
#> More than one position guide found at `position = "top". Only showing the first guide.
#> 3: In panel_guides_grob(panel_params$guides, position = "top", theme = theme) :
#> More than one position guide found at `position = "top". Only showing the first guide.
#> 4: In panel_guides_grob(panel_params$guides, position = "top", theme = theme) :
#> More than one position guide found at `position = "top". Only showing the first guide.
#> 5: In panel_guides_grob(panel_params$guides, position = "top", theme = theme) :
#> More than one position guide found at `position = "top". Only showing the first guide.
#> 6: In panel_guides_grob(panel_params$guides, position = "top", theme = theme) :
#> More than one position guide found at `position = "top". Only showing the first guide.
#> 7: In panel_guides_grob(panel_params$guides, position = "top", theme = theme) :
#> More than one position guide found at `position = "top". Only showing the first guide.There was a problem hiding this comment. Good catch! I tweaked this so that it uses There was a problem hiding this comment. Can you provide an example of how it doesn't play nicely with There was a problem hiding this comment. This is what I had in mind: library(ggplot2)
p <- ggplot(mpg, aes(cty, hwy)) +
geom_point()
p +
guides(x.sec = guide_axis()) +
labs(x.sec = "fish")Created on 2019-09-22 by the reprex package (v0.2.1) |
||
| "More than one position guide found at `position = \"", position, "\". ", | ||
| "Only showing the first guide." | ||
| ) | ||
| grobs[[1]] | ||
| } | ||
| } | ||
|
|
||
| guides_filter_by_position <- function(guides, position) { | ||
| has_position <- vapply( | ||
| guides, | ||
| function(guide) identical(guide$position, position), | ||
| logical(1) | ||
| ) | ||
|
|
||
| guides <- guides[has_position] | ||
| guides_order <- vapply(guides, function(guide) as.numeric(guide$order)[1], numeric(1)) | ||
| guides[order(guides_order)] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.