Skip to content

Add ggalluvial support #2044

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

Closed
moutikabdessabour wants to merge 4 commits into from
Closed

Add ggalluvial support #2044

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2621ac
Closes #1614. Implemented `to_basic` for the `geom_alluvium` and `geo…
moutikabdessabour Oct 12, 2021
5d8ce0a
Added visual tests for this implementation
moutikabdessabour Oct 12, 2021
5861f68
Conforming with the review
moutikabdessabour Oct 12, 2021
bdef939
Conforming with the review
moutikabdessabour Oct 12, 2021
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
29 changes: 29 additions & 0 deletions R/layers2traces.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,35 @@ to_basic.GeomQuantile <- function(data, prestats_data, layout, params, p, ...){
dat
}

#' @export
to_basic.GeomStratum <- function (data, ...) {
to_basic.GeomRect(data, ...)
}

#' @export
to_basic.GeomAlluvium <- function (data, ...) {
prefix_class(transform_alluvium(data), "GeomPolygon")
}

# tranform the alluvium data into the corresponding polygons
transform_alluvium <- function(data) {
data <- data[order(data$x), ]

if(unique(data$colour) == 0) data$colour <- NULL
Copy link
Collaborator

@cpsievert cpsievert Oct 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what this is doing, but it seems you want length(), not unique()?

Copy link
Contributor Author

@moutikabdessabour moutikabdessabour Oct 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

geom_alluvium by default generates a data.frame with a colour column and sets it to 0. This behaviour results in an error when trying to get the colour from the number and grid::col2rgb complains that colors must be positive integers. I got around this by removing the colour column if no color aesthetic is passed by the user.

Error in grDevices::col2rgb(x, alpha = TRUE) : 
  numerical color values must be positive

Copy link
Collaborator

@cpsievert cpsievert Oct 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check needs to be more careful. If unique(data$colour) is not of length 1, the if will warn/error:

> if(c("a", "b") == 0) print("foo")
Warning message:
In if (c("a", "b") == 0) print("foo") :
  the condition has length > 1 and only the first element will be used


unused_aes <- ! names(data) %in% c("x", "y", "ymin", "ymax")

row_number <- nrow(data)

data_rev <- data[nrow(data):1L, ]

structure(rbind(
cbind(x = data$x, y = data$ymin, data[unused_aes]),
cbind(x = data$x[row_number], y = data$ymin[row_number], data[row_number, unused_aes]),
cbind(x = data_rev$x, y = data_rev$ymax, data_rev[unused_aes])
), class = class(data))
}

#' @export
to_basic.default <- function(data, prestats_data, layout, params, p, ...) {
data
Expand Down
Loading