Merge pull request #4182 from efiring/colorbar_ticks

tacaswell · tacaswell · commit 893dfa31fbab · 2015-03-12T19:22:09.000-04:00
BUG : edit tick locations based on vmin and vmax; closes #4181
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -584,10 +584,13 @@ def _ticker(self):
         formatter.set_data_interval(*intv)
 
         b = np.array(locator())
+        if isinstance(locator, ticker.LogLocator):
+            eps = 1e-10
+            b = b[(b <= intv[1] * (1 + eps)) & (b >= intv[0] * (1 - eps))]
+        else:
+            eps = (intv[1] - intv[0]) * 1e-10
+            b = b[(b <= intv[1] + eps) & (b >= intv[0] - eps)]
         ticks = self._locate(b)
-        inrange = (ticks > -0.001) & (ticks < 1.001)
-        ticks = ticks[inrange]
-        b = b[inrange]
         formatter.set_locs(b)
         ticklabels = [formatter(t, i) for i, t in enumerate(b)]
         offset_string = formatter.get_offset()
