Merge pull request #13351 from LevN0/fix-log-colorbar-minorticks-revert-set-ticks

NelleV · web-flow · commit 3ad9be2295fc · 2019-02-04T07:57:21.000-08:00
Fix: Log Colorbar minorticks_off reverted if ticks set
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -579,6 +579,8 @@ def _reset_locator_formatter_scale(self):
             # mid point is easier.
             self.ax.set_xscale('log')
             self.ax.set_yscale('log')
+
+            self.minorticks_on()
         else:
             self.ax.set_xscale('linear')
             self.ax.set_yscale('linear')
@@ -602,8 +604,6 @@ def update_ticks(self):
             _log.debug('locator: %r', locator)
             long_axis.set_major_locator(locator)
             long_axis.set_major_formatter(formatter)
-            if type(self.norm) == colors.LogNorm:
-                self.minorticks_on()
         else:
             _log.debug('Using fixed locator on colorbar')
             ticks, ticklabels, offset_string = self._ticker(locator, formatter)
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
@@ -325,6 +325,12 @@ def test_colorbar_minorticks_on_off():
     assert np.array_equal(cbar.ax.yaxis.get_minorticklocs(),
                           default_minorticklocks)
 
+    # test issue #13339: minorticks for LogNorm should stay off
+    cbar.minorticks_off()
+    cbar.set_ticks([3, 5, 7, 9])
+    assert np.array_equal(cbar.ax.yaxis.get_minorticklocs(),
+                          np.array([]))
+
 
 def test_colorbar_autoticks():
     # Test new autotick modes. Needs to be classic because
