Added exponentbase attribute for axes labeling.

mdtusz · mdtusz · commit 8cedc03339b4 · 2016-02-12T17:19:47.000-05:00
diff --git a/src/components/colorbar/attributes.js b/src/components/colorbar/attributes.js
@@ -169,6 +169,7 @@ module.exports = {
     showticksuffix: axesAttrs.showticksuffix,
     exponentformat: axesAttrs.exponentformat,
     showexponent: axesAttrs.showexponent,
+    exponentbase: axesAttrs.exponentbase,
     title: {
         valType: 'string',
         role: 'info',
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -697,7 +697,7 @@ function autoTickRound(ax) {
             }
             else maxend = Math.max(Math.abs(ax.range[0]), Math.abs(ax.range[1]));
 
-            var rangeexp = Math.floor(Math.log(maxend) / Math.LN10 + 0.01);
+            var rangeexp = Math.floor(Math.log(maxend) / Math.log(ax.exponentbase) + 0.01);
             if(Math.abs(rangeexp) > 3) {
                 if(ax.exponentformat === 'SI' || ax.exponentformat === 'B') {
                     ax._tickexponent = 3 * Math.round((rangeexp - 1) / 3);
@@ -1064,12 +1064,18 @@ function numFormat(v, ax, fmtoverride, hover) {
         // 0 is just 0, but may get exponent if it's the last tick
         v = '0';
         isNeg = false;
-    }
-    else {
+    } else {
         v += e;
         // take out a common exponent, if any
-        if(exponent) {
-            v *= Math.pow(10, -exponent);
+        // Special case for base 2 to follow "SI"
+        if(exponent && base === 2) {
+            v = v/1024;
+
+            // To make 1024 -> 1k
+            exponent -= 9;
+            tickRound += exponent;
+        } else {
+            v *= Math.pow(base, -exponent);
             tickRound += exponent;
         }
         // round the mantissa
@@ -1091,26 +1097,26 @@ function numFormat(v, ax, fmtoverride, hover) {
     // add exponent
     if(exponent && exponentFormat !== 'hide') {
         var signedExponent;
-        if(exponent < 0) signedExponent = '\u2212' + -exponent;
-        else if(exponentFormat !== 'power') signedExponent = '+' + exponent;
-        else signedExponent = String(exponent);
+        if(exponent < 0){
+            signedExponent = '\u2212' + -exponent;
+        } else if(exponentFormat !== 'power') {
+            signedExponent = '+' + exponent;
+        } else {
+            signedExponent = String(exponent);
+        }
 
         if(exponentFormat === 'e' ||
                 ((exponentFormat === 'SI' || exponentFormat === 'B') &&
                  (exponent > 12 || exponent < -15))) {
             v += 'e' + signedExponent;
-        }
-        else if(exponentFormat === 'E') {
+        } else if(exponentFormat === 'E' && base === 10) {
             v += 'E' + signedExponent;
-        }
-        else if(exponentFormat === 'power') {
-            v += '&times;10<sup>' + signedExponent + '</sup>';
-        }
-        else if(exponentFormat === 'B' && exponent === 9) {
+        } else if(exponentFormat === 'B' && exponent === 9 && base === 10) {
             v += 'B';
-        }
-        else if(exponentFormat === 'SI' || exponentFormat === 'B') {
+        } else if((exponentFormat === 'SI' || exponentFormat === 'B') && (base === 2 || base === 10)) {
             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 = {
     },
     exponentbase: {
         valType: 'number',
-        min: 0,
-        dflt: 10
+        min: 2,
+        dflt: 10,
         role: 'style',
         description: [
             'Determines the base for axes and exponent labels.'
diff --git a/src/plots/cartesian/set_convert.js b/src/plots/cartesian/set_convert.js
@@ -43,9 +43,9 @@ module.exports = function setConvert(ax) {
     var clipMult = 10;
 
     function toLog(v, clip){
-        if(v>0) return Math.log(v)/Math.LN10;
+        if(v > 0) return Math.log(v) / Math.log(ax.exponentbase || 10);
 
-        else if(v<=0 && clip && ax.range && ax.range.length===2) {
+        else if(v <= 0 && clip && ax.range && ax.range.length === 2) {
             // clip NaN (ie past negative infinity) to clipMult axis
             // length past the negative edge
             var r0 = ax.range[0],
@@ -55,7 +55,7 @@ module.exports = function setConvert(ax) {
 
         else return constants.BADNUM;
     }
-    function fromLog(v){ return Math.pow(10,v); }
+    function fromLog(v){ return Math.pow(ax.exponentbase, v); }
     function num(v){ return isNumeric(v) ? Number(v) : constants.BADNUM; }
 
     ax.c2l = (ax.type==='log') ? toLog : num;
diff --git a/src/plots/gl3d/layout/axis_attributes.js b/src/plots/gl3d/layout/axis_attributes.js
@@ -95,6 +95,7 @@ module.exports = {
     showticksuffix: axesAttrs.showticksuffix,
     showexponent: axesAttrs.showexponent,
     exponentformat: axesAttrs.exponentformat,
+    exponentbase: axesAttrs.exponentbase,
     tickformat: axesAttrs.tickformat,
     hoverformat: axesAttrs.hoverformat,
     // lines and grids
