exponent bases fixed for linear

mdtusz · mdtusz · commit bdec7beeccd9 · 2015-12-18T18:32:35.000-05:00
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -253,8 +253,12 @@ axes.handleTickDefaults = function(containerIn, containerOut, coerce, axType, op
                 var expBase = coerce('exponentbase'),
                     expFmtDflt = coerce('exponentformat');
 
-                if (expBase !== 2 && expBase !== 10) expFmtDflt = 'power';
-                if (expBase === 2 && expFmtDflt !== 'SI') expFmtDflt = 'power';
+                if (+expBase !== 2 && +expBase !== 10) expFmtDflt = 'power';
+                if (+expBase === 2 && expFmtDflt !== 'SI') expFmtDflt = 'power';
+                if (expBase === 'e'){
+                    containerOut.exponentbase = Math.E;
+                    containerOut.type = 'log';
+                }
 
                 containerOut.exponentformat = expFmtDflt;
             }
@@ -1377,9 +1381,9 @@ axes.autoTicks = function(ax, roughDTick){
             var nt = 1.5 * Math.abs((ax.range[1] - ax.range[0]) / roughDTick);
 
             // ticks on a linear scale, labeled fully
-            roughDTick = Math.abs(Math.pow(10, ax.range[1]) -
-                Math.pow(10, ax.range[0])) / nt;
-            base = Math.pow(10, Math.floor(Math.log(roughDTick) / Math.LN10));
+            roughDTick = Math.abs(Math.pow(ax.exponentbase, ax.range[1]) -
+                Math.pow(ax.exponentbase, ax.range[0])) / nt;
+            base = Math.pow(ax.exponentbase, Math.floor(Math.log(roughDTick) / Math.log(ax.exponentbase)));
             ax.dtick = 'L' + roundDTick(roughDTick, base, roundBase10);
         }
         else {
@@ -1440,7 +1444,7 @@ function autoTickRound(ax) {
             ax._tickround = 2 - Math.floor(Math.log(dtick) / Math.log(ax.exponentbase) + 0.01);
 
             if(ax.type === 'log') {
-                maxend = Math.pow(10, Math.max(ax.range[0], ax.range[1]));
+                maxend = Math.pow(ax.exponentbase, Math.max(ax.range[0], ax.range[1]));
             }
             else maxend = Math.max(Math.abs(ax.range[0]), Math.abs(ax.range[1]));
 
@@ -1765,7 +1769,7 @@ function numFormat(v, ax, fmtoverride, hover) {
         tickRound = ax._tickround,
         exponentFormat = fmtoverride || ax.exponentformat || 'B',
         exponent = ax._tickexponent,
-        base = ax.exponentbase || 10,
+        base = +ax.exponentbase || 10,
         isBase10 = (base === 10),
         tickformat = ax.tickformat;
 
@@ -1791,7 +1795,8 @@ function numFormat(v, ax, fmtoverride, hover) {
     if(tickformat) return d3.format(tickformat)(v).replace(/-/g,'\u2212');
 
     // 'epsilon' - rounding increment
-    var e = Math.pow(base, -tickRound) / 2;
+    var e = isBase10 ? Math.pow(base, -tickRound) / 2 : 0;
+    // var e = 0;
 
     // exponentFormat codes:
     // 'e' (1.2e+6, default)
@@ -1807,6 +1812,7 @@ function numFormat(v, ax, fmtoverride, hover) {
     // take the sign out, put it back manually at the end
     // - makes cases easier
     v = Math.abs(v);
+
     if(v < e) {
         // 0 is just 0, but may get exponent if it's the last tick
         v = '0';
@@ -1815,16 +1821,11 @@ function numFormat(v, ax, fmtoverride, hover) {
         v += e;
         // take out a common exponent, if any
         // Special case for base 2 to follow "SI"
-        if(exponent && base === 2 && exponentFormat === 'SI') {
-            v = v / 1024;
-
-            // To make 1024 -> 1k
-            exponent -= 9;
-            tickRound += exponent;
-        } else {
+        if(exponent){
             v *= Math.pow(base, -exponent);
             tickRound += exponent;
         }
+
         // round the mantissa
         if(tickRound === 0) v = String(Math.floor(v));
         else if(tickRound < 0) {
@@ -1857,6 +1858,13 @@ function numFormat(v, ax, fmtoverride, hover) {
         } else if(exponentFormat === 'B' && exponent === 9) {
             v += 'B';
         } else if(exponentFormat === 'SI' || exponentFormat === 'B') {
+            if(base === 2 && exponent >= 10){
+                v = v * Math.pow(base, (exponent - 10));
+                exponent -= 9;
+            } else if(base === 2 && exponent < 10){
+                v = v * Math.pow(base, (exponent));
+                exponent = 0;
+            }
             v += SIPREFIXES[exponent / 3 + 5];
         } else {
             v += '&times;' + base + '<sup>' + signedExponent + '</sup>';
diff --git a/src/plots/cartesian/layout_attributes.js b/src/plots/cartesian/layout_attributes.js
@@ -290,8 +290,8 @@ module.exports = {
         ].join(' ')
     },
     exponentbase: {
-        valType: 'number',
-        min: 2,
+        valType: 'enumerated',
+        values: [2, '2', 'e', 8, '8', 10, '10', 16, '16'],
         dflt: 10,
         role: 'style',
         description: [
