Merge pull request #535 from ropensci/fix/errorbars

Use transparent scatter lines for errorbars. Fixes #513.

Author: cpsievert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via 'plotly.js'
-Version: 3.4.9
+Version: 3.4.10
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Chris", "Parmer", role = c("aut", "cph"),

NEWS

@@ -1,10 +1,15 @@
+3.4.10 -- 1 Apr 2016
+
+BUGFIX:
+
+Fix a geom_errorbar bug introduced in 3.4.9. See #513.
+
 3.4.9 -- 25 Mar 2016
 
 BUGFIX:
 
 Upgrade to plotlyjs 1.7.0. Fixes #513
 
-
 3.4.8 -- 23 Mar 2016
 
 BUGFIX:

R/layers2traces.R

@@ -655,8 +655,8 @@ make_error <- function(data, params, xy = "x") {
     text = data$hovertext,
     type = "scatter",
     mode = "lines",
-    opacity = 0,
-    line = list(color = color)
+    opacity = aes2plotly(data, params, "alpha"),
+    line = list(color = "transparent")
   )
   e[[paste0("error_", xy)]] <- list(
     array = data[[paste0(xy, "max")]] - data[[xy]],

tests/testthat.R

@@ -12,7 +12,11 @@ if (report_diffs || build_table) {
   message("Spinning up an independent R session with plotly's master branch installed")
   Rserve::Rserve(args = "--vanilla --RS-enable-remote")
   conn <- RSconnect()
-  # master version should _always_ depend on the CRAN version of ggplot2
+  # ensure the seed is the same for randomized tests
+  set.seed(1)
+  RSeval(conn, "set.seed(1)")
+  # we don't make assumptions about ggplot2 versioning,
+  # but it is _strongly_ recommended to use the CRAN version (of ggplot2)
   RSeval(conn, "devtools::install_github('ropensci/plotly')")
   RSeval(conn, "library(plotly)")
   if (report_diffs) {
@@ -23,6 +27,19 @@ if (report_diffs || build_table) {
     master_hash <- substr(master_hash, 1, 7)
     # plotly-test-table repo hosts the diff pages & keeps track of previous versions
     table_dir <- normalizePath("../../plotly-test-table", mustWork = T)
+    # Make sure we have appropriate versions of plotlyjs
+    # (see plotly-test-table/template/template/index.html)
+    file.copy(
+      file.path("..", "inst", "htmlwidgets", "lib", "plotlyjs", "plotly-latest.min.js"),
+      file.path(table_dir, "template", "New.min.js"),
+      overwrite = TRUE
+    )
+    download.file(
+      "https://raw.githubusercontent.com/ropensci/plotly/master/inst/htmlwidgets/lib/plotlyjs/plotly-latest.min.js", 
+      file.path(table_dir, "template", "Old.min.js"),
+      method = "curl"
+    )
+    # directory for placing test differences
     this_dir <- file.path(table_dir, this_hash)
     if (dir.exists(this_dir)) {
       message("Tests were already run on this commit. Nuking the old results...")
@@ -102,9 +119,7 @@ save_outputs <- function(gg, name) {
       dir.create(test_dir, recursive = T)
       # copy over diffing template
       file.copy(
-        file.path(table_dir, "template", "template", "index.html"), 
-        test_dir, 
-        recursive = T
+        dir(file.path(table_dir, "template", "template"), full.names = TRUE), test_dir
       )
       # overwrite the default JSON
       writeLines(

tests/testthat/test-ggplot-jitter.R

@@ -15,7 +15,6 @@ expect_traces <- function(gg, n_traces, name) {
   list(traces = has_data, layout = L$layout)
 }
 
-set.seed(1001)
 p <- ggplot(mpg, aes(cyl, hwy)) + geom_jitter()
 
 test_that("geom_jitter is working", {

tests/testthat/test-mean-error-bars.R

@@ -36,3 +36,21 @@ test_that("different colors for error bars, points, and lines", {
     geom_point(color = "blue", size = 14)
   L <- save_outputs(one.line.gg, "error-simple-line-point-crazy")
 })
+
+# example from https://github.com/ropensci/plotly/issues/513
+
+d <- data.frame(
+  x = 1:5, 
+  y = 1:5, 
+  label = letters[1:5], 
+  group = factor(c('one', 'one', 'two', 'two', 'one'))
+)
+fig1 <- ggplot(d, aes(x = x, y = y, text = label, colour = group)) + 
+  geom_rect(fill = 'lightgrey', colour = 'lightgrey', 
+            xmin = 3, xmax = 4, ymin = -4, ymax = 7) +
+  geom_point() + geom_errorbarh(aes(xmin = x - 1, xmax = x + 2), alpha  =  0.5) + 
+  theme_bw()
+
+test_that("error bars respect trace ordering", {
+  L <- save_outputs(fig1, "error-rect-alpha")
+})