move ptNumber2cdIndex computation to main binning loop

Author: etpinard

src/traces/histogram/calc.js

@@ -112,11 +112,13 @@ module.exports = function calc(gd, trace) {
         };
     }
 
+    // bin the data
+    // and make histogram-specific pt-number-to-cd-index map object
     var nMax = size.length;
     var uniqueValsPerBin = true;
     var leftGap = Infinity;
     var rightGap = Infinity;
-    // bin the data
+    var ptNumber2cdIndex = {};
     for(i = 0; i < pos0.length; i++) {
         var posi = pos0[i];
         n = Lib.findBin(posi, bins);
@@ -126,6 +128,7 @@ module.exports = function calc(gd, trace) {
                 uniqueValsPerBin = false;
             }
             inputPoints[n].push(i);
+            ptNumber2cdIndex[i] = n;
 
             leftGap = Math.min(leftGap, posi - binEdges[n]);
             rightGap = Math.min(rightGap, binEdges[n + 1] - posi);
@@ -195,7 +198,10 @@ module.exports = function calc(gd, trace) {
     }
 
     arraysToCalcdata(cd, trace);
-    calcSelection(cd, trace);
+
+    if(Array.isArray(trace.selectedpoints)) {
+        Lib.tagSelected(cd, trace, ptNumber2cdIndex);
+    }
 
     return cd;
 };
@@ -510,19 +516,3 @@ function cdf(size, direction, currentBin) {
         }
     }
 }
-
-function calcSelection(cd, trace) {
-    if(Array.isArray(trace.selectedpoints)) {
-        var ptNumber2cdIndex = {};
-
-        // make histogram-specific pt-number-to-cd-index map object
-        for(var i = 0; i < cd.length; i++) {
-            var pts = cd[i].pts || [];
-            for(var j = 0; j < pts.length; j++) {
-                ptNumber2cdIndex[pts[j]] = i;
-            }
-        }
-
-        Lib.tagSelected(cd, trace, ptNumber2cdIndex);
-    }
-}

test/jasmine/tests/select_test.js

@@ -554,6 +554,8 @@ describe('Test select box and lasso per trace:', function() {
 
                     if(typeof e[j] === 'number') {
                         expect(p[k]).toBeCloseTo(e[j], 1, msgFull);
+                    } else if(Array.isArray(e[j])) {
+                        expect(p[k]).toBeCloseToArray(e[j], 1, msgFull);
                     } else {
                         expect(p[k]).toBe(e[j], msgFull);
                     }
@@ -990,7 +992,7 @@ describe('Test select box and lasso per trace:', function() {
     });
 
     it('should work for histogram traces', function(done) {
-        var assertPoints = makeAssertPoints(['curveNumber', 'x', 'y']);
+        var assertPoints = makeAssertPoints(['curveNumber', 'x', 'y', 'pointIndices']);
         var assertRanges = makeAssertRanges();
         var assertLassoPoints = makeAssertLassoPoints();
 
@@ -1006,7 +1008,7 @@ describe('Test select box and lasso per trace:', function() {
                 [[200, 200], [400, 200], [400, 350], [200, 350], [200, 200]],
                 function() {
                     assertPoints([
-                        [0, 1.8, 2], [1, 2.2, 1], [1, 3.2, 1]
+                        [0, 1.8, 2, [3, 4]], [1, 2.2, 1, [1]], [1, 3.2, 1, [2]]
                     ]);
                     assertLassoPoints([
                         [1.66, 3.59, 3.59, 1.66, 1.66],
@@ -1024,7 +1026,7 @@ describe('Test select box and lasso per trace:', function() {
                 [[200, 200], [400, 350]],
                 function() {
                     assertPoints([
-                        [0, 1.8, 2], [1, 2.2, 1], [1, 3.2, 1]
+                        [0, 1.8, 2, [3, 4]], [1, 2.2, 1, [1]], [1, 3.2, 1, [2]]
                     ]);
                     assertRanges([[1.66, 3.59], [0.69, 2.17]]);
                 },