Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fa3209e

Browse files
DietmarSchwertbergerDietmarSchwertberger
committed
make NavigationToolbar2 consistent, adjust examples to this and navigation_toolbar.html example
1 parent 96c2876 commit fa3209e

7 files changed

Lines changed: 19 additions & 25 deletions

File tree

‎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
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
11-
from matplotlib.backends.backend_wx import NavigationToolbar2Wx
11+
from matplotlib.backends.backend_wx import NavigationToolbar2Wx as NavigationToolbar
1212
from matplotlib.figure import Figure
1313

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

4040
def add_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
import matplotlib
3131
import matplotlib.cm as cm
3232
import matplotlib.cbook as cbook
33-
from matplotlib.backends.backend_wxagg import Toolbar, FigureCanvasWxAgg
33+
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
34+
from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as NavigationToolbar
3435
from matplotlib.figure import Figure
3536
import numpy as np
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
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
10-
from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg
10+
from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as NavigationToolbar
1111
from matplotlib.backends.backend_wx import _load_bitmap
1212
from matplotlib.figure import Figure
1313

@@ -16,14 +16,14 @@
1616
import wx
1717

1818

19-
class MyNavigationToolbar(NavigationToolbar2WxAgg):
19+
class MyNavigationToolbar(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
import wx.aui as aui
1515

1616
import matplotlib as mpl
17-
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas
18-
from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar
17+
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
18+
from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as NavigationToolbar
1919

2020

2121
class Plot(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
import numpy as np
99

1010
import wx
11-
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg
11+
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
1212
from matplotlib.figure import Figure
1313

1414

@@ -123,7 +123,7 @@ def __init__(self, *args, **kwargs):
123123
def createCanvas(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_wxagg.py‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
from .. import cbook
1010
from . import wx_compat as wxc
1111
from .backend_agg import FigureCanvasAgg
12-
from .backend_wx import (
13-
_BackendWx, _FigureCanvasWxBase, FigureFrameWx, NavigationToolbar2Wx)
12+
from .backend_wx import _BackendWx, _FigureCanvasWxBase, FigureFrameWx
13+
from .backend_wx import NavigationToolbar2Wx as NavigationToolbar2WxAgg
1414

1515

1616
class FigureFrameWxAgg(FigureFrameWx):
@@ -71,15 +71,8 @@ def blit(self, bbox=None):
7171
filetypes = FigureCanvasAgg.filetypes
7272

7373

74-
@cbook.deprecated("2.2")
75-
class NavigationToolbar2WxAgg(NavigationToolbar2Wx):
76-
def get_canvas(self, frame, fig):
77-
return FigureCanvasWxAgg(frame, -1, fig)
78-
79-
8074
# agg/wxPython image conversion functions (wxPython >= 2.8)
8175

82-
8376
def _convert_agg_to_wx_image(agg, bbox):
8477
"""
8578
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import wx
77

88
from .backend_cairo import cairo, FigureCanvasCairo, RendererCairo
9-
from .backend_wx import (
10-
_BackendWx, _FigureCanvasWxBase, FigureFrameWx, NavigationToolbar2Wx)
9+
from .backend_wx import _BackendWx, _FigureCanvasWxBase, FigureFrameWx
10+
from .backend_wx import NavigationToolbar2Wx as NavigationToolbar2WxCairo
1111
from . import wx_compat as wxc
1212

1313

0 commit comments

Comments
 (0)