Merge pull request #164 from ropensci/marianne-area-colour

Support alpha transparency in geom_area

Author: mkcor

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: plotly
 Type: Package
 Title: Interactive, publication-quality graphs online.
-Version: 0.5.19
+Version: 0.5.20
 Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Scott", "Chamberlain", role = "aut",

NEWS

@@ -1,3 +1,8 @@
+0.5.20 -- 9 February 2015.
+
+Add alpha transparency to fill conversion.
+Let geom_area support colour and fill aesthetics.
+
 0.5.19 -- 23 January 2015.
 
 Support class conversion such as as.Date() within ggplot code.

R/colour_conversion.R

@@ -1,6 +1,6 @@
 #' Convert R colours to RGBA hexadecimal colour values
 #' @param x character for colour, for example: "white"
-#' @param alpha alpha
+#' @param alpha transparency alpha
 #' @return hexadecimal colour value (if is.na(x), return "transparent" for compatibility with Plotly)
 #' @export
 toRGB <- function(x, alpha=1) {
@@ -20,7 +20,8 @@ toRGB <- function(x, alpha=1) {
 
 #' Use default ggplot colour for fill (gray20) if not declared
 #' @param x character for colour
+#' @param alpha transparency alpha
 #' @return hexadecimal colour value
-toFill <- function(x) {
-  ifelse(!is.null(x), toRGB(x), toRGB("gray20"))
+toFill <- function(x, alpha=1) {
+  ifelse(!is.null(x), toRGB(x, alpha), toRGB("gray20", alpha))
 }

R/ggplotly.R

@@ -52,6 +52,7 @@ markLegends <-
        path=c("linetype", "size", "colour", "shape"),
        polygon=c("colour", "fill", "linetype", "size", "group"),
        bar=c("colour", "fill"),
+       area=c("colour", "fill"),
        step=c("linetype", "size", "colour"),
        boxplot=c("x"),
        text=c("colour"))

R/plotly-package.r

@@ -7,7 +7,7 @@
 #' \itemize{
 #'  \item Package: plotly
 #'  \item Type: Package
-#'  \item Version: 0.5.19
+#'  \item Version: 0.5.20
 #'  \item Date: 2014-03-07
 #'  \item License: MIT
 #' }

R/plotly.R

@@ -82,7 +82,7 @@ For more help, see https://plot.ly/R or contact <[email protected]>.")
 
   # public attributes/methods that the user has access to
   pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
-              version="0.5.19")
+              version="0.5.20")
   priv <- list()
 
   pub$makecall <- function(args, kwargs, origin) {

R/trace_generation.R

@@ -556,7 +556,8 @@ geom2trace <- list(
          type="scatter",
          line=paramORdefault(params, aes2line, ribbon.line.defaults),
          fill="tozeroy",
-         fillcolor=toFill(params$fill))
+         fillcolor=toFill(params$fill, ifelse(is.null(params$alpha), 1,
+                                              params$alpha)))
   },
   ribbon=function(data, params) {
     list(x=c(data$x[1], data$x, rev(data$x)),

tests/testthat/test-ggplot-area.R

@@ -15,3 +15,14 @@ test_that("sanity check for geom_area", {
 })
 
 save_outputs(ar, "area")
+
+# Test alpha transparency in fill color
+gg <- ggplot(huron) + geom_area(aes(x=year, y=level), alpha=0.4)
+L <- gg2list(gg)
+
+test_that("transparency alpha in geom_area is converted", {
+  expect_identical(L[[1]]$line$color, "transparent")
+  expect_identical(L[[1]]$fillcolor, "rgba(51,51,51,0.4)")
+})
+
+save_outputs(gg, "area-fillcolor")