tkbackend updated

Author: fariza

lib/matplotlib/backends/backend_tkagg.py

@@ -20,8 +20,10 @@
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase
 from matplotlib.backend_bases import FigureManagerBase, FigureCanvasBase
 from matplotlib.backend_bases import NavigationToolbar2, cursors, TimerBase
-from matplotlib.backend_bases import ShowBase, ToolbarBase, NavigationBase
-from matplotlib.backend_tools import SaveFigureBase, ConfigureSubplotsBase, tools
+from matplotlib.backend_bases import (ShowBase, ToolContainerBase,
+                                      NavigationBase, StatusbarBase)
+from matplotlib.backend_tools import (SaveFigureBase, ConfigureSubplotsBase,
+    tools, toolbar_tools, SetCursorBase, RubberbandBase)
 from matplotlib._pylab_helpers import Gcf
 
 from matplotlib.figure import Figure
@@ -530,14 +532,19 @@ def __init__(self, canvas, num, window):
         self.window.withdraw()
         self.set_window_title("Figure %d" % num)
         self.canvas = canvas
-        self._num =  num
-        if matplotlib.rcParams['toolbar']=='toolbar2':
-            self.toolbar = NavigationToolbar2TkAgg( canvas, self.window )
-        else:
-            self.toolbar = None
-        if self.toolbar is not None:
-            self.toolbar.update()
         self.canvas._tkcanvas.pack(side=Tk.TOP, fill=Tk.BOTH, expand=1)
+        self._num = num
+
+        self.navigation = self._get_navigation()
+        self.toolbar = self._get_toolbar()
+        self.statusbar = None
+
+        if matplotlib.rcParams['toolbar'] == 'navigation':
+            self.navigation.add_tools(tools)
+            self.toolbar.add_tools(toolbar_tools)
+            self.statusbar = StatusbarTk(self.window, self.navigation)
+
+        
         self._shown = False
 
         def notify_axes_change(fig):
@@ -552,15 +559,15 @@ def _get_toolbar(self):
         if matplotlib.rcParams['toolbar'] == 'toolbar2':
             toolbar = NavigationToolbar2TkAgg(self.canvas, self.window)
         elif matplotlib.rcParams['toolbar'] == 'navigation':
-            toolbar = ToolbarTk(self)
+            toolbar = ToolbarTk(self.navigation, self.window)
         else:
             toolbar = None
         return toolbar
 
     def _get_navigation(self):
         # must be inited after toolbar is setted
         if rcParams['toolbar'] != 'toolbar2':
-            navigation = NavigationTk(self)
+            navigation = NavigationTk(self.canvas)
         else:
             navigation = None
         return navigation
@@ -894,53 +901,60 @@ def hidetip(self):
 
 
 class NavigationTk(NavigationBase):
-    def __init__(self, *args, **kwargs):
-        NavigationBase.__init__(self, *args, **kwargs)
+    pass
 
-    def set_cursor(self, cursor):
-        self.canvas.manager.window.configure(cursor=cursord[cursor])
 
-    def draw_rubberband(self, event, caller, x0, y0, x1, y1):
-        if not self.canvas.widgetlock.available(caller):
-            return
-        height = self.canvas.figure.bbox.height
+class RubberbandTk(RubberbandBase):
+    def __init__(self, *args, **kwargs):
+        RubberbandBase.__init__(self, *args, **kwargs)
+
+    def draw_rubberband(self, x0, y0, x1, y1):
+        height = self.figure.canvas.figure.bbox.height
         y0 = height - y0
         y1 = height - y1
         try:
             self.lastrect
         except AttributeError:
             pass
         else:
-            self.canvas._tkcanvas.delete(self.lastrect)
-        self.lastrect = self.canvas._tkcanvas.create_rectangle(x0, y0, x1, y1)
+            self.figure.canvas._tkcanvas.delete(self.lastrect)
+        self.lastrect = self.figure.canvas._tkcanvas.create_rectangle(x0, y0, x1, y1)
 
-    def remove_rubberband(self, event, caller):
+    def remove_rubberband(self):
         try:
             self.lastrect
         except AttributeError:
             pass
         else:
-            self.canvas._tkcanvas.delete(self.lastrect)
+            self.figure.canvas._tkcanvas.delete(self.lastrect)
             del self.lastrect
 
+ToolRubberband = RubberbandTk
+
+
+class SetCursorTk(SetCursorBase):
+    def set_cursor(self, cursor):
+        self.figure.canvas.manager.window.configure(cursor=cursord[cursor])
+
+ToolSetCursor = SetCursorTk
+
 
-class ToolbarTk(ToolbarBase, Tk.Frame):
-    def __init__(self, manager):
-        ToolbarBase.__init__(self, manager)
-        xmin, xmax = self.manager.canvas.figure.bbox.intervalx
+class ToolbarTk(ToolContainerBase, Tk.Frame):
+    def __init__(self, navigation, window):
+        ToolContainerBase.__init__(self, navigation)
+        xmin, xmax = self.navigation.canvas.figure.bbox.intervalx
         height, width = 50, xmax - xmin
-        Tk.Frame.__init__(self, master=self.manager.window,
+        Tk.Frame.__init__(self, master=window,
                           width=int(width), height=int(height),
                           borderwidth=2)
         self._toolitems = {}
-        self._add_message()
-
-    def _add_toolitem(self, name, tooltip_text, image_file, position,
-                      toggle):
+        self.pack(side=Tk.TOP, fill=Tk.X)
 
+    def add_toolitem(self, name, group, position, image_file, description,
+                     toggle):
         button = self._Button(name, image_file, toggle)
-        if tooltip_text is not None:
-            ToolTip.createToolTip(button, tooltip_text)
+        if description is not None:
+            ToolTip.createToolTip(button, description)
         self._toolitems[name] = button
 
     def _Button(self, text, image_file, toggle):
@@ -961,31 +975,36 @@ def _Button(self, text, image_file, toggle):
         return b
 
     def _button_click(self, name):
-        self.manager.navigation._toolbar_callback(name)
+        self.trigger_tool(name)
 
-    def _toggle(self, name, callback=False):
+    def toggle_toolitem(self, name, toggled):
         if name not in self._toolitems:
-            self.set_message('%s Not in toolbar' % name)
             return
-        self._toolitems[name].toggle()
-        if callback:
-            self._button_click(name)
-
-    def _add_message(self):
-        self.message = Tk.StringVar(master=self)
-        self._message_label = Tk.Label(master=self, textvariable=self.message)
-        self._message_label.pack(side=Tk.RIGHT)
-        self.pack(side=Tk.BOTTOM, fill=Tk.X)
-
-    def set_message(self, s):
-        self.message.set(s)
+        if toggled:
+            self._toolitems[name].select()
+        else:
+            self._toolitems[name].deselect()
 
-    def _remove_toolitem(self, name):
+    def remove_toolitem(self, name):
         self._toolitems[name].pack_forget()
         del self._toolitems[name]
 
-    def set_toolitem_visibility(self, name, visible):
-        pass
+
+class StatusbarTk(StatusbarBase, Tk.Frame):
+    def __init__(self, window, *args, **kwargs):
+        StatusbarBase.__init__(self, *args, **kwargs)
+        xmin, xmax = self.navigation.canvas.figure.bbox.intervalx
+        height, width = 50, xmax - xmin
+        Tk.Frame.__init__(self, master=window,
+                          width=int(width), height=int(height),
+                          borderwidth=2)
+        self._message = Tk.StringVar(master=self)
+        self._message_label = Tk.Label(master=self, textvariable=self._message)
+        self._message_label.pack(side=Tk.RIGHT)
+        self.pack(side=Tk.TOP, fill=Tk.X)
+
+    def set_message(self, s):
+        self._message.set(s)
 
 
 class SaveFigureTk(SaveFigureBase):
@@ -1046,7 +1065,7 @@ def __init__(self, *args, **kwargs):
         ConfigureSubplotsBase.__init__(self, *args, **kwargs)
         self.window = None
 
-    def trigger(self, event):
+    def trigger(self, *args):
         self.init_window()
         self.window.lift()
 
@@ -1069,8 +1088,8 @@ def destroy(self, *args, **kwargs):
         self.window = None
 
 
-SaveFigure = SaveFigureTk
-ConfigureSubplots = ConfigureSubplotsTk
+ToolSaveFigure = SaveFigureTk
+ToolConfigureSubplots = ConfigureSubplotsTk
 Toolbar = ToolbarTk
 Navigation = NavigationTk
 FigureCanvas = FigureCanvasTkAgg