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

Skip to content

Simplify Annotation and Text bbox drawing. #17220

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
May 8, 2020
Merged

Simplify Annotation and Text bbox drawing. #17220

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
21 changes: 3 additions & 18 deletions lib/matplotlib/offsetbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,28 +1507,21 @@ def contains(self, mouseevent):
inside, info = self._default_contains(mouseevent)
if inside is not None:
return inside, info

xy_pixel = self._get_position_xy(None)
if not self._check_xy(None, xy_pixel):
if not self._check_xy(None):
return False, {}

t, tinfo = self.offsetbox.contains(mouseevent)
return self.offsetbox.contains(mouseevent)
#if self.arrow_patch is not None:
# a, ainfo=self.arrow_patch.contains(event)
# t = t or a

# self.arrow_patch is currently not checked as this can be a line - JJ

return t, tinfo

def get_children(self):
children = [self.offsetbox, self.patch]
if self.arrow_patch:
children.append(self.arrow_patch)
return children

def set_figure(self, fig):

if self.arrow_patch is not None:
self.arrow_patch.set_figure(fig)
self.offsetbox.set_figure(fig)
Expand Down Expand Up @@ -1623,23 +1616,15 @@ def _update_position_xybox(self, renderer, xy_pixel):

def draw(self, renderer):
# docstring inherited

if renderer is not None:
self._renderer = renderer
if not self.get_visible():
if not self.get_visible() or not self._check_xy(renderer):
return

xy_pixel = self._get_position_xy(renderer)
if not self._check_xy(renderer, xy_pixel):
return

self.update_positions(renderer)

if self.arrow_patch is not None:
if self.arrow_patch.figure is None and self.figure is not None:
self.arrow_patch.figure = self.figure
self.arrow_patch.draw(renderer)

self.patch.draw(renderer)
self.offsetbox.draw(renderer)
self.stale = False
Expand Down
30 changes: 9 additions & 21 deletions lib/matplotlib/text.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,10 +502,10 @@ def update_bbox_position_size(self, renderer):

x_box, y_box, w_box, h_box = _get_textbox(self, renderer)
self._bbox_patch.set_bounds(0., 0., w_box, h_box)
theta = np.deg2rad(self.get_rotation())
tr = Affine2D().rotate(theta)
tr = tr.translate(posx + x_box, posy + y_box)
self._bbox_patch.set_transform(tr)
self._bbox_patch.set_transform(
Affine2D()
.rotate_deg(self.get_rotation())
.translate(posx + x_box, posy + y_box))
fontsize_in_pixel = renderer.points_to_pixels(self.get_size())
self._bbox_patch.set_mutation_scale(fontsize_in_pixel)

Expand Down Expand Up @@ -1481,11 +1481,12 @@ def _get_position_xy(self, renderer):
x, y = self.xy
return self._get_xy(renderer, x, y, self.xycoords)

def _check_xy(self, renderer, xy_pixel):
def _check_xy(self, renderer):
"""Check whether the annotation at *xy_pixel* should be drawn."""
b = self.get_annotation_clip()
if b or (b is None and self.xycoords == "data"):
# check if self.xy is inside the axes.
xy_pixel = self._get_position_xy(renderer)
return self.axes.contains_point(xy_pixel)
return True

Expand Down Expand Up @@ -1811,21 +1812,16 @@ def set_figure(self, fig):
Artist.set_figure(self, fig)

def update_positions(self, renderer):
"""Update the pixel positions of the annotated point and the text."""
xy_pixel = self._get_position_xy(renderer)
self._update_position_xytext(renderer, xy_pixel)

def _update_position_xytext(self, renderer, xy_pixel):
"""
Update the pixel positions of the annotation text and the arrow patch.
"""
x1, y1 = self._get_position_xy(renderer) # Annotated position.
# generate transformation,
self.set_transform(self._get_xy_transform(renderer, self.anncoords))

if self.arrowprops is None:
return

x1, y1 = xy_pixel # Annotated position.
bbox = Text.get_window_extent(self, renderer)

d = self.arrowprops.copy()
Expand Down Expand Up @@ -1893,24 +1889,16 @@ def _update_position_xytext(self, renderer, xy_pixel):
@artist.allow_rasterization
def draw(self, renderer):
# docstring inherited

if renderer is not None:
self._renderer = renderer
if not self.get_visible():
return

xy_pixel = self._get_position_xy(renderer)
if not self._check_xy(renderer, xy_pixel):
if not self.get_visible() or not self._check_xy(renderer):
return

self._update_position_xytext(renderer, xy_pixel)
self.update_positions(renderer)
self.update_bbox_position_size(renderer)

if self.arrow_patch is not None: # FancyArrowPatch
if self.arrow_patch.figure is None and self.figure is not None:
self.arrow_patch.figure = self.figure
self.arrow_patch.draw(renderer)

# Draw text, including FancyBboxPatch, after FancyArrowPatch.
# Otherwise, a wedge arrowstyle can land partly on top of the Bbox.
Text.draw(self, renderer)
Expand Down