fill scattergl calcdata only when dragmode is set to select/lasso

- this brings back first render for 1e6 pts in close to 1500ms
- add relayout logic so that updating into dragmode select/lasso
  triggers a recalc.

Author: etpinard

src/plot_api/plot_api.js

@@ -1939,15 +1939,16 @@ function _relayout(gd, aobj) {
             // trunk nodes (everything except the leaf)
             ptrunk = p.parts.slice(0, pend).join('.'),
             parentIn = Lib.nestedProperty(gd.layout, ptrunk).get(),
-            parentFull = Lib.nestedProperty(fullLayout, ptrunk).get();
+            parentFull = Lib.nestedProperty(fullLayout, ptrunk).get(),
+            vOld = p.get();
 
         if(vi === undefined) continue;
 
         redoit[ai] = vi;
 
         // axis reverse is special - it is its own inverse
         // op and has no flag.
-        undoit[ai] = (pleaf === 'reverse') ? vi : p.get();
+        undoit[ai] = (pleaf === 'reverse') ? vi : vOld;
 
         // Setting width or height to null must reset the graph's width / height
         // back to its initial value as computed during the first pass in Plots.plotAutoSize.
@@ -2140,9 +2141,18 @@ function _relayout(gd, aobj) {
                     ai.match(/^(bar|box|font)/)) {
                 flags.docalc = true;
             }
-            else if(fullLayout._has('gl2d') &&
-                (ai.indexOf('axis') !== -1 || ai === 'plot_bgcolor')
-            ) flags.doplot = true;
+            else if(fullLayout._has('gl2d')) {
+                if(ai.indexOf('axis') !== -1 || ai === 'plot_bgcolor') {
+                    flags.doplot = true;
+                }
+
+                if(ai === 'dragmode' &&
+                   (vi === 'lasso' || vi === 'select') &&
+                   !(vOld === 'lasso' || vOld === 'select')
+                ) {
+                    flags.docalc = true;
+                }
+            }
             else if(ai === 'hiddenlabels') flags.docalc = true;
             else if(proot.indexOf('legend') !== -1) flags.dolegend = true;
             else if(ai.indexOf('title') !== -1) flags.doticks = true;

src/plot_api/subroutines.js

@@ -386,11 +386,6 @@ exports.doModeBar = function(gd) {
         scene.updateFx(fullLayout.dragmode, fullLayout.hovermode);
     }
 
-    subplotIds = Plots.getSubplotIds(fullLayout, 'gl2d');
-    for(i = 0; i < subplotIds.length; i++) {
-        fullLayout._plots[subplotIds[i]]._scene2d.updateFx();
-    }
-
     return Plots.previousPromises(gd);
 };
 

src/plots/gl2d/scene2d.js

@@ -154,8 +154,6 @@ proto.makeFramework = function() {
     container.appendChild(canvas);
     container.appendChild(svgContainer);
     container.appendChild(mouseContainer);
-
-    this.updateFx();
 };
 
 proto.toImage = function(format) {
@@ -374,6 +372,7 @@ proto.plot = function(fullData, calcData, fullLayout) {
 
     this.updateRefs(fullLayout);
     this.updateTraces(fullData, calcData);
+    this.updateFx();
 
     var width = fullLayout.width,
         height = fullLayout.height;

src/traces/scattergl/calc.js

@@ -10,21 +10,31 @@
 'use strict';
 
 var Axes = require('../../plots/cartesian/axes');
+var arraysToCalcdata = require('../scatter/arrays_to_calcdata');
 var calcColorscales = require('../scatter/colorscale_calc');
 
 module.exports = function calc(gd, trace) {
-    var xa = Axes.getFromId(gd, trace.xaxis || 'x'),
-        ya = Axes.getFromId(gd, trace.yaxis || 'y');
+    var dragmode = gd._fullLayout.dragmode;
+    var cd;
 
-    var x = xa.makeCalcdata(trace, 'x'),
-        y = ya.makeCalcdata(trace, 'y');
+    if(dragmode === 'lasso' || dragmode === 'select') {
+        var xa = Axes.getFromId(gd, trace.xaxis || 'x');
+        var ya = Axes.getFromId(gd, trace.yaxis || 'y');
 
-    var serieslen = Math.min(x.length, y.length), i;
+        var x = xa.makeCalcdata(trace, 'x');
+        var y = ya.makeCalcdata(trace, 'y');
 
-    // create the "calculated data" to plot
-    var cd = new Array(serieslen);
-    for(i = 0; i < serieslen; i++) {
-        cd[i] = {x: x[i], y: y[i]};
+        var serieslen = Math.min(x.length, y.length), i;
+
+        // create the "calculated data" to plot
+        cd = new Array(serieslen);
+
+        for(i = 0; i < serieslen; i++) {
+            cd[i] = {x: x[i], y: y[i]};
+        }
+    } else {
+        cd = [{x: false, y: false, trace: trace, t: {}}];
+        arraysToCalcdata(cd, trace);
     }
 
     calcColorscales(trace);