Commit0e87f48

authored

Merge pull request#18306 from richardsheridan/fix_configure_subplots

Fix configure subplots

2 parentse3c2b31 +2c9a85b commit0e87f48Copy full SHA for 0e87f48

File tree

+13

-8

lines changed

+13

-8

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,18 +53,17 @@ def destroy(cls, num):`
`53`	`53`	`It is recommended to pass a manager instance, to avoid confusion when`
`54`	`54`	`two managers share the same number.`
`55`	`55`	`"""`
`56`		`-ifall(hasattr(num,attr)forattrin ["num","_cidgcf","destroy"]):`
	`56`	`+ifall(hasattr(num,attr)forattrin ["num","destroy"]):`
`57`	`57`	`manager=num`
`58`	`58`	`ifcls.figs.get(manager.num)ismanager:`
`59`	`59`	`cls.figs.pop(manager.num)`
`60`		`-else:`
`61`		`-return`
`62`	`60`	`else:`
`63`	`61`	`try:`
`64`	`62`	`manager=cls.figs.pop(num)`
`65`	`63`	`exceptKeyError:`
`66`	`64`	`return`
`67`		`-manager.canvas.mpl_disconnect(manager._cidgcf)`
	`65`	`+ifhasattr(manager,"_cidgcf"):`
	`66`	`+manager.canvas.mpl_disconnect(manager._cidgcf)`
`68`	`67`	`manager.destroy()`
`69`	`68`	`gc.collect(1)`
`70`	`69`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3294,8 +3294,8 @@ def _update_view(self):`
`3294`	`3294`
`3295`	`3295`	`defconfigure_subplots(self,*args):`
`3296`	`3296`	`plt=_safe_pyplot_import()`
`3297`		`-tool=plt.subplot_tool(self.canvas.figure)`
`3298`		`-tool.figure.canvas.manager.show()`
	`3297`	`+self.subplot_tool=plt.subplot_tool(self.canvas.figure)`
	`3298`	`+self.subplot_tool.figure.canvas.manager.show()`
`3299`	`3299`
`3300`	`3300`	`defsave_figure(self,*args):`
`3301`	`3301`	`"""Save the current figure."""`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,12 @@ def new_figure_manager_given_figure(num, figure):`
`231`	`231`	`ifis_interactive():`
`232`	`232`	`manager.show()`
`233`	`233`	`figure.canvas.draw_idle()`
`234`		`-canvas.mpl_connect('close_event',lambdaevent:Gcf.destroy(manager))`
	`234`	`+`
	`235`	`+defdestroy(event):`
	`236`	`+canvas.mpl_disconnect(cid)`
	`237`	`+Gcf.destroy(manager)`
	`238`	`+`
	`239`	`+cid=canvas.mpl_connect('close_event',destroy)`
`235`	`240`	`returnmanager`
`236`	`241`
`237`	`242`	`@staticmethod`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1546,7 +1546,8 @@ def subplot_tool(targetfig=None):`
`1546`	`1546`	`"""`
`1547`	`1547`	`Launch a subplot tool window for a figure.`
`1548`	`1548`
`1549`		- A `matplotlib.widgets.SubplotTool` instance is returned.
	`1549`	+ A `matplotlib.widgets.SubplotTool` instance is returned. You must maintain
	`1550`	`+ a reference to the instance to keep the associated callbacks alive.`
`1550`	`1551`	`"""`
`1551`	`1552`	`iftargetfigisNone:`
`1552`	`1553`	`targetfig=gcf()`

Comments

(0)