NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.3k

Commitf71ec63

authored

Merge pull request#17789 from richardsheridan/tkagg_improvements

MNT: Tk backend improvements

2 parents4e11730 +502dd11 commitf71ec63Copy full SHA for f71ec63

File tree

4 files changed

+39

-11

lines changed

lib/matplotlib
- backends
- tests
  - test_backends_interactive.py

4 files changed

+39

-11

lines changed

`‎lib/matplotlib/backends/_backend_tk.py`

Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,6 @@ def __init__(self, figure, master=None, resize_callback=None):`
`209`	`209`	`# to the window and filter.`
`210`	`210`	`deffilter_destroy(event):`
`211`	`211`	`ifevent.widgetisself._tkcanvas:`
`212`		`-self._master.update_idletasks()`
`213`	`212`	`self.close_event()`
`214`	`213`	`root.bind("<Destroy>",filter_destroy,"+")`
`215`	`214`
`@@ -233,7 +232,6 @@ def resize(self, event):`
`233`	`232`	`self._tkcanvas.create_image(`
`234`	`233`	`int(width/2),int(height/2),image=self._tkphoto)`
`235`	`234`	`self.resize_event()`
`236`		`-self.draw()`
`237`	`235`
`238`	`236`	`defdraw_idle(self):`
`239`	`237`	`# docstring inherited`
`@@ -383,6 +381,16 @@ def flush_events(self):`
`383`	`381`	`# docstring inherited`
`384`	`382`	`self._master.update()`
`385`	`383`
	`384`	`+defstart_event_loop(self,timeout=0):`
	`385`	`+# docstring inherited`
	`386`	`+iftimeout>0:`
	`387`	`+self._master.after(int(1000*timeout),self.stop_event_loop)`
	`388`	`+self._master.mainloop()`
	`389`	`+`
	`390`	`+defstop_event_loop(self):`
	`391`	`+# docstring inherited`
	`392`	`+self._master.quit()`
	`393`	`+`
`386`	`394`
`387`	`395`	`classFigureManagerTk(FigureManagerBase):`
`388`	`396`	`"""`
`@@ -527,10 +535,6 @@ def __init__(self, canvas, window, *, pack_toolbar=True):`
`527`	`535`	`ifpack_toolbar:`
`528`	`536`	`self.pack(side=tk.BOTTOM,fill=tk.X)`
`529`	`537`
`530`		`-defdestroy(self,*args):`
`531`		`-delself.message`
`532`		`-tk.Frame.destroy(self,*args)`
`533`		`-`
`534`	`538`	`defset_message(self,s):`
`535`	`539`	`self.message.set(s)`
`536`	`540`
`@@ -554,8 +558,6 @@ def set_cursor(self, cursor):`
`554`	`558`	`window.configure(cursor=cursord[cursor])`
`555`	`559`	`excepttkinter.TclError:`
`556`	`560`	`pass`
`557`		`-else:`
`558`		`-window.update_idletasks()`
`559`	`561`
`560`	`562`	`def_Button(self,text,image_file,toggle,command):`
`561`	`563`	`image= (tk.PhotoImage(master=self,file=image_file)`

`‎lib/matplotlib/backends/backend_tkagg.py`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,10 @@ class FigureCanvasTkAgg(FigureCanvasAgg, FigureCanvasTk):`
`8`	`8`	`defdraw(self):`
`9`	`9`	`super().draw()`
`10`	`10`	`_backend_tk.blit(self._tkphoto,self.renderer._renderer, (0,1,2,3))`
`11`		`-self._master.update_idletasks()`
`12`	`11`
`13`	`12`	`defblit(self,bbox=None):`
`14`	`13`	`_backend_tk.blit(`
`15`	`14`	`self._tkphoto,self.renderer._renderer, (0,1,2,3),bbox=bbox)`
`16`		`-self._master.update_idletasks()`
`17`	`15`
`18`	`16`
`19`	`17`	`@_BackendTk.export`

`‎lib/matplotlib/backends/backend_tkcairo.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ def draw(self):`
`23`	`23`	`_backend_tk.blit(`
`24`	`24`	`self._tkphoto,buf,`
`25`	`25`	`(2,1,0,3)ifsys.byteorder=="little"else (1,2,3,0))`
`26`		`-self._master.update_idletasks()`
`27`	`26`
`28`	`27`
`29`	`28`	`@_BackendTk.export`

`‎lib/matplotlib/tests/test_backends_interactive.py`

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -199,3 +199,32 @@ def test_webagg():`
`199`	`199`	`conn.close()`
`200`	`200`	`proc.send_signal(signal.SIGINT)`
`201`	`201`	`assertproc.wait(timeout=_test_timeout)==0`
	`202`	`+`
	`203`	`+`
	`204`	`+@pytest.mark.backend('TkAgg',skip_on_importerror=True)`
	`205`	`+deftest_never_update(monkeypatch,capsys):`
	`206`	`+importtkinter`
	`207`	`+monkeypatch.delattr(tkinter.Misc,'update')`
	`208`	`+monkeypatch.delattr(tkinter.Misc,'update_idletasks')`
	`209`	`+`
	`210`	`+importmatplotlib.pyplotasplt`
	`211`	`+fig=plt.figure()`
	`212`	`+plt.show(block=False)`
	`213`	`+`
	`214`	`+# regression test on FigureCanvasTkAgg`
	`215`	`+plt.draw()`
	`216`	`+# regression test on NavigationToolbar2Tk`
	`217`	`+fig.canvas.toolbar.configure_subplots()`
	`218`	`+`
	`219`	`+# check for update() or update_idletasks() in the event queue`
	`220`	`+# functionally equivalent to tkinter.Misc.update`
	`221`	`+# must pause >= 1 ms to process tcl idle events plus`
	`222`	`+# extra time to avoid flaky tests on slow systems`
	`223`	`+plt.pause(0.1)`
	`224`	`+`
	`225`	`+# regression test on FigureCanvasTk filter_destroy callback`
	`226`	`+plt.close(fig)`
	`227`	`+`
	`228`	`+# test framework doesn't see tkinter callback exceptions normally`
	`229`	`+# see tkinter.Misc.report_callback_exception`
	`230`	`+assert"Exception in Tkinter callback"notincapsys.readouterr().err`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitf71ec63

File tree

4 files changed

4 files changed

`‎lib/matplotlib/backends/_backend_tk.py`

`‎lib/matplotlib/backends/backend_tkagg.py`

`‎lib/matplotlib/backends/backend_tkcairo.py`

`‎lib/matplotlib/tests/test_backends_interactive.py`

0 commit comments