Commit 98306f9

authored

Merge pull request matplotlib#20859 from tomneep/subfigure-legend

2 parents a4e81e7 + 7da7795 commit 98306f9Copy full SHA for 98306f9

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ def __init__(`
`360`	`360`	`"""`
`361`	`361`	`# local import only to avoid circularity`
`362`	`362`	`from matplotlib.axes import Axes`
`363`		`- from matplotlib.figure import Figure`
	`363`	`+ from matplotlib.figure import FigureBase`
`364`	`364`
`365`	`365`	`super().__init__()`
`366`	`366`
`@@ -434,11 +434,13 @@ def __init__(`
`434`	`434`	`self.isaxes = True`
`435`	`435`	`self.axes = parent`
`436`	`436`	`self.set_figure(parent.figure)`
`437`		`- elif isinstance(parent, Figure):`
	`437`	`+ elif isinstance(parent, FigureBase):`
`438`	`438`	`self.isaxes = False`
`439`	`439`	`self.set_figure(parent)`
`440`	`440`	`else:`
`441`		`- raise TypeError("Legend needs either Axes or Figure as parent")`
	`441`	`+ raise TypeError(`
	`442`	`+ "Legend needs either Axes or FigureBase as parent"`
	`443`	`+ )`
`442`	`444`	`self.parent = parent`
`443`	`445`
`444`	`446`	`self._loc_used_default = loc is None`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -871,3 +871,12 @@ def test_handlerline2d():`
`871`	`871`	`handles = [mlines.Line2D([0], [0], marker="v")]`
`872`	`872`	`leg = ax.legend(handles, ["Aardvark"], numpoints=1)`
`873`	`873`	`assert handles[0].get_marker() == leg.legendHandles[0].get_marker()`
	`874`	`+`
	`875`	`+`
	`876`	`+def test_subfigure_legend():`
	`877`	`+ # Test that legend can be added to subfigure (#20723)`
	`878`	`+ subfig = plt.figure().subfigures()`
	`879`	`+ ax = subfig.subplots()`
	`880`	`+ ax.plot([0, 1], [0, 1], label="line")`
	`881`	`+ leg = subfig.legend()`
	`882`	`+ assert leg.figure is subfig`

Comments

(0)