fill in non-numeric bar items in calcdata

- as per AJ's recommendation
- and skip over them in setPositions
- use BADNUM constant to skip over non-numeric items
  (recall: non-numeric values are set to BADNUM in makeCalcdata)

Author: etpinard

src/traces/bar/calc.js

@@ -49,24 +49,11 @@ module.exports = function calc(gd, trace) {
 
     // create the "calculated data" to plot
     var serieslen = Math.min(pos.length, size.length),
-        cd = [];
+        cd = new Array(serieslen);
 
     // set position and size
     for(i = 0; i < serieslen; i++) {
-        var p = pos[i];
-        var s = size[i];
-
-        // add bars with non-numeric sizes to calcdata
-        // so that ensure that traces with gaps are
-        // plotted in the correct order
-
-        if(isNumeric(p)) {
-            if(isNumeric(s)) {
-                cd.push({ p: p, s: s });
-            } else {
-                cd.push({ p: p });
-            }
-        }
+        cd[i] = { p: pos[i], s: size[i] };
     }
 
     // set base

src/traces/bar/set_positions.js

@@ -10,6 +10,7 @@
 'use strict';
 
 var isNumeric = require('fast-isnumeric');
+var BADNUM = require('../../constants/numerical').BADNUM;
 
 var Registry = require('../../registry');
 var Axes = require('../../plots/cartesian/axes');
@@ -188,7 +189,7 @@ function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces) {
         for(var j = 0; j < calcTrace.length; j++) {
             var bar = calcTrace[j];
 
-            if(!isNumeric(bar.s)) continue;
+            if(bar.s === BADNUM) continue;
 
             var isOutmostBar = ((bar.b + bar.s) === sieve.get(bar.p, bar.s));
             if(isOutmostBar) bar._outmost = true;
@@ -395,6 +396,8 @@ function setBarCenter(gd, pa, sieve) {
             calcBar[pLetter] = calcBar.p +
                 ((poffsetIsArray) ? poffset[j] : poffset) +
                 ((barwidthIsArray) ? barwidth[j] : barwidth) / 2;
+
+
         }
     }
 }
@@ -502,7 +505,7 @@ function stackBars(gd, sa, sieve) {
         for(j = 0; j < trace.length; j++) {
             bar = trace[j];
 
-            if(!isNumeric(bar.s)) continue;
+            if(bar.s === BADNUM) continue;
 
             // stack current bar and get previous sum
             var barBase = sieve.put(bar.p, bar.b + bar.s),
@@ -533,7 +536,7 @@ function sieveBars(gd, sa, sieve) {
         for(var j = 0; j < trace.length; j++) {
             var bar = trace[j];
 
-            if(isNumeric(bar.s)) sieve.put(bar.p, bar.b + bar.s);
+            if(bar.s !== BADNUM) sieve.put(bar.p, bar.b + bar.s);
         }
     }
 }
@@ -569,7 +572,7 @@ function normalizeBars(gd, sa, sieve) {
         for(var j = 0; j < trace.length; j++) {
             var bar = trace[j];
 
-            if(!isNumeric(bar.s)) continue;
+            if(bar.s === BADNUM) continue;
 
             var scale = Math.abs(sTop / sieve.get(bar.p, bar.s));
             bar.b *= scale;

src/traces/bar/sieve.js

@@ -11,6 +11,7 @@
 module.exports = Sieve;
 
 var Lib = require('../../lib');
+var BADNUM = require('../../constants/numerical').BADNUM;
 
 /**
  * Helper class to sieve data from traces into bins
@@ -34,7 +35,7 @@ function Sieve(traces, separateNegativeValues, dontMergeOverlappingData) {
         var trace = traces[i];
         for(var j = 0; j < trace.length; j++) {
             var bar = trace[j];
-            positions.push(bar.p);
+            if(bar.p !== BADNUM) positions.push(bar.p);
         }
     }
     this.positions = positions;

test/jasmine/tests/bar_test.js

@@ -284,15 +284,15 @@ describe('Bar.calc', function() {
         assertPointField(cd, 'b', [[0, 1, 2], [0, 1, 0], [0, 0]]);
     });
 
-    it('should exclude items with non-numeric x/y from calcdata', function() {
+    it('should not exclude items with non-numeric x/y from calcdata', function() {
         var gd = mockBarPlot([{
             x: [5, NaN, 15, 20, null, 21],
             y: [20, NaN, 23, 25, null, 26]
         }]);
 
         var cd = gd.calcdata;
-        assertPointField(cd, 'x', [[5, 15, 20, 21]]);
-        assertPointField(cd, 'y', [[20, 23, 25, 26]]);
+        assertPointField(cd, 'x', [[5, NaN, 15, 20, NaN, 21]]);
+        assertPointField(cd, 'y', [[20, NaN, 23, 25, NaN, 26]]);
     });
 
     it('should not exclude items with non-numeric y from calcdata (to plots gaps correctly)', function() {