Commite392b59

authored

Merge pull request#28468 from meeseeksmachine/auto-backport-of-pr-28465-on-v3.9.x

Backport PR#28465 on branch v3.9.x (Fix pickling of SubFigures)

2 parents1f0e4c4 +14711fa commite392b59Copy full SHA for e392b59

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2224,7 +2224,6 @@ def __init__(self, parent, subplotspec, *,`
`2224`	`2224`	`self.subplotpars=parent.subplotpars`
`2225`	`2225`	`self.dpi_scale_trans=parent.dpi_scale_trans`
`2226`	`2226`	`self._axobservers=parent._axobservers`
`2227`		`-self.canvas=parent.canvas`
`2228`	`2227`	`self.transFigure=parent.transFigure`
`2229`	`2228`	`self.bbox_relative=Bbox.null()`
`2230`	`2229`	`self._redo_transform_rel_fig()`
`@@ -2241,6 +2240,10 @@ def __init__(self, parent, subplotspec, *,`
`2241`	`2240`	`self._set_artist_props(self.patch)`
`2242`	`2241`	`self.patch.set_antialiased(False)`
`2243`	`2242`
	`2243`	`+@property`
	`2244`	`+defcanvas(self):`
	`2245`	`+returnself._parent.canvas`
	`2246`	`+`
`2244`	`2247`	`@property`
`2245`	`2248`	`defdpi(self):`
`2246`	`2249`	`returnself._parent.dpi`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,6 @@ class SubFigure(FigureBase):`
`263`	`263`	`figure:Figure`
`264`	`264`	`subplotpars:SubplotParams`
`265`	`265`	`dpi_scale_trans:Affine2D`
`266`		`-canvas:FigureCanvasBase`
`267`	`266`	`transFigure:Transform`
`268`	`267`	`bbox_relative:Bbox`
`269`	`268`	`figbbox:BboxBase`
`@@ -282,6 +281,8 @@ class SubFigure(FigureBase):`
`282`	`281`	`**kwargs`
`283`	`282`	`)->None: ...`
`284`	`283`	`@property`
	`284`	`+defcanvas(self)->FigureCanvasBase: ...`
	`285`	`+@property`
`285`	`286`	`defdpi(self)->float: ...`
`286`	`287`	`@dpi.setter`
`287`	`288`	`defdpi(self,value:float)->None: ...`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,11 @@ def _generate_complete_test_figure(fig_ref):`
`93`	`93`	`plt.errorbar(x,x*-0.5,xerr=0.2,yerr=0.4,label='$-.5 x$')`
`94`	`94`	`plt.legend(draggable=True)`
`95`	`95`
	`96`	`+# Ensure subfigure parenting works.`
	`97`	`+subfigs=fig_ref.subfigures(2)`
	`98`	`+subfigs[0].subplots(1,2)`
	`99`	`+subfigs[1].subplots(1,2)`
	`100`	`+`
`96`	`101`	`fig_ref.align_ylabels()# Test handling of _align_label_groups Groupers.`
`97`	`102`
`98`	`103`

Comments

(0)