bar: fix normalised group bar plots

n-riesco · n-riesco · commit 6aa7adc5a42b · 2016-11-14T18:57:33.000Z
* Fixed bug computing the normalisation of bar plots in group mode.

* The bug was caused by calling `sieve.put` with bar sizes that didn't
  take into account the bar base.

* Bar plots in stack and relative mode weren't affected by this bug,
  because traces that set a bar base are excluded from the
  stack/relative mode.
diff --git a/src/traces/bar/set_positions.js b/src/traces/bar/set_positions.js
@@ -485,8 +485,8 @@ function stackBars(gd, sa, sieve) {
             if(!isNumeric(bar.s)) continue;
 
             // stack current bar and get previous sum
-            var barBase = sieve.put(bar.p, bar.s),
-                barTop = barBase + bar.s;
+            var barBase = sieve.put(bar.p, bar.b + bar.s),
+                barTop = barBase + bar.b + bar.s;
 
             // store the bar base and top in each calcdata item
             bar.b = barBase;
@@ -524,7 +524,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.s);
+            if(isNumeric(bar.s)) sieve.put(bar.p, bar.b + bar.s);
         }
     }
 }
diff --git a/test/jasmine/tests/bar_test.js b/test/jasmine/tests/bar_test.js
@@ -453,6 +453,27 @@ describe('Bar.setPositions', function() {
         assertPointField(cd, 'y', [[0.75, 0.50, 0.25], [0.25, 0.50, 0.75]]);
     });
 
+    it('should honor barnorm (group+base case)', function() {
+        var gd = mockBarPlot([{
+            base: [3, 2, 1],
+            y: [0, 0, 0]
+        }, {
+            y: [1, 2, 3]
+        }], {
+            bargap: 0,
+            barmode: 'group',
+            barnorm: 'fraction'
+        });
+
+        expect(gd._fullLayout.barnorm).toBe('fraction');
+
+        var cd = gd.calcdata;
+        assertPointField(cd, 'b', [[0.75, 0.50, 0.25], [0, 0, 0]]);
+        assertPointField(cd, 's', [[0, 0, 0], [0.25, 0.50, 0.75]]);
+        assertPointField(cd, 'x', [[-0.25, 0.75, 1.75], [0.25, 1.25, 2.25]]);
+        assertPointField(cd, 'y', [[0.75, 0.50, 0.25], [0.25, 0.50, 0.75]]);
+    });
+
     it('should honor barnorm (stack case)', function() {
         var gd = mockBarPlot([{
             y: [3, 2, 1]

Original file line number	Diff line number	Diff line change
`@@ -485,8 +485,8 @@ function stackBars(gd, sa, sieve) {`
`485`	`485`	`if(!isNumeric(bar.s)) continue;`
`486`	`486`
`487`	`487`	`// stack current bar and get previous sum`
`488`		`- var barBase = sieve.put(bar.p, bar.s),`
`489`		`- barTop = barBase + bar.s;`
	`488`	`+ var barBase = sieve.put(bar.p, bar.b + bar.s),`
	`489`	`+ barTop = barBase + bar.b + bar.s;`
`490`	`490`
`491`	`491`	`// store the bar base and top in each calcdata item`
`492`	`492`	`bar.b = barBase;`
`@@ -524,7 +524,7 @@ function sieveBars(gd, sa, sieve) {`
`524`	`524`	`for(var j = 0; j < trace.length; j++) {`
`525`	`525`	`var bar = trace[j];`
`526`	`526`
`527`		`- if(isNumeric(bar.s)) sieve.put(bar.p, bar.s);`
	`527`	`+ if(isNumeric(bar.s)) sieve.put(bar.p, bar.b + bar.s);`
`528`	`528`	`}`
`529`	`529`	`}`
`530`	`530`	`}`