Skip to content

added fill to gpar in geom_curve() #2375

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 5 commits into from
Apr 27, 2018
Merged

added fill to gpar in geom_curve() #2375

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1df6878
added fill to gpar in geom_curve()
hrbrmstr Dec 19, 2017
fa749c1
also added a aesthetic to geom_segment and geom_curve to enable fill…
hrbrmstr Dec 19, 2017
6880051
Changed `fill` to `arrow.fill` and switched it from being an `aes()` …
hrbrmstr Dec 19, 2017
4358175
Modified `NEWS.md`
hrbrmstr Dec 19, 2017
624a755
Modified `NEWS.md`
hrbrmstr Dec 19, 2017
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
4 changes: 4 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@
* Added `stat_qq_line()` to make it easy to add a simple line to a Q-Q plot. This
line makes it easier to judge the fit of the theoretical distribution
(@nicksolomon).

* Added `arrow.fill` parameter to `geom_segment()` and `geom_curve()` to
Copy link
Member

Choose a reason for hiding this comment

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

Can you please rewrite so the function names come first? (And then use that to alphabetise within this list of changes?)

(Normally I do that just before release but this release has been dragging on because I haven't found the time to finish it off)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

enable specifying a separate fill colour for closed arrowheads. (@hrbrmstr
and @clauswilke).

### Scales

Expand Down
10 changes: 9 additions & 1 deletion R/geom-curve.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ geom_curve <- function(mapping = NULL, data = NULL,
angle = 90,
ncp = 5,
arrow = NULL,
arrow.fill = NULL,
lineend = "butt",
na.rm = FALSE,
show.legend = NA,
Expand All @@ -22,6 +23,7 @@ geom_curve <- function(mapping = NULL, data = NULL,
inherit.aes = inherit.aes,
params = list(
arrow = arrow,
arrow.fill = arrow.fill,
curvature = curvature,
angle = angle,
ncp = ncp,
Expand All @@ -38,21 +40,27 @@ geom_curve <- function(mapping = NULL, data = NULL,
#' @usage NULL
#' @export
GeomCurve <- ggproto("GeomCurve", GeomSegment,
default_aes = aes(colour = "black", size = 0.5, linetype = 1, alpha = NA),
draw_panel = function(data, panel_params, coord, curvature = 0.5, angle = 90,
ncp = 5, arrow = NULL, lineend = "butt", na.rm = FALSE) {
ncp = 5, arrow = NULL, arrow.fill, lineend = "butt", na.rm = FALSE) {

if (!coord$is_linear()) {
warning("geom_curve is not implemented for non-linear coordinates",
call. = FALSE)
}

trans <- coord$transform(data, panel_params)

arrow.fill <- arrow.fill %||% trans$colour

curveGrob(
trans$x, trans$y, trans$xend, trans$yend,
default.units = "native",
curvature = curvature, angle = angle, ncp = ncp,
square = FALSE, squareShape = 1, inflect = FALSE, open = TRUE,
gp = gpar(
col = alpha(trans$colour, trans$alpha),
fill = alpha(arrow.fill, trans$alpha),
lwd = trans$size * .pt,
lty = trans$linetype,
lineend = lineend),
Expand Down
9 changes: 7 additions & 2 deletions R/geom-segment.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#' @inheritParams layer
#' @inheritParams geom_point
#' @param arrow specification for arrow heads, as created by arrow().
#' @param arrow.fill fill color to use for the arrow head (if closed). `NULL`
#' means use `colour` aesthetic.
#' @param lineend Line end style (round, butt, square).
#' @param linejoin Line join style (round, mitre, bevel).
#' @seealso [geom_path()] and [geom_line()] for multi-
Expand Down Expand Up @@ -67,6 +69,7 @@ geom_segment <- function(mapping = NULL, data = NULL,
stat = "identity", position = "identity",
...,
arrow = NULL,
arrow.fill = NULL,
lineend = "butt",
linejoin = "round",
na.rm = FALSE,
Expand All @@ -82,6 +85,7 @@ geom_segment <- function(mapping = NULL, data = NULL,
inherit.aes = inherit.aes,
params = list(
arrow = arrow,
arrow.fill = arrow.fill,
lineend = lineend,
linejoin = linejoin,
na.rm = na.rm,
Expand All @@ -99,7 +103,7 @@ GeomSegment <- ggproto("GeomSegment", Geom,
non_missing_aes = c("linetype", "size", "shape"),
default_aes = aes(colour = "black", size = 0.5, linetype = 1, alpha = NA),

draw_panel = function(data, panel_params, coord, arrow = NULL,
draw_panel = function(data, panel_params, coord, arrow = NULL, arrow.fill = NULL,
lineend = "butt", linejoin = "round", na.rm = FALSE) {

data <- remove_missing(data, na.rm = na.rm,
Expand All @@ -109,11 +113,12 @@ GeomSegment <- ggproto("GeomSegment", Geom,

if (coord$is_linear()) {
coord <- coord$transform(data, panel_params)
arrow.fill <- arrow.fill %||% coord$colour
return(segmentsGrob(coord$x, coord$y, coord$xend, coord$yend,
default.units = "native",
gp = gpar(
col = alpha(coord$colour, coord$alpha),
fill = alpha(coord$colour, coord$alpha),
fill = alpha(arrow.fill, coord$alpha),
lwd = coord$size * .pt,
lty = coord$linetype,
lineend = lineend,
Expand Down
11 changes: 7 additions & 4 deletions man/geom_segment.Rd
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion man/gg-add.Rd
View file
Open in desktop

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