refactored class toolbar in tkagg to support embedding

jdh2358 · jdh2358 · commit e3b5cf2f9689 · 2004-12-22T16:43:09.000Z
svn path=/trunk/matplotlib/; revision=804
diff --git a/.matplotlibrc b/.matplotlibrc
@@ -30,7 +30,7 @@
 backend      : GTKAgg    # the default backend
 numerix      : Numeric   # Numeric or numarray
 interactive  : False     # see http://matplotlib.sourceforge.net/interactive.html
-toolbar      : toolbar2   # None | classic | toolbar2
+toolbar      : classic   # None | classic | toolbar2
 timezone     : UTC        # a pytz timezone string, eg US/Central or Europe/Paris
 
 # Where your matplotlib data lives if you installed to a non-default
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 New entries should be added at the top
 
+2004-12-22 Refactored NavigationToolbar in tkagg to support app
+           embedding , init now takes (canvas, window) rather than
+           (canvas, figman) - JDH
+
 2004-12-21 Refactored axes and subplot management - removed
            add_subplot and add_axes from the FigureManager.  classic
            toolbar updates are done via an observer pattern on the
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -261,7 +261,7 @@ def __init__(self, canvas, num, window):
         w, h = int(w), int(h)
         self.window.minsize(int(w*3/4),int(h*3/4))
         if matplotlib.rcParams['toolbar']=='classic':
-            self.toolbar = NavigationToolbar( canvas, self )
+            self.toolbar = NavigationToolbar( canvas, self.window )
         elif matplotlib.rcParams['toolbar']=='toolbar2':
             self.toolbar = NavigationToolbar2TkAgg( canvas, self.window )
         else:
@@ -380,14 +380,15 @@ def _Button(self, text, file, command):
         b.pack(side=Tk.LEFT)
         return b
             
-    def __init__(self, canvas, figman):
+    def __init__(self, canvas, window):
+        self.canvas = canvas
+        self.window = window
+        
         xmin, xmax = canvas.figure.bbox.intervalx().get_bounds()
         height, width = 50, xmax-xmin
-        Tk.Frame.__init__(self, master=figman.window,
+        Tk.Frame.__init__(self, master=self.window,
                           width=width, height=height,
                           borderwidth=2)
-        self.canvas = canvas
-        self.figman = figman
 
         self.update()  # Make axes menu
 
@@ -429,8 +430,6 @@ def __init__(self, canvas, figman):
 
         self.pack(side=Tk.BOTTOM, fill=Tk.X)
         
-    def close(self):
-        Gcf.destroy(self.figman._num)
         
     def set_active(self, ind):
         self._ind = ind
@@ -444,7 +443,7 @@ def panx(self, arg):
             else: direction=-1
         for a in self._active:
             a.panx(direction)
-        self.figman.show()
+        self.canvas.draw()
 
     def pany(self, arg):
         try: arg.direction
@@ -454,7 +453,7 @@ def pany(self, arg):
             else: direction=-1
         for a in self._active:
             a.pany(direction)
-        self.figman.show()
+        self.canvas.draw()
 
     def zoomx(self, arg):
         try: arg.direction
@@ -465,7 +464,7 @@ def zoomx(self, arg):
 
         for a in self._active:
             a.zoomx(direction)
-        self.figman.show()
+        self.canvas.draw()
 
     def zoomy(self, arg):
         try: arg.direction
@@ -476,10 +475,10 @@ def zoomy(self, arg):
 
         for a in self._active:
             a.zoomy(direction)
-        self.figman.show()
+        self.canvas.draw()
 
     def save_figure(self):
-        fs = FileDialog.SaveFileDialog(master=self.figman.window,
+        fs = FileDialog.SaveFileDialog(master=self.window,
                                        title='Save the figure')
         try:
             self.lastDir
