Simplified Norm

jklymak · jklymak · commit 452e40123e73 · 2017-12-20T08:07:02.000-08:00
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -249,15 +249,13 @@ class ColorbarLogLocator(ticker.LogLocator):
     extrude into the "extend regions".
 
     """
-    def __init__(self, colorbar, vmin, vmax, *args, **kwargs):
-        self.vmin = vmin
-        self.vmax = vmax
+    def __init__(self, colorbar, *args, **kwargs):
         self._colorbar = colorbar
         ticker.LogLocator.__init__(self, *args, **kwargs)
 
     def tick_values(self, vmin, vmax):
-        vmin = max(vmin, self._colorbar.norm.vmin)
-        vmax = min(vmax, self._colorbar.norm.vmax)
+        vmin = self._colorbar.norm.vmin
+        vmax = self._colorbar.norm.vmax
         ticks = ticker.LogLocator.tick_values(self, vmin, vmax)
         return ticks[(ticks >= vmin) & (ticks <= vmax)]
 
@@ -447,7 +445,7 @@ def _get_ticker_locator_formatter(self):
                     b = self.norm.boundaries
                     locator = ticker.FixedLocator(b, nbins=10)
                 elif isinstance(self.norm, colors.LogNorm):
-                    locator = ColorbarLogLocator(self, self.vmin, self.vmax)
+                    locator = ColorbarLogLocator(self)
                 elif isinstance(self.norm, colors.SymLogNorm):
                     # The subs setting here should be replaced
                     # by logic in the locator.
@@ -495,15 +493,15 @@ def update_ticks(self):
                 ax.yaxis.set_major_formatter(formatter)
                 if type(self.norm) == colors.LogNorm:
                     ax.yaxis.set_minor_locator(ColorbarLogLocator(self,
-                            self.vmin, self.vmax, 10., 'all'))
+                            base=10., subs='auto'))
                     ax.yaxis.set_minor_formatter(ticker.NullFormatter())
 
             else:
                 ax.xaxis.set_major_locator(locator)
                 ax.xaxis.set_major_formatter(formatter)
                 if type(self.norm) == colors.LogNorm:
                     ax.xaxis.set_minor_locator(ColorbarLogLocator(self,
-                            self.vmin, self.vmax, 10., 'all'))
+                            base=10., subs='auto'))
                     ax.xaxis.set_minor_formatter(ticker.NullFormatter())
 
         else:
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -2149,8 +2149,8 @@ def tick_values(self, vmin, vmax):
         else:
             subs = self._subs
 
+        # get decades between major ticks.
         stride = 1
-
         if rcParams['_internal.classic_mode']:
             # Leave the bug left over from the PY2-PY3 transition.
             while numdec / stride + 1 > numticks:
@@ -2171,6 +2171,8 @@ def tick_values(self, vmin, vmax):
                 if stride == 1:
                     ticklocs = np.ravel(np.outer(subs, ticklocs))
                 else:
+                    # no ticklocs if we have more than one decade
+                    # between major ticks.
                     ticklocs = []
         else:
             if have_subs:
