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

Commit09ddf9d

Browse files
authored
Merge pull request#10587 from matplotlib/auto-backport-of-pr-10518
Backport PR#10518 on branch v2.2.x
2 parents4db6224 +94ec532 commit09ddf9d

File tree

8 files changed

+29
-31
lines changed

8 files changed

+29
-31
lines changed

‎examples/user_interfaces/embedding_in_wx2_sgskip.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"""
99

1010
frommatplotlib.backends.backend_wxaggimportFigureCanvasWxAggasFigureCanvas
11-
frommatplotlib.backends.backend_wximportNavigationToolbar2Wx
11+
frommatplotlib.backends.backend_wximportNavigationToolbar2WxasNavigationToolbar
1212
frommatplotlib.figureimportFigure
1313

1414
importnumpyasnp
@@ -38,7 +38,7 @@ def __init__(self):
3838
self.add_toolbar()# comment this out for no toolbar
3939

4040
defadd_toolbar(self):
41-
self.toolbar=NavigationToolbar2Wx(self.canvas)
41+
self.toolbar=NavigationToolbar(self.canvas)
4242
self.toolbar.Realize()
4343
# By adding toolbar in sizer, we are able to put it at the bottom
4444
# of the frame - so appearance is closer to GTK version.

‎examples/user_interfaces/embedding_in_wx3_sgskip.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
importmatplotlib
3131
importmatplotlib.cmascm
3232
importmatplotlib.cbookascbook
33-
frommatplotlib.backends.backend_wxaggimportToolbar,FigureCanvasWxAgg
33+
frommatplotlib.backends.backend_wxaggimportFigureCanvasWxAggasFigureCanvas
34+
frommatplotlib.backends.backend_wxaggimportNavigationToolbar2WxAggasNavigationToolbar
3435
frommatplotlib.figureimportFigure
3536
importnumpyasnp
3637

@@ -48,8 +49,8 @@ def __init__(self, parent):
4849
wx.Panel.__init__(self,parent,-1)
4950

5051
self.fig=Figure((5,4),75)
51-
self.canvas=FigureCanvasWxAgg(self,-1,self.fig)
52-
self.toolbar=Toolbar(self.canvas)# matplotlib toolbar
52+
self.canvas=FigureCanvas(self,-1,self.fig)
53+
self.toolbar=NavigationToolbar(self.canvas)# matplotlib toolbar
5354
self.toolbar.Realize()
5455
# self.toolbar.set_active([0,1])
5556

‎examples/user_interfaces/embedding_in_wx4_sgskip.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"""
88

99
frommatplotlib.backends.backend_wxaggimportFigureCanvasWxAggasFigureCanvas
10-
frommatplotlib.backends.backend_wxaggimportNavigationToolbar2WxAgg
10+
frommatplotlib.backends.backend_wxaggimportNavigationToolbar2WxAggasNavigationToolbar
1111
frommatplotlib.backends.backend_wximport_load_bitmap
1212
frommatplotlib.figureimportFigure
1313

@@ -16,14 +16,14 @@
1616
importwx
1717

1818

19-
classMyNavigationToolbar(NavigationToolbar2WxAgg):
19+
classMyNavigationToolbar(NavigationToolbar):
2020
"""
2121
Extend the default wx toolbar with your own event handlers
2222
"""
2323
ON_CUSTOM=wx.NewId()
2424

2525
def__init__(self,canvas,cankill):
26-
NavigationToolbar2WxAgg.__init__(self,canvas)
26+
NavigationToolbar.__init__(self,canvas)
2727

2828
# for simplicity I'm going to reuse a bitmap from wx, you'll
2929
# probably want to add your own.

‎examples/user_interfaces/embedding_in_wx5_sgskip.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
importwx.auiasaui
1515

1616
importmatplotlibasmpl
17-
frommatplotlib.backends.backend_wxaggimportFigureCanvasWxAggasCanvas
18-
frommatplotlib.backends.backend_wxaggimportNavigationToolbar2WxasToolbar
17+
frommatplotlib.backends.backend_wxaggimportFigureCanvasWxAggasFigureCanvas
18+
frommatplotlib.backends.backend_wxaggimportNavigationToolbar2WxAggasNavigationToolbar
1919

2020

2121
classPlot(wx.Panel):
2222
def__init__(self,parent,id=-1,dpi=None,**kwargs):
2323
wx.Panel.__init__(self,parent,id=id,**kwargs)
2424
self.figure=mpl.figure.Figure(dpi=dpi,figsize=(2,2))
25-
self.canvas=Canvas(self,-1,self.figure)
26-
self.toolbar=Toolbar(self.canvas)
25+
self.canvas=FigureCanvas(self,-1,self.figure)
26+
self.toolbar=NavigationToolbar(self.canvas)
2727
self.toolbar.Realize()
2828

2929
sizer=wx.BoxSizer(wx.VERTICAL)

‎examples/user_interfaces/fourier_demo_wx_sgskip.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
importnumpyasnp
99

1010
importwx
11-
frommatplotlib.backends.backend_wxaggimportFigureCanvasWxAgg
11+
frommatplotlib.backends.backend_wxaggimportFigureCanvasWxAggasFigureCanvas
1212
frommatplotlib.figureimportFigure
1313

1414

@@ -123,7 +123,7 @@ def __init__(self, *args, **kwargs):
123123
defcreateCanvas(self,parent):
124124
self.lines= []
125125
self.figure=Figure()
126-
self.canvas=FigureCanvasWxAgg(parent,-1,self.figure)
126+
self.canvas=FigureCanvas(parent,-1,self.figure)
127127
self.canvas.callbacks.connect('button_press_event',self.mouseDown)
128128
self.canvas.callbacks.connect('motion_notify_event',self.mouseMotion)
129129
self.canvas.callbacks.connect('button_release_event',self.mouseUp)

‎lib/matplotlib/backends/backend_wx.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,6 +1474,7 @@ def updateButtonText(self, lst):
14741474
}
14751475

14761476

1477+
@cbook.deprecated("2.2")
14771478
classSubplotToolWX(wx.Frame):
14781479
def__init__(self,targetfig):
14791480
wx.Frame.__init__(self,None,-1,"Configure subplots")
@@ -1699,6 +1700,11 @@ def set_history_buttons(self):
16991700
self.EnableTool(self.wx_ids['Forward'],can_forward)
17001701

17011702

1703+
@cbook.deprecated("2.2",alternative="NavigationToolbar2Wx")
1704+
classToolbar(NavigationToolbar2Wx):
1705+
pass
1706+
1707+
17021708
classStatusBarWx(wx.StatusBar):
17031709
"""
17041710
A status bar is added to _FigureFrame to allow measurements and the
@@ -1956,15 +1962,6 @@ def OnPrintPage(self, page):
19561962
returnTrue
19571963
# >
19581964

1959-
########################################################################
1960-
#
1961-
# Now just provide the standard names that backend.__init__ is expecting
1962-
#
1963-
########################################################################
1964-
1965-
1966-
Toolbar=NavigationToolbar2Wx
1967-
19681965

19691966
@_Backend.export
19701967
class_BackendWx(_Backend):

‎lib/matplotlib/backends/backend_wxagg.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
importwx
77

88
importmatplotlib
9-
from..importcbook
9+
frommatplotlibimportcbook
1010
from .importwx_compataswxc
1111
from .backend_aggimportFigureCanvasAgg
1212
from .backend_wximport (
13-
_BackendWx,_FigureCanvasWxBase,FigureFrameWx,NavigationToolbar2Wx)
13+
_BackendWx,_FigureCanvasWxBase,FigureFrameWx,
14+
NavigationToolbar2WxasNavigationToolbar2WxAgg)
1415

1516

1617
classFigureFrameWxAgg(FigureFrameWx):
@@ -71,15 +72,13 @@ def blit(self, bbox=None):
7172
filetypes=FigureCanvasAgg.filetypes
7273

7374

74-
@cbook.deprecated("2.2")
75-
classNavigationToolbar2WxAgg(NavigationToolbar2Wx):
76-
defget_canvas(self,frame,fig):
77-
returnFigureCanvasWxAgg(frame,-1,fig)
75+
@cbook.deprecated("2.2",alternative="NavigationToolbar2WxAgg")
76+
classToolbar(NavigationToolbar2WxAgg):
77+
pass
7878

7979

8080
# agg/wxPython image conversion functions (wxPython >= 2.8)
8181

82-
8382
def_convert_agg_to_wx_image(agg,bbox):
8483
"""
8584
Convert the region of the agg buffer bounded by bbox to a wx.Image. If

‎lib/matplotlib/backends/backend_wxcairo.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
from .backend_cairoimportcairo,FigureCanvasCairo,RendererCairo
99
from .backend_wximport (
10-
_BackendWx,_FigureCanvasWxBase,FigureFrameWx,NavigationToolbar2Wx)
10+
_BackendWx,_FigureCanvasWxBase,FigureFrameWx,
11+
NavigationToolbar2WxasNavigationToolbar2WxCairo)
1112
importwx.lib.wxcairoaswxcairo
1213

1314

0 commit comments

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