FIX: re-organize setting scale so gets reset if norm changed

jklymak · jklymak · commit eda0b4544f29 · 2019-01-20T14:24:41.000-08:00
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -444,13 +444,6 @@ def draw_all(self):
 
     def config_axis(self):
         ax = self.ax
-        if (isinstance(self.norm, colors.LogNorm)
-                and self._use_auto_colorbar_locator()):
-            # *both* axes are made log so that determining the
-            # mid point is easier.
-            ax.set_xscale('log')
-            ax.set_yscale('log')
-            
 
         if self.orientation == 'vertical':
             long_axis, short_axis = ax.yaxis, ax.xaxis
@@ -1103,6 +1096,7 @@ def __init__(self, ax, mappable, **kw):
                 kw['alpha'] = mappable.get_alpha()
 
             ColorbarBase.__init__(self, ax, **kw)
+        self.update_normal(mappable)
 
     def on_mappable_changed(self, mappable):
         """
@@ -1112,6 +1106,7 @@ def on_mappable_changed(self, mappable):
         by :func:`colorbar_factory` and should not be called manually.
 
         """
+        _log.debug('mappable changed')
         self.set_cmap(mappable.get_cmap())
         self.set_clim(mappable.get_clim())
         self.update_normal(mappable)
@@ -1150,10 +1145,25 @@ def update_normal(self, mappable):
         have been customized, they will need to be customized again.
         """
 
+        _log.debug('update normal')
         self.mappable = mappable
-        self.norm = self.mappable.norm
+        self.set_alpha(mappable.get_alpha())
+        self.cmap = mappable.cmap
+        self.norm = mappable.norm
         self.locator = None
         self.formatter = None
+        if (isinstance(self.norm, colors.LogNorm)
+                and self._use_auto_colorbar_locator()):
+            # *both* axes are made log so that determining the
+            # mid point is easier.
+            self.ax.set_xscale('log')
+            self.ax.set_yscale('log')
+            print('Log!')
+        else:
+            self.ax.set_xscale('linear')
+            self.ax.set_yscale('linear')
+            print('Linear!')
+
         self.draw_all()
         if isinstance(self.mappable, contour.ContourSet):
             CS = self.mappable
@@ -1177,17 +1187,14 @@ def update_bruteforce(self, mappable):
         self.ax.cla()
         self.locator = None
         self.formatter = None
-        self.mappable = mappable
 
         # clearing the axes will delete outline, patch, solids, and lines:
         self.outline = None
         self.patch = None
         self.solids = None
         self.lines = list()
         self.dividers = None
-        self.set_alpha(mappable.get_alpha())
-        self.cmap = mappable.cmap
-        self.norm = mappable.norm
+        self.update_normal(mappable)
         self.draw_all()
         if isinstance(self.mappable, contour.ContourSet):
             CS = self.mappable
