FIX: colorbar re-check norm before draw for autolabels

jklymak · jklymak · commit 777c9e5dff34 · 2018-10-15T13:01:49.000-07:00
FIX: properly set x/y limits

MNT: add tolerance to colorbar locator methods
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -240,7 +240,8 @@ def tick_values(self, vmin, vmax):
         vmin = max(vmin, self._colorbar.norm.vmin)
         vmax = min(vmax, self._colorbar.norm.vmax)
         ticks = super().tick_values(vmin, vmax)
-        return ticks[(ticks >= vmin) & (ticks <= vmax)]
+        rtol = (vmax - vmin) * 1e-10
+        return ticks[(ticks >= vmin - rtol) & (ticks <= vmax + rtol)]
 
 
 class _ColorbarAutoMinorLocator(ticker.AutoMinorLocator):
@@ -296,7 +297,10 @@ def tick_values(self, vmin, vmax):
         vmin = self._colorbar.norm.vmin
         vmax = self._colorbar.norm.vmax
         ticks = super().tick_values(vmin, vmax)
-        return ticks[(ticks >= vmin) & (ticks <= vmax)]
+        rtol = (np.log10(vmax) - np.log10(vmin)) * 1e-10
+        ticks = ticks[(np.log10(ticks) >= np.log10(vmin) - rtol) &
+              (np.log10(ticks) <= np.log10(vmax) + rtol)]
+        return ticks
 
 
 class ColorbarBase(cm.ScalarMappable):
@@ -405,7 +409,6 @@ def __init__(self, ax, cmap=None,
         else:
             self.formatter = format  # Assume it is a Formatter
         # The rest is in a method so we can recalculate when clim changes.
-        self.config_axis()
         self.draw_all()
 
     def _extend_lower(self):
@@ -439,6 +442,7 @@ def draw_all(self):
         # units:
         X, Y = self._mesh()
         C = self._values[:, np.newaxis]
+        self.config_axis()
         self._config_axes(X, Y)
         if self.filled:
             self._add_solids(X, Y, C)
@@ -593,6 +597,7 @@ def _config_axes(self, X, Y):
         ax.set_frame_on(False)
         ax.set_navigate(False)
         xy = self._outline(X, Y)
+        ax.ignore_existing_data_limits = True
         ax.update_datalim(xy)
         ax.set_xlim(*ax.dataLim.intervalx)
         ax.set_ylim(*ax.dataLim.intervaly)
@@ -1150,7 +1155,6 @@ def update_bruteforce(self, mappable):
         self.set_alpha(mappable.get_alpha())
         self.cmap = mappable.cmap
         self.norm = mappable.norm
-        self.config_axis()
         self.draw_all()
         if isinstance(self.mappable, contour.ContourSet):
             CS = self.mappable
