Filter points by range

plotly · dy · Nov 20, 2017 · Dec 11, 2017 · Dec 11, 2017 · Dec 11, 2017
commit e8276acb9fd0ab6d79a0ba7e001ca6684f39cf5d
diff --git a/src/traces/scattergl/index.js b/src/traces/scattergl/index.js
@@ -194,7 +194,13 @@ ScatterGl.calc = function calc(container, trace) {
     }
 
     // create scene
-    var scene = ScatterGl.scene(container, subplot, trace, positions, options);
+    var scene = ScatterGl.scene(container, subplot);
+
+    // set flags to create scene renderers
+    if(options.fill && !scene.fill2d) scene.fill2d = true;
+    if(options.marker && !scene.scatter2d) scene.scatter2d = true;
+    if(options.line && !scene.line2d) scene.line2d = true;
+    if((options.errorX || options.errorY) && !scene.error2d) scene.error2d = true;
 
     // save scene options batch
     scene.lineOptions.push(options.line);
@@ -516,11 +522,9 @@ ScatterGl.sceneOptions = function sceneOptions(container, subplot, trace, positi
 
 
 // make sure scene exists on subplot
-ScatterGl.scene = function getScene(container, subplot, trace, positions, options) {
+ScatterGl.scene = function getScene(container, subplot) {
     var scene = subplot._scene;
     var layout = container._fullLayout;
-    var xaxis = Axes.getFromId(container, trace.xaxis);
-    var yaxis = Axes.getFromId(container, trace.yaxis);
 
     if(!subplot._scene) {
         scene = subplot._scene = {
@@ -542,10 +546,10 @@ ScatterGl.scene = function getScene(container, subplot, trace, positions, option
             unselectBatch: null,
 
             // regl- component stubs, initialized in dirty plot call
-            fill2d: !!options.fill,
-            scatter2d: !!options.marker,
-            error2d: !!(options.errorX || options.errorY),
-            line2d: !!options.line,
+            fill2d: false,
+            scatter2d: false,
+            error2d: false,
+            line2d: false,
             select2d: null
         };
 
@@ -566,7 +570,6 @@ ScatterGl.scene = function getScene(container, subplot, trace, positions, option
 
         // draw traces in proper order
         scene.draw = function draw() {
-
             for(var i = 0; i < scene.count; i++) {
                 if(scene.fill2d) scene.fill2d.draw(i);
                 if(scene.line2d) {
@@ -594,27 +597,31 @@ ScatterGl.scene = function getScene(container, subplot, trace, positions, option
         scene.clear = function clear() {
             var vpSize = layout._size, width = layout.width, height = layout.height;
             var vp = [
-                vpSize.l + (xaxis ? xaxis.domain[0] : 0) * vpSize.w,
-                vpSize.b + (yaxis ? yaxis.domain[0] : 0) * vpSize.h,
-                (width - vpSize.r) - (1 - (xaxis ? xaxis.domain[1] : 1)) * vpSize.w,
-                (height - vpSize.t) - (1 - (yaxis ? yaxis.domain[1] : 1)) * vpSize.h
+                vpSize.l,
+                vpSize.b,
+                (width - vpSize.r),
+                (height - vpSize.t)
             ];
 
             var gl, regl;
 
-            regl = scene.select2d.regl;
-            gl = regl._gl;
-            gl.enable(gl.SCISSOR_TEST);
-            gl.scissor(vp[0], vp[1], vp[2] - vp[0], vp[3] - vp[1]);
-            gl.clearColor(0, 0, 0, 0);
-            gl.clear(gl.COLOR_BUFFER_BIT);
-
-            regl = scene.scatter2d.regl;
-            gl = regl._gl;
-            gl.enable(gl.SCISSOR_TEST);
-            gl.scissor(vp[0], vp[1], vp[2] - vp[0], vp[3] - vp[1]);
-            gl.clearColor(0, 0, 0, 0);
-            gl.clear(gl.COLOR_BUFFER_BIT);
+            if(scene.select2d) {
+                regl = scene.select2d.regl;
+                gl = regl._gl;
+                gl.enable(gl.SCISSOR_TEST);
+                gl.scissor(vp[0], vp[1], vp[2] - vp[0], vp[3] - vp[1]);
+                gl.clearColor(0, 0, 0, 0);
+                gl.clear(gl.COLOR_BUFFER_BIT);
+            }
+
+            if(scene.scatter2d) {
+                regl = scene.scatter2d.regl;
+                gl = regl._gl;
+                gl.enable(gl.SCISSOR_TEST);
+                gl.scissor(vp[0], vp[1], vp[2] - vp[0], vp[3] - vp[1]);
+                gl.clearColor(0, 0, 0, 0);
+                gl.clear(gl.COLOR_BUFFER_BIT);
+            }
         };
 
         // remove selection
@@ -648,12 +655,6 @@ ScatterGl.scene = function getScene(container, subplot, trace, positions, option
             delete subplot._scene;
         };
     }
-    else {
-        if(!!options.fill && !scene.fill2d) scene.fill2d = true;
-        if(!!options.marker && !scene.scatter2d) scene.scatter2d = true;
-        if(!!options.line && !scene.line2d) scene.line2d = true;
-        if(!!(options.errorX || options.errorY) && !scene.error2d) scene.error2d = true;
-    }
 
     // In case if we have scene from the last calc - reset data
     if(!scene.dirty) {
@@ -942,7 +943,7 @@ ScatterGl.plot = function plot(container, subplot, cdata) {
         } : null;
     });
 
-    // uploat batch data to GPU
+    // uploat viewport/range data to GPU
     if(scene.fill2d) {
         scene.fill2d.update(vpRange);
     }

diff --git a/src/traces/scatterpolargl/index.js b/src/traces/scatterpolargl/index.js
@@ -15,42 +15,23 @@ var Axes = require('../../plots/cartesian/axes');
 var kdtree = require('kdgrass');
 var Lib = require('../../lib');
 
+
 function calc(container, trace) {
     var layout = container._fullLayout;
     var subplotId = trace.subplot;
     var radialAxis = layout[subplotId].radialaxis;
     var angularAxis = layout[subplotId].angularaxis;
     var rArray = radialAxis.makeCalcdata(trace, 'r');
     var thetaArray = angularAxis.makeCalcdata(trace, 'theta');
-    var count = rArray.length;
     var stash = {};
-    var subplot = layout[subplotId];
-
-    var positions = new Array(count * 2), x = Array(count), y = Array(count);
-
-    function c2rad(v) {
-        return angularAxis.c2rad(v, trace.thetaunit);
-    }
-
-    for(var i = 0; i < count; i++) {
-        var r = rArray[i];
-        var theta = thetaArray[i];
-
-        if(isNumeric(r) && isNumeric(theta)) {
-            var rad = c2rad(theta);
-
-            x[i] = positions[i * 2] = r * Math.cos(rad);
-            y[i] = positions[i * 2 + 1] = r * Math.sin(rad);
-        } else {
-            x[i] = y[i] =
8000
 positions[i * 2] = positions[i * 2 + 1] = NaN;
-        }
-    }
 
     calcColorscales(trace);
 
+    stash.r = rArray;
+    stash.theta = thetaArray;
 
-    var options = ScatterGl.sceneOptions(container, subplot, trace, positions);
-
+    // FIXME: remove this once .plot API gets compatible w/others
+    stash.container = container;
 
     Axes.expand(radialAxis, rArray, {tozero: true});
 
@@ -59,48 +40,106 @@ function calc(container, trace) {
         Axes.expand(angularAxis, thetaArray);
     }
 
-    var scene = ScatterGl.scene(container, subplot, trace, positions, options);
-
-    // save scene options batch
-    scene.lineOptions.push(options.line);
-    scene.errorXOptions.push(options.errorX);
-    scene.errorYOptions.push(options.errorY);
-    scene.fillOptions.push(options.fill);
-    scene.markerOptions.push(options.marker);
-    scene.selectedOptions.push(options.selected);
-    scene.unselectedOptions.push(options.unselected);
-    scene.count++;
-
-    // stash scene ref
-    stash.scene = scene;
-    stash.index = scene.count - 1;
-    stash.x = x;
-    stash.y = y;
-    stash.rawx = x;
-    stash.rawy = y;
-    stash.r = rArray;
-    stash.theta = thetaArray;
-    stash.positions = positions;
-    stash.count = count;
+    return [{x: false, y: false, t: stash, trace: trace}];
+}
 
-    // FIXME: remove this later on once we get rid of .plot wrapper
-    stash.container = container;
 
-    // FIXME: delegate this to webworker
-    stash.tree = kdtree(positions, 512);
-    // var ids = stash.ids = Array(count);
-    // for(i = 0; i < count; i++) {
-    //     ids[i] = i;
77F4    // }
+function plot(subplot, cdata) {
+    var stash = cdata[0][0].t;
+    var container = stash.container;
+    var radialAxis = subplot.radialAxis;
+    var angularAxis = subplot.angularAxis;
+    var rRange = radialAxis.range;
+    var thetaRange = angularAxis.range;
+
+    var scene = ScatterGl.scene(container, subplot);
+    scene.clear();
+
+    cdata.forEach(function(cdscatter, traceIndex) {
+        if(!cdscatter || !cdscatter[0] || !cdscatter[0].trace) return;
+        var cd = cdscatter[0];
+        var trace = cd.trace;
+        var stash = cd.t;
+        var rArray = stash.r;
+        var thetaArray = stash.theta;
+        var i, r, theta;
+
+        // filter out by range
+        var newRadialArray = [];
+        var newThetaArray = [];
+
+        for(i = 0; i < rArray.length; i++) {
+            r = rArray[i], theta = thetaArray[i];
+
+            if(theta < 0) theta += 360;
+
+            if(r >= rRange[0] && r <= rRange[1] && theta >= thetaRange[0] && theta <= thetaRange[1]) {
+                newRadialArray.push(r);
+                newThetaArray.push(theta);
+            }
+        }
 
-    return [{x: false, y: false, t: stash, trace: trace}];
-}
+        rArray = newRadialArray;
+        thetaArray = newThetaArray;
+
+        var count = rArray.length;
+        var positions = new Array(count * 2), x = Array(count), y = Array(count);
+
+        function c2rad(v) {
+            return angularAxis.c2rad(v, trace.thetaunit);
+        }
 
+        for(i = 0; i < count; i++) {
+            r = rArray[i];
+            theta = thetaArray[i];
+
+            if(isNumeric(r) && isNumeric(theta)) {
+                var rad = c2rad(theta);
+
+                x[i] = positions[i * 2] = r * Math.cos(rad);
+                y[i] = positions[i * 2 + 1] = r * Math.sin(rad);
+            } else {
+                x[i] = y[i] = positions[i * 2] = positions[i * 2 + 1] = NaN;
+            }
+        }
 
-// FIXME: remove this wrapper once .plot args get consistent order
-function plot(plotinfo, cdata) {
-    var container = cdata[0][0].t.container;
-    return ScatterGl.plot(container, plotinfo, cdata);
+        var options = ScatterGl.sceneOptions(container, subplot, trace, positions);
+
+        // set flags to create scene renderers
+        if(options.fill && !scene.fill2d) scene.fill2d = true;
+        if(options.marker && !scene.scatter2d) scene.scatter2d = true;
+        if(options.line && !scene.line2d) scene.line2d = true;
+        if((options.errorX || options.errorY) && !scene.error2d) scene.error2d = true;
+
+        // save scene options batch
+        scene.lineOptions.push(options.line);
+        scene.errorXOptions.push(options.errorX);
+        scene.errorYOptions.push(options.errorY);
+        scene.fillOptions.push(options.fill);
+        scene.markerOptions.push(options.marker);
+        scene.selectedOptions.push(options.selected);
+        scene.unselectedOptions.push(options.unselected);
+        scene.count = cdata.length;
+
+        // stash scene ref
+        stash.scene = scene;
+        stash.index = traceIndex;
+        stash.x = x;
+        stash.y = y;
+        stash.rawx = x;
+        stash.rawy = y;
+        stash.r = rArray;
+        stash.theta = thetaArray;
+        stash.positions = positions;
+        stash.count = count;
+        stash.tree = kdtree(positions, 512);
+        // var ids = stash.ids = Array(count);
+        // for(i = 0; i < count; i++) {
+        //     ids[i] = i;
+        // }
+    });
+
+    return ScatterGl.plot(container, subplot, cdata);
 }