Merge pull request #3901 from plotly/parcoords-coloraxis

Parcoords coloraxis
plotly · May 23, 2019 · 554d3d1 · 554d3d1
2 parents 6a6ecdb + b09df4e
commit 554d3d1
Show file tree

Hide file tree

Showing 5 changed files with 1,002 additions and 16 deletions.
diff --git a/src/traces/parcoords/attributes.js b/src/traces/parcoords/attributes.js
@@ -114,7 +114,7 @@ module.exports = {
     line: extendFlat({editType: 'calc'},
         colorScaleAttrs('line', {
             // the default autocolorscale isn't quite usable for parcoords due to context ambiguity around 0 (grey, off-white)
-            // autocolorscale therefore defaults to false too, to avoid being overridden by the  blue-white-red autocolor palette
+            // autocolorscale therefore defaults to false too, to avoid being overridden by the blue-white-red autocolor palette
             colorscaleDflt: 'Viridis',
             autoColorDflt: false,
             editTypeOverride: 'calc'

diff --git a/src/traces/parcoords/calc.js b/src/traces/parcoords/calc.js
@@ -8,8 +8,7 @@
 
 'use strict';
 
-var hasColorscale = require('../../components/colorscale/helpers').hasColorscale;
-var calcColorscale = require('../../components/colorscale/calc');
+var Colorscale = require('../../components/colorscale');
 var Lib = require('../../lib');
 var wrap = require('../../lib/gup').wrap;
 
@@ -19,22 +18,24 @@ module.exports = function calc(gd, trace) {
     }
     trace.line.color = convertTypedArray(trace.line.color);
 
-    var cs = !!trace.line.colorscale && Array.isArray(trace.line.color);
-    var color = cs ? trace.line.color : constHalf(trace._length);
-    var cscale = cs ? trace.line.colorscale : [[0, trace.line.color], [1, trace.line.color]];
+    var lineColor;
+    var cscale;
 
-    if(hasColorscale(trace, 'line')) {
-        calcColorscale(gd, trace, {
-            vals: color,
+    if(Colorscale.hasColorscale(trace, 'line') && Array.isArray(trace.line.color)) {
+        lineColor = trace.line.color;
+        cscale = Colorscale.extractOpts(trace.line).colorscale;
+
+        Colorscale.calc(gd, trace, {
+            vals: lineColor,
             containerStr: 'line',
             cLetter: 'c'
         });
+    } else {
+        lineColor = constHalf(trace._length);
+        cscale = [[0, trace.line.color], [1, trace.line.color]];
     }
 
-    return wrap({
-        lineColor: color,
-        cscale: cscale
-    });
+    return wrap({lineColor: lineColor, cscale: cscale});
 };
 
 function constHalf(len) {
@@ -46,5 +47,5 @@ function constHalf(len) {
 }
 
 function convertTypedArray(a) {
-    return (Lib.isTypedArray(a)) ? Array.prototype.slice.call(a) : a;
+    return Lib.isTypedArray(a) ? Array.prototype.slice.call(a) : a;
 }
diff --git a/src/traces/parcoords/parcoords.js b/src/traces/parcoords/parcoords.js
@@ -132,7 +132,8 @@ function model(layout, d, i) {
     var trace = cd0.trace;
     var lineColor = cd0.lineColor;
     var line = trace.line;
-    var cscale = line.reversescale ? Colorscale.flipScale(cd0.cscale) : cd0.cscale;
+    var cOpts = Colorscale.extractOpts(line);
+    var cscale = cOpts.reversescale ? Colorscale.flipScale(cd0.cscale) : cd0.cscale;
     var domain = trace.domain;
     var dimensions = trace.dimensions;
     var width = layout.width;
@@ -143,7 +144,7 @@ function model(layout, d, i) {
     var lines = Lib.extendDeepNoArrays({}, line, {
         color: lineColor.map(d3.scale.linear().domain(dimensionExtent({
             values: lineColor,
-            range: [line.cmin, line.cmax],
+            range: [cOpts.min, cOpts.max],
             _length: trace._length
         }))),
         blockLineCount: c.blockLineCount,

diff --git a/test/image/baselines/gl2d_parcoords_coloraxis.png b/test/image/baselines/gl2d_parcoords_coloraxis.png