#581 calculating cmin/cmax for the line too; test cases

Author: monfera

src/traces/scatter/line_colorscale_calc.js

@@ -0,0 +1,28 @@
+/**
+* Copyright 2012-2016, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+'use strict';
+
+var hasColorscale = require('../../components/colorscale/has_colorscale');
+var calcColorscale = require('../../components/colorscale/calc');
+
+var subTypes = require('./subtypes');
+
+
+// common to 'scatter', 'scatter3d' and 'scattergeo'
+module.exports = function calcMarkerColorscale(trace) {
+    if(!subTypes.hasLines(trace)) return;
+
+    var line = trace.line;
+
+    // auto-z and autocolorscale if applicable
+    if(hasColorscale(trace, 'line')) {
+        calcColorscale(trace, line.color, 'line', 'c');
+    }
+};

src/traces/scatter/marker_defaults.js

@@ -20,15 +20,19 @@ var subTypes = require('./subtypes');
 module.exports = function markerDefaults(traceIn, traceOut, defaultColor, layout, coerce) {
     var isBubble = subTypes.isBubble(traceIn),
         lineColor = (traceIn.line || {}).color,
+        lineColorscale = (traceIn.line || {}).colorscale,
+        defaultColorscale,
         defaultMLC;
 
     if(lineColor) defaultColor = lineColor;
+    if(lineColorscale) defaultColorscale = lineColorscale;
 
     coerce('marker.symbol');
     coerce('marker.opacity', isBubble ? 0.7 : 1);
     coerce('marker.size');
 
     coerce('marker.color', defaultColor);
+    coerce('marker.colorscale', defaultColorscale);
     if(hasColorscale(traceIn, 'marker')) {
         colorscaleDefaults(
             traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'}

src/traces/scatter3d/calc.js

@@ -9,6 +9,7 @@
 'use strict';
 
 var arraysToCalcdata = require('../scatter/arrays_to_calcdata');
+var calcLineColorscale = require('../scatter/line_colorscale_calc');
 var calcMarkerColorscale = require('../scatter/marker_colorscale_calc');
 
 
@@ -21,6 +22,7 @@ module.exports = function calc(gd, trace) {
     var cd = [{x: false, y: false, trace: trace, t: {}}];
 
     arraysToCalcdata(cd);
+    calcLineColorscale(trace);
     calcMarkerColorscale(trace);
 
     return cd;

test/image/baselines/20.png

@@ -3,13 +3,14 @@
     "x":[-4,-3,-2,-1,0,1,2,3,4,5,6],
     "y":[7,5,6,4,2,3,1,3,-1,-4,-2],
     "z":[2,3,4,5,4,3,2,1,0,-1,-2],
-    "mode": "lines",
+    "mode": "lines+markers",
     "line": {
-      "width": 10,
+      "width": 5,
       "colorscale": "Viridis",
-      "color": [1,2,3,4,5,6,7,8,9,10],
-      "cmin": 1,
-      "cmax": 10
+      "color": [1,2,3,4,5,6,7,8,9,10]
+    },
+    "marker": {
+      "size": 10
     },
     "type":"scatter3d"
   }],

test/image/baselines/gl3d_scatter-color-palette-with-default-marker.png

@@ -5,11 +5,8 @@
     "z":[2,3,4,5,4,3,2,1,0,-1,-2],
     "mode": "lines",
     "line": {
-      "width": 5,
       "colorscale": "Viridis",
-      "color": [1,2,3,4,5,6,7,8,9,10],
-      "cmin": 1,
-      "cmax": 10
+      "color": [1,2,3,4,5,6,7,8,9,10]
     },
     "type":"scatter3d"
   }],