Skip to content

Cleanup patheffects. #15072

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
merged 1 commit into from
Aug 18, 2019
Merged

Cleanup patheffects. #15072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 14 additions & 26 deletions lib/matplotlib/patheffects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,11 @@ def __init__(self, offset=(0., 0.)):
The offset to apply to the path, measured in points.
"""
self._offset = offset
self._offset_trans = mtransforms.Affine2D()

def _offset_transform(self, renderer, transform):
def _offset_transform(self, renderer):
"""Apply the offset to the given transform."""
offset_x = renderer.points_to_pixels(self._offset[0])
offset_y = renderer.points_to_pixels(self._offset[1])
return transform + self._offset_trans.clear().translate(offset_x,
offset_y)
return mtransforms.Affine2D().translate(
*map(renderer.points_to_pixels, self._offset))

def _update_gc(self, gc, new_gc_dict):
"""
Expand Down Expand Up @@ -180,14 +177,11 @@ def draw_path(self, renderer, gc, tpath, affine, rgbFace):
"""
Draw the path with updated gc.
"""
# Do not modify the input! Use copy instead.

gc0 = renderer.new_gc()
gc0 = renderer.new_gc() # Don't modify gc, but a copy!
gc0.copy_properties(gc)

gc0 = self._update_gc(gc0, self._gc)
trans = self._offset_transform(renderer, affine)
renderer.draw_path(gc0, tpath, trans, rgbFace)
renderer.draw_path(
gc0, tpath, affine + self._offset_transform(renderer), rgbFace)
gc0.restore()


Expand Down Expand Up @@ -246,11 +240,8 @@ def draw_path(self, renderer, gc, tpath, affine, rgbFace):
"""
Overrides the standard draw_path to add the shadow offset and
necessary color changes for the shadow.

"""
# IMPORTANT: Do not modify the input - we copy everything instead.
affine0 = self._offset_transform(renderer, affine)
gc0 = renderer.new_gc()
gc0 = renderer.new_gc() # Don't modify gc, but a copy!
gc0.copy_properties(gc)

if self._shadow_rgbFace is None:
Expand All @@ -265,7 +256,9 @@ def draw_path(self, renderer, gc, tpath, affine, rgbFace):
gc0.set_linewidth(0)

gc0 = self._update_gc(gc0, self._gc)
renderer.draw_path(gc0, tpath, affine0, shadow_rgbFace)
renderer.draw_path(
gc0, tpath, affine + self._offset_transform(renderer),
shadow_rgbFace)
gc0.restore()


Expand Down Expand Up @@ -317,11 +310,8 @@ def draw_path(self, renderer, gc, tpath, affine, rgbFace):
"""
Overrides the standard draw_path to add the shadow offset and
necessary color changes for the shadow.

"""
# IMPORTANT: Do not modify the input - we copy everything instead.
affine0 = self._offset_transform(renderer, affine)
gc0 = renderer.new_gc()
gc0 = renderer.new_gc() # Don't modify gc, but a copy!
gc0.copy_properties(gc)

if self._shadow_color is None:
Expand All @@ -331,13 +321,12 @@ def draw_path(self, renderer, gc, tpath, affine, rgbFace):
else:
shadow_rgbFace = self._shadow_color

fill_color = None

gc0.set_foreground(shadow_rgbFace)
gc0.set_alpha(self._alpha)

gc0 = self._update_gc(gc0, self._gc)
renderer.draw_path(gc0, tpath, affine0, fill_color)
renderer.draw_path(
gc0, tpath, affine + self._offset_transform(renderer))
gc0.restore()


Expand All @@ -363,9 +352,8 @@ def __init__(self, offset=(0, 0), **kwargs):
self.patch = mpatches.PathPatch([], **kwargs)

def draw_path(self, renderer, gc, tpath, affine, rgbFace):
affine = self._offset_transform(renderer, affine)
self.patch._path = tpath
self.patch.set_transform(affine)
self.patch.set_transform(affine + self._offset_transform(renderer))
self.patch.set_clip_box(gc.get_clip_rectangle())
clip_path = gc.get_clip_path()
if clip_path:
Expand Down
7 changes: 2 additions & 5 deletions lib/matplotlib/tests/test_patheffects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,14 @@ def test_patheffects_stroked_text():
ax.axis('off')


@pytest.mark.xfail
def test_PathEffect_points_to_pixels():
fig = plt.figure(dpi=150)
p1, = plt.plot(range(10))
p1.set_path_effects([path_effects.SimpleLineShadow(),
path_effects.Normal()])

renderer = fig.canvas.get_renderer()
pe_renderer = path_effects.SimpleLineShadow().get_proxy_renderer(renderer)

assert isinstance(pe_renderer, path_effects.PathEffectRenderer)
pe_renderer = path_effects.PathEffectRenderer(
p1.get_path_effects(), renderer)
# Confirm that using a path effects renderer maintains point sizes
# appropriately. Otherwise rendered font would be the wrong size.
assert renderer.points_to_pixels(15) == pe_renderer.points_to_pixels(15)
Expand Down