Merge branch 'master' of github.com:ropensci/plotly into add-r-cookbook-tests

Author: mkcor

DESCRIPTION

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

R/ggplotly.R

@@ -41,7 +41,7 @@ markLegends <-
   ## Legends based on sizes not implemented yet in Plotly
   ##  list(point=c("colour", "fill", "shape", "size"),
   list(point=c("colour", "fill", "shape"),
-       path=c("linetype", "size", "colour"),
+       path=c("linetype", "size", "colour", "shape"),
        polygon=c("colour", "fill", "linetype", "size", "group"),
        bar=c("colour", "fill"),
        step=c("linetype", "size", "colour"),

tests/testthat/test-ggplot-path-colored-groups-stay-together-ggplot2.png

@@ -0,0 +1,134 @@
+{
+    "data": [
+        {
+            "x": [
+                "Lunch", 
+                "Dinner"
+            ], 
+            "y": [
+                13.53, 
+                16.81
+            ], 
+            "mode": "lines", 
+            "name": "Female", 
+            "line": {
+                "color": "rgb(0,0,0)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
+            "xaxis": "x1", 
+            "yaxis": "y1", 
+            "type": "scatter"
+        }, 
+        {
+            "x": [
+                "Lunch", 
+                "Dinner"
+            ], 
+            "y": [
+                16.24, 
+                17.42
+            ], 
+            "mode": "lines", 
+            "name": "Male", 
+            "line": {
+                "color": "rgb(0,0,0)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
+            "xaxis": "x1", 
+            "yaxis": "y1", 
+            "type": "scatter"
+        }, 
+        {
+            "x": [
+                "Lunch", 
+                "Dinner"
+            ], 
+            "y": [
+                13.53, 
+                16.81
+            ], 
+            "mode": "markers", 
+            "name": "Female", 
+            "marker": {
+                "color": "rgb(0,0,0)", 
+                "size": 10, 
+                "symbol": "circle", 
+                "opacity": 1, 
+                "sizeref": 1, 
+                "sizemode": "area"
+            }, 
+            "xaxis": "x1", 
+            "yaxis": "y1", 
+            "type": "scatter"
+        }, 
+        {
+            "x": [
+                "Lunch", 
+                "Dinner"
+            ], 
+            "y": [
+                16.24, 
+                17.42
+            ], 
+            "mode": "markers", 
+            "name": "Male", 
+            "marker": {
+                "color": "rgb(0,0,0)", 
+                "size": 10, 
+                "symbol": "triangle-up", 
+                "opacity": 1, 
+                "sizeref": 1, 
+                "sizemode": "area"
+            }, 
+            "xaxis": "x1", 
+            "yaxis": "y1", 
+            "type": "scatter"
+        }
+    ], 
+    "layout": {
+        "titlefont": {
+            "family": ""
+        }, 
+        "showlegend": true, 
+        "xaxis": {
+            "title": "time", 
+            "type": "category", 
+            "showgrid": true, 
+            "zeroline": false, 
+            "showline": false, 
+            "ticks": "outside", 
+            "showticklabels": true, 
+            "tickcolor": "rgb(127,127,127)", 
+            "gridcolor": "rgb(255,255,255)"
+        }, 
+        "yaxis": {
+            "title": "total_bill", 
+            "type": "linear", 
+            "showgrid": true, 
+            "zeroline": false, 
+            "showline": false, 
+            "ticks": "outside", 
+            "showticklabels": true, 
+            "tickcolor": "rgb(127,127,127)", 
+            "gridcolor": "rgb(255,255,255)"
+        }, 
+        "legend": {
+            "x": 100, 
+            "y": 0.5, 
+            "font": {
+                "family": ""
+            }, 
+            "bgcolor": "rgb(255,255,255)", 
+            "bordercolor": "transparent"
+        }, 
+        "margin": {
+            "r": 10
+        }, 
+        "paper_bgcolor": "rgb(255,255,255)", 
+        "plot_bgcolor": "rgb(229,229,229)"
+    }
+}

tests/testthat/test-ggplot-path-colors-ggplot2.png

@@ -0,0 +1 @@
+https://plot.ly/~TestBot/718

tests/testthat/test-ggplot-path-line-symbols-ggplot2.png

@@ -63,3 +63,24 @@ test_that("paths with the same color but different groups stay together", {
 
   save_outputs(gg, "path-colored-groups-stay-together")
 })
+
+test_that("lines work with aesthetic shape", {
+  df1 <- data.frame(sex = factor(c("Female", "Female", "Male", "Male")),
+                    time = factor(c("Lunch", "Dinner", "Lunch", "Dinner"),
+                                  levels=c("Lunch", "Dinner")),
+                    total_bill = c(13.53, 16.81, 16.24, 17.42))
+  gg <- ggplot(data=df1, aes(x=time, y=total_bill, group=sex, shape=sex)) +
+    geom_line() +
+    geom_point()
+  info <- gg2list(gg)
+  expect_equal(length(info), 5)  # 2 lines and 2 sets of points for each group
+  expect_identical(info[[3]]$name, "Female")
+  expect_identical(info[[3]]$marker$symbol, "circle")
+  expect_identical(info[[4]]$name, "Male")
+  expect_identical(info[[4]]$marker$symbol, "triangle-up")
+  # Layout
+  expect_identical(info[[5]]$layout$xaxis$title, "time")
+  expect_identical(info[[5]]$layout$xaxis$type, "category")
+  
+  save_outputs(gg, "path-line-symbols")
+})