FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix issue with colorbar extend and drawedges by oscargus · Pull Request #22865 · matplotlib/matplotlib · GitHub

  1. matplotlib
  2. matplotlib

Repository navigation

Fix issue with colorbar extend and drawedges #22865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timhoffm merged 2 commits into from
Jun 15, 2022
Conversation 18 Commits 2 Checks 0 Files changed
Merged

Fix issue with colorbar extend and drawedges #22865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d4f70d
Fix issue with colorbar extend and drawedges
oscargus Apr 20, 2022
c6729ba
Update lib/matplotlib/colorbar.py
oscargus Jun 14, 2022
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
8 changes: 6 additions & 2 deletions lib/matplotlib/colorbar.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -651,8 +651,12 @@ def _add_solids(self, X, Y, C):
if not self.drawedges:
if len(self._y) >= self.n_rasterize:
self.solids.set_rasterized(True)
self.dividers.set_segments(
np.dstack([X, Y])[1:-1] if self.drawedges else [])
if self.drawedges:
start_idx = 0 if self._extend_lower() else 1
end_idx = len(X) if self._extend_upper() else -1
self.dividers.set_segments(np.dstack([X, Y])[start_idx:end_idx])
else:
self.dividers.set_segments([])

def _add_solids_patches(self, X, Y, C, mappable):
hatches = mappable.hatches * len(C) # Have enough hatches.
Expand Down
24 changes: 24 additions & 0 deletions lib/matplotlib/tests/test_colorbar.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,30 @@ def test_proportional_colorbars():
fig.colorbar(CS3, spacing=spacings[j], ax=axs[i, j])


@pytest.mark.parametrize("extend, coloroffset, res", [
('both', 1, [np.array([[0., 0.], [0., 1.]]),
np.array([[1., 0.], [1., 1.]]),
np.array([[2., 0.], [2., 1.]])]),
('min', 0, [np.array([[0., 0.], [0., 1.]]),
np.array([[1., 0.], [1., 1.]])]),
('max', 0, [np.array([[1., 0.], [1., 1.]]),
np.array([[2., 0.], [2., 1.]])]),
('neither', -1, [np.array([[1., 0.], [1., 1.]])])
])
def test_colorbar_extend_drawedges(extend, coloroffset, res):
cmap = plt.get_cmap("viridis")
bounds = np.arange(3)
nb_colors = len(bounds) + coloroffset
colors = cmap(np.linspace(100, 255, nb_colors).astype(int))
cmap, norm = mcolors.from_levels_and_colors(bounds, colors, extend=extend)

plt.figure(figsize=(5, 1))
ax = plt.subplot(111)
cbar = Colorbar(ax, cmap=cmap, norm=norm, orientation='horizontal',
drawedges=True)
assert np.all(np.equal(cbar.dividers.get_segments(), res))


def test_negative_boundarynorm():
fig, ax = plt.subplots(figsize=(1, 3))
cmap = plt.get_cmap("viridis")
Expand Down
Back | FazBrowse Home | New Git URL