Revert to using minor locators in scales

n-aswin · n-aswin · commit 66124fc8d402 · 2022-04-11T09:46:35.000+05:30
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -889,6 +889,14 @@ def minorticks_on(self):
             s = self._scale
             self.set_minor_locator(
                 mticker.SymmetricalLogLocator(s._transform, s.subs))
+        elif scale == 'asinh':
+            s = self._scale
+            self.set_minor_locator(
+                    mticker.AsinhLocator(s.linear_width, base=s._base,
+                                         subs=s._subs))
+        elif scale == 'logit':
+            s = self._scale
+            self.set_minor_locator(mticker.LogitLocator(minor=True))
         else:
             self.set_minor_locator(mticker.AutoMinorLocator())
 
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -21,7 +21,8 @@
 from matplotlib import _api, _docstring
 from matplotlib.ticker import (
     NullFormatter, ScalarFormatter, LogFormatterSciNotation, LogitFormatter,
-    LogLocator, AutoLocator, SymmetricalLogLocator, AsinhLocator, LogitLocator)
+    NullLocator, AutoLocator, AutoMinorLocator, LogLocator,
+    SymmetricalLogLocator, AsinhLocator, LogitLocator)
 from matplotlib.transforms import Transform, IdentityTransform
 
 
@@ -107,9 +108,9 @@ def set_default_locators_and_formatters(self, axis):
         # update the minor locator for x and y axis based on rcParams
         if (axis.axis_name == 'x' and mpl.rcParams['xtick.minor.visible'] or
                 axis.axis_name == 'y' and mpl.rcParams['ytick.minor.visible']):
-            axis.minorticks_on()
+            axis.set_minor_locator(AutoMinorLocator())
         else:
-            axis.minorticks_off()
+            axis.set_minor_locator(NullLocator())
 
     def get_transform(self):
         """
@@ -192,9 +193,9 @@ def set_default_locators_and_formatters(self, axis):
         # update the minor locator for x and y axis based on rcParams
         if (axis.axis_name == 'x' and mpl.rcParams['xtick.minor.visible'] or
                 axis.axis_name == 'y' and mpl.rcParams['ytick.minor.visible']):
-            axis.minorticks_on()
+            axis.set_minor_locator(AutoMinorLocator())
         else:
-            axis.minorticks_off()
+            axis.set_minor_locator(NullLocator())
 
 
 class LogTransform(Transform):
@@ -286,10 +287,14 @@ def set_default_locators_and_formatters(self, axis):
         # docstring inherited
         axis.set_major_locator(LogLocator(self.base))
         axis.set_major_formatter(LogFormatterSciNotation(self.base))
-        axis.set_minor_locator(LogLocator(self.base, self.subs))
         axis.set_minor_formatter(
             LogFormatterSciNotation(self.base,
                                     labelOnlyBase=(self.subs is not None)))
+        if (axis.axis_name == 'x' and mpl.rcParams['xtick.minor.visible'] or
+                axis.axis_name == 'y' and mpl.rcParams['ytick.minor.visible']):
+            axis.set_minor_locator(LogLocator(self.base, self.subs))
+        else:
+            axis.set_minor_locator(NullLocator())
 
     def get_transform(self):
         """Return the `.LogTransform` associated with this scale."""
@@ -447,9 +452,13 @@ def set_default_locators_and_formatters(self, axis):
         # docstring inherited
         axis.set_major_locator(SymmetricalLogLocator(self.get_transform()))
         axis.set_major_formatter(LogFormatterSciNotation(self.base))
-        axis.set_minor_locator(SymmetricalLogLocator(self.get_transform(),
-                                                     self.subs))
         axis.set_minor_formatter(NullFormatter())
+        if (axis.axis_name == 'x' and mpl.rcParams['xtick.minor.visible'] or
+                axis.axis_name == 'y' and mpl.rcParams['ytick.minor.visible']):
+            axis.set_minor_locator(SymmetricalLogLocator(self.get_transform(),
+                                                         self.subs))
+        else:
+            axis.set_minor_locator(NullLocator())
 
     def get_transform(self):
         """Return the `.SymmetricalLogTransform` associated with this scale."""
@@ -563,14 +572,18 @@ def get_transform(self):
     def set_default_locators_and_formatters(self, axis):
         axis.set(major_locator=AsinhLocator(self.linear_width,
                                             base=self._base),
-                 minor_locator=AsinhLocator(self.linear_width,
-                                            base=self._base,
-                                            subs=self._subs),
                  minor_formatter=NullFormatter())
         if self._base > 1:
             axis.set_major_formatter(LogFormatterSciNotation(self._base))
         else:
             axis.set_major_formatter('{x:.3g}'),
+        if (axis.axis_name == 'x' and mpl.rcParams['xtick.minor.visible'] or
+                axis.axis_name == 'y' and mpl.rcParams['ytick.minor.visible']):
+            axis.set_minor_locator(AsinhLocator(self.linear_width,
+                                                base=self._base,
+                                                subs=self._subs))
+        else:
+            axis.set_minor_locator(NullLocator())
 
 
 class LogitTransform(Transform):
@@ -660,14 +673,18 @@ def set_default_locators_and_formatters(self, axis):
                 use_overline=self._use_overline
             )
         )
-        axis.set_minor_locator(LogitLocator(minor=True))
         axis.set_minor_formatter(
             LogitFormatter(
                 minor=True,
                 one_half=self._one_half,
                 use_overline=self._use_overline
             )
         )
+        if (axis.axis_name == 'x' and mpl.rcParams['xtick.minor.visible'] or
+                axis.axis_name == 'y' and mpl.rcParams['ytick.minor.visible']):
+            axis.set_minor_locator(LogitLocator(minor=True))
+        else:
+            axis.set_minor_locator(NullLocator())
 
     def limit_range_for_scale(self, vmin, vmax, minpos):
         """
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -10,6 +10,7 @@
 import matplotlib as mpl
 import matplotlib.pyplot as plt
 import matplotlib.ticker as mticker
+import matplotlib.scale as mscale
 
 
 class TestMaxNLocator:
@@ -1443,10 +1444,20 @@ def minorticksubplot(xminor, yminor, i):
 
 
 def test_minorticks_toggle():
+    """
+    Test toggling minor ticks 
+
+    Test `.Axis.minorticks_on()` and `.Axis.minorticks_off()`. Testing is
+    limited to a subset of built-in scales - `'linear'`, `'log'`, `'asinh'`
+    and `'logit'`. `symlog` scale does not seem to have a working minor
+    locator and is omitted. In future, this test should cover all scales in
+    `matplotlib.scale.get_scale_names()`.
+    """
     fig = plt.figure()
-
-    def minortickstoggle(xminor, yminor, i):
+    def minortickstoggle(xminor, yminor, scale, i):
         ax = fig.add_subplot(2, 2, i)
+        ax.set_xscale(scale)
+        ax.set_yscale(scale)
         if not xminor and not yminor:
             ax.minorticks_off()
         if xminor and not yminor:
@@ -1461,11 +1472,16 @@ def minortickstoggle(xminor, yminor, i):
         assert (len(ax.xaxis.get_minor_ticks()) > 0) == xminor
         assert (len(ax.yaxis.get_minor_ticks()) > 0) == yminor
 
-    minortickstoggle(False, False, 1)
-    minortickstoggle(True, False, 2)
-    minortickstoggle(False, True, 3)
-    minortickstoggle(True, True, 4)
+    #scales = mscale.get_scale_names()
+    scales = ['linear', 'log', 'asinh', 'logit']
+    for scale in scales:
+        minortickstoggle(False, False, scale, 1)
+        minortickstoggle(True, False, scale, 2)
+        minortickstoggle(False, True, scale, 3)
+        minortickstoggle(True, True, scale, 4)
+        fig.clear()
 
+    plt.close(fig)
 
 @pytest.mark.parametrize('remove_overlapping_locs, expected_num',
                          ((True, 6),
