8000 FIX patch.update_from to also copy _original_edge/facecolor by KonradAdamczyk · Pull Request #10575 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

FIX patch.update_from to also copy _original_edge/facecolor #10575

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

Closed
wants to merge 9 commits into from
Closed

FIX patch.update_from to also copy _original_edge/facecolor #10575

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
df74949
fix for #10574
KonradAdamczyk Feb 23, 2018
8f327ab
patch test to set alpha after update_from
KonradAdamczyk Mar 14, 2018
0f1e0ea
test to ensure #10575 is fixed
KonradAdamczyk Mar 14, 2018
85a8b06
move test to lib/matplotlib/tests/test_patches.py
KonradAdamczyk Mar 14, 2018
e1afc16
add line breaks
KonradAdamczyk Apr 8, 2018
6d47414
typo and PEP8 fix
KonradAdamczyk Apr 16, 2018
e5ac3d8
Merge branch 'master' into patch-1
KonradAdamczyk Jul 31, 2018
1d37d4d
fix wrong merge
KonradAdamczyk Jul 31, 2018
08d0294
Whitespace fixes
dstansby Nov 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/matplotlib/patches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,9 @@ def update_from(self, other):
# For some properties we don't need or don't want to go through the
# getters/setters, so we just copy them directly.
self._edgecolor = other._edgecolor
self._original_edgecolor = other._original_edgecolor
self._facecolor = other._facecolor
self._original_facecolor = other._original_facecolor
self._fill = other._fill
self._hatch = other._hatch
self._hatch_color = other._hatch_color
Expand Down
22 changes: 22 additions & 0 deletions lib/matplotlib/tests/test_patches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,3 +410,25 @@ def test_contains_points():
expected = path.contains_points(points, transform, radius)
result = ell.contains_points(points)
assert np.all(result == expected)


def test_when_update_from_and_set_alpha_then_only_alpha_changes():
# given
source_facecolor = (0.234, 0.123, 0.135, 0.322)
source_egdecolor = (0.728, 0.682, 0.945, 0.268)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

edgecolor

source = mpatches.Rectangle((0, 0), 1., 1.,
facecolor=source_facecolor, edgecolor=source_egdecolor)
updated = mpatches.Rectangle((1., 0), 1., 1.,
facecolor='pink', edgecolor="green")
# when
updated.update_from(source)
# then
assert updated.get_facecolor() == source_facecolor
assert updated.get_edgecolor() == source_egdecolor
# when
updated.set_alpha(0.777)
# then
expected_facecolor = source_facecolor[0:3] + (0.777,)
expected_edgecolor = source_egdecolor[0:3] + (0.777,)
assert updated.get_facecolor() == expected_facecolor
assert updated.get_edgecolor() == expected_edgecolor
0