#581 [WIP commit] making colorscale usable; initiating progress for showscale if requested; temporarily suspending color defaulting for marker / marker.line to defer on defaulting decisions and to manually test independently

Author: monfera

src/traces/scatter/line_defaults.js

@@ -9,14 +9,24 @@
 
 'use strict';
 
+var hasColorscale = require('../../components/colorscale/has_colorscale');
+var colorscaleDefaults = require('../../components/colorscale/defaults');
+
 
 // common to 'scatter', 'scatter3d', 'scattergeo' and 'scattergl'
-module.exports = function lineDefaults(traceIn, traceOut, defaultColor, coerce) {
+module.exports = function lineDefaults(traceIn, traceOut, defaultColor, layout, coerce) {
     var markerColor = (traceIn.marker || {}).color;
 
-    // don't try to inherit a color array
-    coerce('line.color', (Array.isArray(markerColor) ? false : markerColor) ||
-                         defaultColor);
+    if(traceIn.line) defaultColor = markerColor;
+
+    coerce('line.color', defaultColor);
+    if(hasColorscale(traceIn, 'line')) {
+        colorscaleDefaults(
+            traceIn, traceOut, layout, coerce, {prefix: 'line.', cLetter: 'c'}
+        );
+    }
+
+
     coerce('line.width');
     coerce('line.dash');
 };

src/traces/scatter/marker_colorscale_calc.js

@@ -19,9 +19,14 @@ var subTypes = require('./subtypes');
 module.exports = function calcMarkerColorscale(trace) {
     if(!subTypes.hasMarkers(trace)) return;
 
+    var line = trace.line;
     var marker = trace.marker;
 
     // auto-z and autocolorscale if applicable
+    if(hasColorscale(trace, 'line')) {
+        calcColorscale(trace, line.color, 'line', 'c');
+    }
+
     if(hasColorscale(trace, 'marker')) {
         calcColorscale(trace, marker.color, 'marker', 'c');
     }

src/traces/scatter/marker_defaults.js

@@ -19,7 +19,8 @@ var subTypes = require('./subtypes');
 // common to 'scatter', 'scatter3d', 'scattergeo' and 'scattergl'
 module.exports = function markerDefaults(traceIn, traceOut, defaultColor, layout, coerce) {
     var isBubble = subTypes.isBubble(traceIn),
-        lineColor = (traceIn.line || {}).color,
+        // TEMPORARILY HOLDING OFF ON THE DEFAULTING
+        lineColor = ({}).color, // lineColor = (traceIn.line || {}).color,
         defaultMLC;
 
     if(lineColor) defaultColor = lineColor;

src/traces/scatter3d/attributes.js

@@ -99,7 +99,16 @@ module.exports = {
     connectgaps: scatterAttrs.connectgaps,
     line: extendFlat({}, {
         width: scatterLineAttrs.width,
-        dash: scatterLineAttrs.dash
+        dash: scatterLineAttrs.dash,
+        showscale: {
+            valType: 'boolean',
+            role: 'info',
+            dflt: false,
+            description: [
+                'Has an effect only if `marker.color` is set to a numerical array.',
+                'Determines whether or not a colorbar is displayed.'
+            ].join(' ')
+        }
     },
         colorAttributes('line')
     ),

src/traces/scatter3d/defaults.js

@@ -37,7 +37,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     if(subTypes.hasLines(traceOut)) {
         coerce('connectgaps');
-        handleLineDefaults(traceIn, traceOut, defaultColor, coerce);
+        handleLineDefaults(traceIn, traceOut, defaultColor, layout, coerce);
     }
 
     if(subTypes.hasMarkers(traceOut)) {

test/image/mocks/gl3d_scatter-line-gradient-2.json

@@ -0,0 +1,81 @@
+{
+  "data": [{
+    "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+markers",
+    "line": {
+      "width": 5,
+      "color":  [10,15,20,25,30,35,40,45,50,55,60],
+      "colorscale": "Rainbow",
+      "showscale": true
+    },
+    "marker": {
+      "size": 10,
+      "colorscale": "Viridis",
+      "color": [9,15,20,25,30,35,40,45,50,55,61]
+    },
+    "name":"Col3",
+    "type":"scatter3d",
+    "xsrc":":c54135",
+    "ysrc":":a7b14d",
+    "zsrc":":7b7778",
+    "uid":"3e38e6"
+  }],
+  "layout": {
+    "yaxis":{
+      "type":"linear",
+      "autorange":true,
+      "rangemode":"normal",
+      "showline":true,
+      "mirror":true,
+      "showgrid":true,
+      "zeroline":false,
+      "zerolinecolor":"rgb(214, 39, 40)"
+    },"xaxis":{
+      "type":"linear",
+      "autorange":true,
+      "rangemode":"normal",
+      "showline":true,
+      "mirror":true,
+      "showgrid":true,
+      "zeroline":false,
+      "zerolinecolor":"rgb(214, 39, 40)"
+    },"scene":{
+      "xaxis":{
+        "type":"linear",
+        "autorange":true,
+        "rangemode":"normal",
+        "showline":true,
+        "mirror":true,
+        "showgrid":true,
+        "zeroline":false,
+        "zerolinecolor":"rgb(214, 39, 40)"
+      },"yaxis":{
+        "type":"linear",
+        "autorange":true,
+        "rangemode":"normal",
+        "showline":true,
+        "mirror":true,
+        "showgrid":true,
+        "zeroline":false,
+        "zerolinecolor":"rgb(214, 39, 40)"
+      },"zaxis":{
+        "type":"linear",
+        "autorange":false,
+        "rangemode":"normal",
+        "showline":true,
+        "mirror":true,
+        "showgrid":true,
+        "zeroline":false,
+        "zerolinecolor":"rgb(214, 39, 40)",
+        "range":[-3,6]
+      }
+    },
+    "height":758,
+    "width":1310,
+    "autosize":true,
+    "showlegend":false,
+    "dragmode":"rotate"
+  }
+}