stop slicing and generating fake arrays in scatter3d and surface defaults

Author: alexcjohnson

src/plots/gl3d/scene.js

@@ -306,9 +306,15 @@ proto.recoverContext = function() {
 
 var axisProperties = [ 'xaxis', 'yaxis', 'zaxis' ];
 
-function coordinateBound(axis, coord, d, bounds, calendar) {
+function coordinateBound(axis, coord, len, d, bounds, calendar) {
     var x;
-    for(var i = 0; i < coord.length; ++i) {
+    if(!Array.isArray(coord)) {
+        bounds[0][d] = Math.min(bounds[0][d], 0);
+        bounds[1][d] = Math.max(bounds[1][d], len - 1);
+        return;
+    }
+
+    for(var i = 0; i < (len || coord.length); ++i) {
         if(Array.isArray(coord[i])) {
             for(var j = 0; j < coord[i].length; ++j) {
                 x = axis.d2l(coord[i][j], 0, calendar);
@@ -330,9 +336,9 @@ function coordinateBound(axis, coord, d, bounds, calendar) {
 
 function computeTraceBounds(scene, trace, bounds) {
     var sceneLayout = scene.fullSceneLayout;
-    coordinateBound(sceneLayout.xaxis, trace.x, 0, bounds, trace.xcalendar);
-    coordinateBound(sceneLayout.yaxis, trace.y, 1, bounds, trace.ycalendar);
-    coordinateBound(sceneLayout.zaxis, trace.z, 2, bounds, trace.zcalendar);
+    coordinateBound(sceneLayout.xaxis, trace.x, trace._xlength, 0, bounds, trace.xcalendar);
+    coordinateBound(sceneLayout.yaxis, trace.y, trace._ylength, 1, bounds, trace.ycalendar);
+    coordinateBound(sceneLayout.zaxis, trace.z, trace._zlength, 2, bounds, trace.zcalendar);
 }
 
 proto.plot = function(sceneData, fullLayout, layout) {

src/traces/scatter3d/defaults.js

@@ -78,10 +78,9 @@ function handleXYZDefaults(traceIn, traceOut, coerce, layout) {
     handleCalendarDefaults(traceIn, traceOut, ['x', 'y', 'z'], layout);
 
     if(x && y && z) {
+        // TODO: what happens if one is missing?
         len = Math.min(x.length, y.length, z.length);
-        if(len < x.length) traceOut.x = x.slice(0, len);
-        if(len < y.length) traceOut.y = y.slice(0, len);
-        if(len < z.length) traceOut.z = z.slice(0, len);
+        traceOut._xlength = traceOut._ylength = traceOut._zlength = len;
     }
 
     return len;

src/traces/surface/convert.js

@@ -45,12 +45,17 @@ proto.handlePick = function(selection) {
         ];
         var traceCoordinate = [0, 0, 0];
 
-        if(Array.isArray(this.data.x[0])) {
+        if(!Array.isArray(this.data.x)) {
+            traceCoordinate[0] = selectIndex[0];
+        } else if(Array.isArray(this.data.x[0])) {
             traceCoordinate[0] = this.data.x[selectIndex[1]][selectIndex[0]];
         } else {
             traceCoordinate[0] = this.data.x[selectIndex[0]];
         }
-        if(Array.isArray(this.data.y[0])) {
+
+        if(!Array.isArray(this.data.y)) {
+            traceCoordinate[1] = selectIndex[1];
+        } else if(Array.isArray(this.data.y[0])) {
             traceCoordinate[1] = this.data.y[selectIndex[1]][selectIndex[0]];
         } else {
             traceCoordinate[1] = this.data.y[selectIndex[1]];
@@ -195,8 +200,8 @@ proto.update = function(data) {
         yaxis = sceneLayout.yaxis,
         zaxis = sceneLayout.zaxis,
         scaleFactor = scene.dataScale,
-        xlen = z[0].length,
-        ylen = z.length,
+        xlen = data._xlength,
+        ylen = data._ylength,
         coords = [
             ndarray(new Float32Array(xlen * ylen), [xlen, ylen]),
             ndarray(new Float32Array(xlen * ylen), [xlen, ylen]),
@@ -226,7 +231,11 @@ proto.update = function(data) {
     });
 
     // coords x
-    if(Array.isArray(x[0])) {
+    if(!Array.isArray(x)) {
+        fill(xc, function(row) {
+            return xaxis.d2l(row, 0, xcalendar) * scaleFactor[0];
+        });
+    } else if(Array.isArray(x[0])) {
         fill(xc, function(row, col) {
             return xaxis.d2l(x[col][row], 0, xcalendar) * scaleFactor[0];
         });
@@ -238,7 +247,11 @@ proto.update = function(data) {
     }
 
     // coords y
-    if(Array.isArray(y[0])) {
+    if(!Array.isArray(x)) {
+        fill(yc, function(row, col) {
+            return yaxis.d2l(col, 0, xcalendar) * scaleFactor[1];
+        });
+    } else if(Array.isArray(y[0])) {
         fill(yc, function(row, col) {
             return yaxis.d2l(y[col][row], 0, ycalendar) * scaleFactor[1];
         });

src/traces/surface/defaults.js

@@ -29,30 +29,16 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         return;
     }
 
-    var xlen = z[0].length;
-    var ylen = z.length;
+    traceOut._xlength = z[0].length;
+    traceOut._ylength = z.length;
 
     coerce('x');
     coerce('y');
 
     var handleCalendarDefaults = Registry.getComponentMethod('calendars', 'handleTraceDefaults');
     handleCalendarDefaults(traceIn, traceOut, ['x', 'y', 'z'], layout);
 
-    if(!Array.isArray(traceOut.x)) {
-        // build a linearly scaled x
-        traceOut.x = [];
-        for(i = 0; i < xlen; ++i) {
-            traceOut.x[i] = i;
-        }
-    }
-
     coerce('text');
-    if(!Array.isArray(traceOut.y)) {
-        traceOut.y = [];
-        for(i = 0; i < ylen; ++i) {
-            traceOut.y[i] = i;
-        }
-    }
 
     // Coerce remaining properties
     [

test/jasmine/tests/surface_test.js

@@ -25,14 +25,15 @@ describe('Test surface', function() {
             expect(traceOut.visible).toBe(false);
         });
 
-        it('should fill \'x\' and \'y\' if not provided', function() {
+        it('should NOT fill \'x\' and \'y\' if not provided', function() {
+            // this happens later on now
             traceIn = {
                 z: [[1, 2, 3], [2, 1, 2]]
             };
 
             supplyDefaults(traceIn, traceOut, defaultColor, layout);
-            expect(traceOut.x).toEqual([0, 1, 2]);
-            expect(traceOut.y).toEqual([0, 1]);
+            expect(traceOut.x).toBeUndefined();
+            expect(traceOut.y).toBeUndefined();
         });
 
         it('should coerce \'project\' if contours or highlight lines are enabled', function() {