mv bPos, bdPos computation to Box.crossTraceCalc

etpinard · etpinard · commit faaf894e5102 · 2018-11-26T17:37:03.000-05:00
.. out of Box.plot and Violin.plot, AND use them to provide
   exact (!) findExtremes values.
diff --git a/src/traces/box/cross_trace_calc.js b/src/traces/box/cross_trace_calc.js
@@ -13,11 +13,6 @@ var Lib = require('../../lib');
 
 var orientations = ['v', 'h'];
 
-
-function getPosition(di) {
-    return di.pos;
-}
-
 function crossTraceCalc(gd, plotinfo) {
     var calcdata = gd.calcdata;
     var xa = plotinfo.xaxis;
@@ -27,8 +22,6 @@ function crossTraceCalc(gd, plotinfo) {
         var orientation = orientations[i];
         var posAxis = orientation === 'h' ? ya : xa;
         var boxList = [];
-        var minPad = 0;
-        var maxPad = 0;
 
         // make list of boxes / candlesticks
         // For backward compatibility, candlesticks are treated as if they *are* box traces here
@@ -45,27 +38,24 @@ function crossTraceCalc(gd, plotinfo) {
                     trace.yaxis === ya._id
               ) {
                 boxList.push(j);
-
-                if(trace.boxpoints) {
-                    minPad = Math.max(minPad, trace.jitter - trace.pointpos - 1);
-                    maxPad = Math.max(maxPad, trace.jitter + trace.pointpos - 1);
-                }
             }
         }
 
-        setPositionOffset('box', gd, boxList, posAxis, [minPad, maxPad]);
+        setPositionOffset('box', gd, boxList, posAxis);
     }
 }
 
-function setPositionOffset(traceType, gd, boxList, posAxis, pad) {
+function setPositionOffset(traceType, gd, boxList, posAxis) {
     var calcdata = gd.calcdata;
     var fullLayout = gd._fullLayout;
-    var pointList = [];
+    var axId = posAxis._id;
+    var axLetter = axId.charAt(0);
 
     // N.B. reused in violin
     var numKey = traceType === 'violin' ? '_numViolins' : '_numBoxes';
 
     var i, j, calcTrace;
+    var pointList = [];
 
     // make list of box points
     for(i = 0; i < boxList.length; i++) {
@@ -78,9 +68,8 @@ function setPositionOffset(traceType, gd, boxList, posAxis, pad) {
     if(!pointList.length) return;
 
     // box plots - update dPos based on multiple traces
-    // and then use for posAxis autorange
     var boxdv = Lib.distinctVals(pointList);
-    var dPos = boxdv.minDiff / 2;
+    var dPos0 = boxdv.minDiff / 2;
 
     // if there's no duplication of x points,
     // disable 'group' mode by setting counter to 1
@@ -91,33 +80,92 @@ function setPositionOffset(traceType, gd, boxList, posAxis, pad) {
     // check for forced minimum dtick
     Axes.minDtick(posAxis, boxdv.minDiff, boxdv.vals[0], true);
 
-    var gap = fullLayout[traceType + 'gap'];
-    var groupgap = fullLayout[traceType + 'groupgap'];
-    var padfactor = (1 - gap) * (1 - groupgap) * dPos / fullLayout[numKey];
+    var num = fullLayout[numKey];
+    var group = (fullLayout[traceType + 'mode'] === 'group' && num > 1);
+    var groupFraction = 1 - fullLayout[traceType + 'gap'];
+    var groupGapFraction = 1 - fullLayout[traceType + 'groupgap'];
 
-    // Find maximum trace width
-    // we baseline this at dPos
     for(i = 0; i < boxList.length; i++) {
         calcTrace = calcdata[boxList[i]];
-        // set the width of this box
-        // override dPos with trace.width if present
-        var thisDPos = calcTrace[0].t.dPos = (calcTrace[0].trace.width / 2) || dPos;
-        var positions = calcTrace.map(getPosition);
-        // 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 trace = calcTrace[0].trace;
-        var vpadminus_pos_side = (trace.pointpos <= 0) ? (-trace.pointpos) * padfactor * fullLayout[numKey] : 0;
-        var vpadplus_neg_side = (trace.pointpos >= 0) ? trace.pointpos * padfactor * fullLayout[numKey] : 0;
-        var side = calcTrace[0].trace.side;
-        var vpadminus = (side === 'positive') ? vpadminus_pos_side : (thisDPos + pad[0] * padfactor);
-        var vpadplus = (side === 'negative') ? vpadplus_neg_side : (thisDPos + pad[1] * padfactor);
-        var extremes = Axes.findExtremes(posAxis, positions, {
+        var t = calcTrace[0].t;
+        var width = trace.width;
+        var side = trace.side;
+        var pointpos = trace.pointpos;
+
+        // position coordinate delta
+        var dPos;
+        // box half width;
+        var bdPos;
+        // box center offset
+        var bPos;
+        // half-width within which to accept hover for this box/violin
+        // always split the distance to the closest box/violin
+        var wHover;
+
+        if(width) {
+            dPos = bdPos = wHover = width / 2;
+            bPos = 0;
+        } else {
+            dPos = dPos0;
+            bdPos = dPos * groupFraction * groupGapFraction / (group ? num : 1);
+            bPos = group ? 2 * dPos * (-0.5 + (t.num + 0.5) / num) * groupFraction : 0;
+            wHover = dPos * (group ? groupFraction / num : 1);
+        }
+        t.dPos = dPos;
+        t.bPos = bPos;
+        t.bdPos = bdPos;
+        t.wHover = wHover;
+
+        var edge = bPos + bdPos;
+        // data-space padding
+        var vpadplus = 0;
+        var vpadminus = 0;
+        // pixel-space padding
+        var ppadplus;
+        var ppadminus;
+
+        if(side === 'positive') {
+            vpadplus = edge;
+            vpadminus = bPos;
+        } else if(side === 'negative') {
+            vpadplus = bPos;
+            vpadminus = edge;
+        } else {
+            vpadplus = edge;
+            vpadminus = edge;
+        }
+
+        if(trace.boxpoints || trace.points) {
+            var jitter = trace.jitter;
+            var ms = trace.marker.size / 2;
+
+            if((pointpos + jitter) > 0) {
+                ppadplus = ms;
+                var pp = bPos + bdPos * (pointpos + jitter);
+                if(pp > vpadplus) vpadplus = pp;
+            }
+            if((pointpos - jitter) < 0) {
+                ppadminus = ms;
+                var pm = -bPos - bdPos * (pointpos - jitter);
+                if(pm > vpadminus) vpadminus = pm;
+            }
+        }
+
+        // calcdata[i][j] are in ascending order
+        var firstPos = calcTrace[0].pos;
+        var lastPos = calcTrace[calcTrace.length - 1].pos;
+
+        trace._extremes[axId] = Axes.findExtremes(posAxis, [firstPos, lastPos], {
             vpadminus: vpadminus,
             vpadplus: vpadplus,
+            // N.B. SVG px-space positive/negative
+            ppadminus: {x: ppadminus, y: ppadplus}[axLetter],
+            ppadplus: {x: ppadplus, y: ppadminus}[axLetter],
+            // add 5% of both sides
             padded: true
         });
-        calcTrace[0].trace._extremes[posAxis._id] = extremes;
     }
 }
 
diff --git a/src/traces/box/plot.js b/src/traces/box/plot.js
@@ -18,13 +18,8 @@ var JITTERCOUNT = 5; // points either side of this to include
 var JITTERSPREAD = 0.01; // fraction of IQR to count as "dense"
 
 function plot(gd, plotinfo, cdbox, boxLayer) {
-    var fullLayout = gd._fullLayout;
     var xa = plotinfo.xaxis;
     var ya = plotinfo.yaxis;
-    var numBoxes = fullLayout._numBoxes;
-    var group = (fullLayout.boxmode === 'group' && numBoxes > 1);
-    var groupFraction = (1 - fullLayout.boxgap);
-    var groupGapFraction = 1 - fullLayout.boxgroupgap;
 
     Lib.makeTraceGroups(boxLayer, cdbox, 'trace boxes').each(function(cd) {
         var plotGroup = d3.select(this);
@@ -33,23 +28,8 @@ function plot(gd, plotinfo, cdbox, boxLayer) {
         var trace = cd0.trace;
         if(!plotinfo.isRangePlot) cd0.node3 = plotGroup;
 
-        // position coordinate delta
-        var dPos = t.dPos;
-        // box half width;
-        var bdPos;
-        // box center offset
-        var bPos;
-
-        if(trace.width) {
-            bdPos = dPos;
-            bPos = 0;
-        } else {
-            bdPos = dPos * groupFraction * groupGapFraction / (group ? numBoxes : 1);
-            bPos = group ? 2 * dPos * (-0.5 + (t.num + 0.5) / numBoxes) * groupFraction : 0;
-        }
-
         // whisker width
-        var wdPos = bdPos * trace.whiskerwidth;
+        t.wdPos = t.bdPos * trace.whiskerwidth;
 
         if(trace.visible !== true || t.empty) {
             plotGroup.remove();
@@ -66,14 +46,6 @@ function plot(gd, plotinfo, cdbox, boxLayer) {
             valAxis = ya;
         }
 
-        // save the box size and box position for use by hover
-        t.bPos = bPos;
-        t.bdPos = bdPos;
-        t.wdPos = wdPos;
-        // half-width within which to accept hover for this box
-        // always split the distance to the closest box
-        t.wHover = t.dPos * (group ? groupFraction / numBoxes : 1);
-
         plotBoxAndWhiskers(plotGroup, {pos: posAxis, val: valAxis}, trace, t);
         plotPoints(plotGroup, {x: xa, y: ya}, trace, t);
         plotBoxMean(plotGroup, {pos: posAxis, val: valAxis}, trace, t);
diff --git a/src/traces/violin/cross_trace_calc.js b/src/traces/violin/cross_trace_calc.js
@@ -20,8 +20,6 @@ module.exports = function crossTraceCalc(gd, plotinfo) {
         var orientation = orientations[i];
         var posAxis = orientation === 'h' ? ya : xa;
         var violinList = [];
-        var minPad = 0;
-        var maxPad = 0;
 
         for(var j = 0; j < calcdata.length; j++) {
             var cd = calcdata[j];
@@ -35,14 +33,9 @@ module.exports = function crossTraceCalc(gd, plotinfo) {
                     trace.yaxis === ya._id
               ) {
                 violinList.push(j);
-
-                if(trace.points !== false) {
-                    minPad = Math.max(minPad, trace.jitter - trace.pointpos - 1);
-                    maxPad = Math.max(maxPad, trace.jitter + trace.pointpos - 1);
-                }
             }
         }
 
-        setPositionOffset('violin', gd, violinList, posAxis, [minPad, maxPad]);
+        setPositionOffset('violin', gd, violinList, posAxis);
     }
 };
diff --git a/src/traces/violin/plot.js b/src/traces/violin/plot.js
@@ -20,10 +20,6 @@ module.exports = function plot(gd, plotinfo, cdViolins, violinLayer) {
     var fullLayout = gd._fullLayout;
     var xa = plotinfo.xaxis;
     var ya = plotinfo.yaxis;
-    var numViolins = fullLayout._numViolins;
-    var group = (fullLayout.violinmode === 'group' && numViolins > 1);
-    var groupFraction = 1 - fullLayout.violingap;
-    var groupGapFraction = 1 - fullLayout.violingroupgap;
 
     function makePath(pts) {
         var segments = linePoints(pts, {
@@ -44,35 +40,13 @@ module.exports = function plot(gd, plotinfo, cdViolins, violinLayer) {
         var trace = cd0.trace;
         if(!plotinfo.isRangePlot) cd0.node3 = plotGroup;
 
-        // position coordinate delta
-        var dPos = t.dPos;
-        // violin max half width
-        var bdPos;
-        // violin center offset
-        var bPos;
-        // half-width within which to accept hover for this violin
-        // always split the distance to the closest violin
-        var wHover;
-
-        if(trace.width) {
-            bdPos = dPos;
-            bPos = 0;
-            wHover = dPos;
-        } else {
-            bdPos = dPos * groupFraction * groupGapFraction / (group ? numViolins : 1);
-            bPos = group ? 2 * dPos * (-0.5 + (t.num + 0.5) / numViolins) * groupFraction : 0;
-            wHover = dPos * (group ? groupFraction / numViolins : 1);
-        }
-
-        t.bdPos = bdPos;
-        t.bPos = bPos;
-        t.wHover = wHover;
-
         if(trace.visible !== true || t.empty) {
             plotGroup.remove();
             return;
         }
 
+        var bPos = t.bPos;
+        var bdPos = t.bdPos;
         var valAxis = plotinfo[t.valLetter + 'axis'];
         var posAxis = plotinfo[t.posLetter + 'axis'];
         var hasBothSides = trace.side === 'both';
