Commitd0958e4

committed

Fix: properly decouple from pyplot and specific backends when destroying

When destroying a manager, replace the figure's canvas by afigure canvas base.

1 parentc718eae commitd0958e4Copy full SHA for d0958e4

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -664,6 +664,7 @@ def show(self):`
`664`	`664`	`self.window.raise_()`
`665`	`665`
`666`	`666`	`defdestroy(self,*args):`
	`667`	`+self.canvas.figure._set_base_canvas()`
`667`	`668`	`# check for qApp first, as PySide deletes it in its atexit handler`
`668`	`669`	`ifQtWidgets.QApplication.instance()isNone:`
`669`	`670`	`return`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2642,7 +2642,7 @@ def __init__(self,`
`2642`	`2642`	`self._set_artist_props(self.patch)`
`2643`	`2643`	`self.patch.set_antialiased(False)`
`2644`	`2644`
`2645`		`-FigureCanvasBase(self)# Set self.canvas.`
	`2645`	`+self._set_base_canvas()`
`2646`	`2646`
`2647`	`2647`	`ifsubplotparsisNone:`
`2648`	`2648`	`subplotpars=SubplotParams()`
`@@ -2996,6 +2996,15 @@ def get_constrained_layout_pads(self, relative=False):`
`2996`	`2996`
`2997`	`2997`	`returnw_pad,h_pad,wspace,hspace`
`2998`	`2998`
	`2999`	`+def_set_base_canvas(self):`
	`3000`	`+"""`
	`3001`	`+ Initialize self.canvas with a FigureCanvasBase instance.`
	`3002`	`+`
	`3003`	`+ This is used upon initialization of the Figure, but also`
	`3004`	`+ to reset the canvas when decoupling from pyplot.`
	`3005`	`+ """`
	`3006`	`+FigureCanvasBase(self)# Set self.canvas as a side-effect`
	`3007`	`+`
`2999`	`3008`	`defset_canvas(self,canvas):`
`3000`	`3009`	`"""`
`3001`	`3010`	`Set the canvas that contains the figure`

Comments

(0)