revise options

Author: archmoj

src/plots/cartesian/axes.js

@@ -1899,7 +1899,7 @@ function formatLog(ax, out, hover, extraPrecision, hideexp) {
 
     if(tickformat || (dtChar0 === 'L')) {
         out.text = numFormat(Math.pow(10, x), ax, hideexp, extraPrecision);
-    } else if(isNumeric(dtick) || ((dtChar0 === 'D') && (Lib.mod(x + 0.01, 1) < 0.1))) {
+    } else if(isNumeric(dtick) || ((dtChar0 === 'D') && (Lib.mod(x + 0.01, 1) < 0.1 || ax.minorloglabels === 'complete'))) {
         var p = Math.round(x);
         var absP = Math.abs(p);
         var exponentFormat = ax.exponentformat;
@@ -1919,9 +1919,7 @@ function formatLog(ax, out, hover, extraPrecision, hideexp) {
         }
     } else if(dtChar0 === 'D') {
         out.text =
-            ax.minorloglabels === 'exponential' ? Math.pow(10, x).toExponential(0) :
-            ax.minorloglabels === 'scientific' ? Math.pow(10, x).toExponential(0).replace(/e\+?/, 'x10<sup>') :
-            ax.minorloglabels === 'metric' ? Lib.numberFormat('0.1s')(Math.pow(10, x)) :
+            ax.minorloglabels === 'none' ? '' :
             /* ax.minorloglabels === 'small digits' */ String(Math.round(Math.pow(10, Lib.mod(x, 1))));
 
         out.fontSize *= 0.75;

src/plots/cartesian/layout_attributes.js

@@ -1138,15 +1138,14 @@ module.exports = {
 
     minorloglabels: {
         valType: 'enumerated',
-        values: ['small digits', 'exponential', 'scientific', 'metric'],
-        dflt: 'small digits',
+        values: ['small digits', 'complete', 'none'],
+        dflt: 'metric',
         editType: 'calc',
         description: [
             'Determines how minor log labels are displayed.',
             'If *small digits*, small digits i.e. 2 or 5 are displayed.',
-            'If *exponential*, exponential notation is applied.',
-            'If *scientific*, scientific notation is applied.',
-            'If *metric*, SI-prefix with one significant digits are displayed.',
+            'If *complete*, complete digits are displayed.',
+            'If *none*, no labels are displayed.',
         ].join(' ')
     },
 

test/image/mocks/zz-minorloglabels.json

@@ -4,27 +4,21 @@
         "x": [0.001, 0.01, 0.1, 1, 10, 100, 1000],
         "y": [0, 1, 2, 3, 4, 5, 6]
     }, {
-        "name": "exponential",
+        "name": "complete",
         "xaxis": "x2",
         "yaxis": "y2",
         "x": [0.001, 0.01, 0.1, 1, 10, 100, 1000],
         "y": [0, 1, 2, 3, 4, 5, 6]
     }, {
-        "name": "scientific",
+        "name": "none",
         "xaxis": "x3",
         "yaxis": "y3",
         "x": [0.001, 0.01, 0.1, 1, 10, 100, 1000],
         "y": [0, 1, 2, 3, 4, 5, 6]
-    }, {
-        "name": "metric",
-        "xaxis": "x4",
-        "yaxis": "y4",
-        "x": [0.001, 0.01, 0.1, 1, 10, 100, 1000],
-        "y": [0, 1, 2, 3, 4, 5, 6]
     }],
     "layout": {
         "grid": {
-            "rows": 4,
+            "rows": 3,
             "columns": 1,
             "xgap": 0.25,
             "ygap": 0.25,
@@ -36,20 +30,16 @@
         },
         "xaxis2": {
             "type": "log",
-            "minorloglabels": "exponential"
+            "minorloglabels": "complete"
         },
         "xaxis3": {
             "type": "log",
-            "minorloglabels": "scientific"
-        },
-        "xaxis4": {
-            "type": "log",
-            "minorloglabels": "metric"
+            "minorloglabels": "none"
         },
         "title": {
             "text": "options of minorloglabels"
         },
         "width": 1200,
-        "height": 800
+        "height": 600
     }
 }