store cornerradius in t instead of trace; general cleanup

Author: emilykl

src/traces/bar/cross_trace_calc.js

@@ -123,40 +123,53 @@ function setGroupPositions(gd, pa, sa, calcTraces, opts) {
             }
             break;
     }
+    setCornerradius(calcTraces);
     collectExtents(calcTraces, pa);
 }
 
+// Set cornerradiusvalue and cornerradiusform in calcTraces[0].t
+function setCornerradius(calcTraces) {
+    var i, calcTrace, fullTrace, t, cr, crValue, crForm;
+
+    for(i = 0; i < calcTraces.length; i++) {
+        calcTrace = calcTraces[i];
+        fullTrace = calcTrace[0].trace;
+        t = calcTrace[0].t;
+
+        if(t.cornerradiusvalue === undefined) {
+            cr = fullTrace.marker ? fullTrace.marker.cornerradius : undefined;
+            if(cr !== undefined) {
+                crValue = isNumeric(cr) ? +cr : +cr.slice(0, -1);
+                crForm = isNumeric(cr) ? 'px' : '%';
+                t.cornerradiusvalue = crValue;
+                t.cornerradiusform = crForm;
+            }
+        }
+    }
+}
+
+// Make sure all traces in a stack use the same cornerradius
 function standardizeCornerradius(calcTraces) {
     if(calcTraces.length < 2) return;
-    var i, calcTrace, fullTrace;
-    var cr;
+    var i, calcTrace, fullTrace, t;
+    var cr, crValue, crForm;
     for(i = 0; i < calcTraces.length; i++) {
         calcTrace = calcTraces[i];
         fullTrace = calcTrace[0].trace;
-
-        fullTrace.marker = fullTrace.marker || {};
-        cr = fullTrace.marker.cornerradius;
+        cr = fullTrace.marker ? fullTrace.marker.cornerradius : undefined;
         if(cr !== undefined) break;
     }
-    // If any trace has cornerradius, set all other traces
-    // to match first trace which has cornerradius
+    // If any trace has cornerradius, store first cornerradius
+    // in calcTrace[0].t so that all traces in stack use same cornerradius
     if(cr !== undefined) {
+        crValue = isNumeric(cr) ? +cr : +cr.slice(0, -1);
+        crForm = isNumeric(cr) ? 'px' : '%';
         for(i = 0; i < calcTraces.length; i++) {
             calcTrace = calcTraces[i];
-            fullTrace = calcTrace[0].trace;
+            t = calcTrace[0].t;
 
-            fullTrace.marker = fullTrace.marker || {};
-            fullTrace.marker.cornerradius = cr;
-        }
-    // Otherwise, remove cornerradius from all other traces
-    } else {
-        for(i = 0; i < calcTraces.length; i++) {
-            calcTrace = calcTraces[i];
-            fullTrace = calcTrace[0].trace;
-
-            if(fullTrace.marker && fullTrace.marker.cornerradius) {
-                delete fullTrace.marker.cornerradius;
-            }
+            t.cornerradiusvalue = crValue;
+            t.cornerradiusform = crForm;
         }
     }
 }
@@ -754,13 +767,14 @@ function normalizeBars(sa, sieve, opts) {
 // Add an `_sMin` and `_sMax` value for each bar representing the min and max size value
 // across all bars sharing the same position as that bar. These values are used for rounded
 // bar corners, to carry rounding down to lower bars in the stack as needed.
-function setHelperValuesForRoundedCorners(calcTraces, sMinByPos, sMaxByPos) {
+function setHelperValuesForRoundedCorners(calcTraces, sMinByPos, sMaxByPos, pa) {
+    var pLetter = getAxisLetter(pa);
     // Set `_sMin` and `_sMax` value for each bar
     for(var i = 0; i < calcTraces.length; i++) {
         var calcTrace = calcTraces[i];
         for(var j = 0; j < calcTrace.length; j++) {
             var bar = calcTrace[j];
-            var pos = bar.p0;
+            var pos = bar[pLetter];
             bar._sMin = sMinByPos[pos];
             bar._sMax = sMaxByPos[pos];
         }
@@ -840,14 +854,14 @@ function collectExtents(calcTraces, pa) {
             if(anyTraceHasCornerradius) {
                 var sMin = Math.min(di.s0, di.s1) || 0;
                 var sMax = Math.max(di.s0, di.s1) || 0;
-                var pos = di.p0;
+                var pos = di[pLetter];
                 sMinByPos[pos] = (pos in sMinByPos) ? Math.min(sMinByPos[pos], sMin) : sMin;
                 sMaxByPos[pos] = (pos in sMaxByPos) ? Math.max(sMaxByPos[pos], sMax) : sMax;
             }
         }
     }
     if(anyTraceHasCornerradius) {
-        setHelperValuesForRoundedCorners(calcTraces, sMinByPos, sMaxByPos);
+        setHelperValuesForRoundedCorners(calcTraces, sMinByPos, sMaxByPos, pa);
     }
 }
 

src/traces/bar/defaults.js

@@ -93,18 +93,17 @@ function crossTraceDefaults(fullData, fullLayout) {
 // If the given cornerradius value is a numeric string, it will be converted
 // to a number.
 function validateCornerradius(r) {
-    var validR = false;
     if(isNumeric(r)) {
         r = +r;
-        if(r >= 0) validR = true;
-    } else if(typeof r === 'string' && r.slice(-1) === '%') {
-        r = +r.slice(0, -1);
-        if(r >= 0) {
-            r += '%';
-            validR = true;
+        if(r >= 0) return r;
+    } else if(typeof r === 'string') {
+        r = r.trim();
+        if(r.slice(-1) === '%' && isNumeric(r.slice(0, -1))) {
+            r = +r.slice(0, -1);
+            if(r >= 0) return r + '%';
         }
     }
-    return validR ? r : undefined;
+    return undefined;
 }
 
 function handleText(traceIn, traceOut, layout, coerce, textposition, opts) {

src/traces/bar/layout_defaults.js

@@ -5,6 +5,8 @@ var Axes = require('../../plots/cartesian/axes');
 var Lib = require('../../lib');
 
 var layoutAttributes = require('./layout_attributes');
+var validateCornerradius = require('./defaults').validateCornerradius;
+
 
 module.exports = function(layoutIn, layoutOut, fullData) {
     function coerce(attr, dflt) {
@@ -47,5 +49,6 @@ module.exports = function(layoutIn, layoutOut, fullData) {
 
     coerce('bargap', (shouldBeGapless && !gappedAnyway) ? 0 : 0.2);
     coerce('bargroupgap');
-    coerce('barcornerradius');
+    var r = coerce('barcornerradius');
+    layoutOut.barcornerradius = validateCornerradius(r);
 };

src/traces/bar/plot.js

@@ -100,6 +100,7 @@ function plot(gd, plotinfo, cdModule, traceLayer, opts, makeOnCompleteCallback)
     var bartraces = Lib.makeTraceGroups(traceLayer, cdModule, 'trace bars').each(function(cd) {
         var plotGroup = d3.select(this);
         var trace = cd[0].trace;
+        var t = cd[0].t;
         var isWaterfall = (trace.type === 'waterfall');
         var isFunnel = (trace.type === 'funnel');
         var isHistogram = (trace.type === 'histogram');
@@ -249,26 +250,26 @@ function plot(gd, plotinfo, cdModule, traceLayer, opts, makeOnCompleteCallback)
             }
 
             // Calculate corner radius of bar in pixels
-            function calcCornerRadius(radiusParam) {
+            function calcCornerRadius(crValue, crForm) {
                 var barWidth = isHorizontal ? Math.abs(y1 - y0) : Math.abs(x1 - x0);
                 var barLength = isHorizontal ? Math.abs(x1 - x0) : Math.abs(y1 - y0);
                 var stackedBarTotalLength = fixpx(Math.abs(c2p(outerBound, true) - c2p(0, true)));
                 var maxRadius = di.hasB ? Math.min(barWidth / 2, barLength / 2) : Math.min(barWidth / 2, stackedBarTotalLength);
-                var rPx;
-                if(!radiusParam) {
+                var crPx;
+                if(!crValue) {
                     return 0;
-                } else if(typeof radiusParam === 'string') {
+                } else if(crForm === '%') {
                     // If radius is given as a % string, convert to number of pixels
-                    var rPercent = Math.min(50, +radiusParam.slice(0, -1));
-                    rPx = barWidth * (rPercent / 100);
+                    var crPercent = Math.min(50, crValue);
+                    crPx = barWidth * (crPercent / 100);
                 } else {
                     // Otherwise, it's already a number of pixels, use the given value
-                    rPx = +radiusParam;
+                    crPx = crValue;
                 }
-                return fixpx(Math.max(Math.min(rPx, maxRadius), 0));
+                return fixpx(Math.max(Math.min(crPx, maxRadius), 0));
             }
             // Exclude anything which is not explicitly a bar or histogram chart from rounding
-            var r = (isBar || isHistogram) ? calcCornerRadius(trace.marker.cornerradius) : 0;
+            var r = (isBar || isHistogram) ? calcCornerRadius(t.cornerradiusvalue, t.cornerradiusform) : 0;
             // Construct path string for bar
             var path, h;
             // Functions which return x-dimension and y-dimension of bar at a given x/y,
@@ -580,11 +581,13 @@ function appendBarText(gd, plotinfo, bar, cd, i, x0, x1, y0, y1, lxFunc, lyFunc,
             trace.constraintext === 'both' ||
             trace.constraintext === 'inside';
 
-        transform = toMoveInsideBarWithCornerradius(x0, x1, y0, y1, textBB, lxFunc, lyFunc, {
+        transform = toMoveInsideBar(x0, x1, y0, y1, textBB, {
             isHorizontal: isHorizontal,
             constrained: constrained,
             angle: angle,
             anchor: insidetextanchor,
+            lxFunc: lxFunc,
+            lyFunc: lyFunc,
         });
     }
 
@@ -612,11 +615,6 @@ function getRotatedTextSize(textBB, rotate) {
 }
 
 function toMoveInsideBar(x0, x1, y0, y1, textBB, opts) {
-    // Wrapper for export
-    return toMoveInsideBarWithCornerradius(x0, x1, y0, y1, textBB, null, null, opts);
-}
-
-function toMoveInsideBarWithCornerradius(x0, x1, y0, y1, textBB, lxFunc, lyFunc, opts) {
     var isHorizontal = !!opts.isHorizontal;
     var constrained = !!opts.constrained;
     var angle = opts.angle || 0;
@@ -626,6 +624,8 @@ function toMoveInsideBarWithCornerradius(x0, x1, y0, y1, textBB, lxFunc, lyFunc,
     var leftToRight = opts.leftToRight || 0; // left: -1, center: 0, right: 1
     var toRight = (leftToRight + 1) / 2;
     var toLeft = 1 - toRight;
+    var lxFunc = opts.lxFunc;
+    var lyFunc = opts.lyFunc;
 
     var textWidth = textBB.width;
     var textHeight = textBB.height;