8000 Annotation legend by jlecoeur · Pull Request #8292 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Annotation legend #8292

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 13 commits into from
Closed

Annotation legend #8292

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8b8b560
Add texts artists to legend
Mar 14, 2017
036daed
Allow different widths in legends handled by HandlerTuple
Mar 14, 2017
d7bd069
Add legend handler for FancyArrowPatch
Mar 14, 2017
70dd56d
Add legend handler for Text artists
Mar 14, 2017
b073527
Add legend handler for Annotation artists
Mar 14, 2017
7b35e23
Add Text, FancyArrowPatch and Annotation legend handlers to handler map
Mar 14, 2017
240a497
Fix typo and add documentation
Mar 14, 2017
3e612e2
Display transparent rectangle in legend for empty annotations
Mar 15, 2017
f2de7f1
Add params in HandlerText: max string length and replacement string
Mar 15, 2017
0c623ce
HandlerTuple: allow to pass a list of custom handlers
Mar 15, 2017
aeed3e5
HandlerAnnotation: pass additionnal arguments to handle text correctly
Mar 15, 2017
db84d07
Shift Text legend artist laterally according to its length
Mar 15, 2017
f666224
typo
Mar 15, 2017
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
Prev Previous commit
Next Next commit
HandlerAnnotation: pass additionnal arguments to handle text correctly
  • Loading branch information
Julien Lecoeur committed Mar 15, 2017
commit aeed3e574f0e1cbd3e00deded27cafed95162a41
31 changes: 27 additions & 4 deletions lib/matplotlib/legend_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,20 +748,43 @@ def create_artists(self, legend, orig_handle,
return [t]


class HandlerAnnotation(HandlerBase):
class HandlerAnnotation(HandlerText):
"""
Handler for Annotation instances.

Defers to HandlerText to draw the annotation text (if any).
Defers to HandlerFancyArrowPatch to draw the annotation arrow (if any).
For annotations made of both text and arrow, HandlerTuple is used to draw them side by side.

Additional kwargs are passed through to `HandlerText`.

Parameters
----------

pad : float, optional
If None, fall back to `legend.borderpad` asstr the default.
In units of fraction of font size. Default is None.

width_ratios : tuple, optional
The relative width of text and arrow sections. Must be of length 2.
Default is [1,4].

"""
def __init__(self, pad=None, width_ratios=[1,4], **kwargs):

self._pad = pad
self._width_ratios = width_ratios

HandlerText.__init__(self, **kwargs)

def create_artists(self, legend, orig_handle,
xdescent, ydescent, width, height, fontsize, trans):
if (orig_handle.arrow_patch is not None) and (orig_handle.get_text() is not ""):
# Draw a tuple (text, arrow)
handler = HandlerTuple(ndivide=2, pad=None, width_ratios=[1,4])

handler = HandlerTuple(ndivide=2, pad=self._pad, width_ratios=self._width_ratios,
handlers=[HandlerText(rep_str=self._rep_str,
rep_maxlen=self._rep_maxlen),
HandlerFancyArrowPatch()])
# Create a Text instance from annotation text
text_handle = Text(text=orig_handle.get_text())
text_handle.update_from(orig_handle)
Expand All @@ -772,7 +795,7 @@ def create_artists(self, legend, orig_handle,
handle = orig_handle.arrow_patch
elif orig_handle.get_text() is not "":
# Text without arrow
handler = HandlerText()
handler = HandlerText(rep_str=self._rep_str, rep_maxlen=self._rep_maxlen)
handle = orig_handle
else:
# No text, no arrow
Expand Down
0