dont touch trace data - move handeling of typedarrays from calc to plot step

Author: archmoj

src/traces/parcoords/calc.js

@@ -8,20 +8,15 @@
 
 'use strict';
 
+var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
 var Colorscale = require('../../components/colorscale');
-var Lib = require('../../lib');
 var wrap = require('../../lib/gup').wrap;
 
 module.exports = function calc(gd, trace) {
-    for(var i = 0; i < trace.dimensions.length; i++) {
-        trace.dimensions[i].values = convertTypedArray(trace.dimensions[i].values);
-    }
-    trace.line.color = convertTypedArray(trace.line.color);
-
     var lineColor;
     var cscale;
 
-    if(Colorscale.hasColorscale(trace, 'line') && Array.isArray(trace.line.color)) { // TODO: should we support typed arrays here?
+    if(Colorscale.hasColorscale(trace, 'line') && isArrayOrTypedArray(trace.line.color)) {
         lineColor = trace.line.color;
         cscale = Colorscale.extractOpts(trace.line).colorscale;
 
@@ -45,7 +40,3 @@ function constHalf(len) {
     }
     return out;
 }
-
-function convertTypedArray(a) {
-    return Lib.isTypedArray(a) ? Array.prototype.slice.call(a) : a;
-}

src/traces/parcoords/parcoords.js

@@ -26,6 +26,10 @@ var c = require('./constants');
 var brush = require('./axisbrush');
 var lineLayerMaker = require('./lines');
 
+function convertTypedArray(a) {
+    return Lib.isTypedArray(a) ? Array.prototype.slice.call(a) : a;
+}
+
 function visible(dimension) { return !('visible' in dimension) || dimension.visible; }
 
 function dimensionExtent(dimension) {
@@ -136,7 +140,7 @@ function someFiltersActive(view) {
 function model(layout, d, i) {
     var cd0 = unwrap(d);
     var trace = cd0.trace;
-    var lineColor = cd0.lineColor;
+    var lineColor = convertTypedArray(cd0.lineColor);
     var line = trace.line;
     var cOpts = Colorscale.extractOpts(line);
     var cscale = cOpts.reversescale ? Colorscale.flipScale(cd0.cscale) : cd0.cscale;
@@ -270,6 +274,9 @@ function viewModel(state, callbacks, model) {
             }
         } else tickvals = undefined;
 
+        truncatedValues = convertTypedArray(truncatedValues);
+        truncatedValues = convertTypedArray(truncatedValues);
+
         return {
             key: key,
             label: dimension.label,

test/jasmine/tests/parcoords_test.js

@@ -322,7 +322,7 @@ describe('parcoords initialization tests', function() {
                 color: '#444'
             });
         });
-
+/* TODO: write a new test for typed arrays
         it('\'dimensions.values\' and \'line.color\' should convert typed arrays to normal arrays', function() {
             var fullTrace = _calc(Lib.extendDeep({}, base, {
                 dimensions: [{
@@ -346,6 +346,7 @@ describe('parcoords initialization tests', function() {
             expect(Array.isArray(fullTrace.dimensions[1].values) === true).toEqual(true);
             expect(Array.isArray(fullTrace.dimensions[2].values) === true).toEqual(true);
         });
+        */
     });
 });