only skip prefix and suffix for D log axes - improve test

archmoj · archmoj · commit 27067a6c8f45 · 2019-07-22T15:46:56.000-04:00
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -577,7 +577,7 @@ axes.calcTicks = function calcTicks(ax) {
             Math.min(ax._categories.length - 0.5, endTick);
     }
 
-    var isLog = (ax.type === 'log');
+    var isDLog = (ax.type === 'log') && !(isNumeric(ax.dtick) || ax.dtick.charAt(0) === 'L');
 
     var xPrevious = null;
     var maxTicks = Math.max(1000, ax._length || 0);
@@ -590,7 +590,7 @@ axes.calcTicks = function calcTicks(ax) {
         xPrevious = x;
 
         var minor = false;
-        if(isLog && (x !== (x | 0))) {
+        if(isDLog && (x !== (x | 0))) {
             minor = true;
         }
 
diff --git a/test/image/baselines/log-axis_no-minor_suffix-prefix.png b/test/image/baselines/log-axis_no-minor_suffix-prefix.png
diff --git a/test/image/mocks/log-axis_no-minor_suffix-prefix.json b/test/image/mocks/log-axis_no-minor_suffix-prefix.json
@@ -7,18 +7,111 @@
         1e7
       ],
       "type": "scatter"
+    },
+    {
+      "xaxis": "x2",
+      "yaxis": "y2",
+      "y": [
+        1e8,
+        1e6,
+        1e7
+      ],
+      "type": "scatter"
+    },
+    {
+      "xaxis": "x3",
+      "yaxis": "y3",
+      "y": [
+        1e8,
+        1e6,
+        1e7
+      ],
+      "type": "scatter"
+    },
+    {
+      "xaxis": "x4",
+      "yaxis": "y4",
+      "y": [
+        1e8,
+        1e6,
+        1e7
+      ],
+      "type": "scatter"
     }
   ],
   "layout": {
+    "width": 800,
+    "height": 800,
+    "xaxis": {
+      "domain": [
+        0,
+        0.45
+      ]
+    },
+    "xaxis2": {
+      "anchor": "y2",
+      "domain": [
+        0.6,
+        1
+      ]
+    },
+    "xaxis3": {
+      "anchor": "y3",
+      "domain": [
+        0,
+        0.45
+      ]
+    },
+    "xaxis4": {
+      "anchor": "y4",
+      "domain": [
+        0.6,
+        1
+      ]
+    },
     "yaxis": {
-        "type": "log",
-        "tickprefix": "$",
-        "ticksuffix": "Hz"
-    },
-    "height": 600,
-    "width": 300,
-    "margin": {
-        "l": 150
+      "tick0": 1,
+      "dtick": "L10000000",
+      "type": "log",
+      "tickprefix": "$",
+      "ticksuffix": "Hz",
+      "domain": [
+        0,
+        0.45
+      ]
+    },
+    "yaxis2": {
+      "tick0": 1,
+      "dtick": 0.5,
+      "type": "log",
+      "tickprefix": "$",
+      "ticksuffix": "Hz",
+      "anchor": "x2",
+      "domain": [
+        0,
+        0.45
+      ]
+    },
+    "yaxis3": {
+      "dtick": "D1",
+      "type": "log",
+      "tickprefix": "$",
+      "ticksuffix": "Hz",
+      "anchor": "x3",
+      "domain": [
+        0.6,
+        1
+      ]
+    },
+    "yaxis4": {
+      "type": "log",
+      "tickprefix": "$",
+      "ticksuffix": "Hz",
+      "anchor": "x4",
+      "domain": [
+        0.6,
+        1
+      ]
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ axes.calcTicks = function calcTicks(ax) {`
`577`	`577`	`Math.min(ax._categories.length - 0.5, endTick);`
`578`	`578`	`}`
`579`	`579`
`580`		`- var isLog = (ax.type === 'log');`
	`580`	`+ var isDLog = (ax.type === 'log') && !(isNumeric(ax.dtick) \|\| ax.dtick.charAt(0) === 'L');`
`581`	`581`
`582`	`582`	`var xPrevious = null;`
`583`	`583`	`var maxTicks = Math.max(1000, ax._length \|\| 0);`
`@@ -590,7 +590,7 @@ axes.calcTicks = function calcTicks(ax) {`
`590`	`590`	`xPrevious = x;`
`591`	`591`
`592`	`592`	`var minor = false;`
`593`		`- if(isLog && (x !== (x \| 0))) {`
	`593`	`+ if(isDLog && (x !== (x \| 0))) {`
`594`	`594`	`minor = true;`
`595`	`595`	`}`
`596`	`596`