Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1e8658d

Browse files
committed
FIX
1 parent b54d8b8 commit 1e8658d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

lib/matplotlib/colorbar.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,15 +1024,19 @@ def _reset_locator_formatter_scale(self):
10241024
self.__scale = 'linear'
10251025
self.ax.set_xscale('linear')
10261026
self.ax.set_yscale('linear')
1027-
elif hasattr(self.norm, '_scale') and (self.norm._scale is not None):
1027+
elif hasattr(self.norm, '_scale') and self.norm._scale is not None:
1028+
# use the norm's scale:
10281029
self.ax.set_xscale(self.norm._scale)
10291030
self.ax.set_yscale(self.norm._scale)
10301031
self.__scale = self.norm._scale.name
10311032
elif type(self.norm) is colors.Normalize:
1032-
self.__scale = 'linear'
1033+
# plain Normalize:
10331034
self.ax.set_xscale('linear')
10341035
self.ax.set_yscale('linear')
1036+
self.__scale = 'linear'
10351037
else:
1038+
# norm._scale is None or not an attr: derive the scale from
1039+
# the Norm:
10361040
funcs = (self._forward_from_norm, self._inverse_from_norm)
10371041
self.ax.set_xscale('function', functions=funcs)
10381042
self.ax.set_yscale('function', functions=funcs)

lib/matplotlib/tests/test_colors.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,6 +1406,5 @@ def test_norm_deepcopy():
14061406
norm = mcolors.Normalize()
14071407
norm.vmin = 0.0002
14081408
norm2 = copy.deepcopy(norm)
1409-
assert isinstance(norm2._scale, mscale.LinearScale)
1409+
assert norm2._scale is None
14101410
assert norm2.vmin == norm.vmin
1411-
assert norm2._scale is not norm._scale

0 commit comments

Comments
 (0)