replace gd.numboxes by fullLayout._numBoxes

Author: etpinard

src/plots/plots.js

@@ -1342,7 +1342,6 @@ plots.purge = function(gd) {
     delete gd.firstscatter;
     delete gd._hmlumcount;
     delete gd._hmpixcount;
-    delete gd.numboxes;
     delete gd._transitionData;
     delete gd._transitioning;
     delete gd._initialAutoSize;
@@ -2159,8 +2158,8 @@ plots.doCalcdata = function(gd, traces) {
     // firstscatter: fill-to-next on the first trace goes to zero
     gd.firstscatter = true;
 
-    // how many box plots do we have (in case they're grouped)
-    gd.numboxes = 0;
+    // how many box/violins plots do we have (in case they're grouped)
+    fullLayout._numBoxes = 0;
 
     // for calculating avg luminosity of heatmaps
     gd._hmpixcount = 0;

src/traces/box/calc.js

@@ -15,11 +15,14 @@ var Axes = require('../../plots/cartesian/axes');
 
 // outlier definition based on http://www.physics.csbsju.edu/stats/box2.html
 module.exports = function calc(gd, trace) {
+    var fullLayout = gd._fullLayout;
     var xa = Axes.getFromId(gd, trace.xaxis || 'x');
     var ya = Axes.getFromId(gd, trace.yaxis || 'y');
     var orientation = trace.orientation;
     var cd = [];
 
+    var numKey = '_numBoxes';
+
     var i;
     var valAxis, valLetter;
     var posAxis, posLetter;
@@ -37,7 +40,7 @@ module.exports = function calc(gd, trace) {
     }
 
     var val = valAxis.makeCalcdata(trace, valLetter);
-    var pos = getPos(trace, posLetter, posAxis, val, gd.numboxes);
+    var pos = getPos(trace, posLetter, posAxis, val, fullLayout[numKey]);
 
     var dv = Lib.distinctVals(pos);
     var posDistinct = dv.vals;
@@ -115,10 +118,11 @@ module.exports = function calc(gd, trace) {
 
     if(cd.length > 0) {
         cd[0].t = {
-            boxnum: gd.numboxes,
+            num: fullLayout[numKey],
             dPos: dPos
         };
-        gd.numboxes++;
+
+        fullLayout[numKey]++;
         return cd;
     } else {
         return [{t: {emptybox: true}}];
@@ -130,7 +134,7 @@ module.exports = function calc(gd, trace) {
 // so if you want one box
 // per trace, set x0 (y0) to the x (y) value or category for this trace
 // (or set x (y) to a constant array matching y (x))
-function getPos(trace, posLetter, posAxis, val, numboxes) {
+function getPos(trace, posLetter, posAxis, val, num) {
     if(posLetter in trace) {
         return posAxis.makeCalcdata(trace, posLetter);
     }
@@ -150,7 +154,7 @@ function getPos(trace, posLetter, posAxis, val, numboxes) {
     )) {
         pos0 = trace.name;
     } else {
-        pos0 = numboxes;
+        pos0 = num;
     }
 
     var pos0c = posAxis.d2c(pos0, 0, trace[posLetter + 'calendar']);

src/traces/box/plot.js

@@ -49,12 +49,13 @@ module.exports = function plot(gd, plotinfo, cdbox) {
         var t = cd0.t;
         var trace = cd0.trace;
         var sel = cd0.node3 = d3.select(this);
+        var numBoxes = fullLayout._numBoxes;
 
-        var group = (fullLayout.boxmode === 'group' && gd.numboxes > 1);
+        var group = (fullLayout.boxmode === 'group' && numBoxes > 1);
         // box half width
-        var bdPos = t.dPos * (1 - fullLayout.boxgap) * (1 - fullLayout.boxgroupgap) / (group ? gd.numboxes : 1);
+        var bdPos = t.dPos * (1 - fullLayout.boxgap) * (1 - fullLayout.boxgroupgap) / (group ? numBoxes : 1);
         // box center offset
-        var bPos = group ? 2 * t.dPos * (-0.5 + (t.boxnum + 0.5) / gd.numboxes) * (1 - fullLayout.boxgap) : 0;
+        var bPos = group ? 2 * t.dPos * (-0.5 + (t.num + 0.5) / numBoxes) * (1 - fullLayout.boxgap) : 0;
         // whisker width
         var wdPos = bdPos * trace.whiskerwidth;
 

src/traces/box/set_positions.js

@@ -14,10 +14,13 @@ var Lib = require('../../lib');
 
 
 module.exports = function setPositions(gd, plotinfo) {
-    var fullLayout = gd._fullLayout,
-        xa = plotinfo.xaxis,
-        ya = plotinfo.yaxis,
-        orientations = ['v', 'h'];
+    var fullLayout = gd._fullLayout;
+    var xa = plotinfo.xaxis;
+    var ya = plotinfo.yaxis;
+    var orientations = ['v', 'h'];
+
+    var numKey = '_numBoxes';
+
     var posAxis, i, j, k;
 
     for(i = 0; i < orientations.length; ++i) {
@@ -63,12 +66,14 @@ module.exports = function setPositions(gd, plotinfo) {
         // box plots - update dPos based on multiple traces
         // and then use for posAxis autorange
 
-        var boxdv = Lib.distinctVals(boxpointlist),
-            dPos = boxdv.minDiff / 2;
+        var boxdv = Lib.distinctVals(boxpointlist);
+        var dPos = boxdv.minDiff / 2;
 
         // if there's no duplication of x points,
-        // disable 'group' mode by setting numboxes=1
-        if(boxpointlist.length === boxdv.vals.length) gd.numboxes = 1;
+        // disable 'group' mode by setting counter to 1
+        if(boxpointlist.length === boxdv.vals.length) {
+            fullLayout[numKey] = 1;
+        }
 
         // check for forced minimum dtick
         Axes.minDtick(posAxis, boxdv.minDiff, boxdv.vals[0], true);
@@ -79,11 +84,13 @@ module.exports = function setPositions(gd, plotinfo) {
             gd.calcdata[boxListIndex][0].t.dPos = dPos;
         }
 
+        var gap = fullLayout.boxgap;
+        var groupgap = fullLayout.boxgroupgap;
+
         // autoscale the x axis - including space for points if they're off the side
         // TODO: this will overdo it if the outermost boxes don't have
         // their points as far out as the other boxes
-        var padfactor = (1 - fullLayout.boxgap) * (1 - fullLayout.boxgroupgap) *
-                dPos / gd.numboxes;
+        var padfactor = (1 - gap) * (1 - groupgap) * dPos / fullLayout[numKey];
         Axes.expand(posAxis, boxdv.vals, {
             vpadminus: dPos + minPad * padfactor,
             vpadplus: dPos + maxPad * padfactor

test/jasmine/tests/plots_test.js

@@ -435,7 +435,7 @@ describe('Test Plots', function() {
             var expectedUndefined = [
                 'data', 'layout', '_fullData', '_fullLayout', 'calcdata', 'framework',
                 'empty', 'fid', 'undoqueue', 'undonum', 'autoplay', 'changed',
-                '_promises', '_redrawTimer', 'firstscatter', 'numboxes',
+                '_promises', '_redrawTimer', 'firstscatter',
                 '_transitionData', '_transitioning', '_hmpixcount', '_hmlumcount',
                 '_dragging', '_dragged', '_hoverdata', '_snapshotInProgress', '_editing',
                 '_replotPending', '_mouseDownTime', '_legendMouseDownTime'