move label logic to independent function

zblz · zblz · commit de02706db494 · 2015-10-07T16:17:53.000+01:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -889,13 +889,15 @@ def iter_ticks(self):
         """
         Iterate through all of the major and minor ticks.
         """
-        majorLocs, hasLabel = self.major.locator()
+        majorLocs = self.major.locator()
+        hasLabel = self.major.locator.show_tick_label(majorLocs)
         majorTicks = self.get_major_ticks(len(majorLocs))
         self.major.formatter.set_locs(majorLocs)
         majorLabels = [self.major.formatter(val, i) if hasLabel[i] else ''
                        for i, val in enumerate(majorLocs)]
 
-        minorLocs, hasLabel = self.minor.locator()
+        minorLocs = self.minor.locator()
+        hasLabel = self.major.locator.show_tick_label(minorLocs)
         minorTicks = self.get_minor_ticks(len(minorLocs))
         self.minor.formatter.set_locs(minorLocs)
         minorLabels = [self.minor.formatter(val, i) if hasLabel[i] else ''
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1052,6 +1052,11 @@ def __call__(self):
         # hence there is no *one* interface to call self.tick_values.
         raise NotImplementedError('Derived must override')
 
+    def show_tick_label(self, locs):
+        """Return boolean array on whether to show a label for the given
+           locations"""
+        return np.ones(loc.size, dtype=np.bool)
+
     def raise_if_exceeds(self, locs):
         """raise a RuntimeError if Locator attempts to create more than
            MAXTICKS locs"""
@@ -1658,6 +1663,17 @@ def tick_values(self, vmin, vmax):
             else:
                 ticklocs = b ** decades
 
+        return self.raise_if_exceeds(np.asarray(ticklocs))
+
+    def show_tick_label(self, ticklocs):
+        b = self._base
+
+        vmin, vmax = self.axis.get_view_interval()
+        vmin = math.log(vmin) / math.log(b)
+        vmax = math.log(vmax) / math.log(b)
+
+        numdec = abs(vmax - vmin)
+
         if numdec > 3:
             sublabel = set((1))
         elif numdec > 2:
@@ -1667,14 +1683,14 @@ def tick_values(self, vmin, vmax):
         else:
             sublabel = set((1, 2, 4, 7))
 
-        label = [True,] * np.asarray(ticklocs).size
+        label = np.ones(ticklocs.size, dtype=np.bool)
         for i, loc in enumerate(ticklocs):
             exponent = math.floor(math.log(abs(loc)) / math.log(b))
             coeff = loc / b ** nearest_long(exponent)
             if nearest_long(coeff) not in sublabel:
                 label[i] = False
 
-        return self.raise_if_exceeds(np.asarray(ticklocs)), label
+        return label
 
     def view_limits(self, vmin, vmax):
         'Try to choose the view limits intelligently'
