Include line options in lines+markers trace

mkcor · mkcor · commit adfcee8bba3c · 2014-11-25T18:15:21.000-05:00
diff --git a/tests/cookbook-test-suite/bars-and-lines/basic-line-swapped-vars.json b/tests/cookbook-test-suite/bars-and-lines/basic-line-swapped-vars.json
@@ -19,6 +19,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(248,118,109)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
@@ -42,6 +48,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(0,191,196)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
diff --git a/tests/cookbook-test-suite/bars-and-lines/basic-line-with-mapped-colors.json b/tests/cookbook-test-suite/bars-and-lines/basic-line-with-mapped-colors.json
@@ -19,6 +19,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(248,118,109)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
@@ -42,6 +48,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(0,191,196)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
diff --git a/tests/cookbook-test-suite/bars-and-lines/basic-line-with-points-fully-styled-plotly.png b/tests/cookbook-test-suite/bars-and-lines/basic-line-with-points-fully-styled-plotly.png
diff --git a/tests/cookbook-test-suite/bars-and-lines/basic-line-with-points-fully-styled.json b/tests/cookbook-test-suite/bars-and-lines/basic-line-with-points-fully-styled.json
@@ -22,6 +22,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(0,0,0)", 
+                "width": 3, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
@@ -48,6 +54,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(0,0,0)", 
+                "width": 3, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
diff --git a/tests/cookbook-test-suite/bars-and-lines/basic-line-with-symbols.json b/tests/cookbook-test-suite/bars-and-lines/basic-line-with-symbols.json
@@ -19,6 +19,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(0,0,0)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
@@ -42,6 +48,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(0,0,0)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
diff --git a/tests/cookbook-test-suite/bars-and-lines/finished-line-plotly.png b/tests/cookbook-test-suite/bars-and-lines/finished-line-plotly.png
diff --git a/tests/cookbook-test-suite/bars-and-lines/finished-line.json b/tests/cookbook-test-suite/bars-and-lines/finished-line.json
@@ -23,6 +23,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(145,12,0)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
@@ -50,6 +56,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(0,105,110)", 
+                "width": 2, 
+                "dash": "dash", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
diff --git a/tests/cookbook-test-suite/bars-and-lines/line-continuous-categorical-x-axis.json b/tests/cookbook-test-suite/bars-and-lines/line-continuous-categorical-x-axis.json
@@ -21,6 +21,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(248,118,109)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
@@ -46,6 +52,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(0,191,196)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
diff --git a/tests/cookbook-test-suite/bars-and-lines/line-continuous-numerical-x-axis.json b/tests/cookbook-test-suite/bars-and-lines/line-continuous-numerical-x-axis.json
@@ -21,6 +21,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(248,118,109)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
@@ -46,6 +52,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(0,191,196)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
diff --git a/tests/testthat/test-ggplot-path-line-symbols.json b/tests/testthat/test-ggplot-path-line-symbols.json
@@ -19,6 +19,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(0,0,0)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
@@ -42,6 +48,12 @@
                 "sizeref": 1, 
                 "sizemode": "area"
             }, 
+            "line": {
+                "color": "rgb(0,0,0)", 
+                "width": 2, 
+                "dash": "solid", 
+                "shape": "linear"
+            }, 
             "xaxis": "x1", 
             "yaxis": "y1", 
             "type": "scatter"
