Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb0807ae

Browse files
committed
revert PR#1125 and#1201
The attempt to make OO use easier broke the Tkagg and Wx* backends.
1 parent32dc947 commitb0807ae

27 files changed

+5
-64
lines changed

‎doc/users/whats_new.rst

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,6 @@ Features that depend on the Python Imaging Library, such as JPEG
4141
handling, do not work, since the version of PIL for Python 3.x is not
4242
sufficiently mature.
4343

44-
Object-oriented interface
45-
-------------------------
46-
47-
Damon McDougall has reduced some of the boilerplate code needed to interact
48-
with the object-oriented interface. Now a figure canvas is set up by default::
49-
50-
>>> from matplotlib.figure import Figure
51-
>>> fig = Figure()
52-
>>> ax = fig.add_subplot(1, 1, 1)
53-
>>> fig.savefig('figure.pdf')
54-
5544
PGF/TikZ backend
5645
----------------
5746
Peter Würtz wrote a backend that allows matplotlib to export figures as

‎lib/matplotlib/backends/backend_agg.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,5 +515,3 @@ def print_to_buffer(self):
515515
(int(renderer.width),int(renderer.height)))
516516
renderer.dpi=original_dpi
517517
returnresult
518-
519-
FigureCanvas=FigureCanvasAgg

‎lib/matplotlib/backends/backend_cairo.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,5 +512,3 @@ def _save (self, fo, format, **kwargs):
512512

513513
ctx.show_page()
514514
surface.finish()
515-
516-
FigureCanvas=FigureCanvasCairo

‎lib/matplotlib/backends/backend_cocoaagg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def stop_event_loop(self):
8989
FigureCanvasBase.stop_event_loop_default(self)
9090
stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
9191

92-
FigureCanvas=FigureCanvasCocoaAgg
92+
9393

9494
NibClassBuilder.extractClasses('Matplotlib.nib',mplBundle)
9595

‎lib/matplotlib/backends/backend_emf.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -727,8 +727,6 @@ def print_emf(self, filename, dpi=300, **kwargs):
727727
defget_default_filetype(self):
728728
return'emf'
729729

730-
FigureCanvas=FigureCanvasEMF
731-
732730
classFigureManagerEMF(FigureManagerBase):
733731
"""
734732
Wrap everything up into a window for the pylab interface

‎lib/matplotlib/backends/backend_fltkagg.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,6 @@ def stop_event_loop(self):
231231
FigureCanvasBase.stop_event_loop_default(self)
232232
stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
233233

234-
FigureCanvas=FigureCanvasFltkAgg
235-
236234
defdestroy_figure(ptr,figman):
237235
figman.window.hide()
238236
Fltk.Fl.wait(0)# This is needed to make the last figure vanish.

‎lib/matplotlib/backends/backend_gdk.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ def new_figure_manager_given_figure(num, figure):
434434
returnmanager
435435

436436

437-
classFigureCanvasGDK(FigureCanvasBase):
437+
classFigureCanvasGDK(FigureCanvasBase):
438438
def__init__(self,figure):
439439
FigureCanvasBase.__init__(self,figure)
440440

@@ -472,5 +472,3 @@ def _print_image(self, filename, format, *args, **kwargs):
472472
0,0,0,0,width,height)
473473

474474
pixbuf.save(filename,format)
475-
476-
FigureCanvas=FigureCanvasGDK

‎lib/matplotlib/backends/backend_gtk.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def _on_timer(self):
144144
returnFalse
145145

146146

147-
classFigureCanvasGTK(gtk.DrawingArea,FigureCanvasBase):
147+
classFigureCanvasGTK(gtk.DrawingArea,FigureCanvasBase):
148148
keyvald= {65507 :'control',
149149
65505 :'shift',
150150
65513 :'alt',
@@ -519,8 +519,6 @@ def stop_event_loop(self):
519519
FigureCanvasBase.stop_event_loop_default(self)
520520
stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
521521

522-
FigureCanvas=FigureCanvasGTK
523-
524522
classFigureManagerGTK(FigureManagerBase):
525523
"""
526524
Public attributes

‎lib/matplotlib/backends/backend_gtk3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def _on_timer(self):
9898
self._timer=None
9999
returnFalse
100100

101-
classFigureCanvasGTK3(Gtk.DrawingArea,FigureCanvasBase):
101+
classFigureCanvasGTK3(Gtk.DrawingArea,FigureCanvasBase):
102102
keyvald= {65507 :'control',
103103
65505 :'shift',
104104
65513 :'alt',

‎lib/matplotlib/backends/backend_gtk3agg.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ def print_png(self, filename, *args, **kwargs):
6767
agg=self.switch_backends(backend_agg.FigureCanvasAgg)
6868
returnagg.print_png(filename,*args,**kwargs)
6969

70-
FigureCanvas=FigureCanvasGTK3Agg
7170

7271
classFigureManagerGTK3Agg(backend_gtk3.FigureManagerGTK3):
7372
pass

‎lib/matplotlib/backends/backend_gtk3cairo.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ def on_draw_event(self, widget, ctx):
3434

3535
returnFalse# finish event propagation?
3636

37-
FigureCanvas=FigureCanvasGTK3Cairo
3837

3938
classFigureManagerGTK3Cairo(backend_gtk3.FigureManagerGTK3):
4039
pass

‎lib/matplotlib/backends/backend_gtkagg.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ def print_png(self, filename, *args, **kwargs):
111111
agg=self.switch_backends(FigureCanvasAgg)
112112
returnagg.print_png(filename,*args,**kwargs)
113113

114-
FigureCanvas=FigureCanvasGTKAgg
115114

116115
"""\
117116
Traceback (most recent call last):

‎lib/matplotlib/backends/backend_gtkcairo.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ def _renderer_init(self):
5555
if_debug:print('%s.%s()'% (self.__class__.__name__,_fn_name()))
5656
self._renderer=RendererGTKCairo (self.figure.dpi)
5757

58-
FigureCanvas=FigureCanvasGTKCairo
5958

6059
classFigureManagerGTKCairo(FigureManagerGTK):
6160
def_get_toolbar(self,canvas):

‎lib/matplotlib/backends/backend_macosx.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,6 @@ def new_timer(self, *args, **kwargs):
352352
"""
353353
returnTimerMac(*args,**kwargs)
354354

355-
FigureCanvas=FigureCanvasMac
356355

357356
classFigureManagerMac(_macosx.FigureManager,FigureManagerBase):
358357
"""

‎lib/matplotlib/backends/backend_pdf.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2299,8 +2299,6 @@ def print_pdf(self, filename, **kwargs):
22992299
else:# we opened the file above; now finish it off
23002300
file.close()
23012301

2302-
FigureCanvas=FigureCanvasPdf
2303-
23042302
classFigureManagerPdf(FigureManagerBase):
23052303
pass
23062304

‎lib/matplotlib/backends/backend_pgf.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,8 +838,6 @@ def _render_texts_pgf(self, fh):
838838
defget_renderer(self):
839839
returnRendererPgf(self.figure,None)
840840

841-
FigureCanvas=FigureCanvasPgf
842-
843841
classFigureManagerPgf(FigureManagerBase):
844842
def__init__(self,*args):
845843
FigureManagerBase.__init__(self,*args)

‎lib/matplotlib/backends/backend_ps.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,8 +1357,6 @@ def write(self, *kl, **kwargs):
13571357
shutil.move(tmpfile,outfile)
13581358
os.chmod(outfile,mode)
13591359

1360-
FigureCanvas=FigureCanvasPS
1361-
13621360
defconvert_psfrags(tmpfile,psfrags,font_preamble,custom_preamble,
13631361
paperWidth,paperHeight,orientation):
13641362
"""

‎lib/matplotlib/backends/backend_qt.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,6 @@ def stop_event_loop(self):
203203
FigureCanvasBase.stop_event_loop_default(self)
204204
stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
205205

206-
FigureCanvas=FigureCanvasQT
207-
208206
classFigureManagerQT(FigureManagerBase ):
209207
"""
210208
Public attributes

‎lib/matplotlib/backends/backend_qt4.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,6 @@ def idle_draw(*args):
377377
self._idle=True
378378
ifd:QtCore.QTimer.singleShot(0,idle_draw)
379379

380-
FigureCanvas=FigureCanvasQT
381-
382380
classFigureManagerQT(FigureManagerBase ):
383381
"""
384382
Public attributes

‎lib/matplotlib/backends/backend_qt4agg.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,5 +145,3 @@ def blit(self, bbox=None):
145145
defprint_figure(self,*args,**kwargs):
146146
FigureCanvasAgg.print_figure(self,*args,**kwargs)
147147
self.draw()
148-
149-
FigureCanvas=FigureCanvasQTAgg

‎lib/matplotlib/backends/backend_qtagg.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,5 +156,3 @@ def blit(self, bbox=None):
156156
defprint_figure(self,*args,**kwargs):
157157
FigureCanvasAgg.print_figure(self,*args,**kwargs)
158158
self.draw()
159-
160-
FigureCanvas=FigureCanvasQTAgg

‎lib/matplotlib/backends/backend_svg.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,8 +1143,6 @@ def _print_svg(self, filename, svgwriter, fh_to_close=None, **kwargs):
11431143
defget_default_filetype(self):
11441144
return'svg'
11451145

1146-
FigureCanvas=FigureCanvasSVG
1147-
11481146
classFigureManagerSVG(FigureManagerBase):
11491147
pass
11501148

‎lib/matplotlib/backends/backend_template.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,6 @@ def print_foo(self, filename, *args, **kwargs):
245245
defget_default_filetype(self):
246246
return'foo'
247247

248-
FigureCanvas=FigureCanvasTemplate
249-
250248
classFigureManagerTemplate(FigureManagerBase):
251249
"""
252250
Wrap everything up into a window for the pylab interface

‎lib/matplotlib/backends/backend_tkagg.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,6 @@ def stop_event_loop(self):
505505
FigureCanvasBase.stop_event_loop_default(self)
506506
stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
507507

508-
FigureCanvas=FigureCanvasTkAgg
509-
510508
classFigureManagerTkAgg(FigureManagerBase):
511509
"""
512510
Public attributes

‎lib/matplotlib/backends/backend_wx.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,6 @@ def _onEnter(self, evt):
14001400
"""Mouse has entered the window."""
14011401
FigureCanvasBase.enter_notify_event(self,guiEvent=evt)
14021402

1403-
FigureCanvas=FigureCanvasWx
14041403

14051404
########################################################################
14061405
#

‎lib/matplotlib/backends/backend_wxagg.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ def print_figure(self, filename, *args, **kwargs):
105105
ifself._isDrawn:
106106
self.draw()
107107

108-
FigureCanvas=FigureCanvasWxAgg
109-
110108
classNavigationToolbar2WxAgg(NavigationToolbar2Wx):
111109
defget_canvas(self,frame,fig):
112110
returnFigureCanvasWxAgg(frame,-1,fig)

‎lib/matplotlib/figure.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ def __init__(self,
318318
self.patch.set_aa(False)
319319

320320
self._hold=rcParams['axes.hold']
321-
self.canvas=self._setup_canvas()
321+
self.canvas=None
322322

323323
ifsubplotparsisNone:
324324
subplotpars=SubplotParams()
@@ -330,14 +330,6 @@ def __init__(self,
330330
self.clf()
331331
self._cachedRenderer=None
332332

333-
def_setup_canvas(self):
334-
"""
335-
Return the FigureCanvas instance defined by the currently loaded backend.
336-
"""
337-
importmatplotlib.backendsasmbackends# lazy import
338-
backend_mod=mbackends.pylab_setup()[0]
339-
returnbackend_mod.FigureCanvas(self)
340-
341333
defshow(self,warn=True):
342334
"""
343335
If using a GUI backend with pyplot, display the figure window.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp