bar: refactor code into function setBaseAndSize

Author: n-riesco

src/traces/bar/set_positions.js

@@ -54,8 +54,7 @@ function setGroupPositions(gd, pa, sa, traces) {
 
     var fullLayout = gd._fullLayout,
         pLetter = pa._id.charAt(0),
-        sLetter = sa._id.charAt(0),
-        i, j;
+        sLetter = sa._id.charAt(0);
 
     if(fullLayout.barmode === 'overlay') {
         traces.forEach(function(trace) {
@@ -64,6 +63,83 @@ function setGroupPositions(gd, pa, sa, traces) {
     }
     else setOffsetAndWidth(gd, pa, pLetter, traces);
 
+    setBaseAndSize(gd, sa, sLetter, traces);
+}
+
+
+// bar position offset and width calculation
+// traces is a list of traces (in calcdata) to look at together
+// to find the maximum width bars that won't overlap
+// for stacked or grouped bars, this is all vertical or horizontal
+// bars for overlaid bars, call this individually on each trace.
+function setOffsetAndWidth(gd, pa, pLetter, traces) {
+    var fullLayout = gd._fullLayout,
+        i, trace,
+        j, bar;
+
+    // make list of bar positions
+    var positions = [];
+    for(i = 0; i < traces.length; i++) {
+        trace = traces[i];
+        for(j = 0; j < trace.length; j++) {
+            bar = trace[j];
+            positions.push(bar.p);
+        }
+    }
+
+    var dv = Lib.distinctVals(positions),
+        distinctPositions = dv.vals,
+        minDiff = dv.minDiff;
+
+    // check if there are any overlapping positions;
+    // if there aren't, let them have full width even if mode is group
+    var overlap = false;
+    if(fullLayout.barmode === 'group') {
+        overlap = (positions.length !== distinctPositions.length);
+    }
+
+    // check forced minimum dtick
+    Axes.minDtick(pa, minDiff, distinctPositions[0], overlap);
+
+    // position axis autorange - always tight fitting
+    Axes.expand(pa, distinctPositions, {vpad: minDiff / 2});
+
+    // computer bar widths and position offsets
+    var barWidth = minDiff * (1 - fullLayout.bargap);
+    if(overlap) barWidth /= traces.length;
+
+    var barWidthMinusGroupGap = barWidth * (1 - fullLayout.bargroupgap);
+
+    for(i = 0; i < traces.length; i++) {
+        trace = traces[i];
+
+        // computer bar group center and bar offset
+        var offsetFromCenter = (
+                (overlap ? (2 * i + 1 - traces.length) * barWidth : 0) -
+                barWidthMinusGroupGap
+            ) / 2,
+            barCenter = offsetFromCenter + barWidthMinusGroupGap / 2;
+
+        // store bar width and offset for this trace
+        var t = trace[0].t;
+        t.barwidth = barWidthMinusGroupGap;
+        t.poffset = offsetFromCenter;
+        t.dbar = minDiff;
+
+        // store the bar center in each calcdata item
+        for(j = 0; j < trace.length; j++) {
+            bar = trace[j];
+            bar[pLetter] = bar.p + barCenter;
+        }
+    }
+}
+
+
+function setBaseAndSize(gd, sa, sLetter, traces) {
+    var fullLayout = gd._fullLayout,
+        i, trace,
+        j, bar;
+
     var stack = (fullLayout.barmode === 'stack'),
         relative = (fullLayout.barmode === 'relative'),
         norm = fullLayout.barnorm;
@@ -85,32 +161,32 @@ function setGroupPositions(gd, pa, sa, traces) {
             sv = 0,
             padded = true,
             barEnd,
-            ti,
             scale;
 
         for(i = 0; i < traces.length; i++) { // trace index
-            ti = traces[i];
+            trace = traces[i];
 
-            for(j = 0; j < ti.length; j++) {
+            for(j = 0; j < trace.length; j++) {
+                bar = trace[j];
 
                 // skip over bars with no size,
                 // so that we don't try to stack them
-                if(!isNumeric(ti[j].s)) continue;
+                if(!isNumeric(bar.s)) continue;
 
-                sv = Math.round(ti[j].p / sumround);
+                sv = Math.round(bar.p / sumround);
 
                 // store the negative sum value for p at the same key,
                 // with sign flipped using string to ensure -0 !== 0.
-                if(relative && ti[j].s < 0) sv = '-' + sv;
+                if(relative && bar.s < 0) sv = '-' + sv;
 
                 var previousSum = sums[sv] || 0;
-                if(stack || relative) ti[j].b = previousSum;
-                barEnd = ti[j].b + ti[j].s;
-                sums[sv] = previousSum + ti[j].s;
+                if(stack || relative) bar.b = previousSum;
+                barEnd = bar.b + bar.s;
+                sums[sv] = previousSum + bar.s;
 
                 // store the bar top in each calcdata item
                 if(stack || relative) {
-                    ti[j][sLetter] = barEnd;
+                    bar[sLetter] = barEnd;
                     if(!norm && isNumeric(sa.c2l(barEnd))) {
                         sMax = Math.max(sMax, barEnd);
                         sMin = Math.min(sMin, barEnd);
@@ -129,12 +205,14 @@ function setGroupPositions(gd, pa, sa, traces) {
             sMax = stack ? top : 0;
 
             for(i = 0; i < traces.length; i++) { // trace index
-                ti = traces[i];
+                trace = traces[i];
 
-                for(j = 0; j < ti.length; j++) {
-                    relAndNegative = (relative && ti[j].s < 0);
+                for(j = 0; j < trace.length; j++) {
+                    bar = trace[j];
 
-                    sv = Math.round(ti[j].p / sumround);
+                    relAndNegative = (relative && bar.s < 0);
+
+                    sv = Math.round(bar.p / sumround);
 
                     // locate negative sum amount for this p val
                     if(relAndNegative) sv = '-' + sv;
@@ -143,10 +221,10 @@ function setGroupPositions(gd, pa, sa, traces) {
 
                     // preserve sign if negative
                     if(relAndNegative) scale *= -1;
-                    ti[j].b *= scale;
-                    ti[j].s *= scale;
-                    barEnd = ti[j].b + ti[j].s;
-                    ti[j][sLetter] = barEnd;
+                    bar.b *= scale;
+                    bar.s *= scale;
+                    barEnd = bar.b + bar.s;
+                    bar[sLetter] = barEnd;
 
                     if(isNumeric(sa.c2l(barEnd))) {
                         if(barEnd < sMin - tiny) {
@@ -175,71 +253,3 @@ function setGroupPositions(gd, pa, sa, traces) {
         }
     }
 }
-
-
-// bar position offset and width calculation
-// traces is a list of traces (in calcdata) to look at together
-// to find the maximum width bars that won't overlap
-// for stacked or grouped bars, this is all vertical or horizontal
-// bars for overlaid bars, call this individually on each trace.
-function setOffsetAndWidth(gd, pa, pLetter, traces) {
-    var fullLayout = gd._fullLayout,
-        i, trace,
-        j, bar;
-
-    // make list of bar positions
-    var positions = [];
-    for(i = 0; i < traces.length; i++) {
-        trace = traces[i];
-        for(j = 0; j < trace.length; j++) {
-            bar = trace[j];
-            positions.push(bar.p);
-        }
-    }
-
-    var dv = Lib.distinctVals(positions),
-        distinctPositions = dv.vals,
-        minDiff = dv.minDiff;
-
-    // check if there are any overlapping positions;
-    // if there aren't, let them have full width even if mode is group
-    var overlap = false;
-    if(fullLayout.barmode === 'group') {
-        overlap = (positions.length !== distinctPositions.length);
-    }
-
-    // check forced minimum dtick
-    Axes.minDtick(pa, minDiff, distinctPositions[0], overlap);
-
-    // position axis autorange - always tight fitting
-    Axes.expand(pa, distinctPositions, {vpad: minDiff / 2});
-
-    // computer bar widths and position offsets
-    var barWidth = minDiff * (1 - fullLayout.bargap);
-    if(overlap) barWidth /= traces.length;
-
-    var barWidthMinusGroupGap = barWidth * (1 - fullLayout.bargroupgap);
-
-    for(i = 0; i < traces.length; i++) {
-        trace = traces[i];
-
-        // computer bar group center and bar offset
-        var offsetFromCenter = (
-                (overlap ? (2 * i + 1 - traces.length) * barWidth : 0) -
-                barWidthMinusGroupGap
-            ) / 2,
-            barCenter = offsetFromCenter + barWidthMinusGroupGap / 2;
-
-        // store bar width and offset for this trace
-        var t = trace[0].t;
-        t.barwidth = barWidthMinusGroupGap;
-        t.poffset = offsetFromCenter;
-        t.dbar = minDiff;
-
-        // store the bar center in each calcdata item
-        for(j = 0; j < trace.length; j++) {
-            bar = trace[j];
-            bar[pLetter] = bar.p + barCenter;
-        }
-    }
-}