helper methods in toolbar and navigation

fariza · fariza · commit b4d5fcf04799 · 2015-04-07T15:12:18.000-04:00
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -3228,8 +3228,10 @@ class NavigationBase(object):
              tools.ToolToggleYScale,
              tools.ToolHome, tools.ToolBack,
              tools.ToolForward,
+             None,
              tools.ToolZoom,
              tools.ToolPan,
+             None,
              'ConfigureSubplots',
              'SaveFigure']
 
@@ -3266,7 +3268,11 @@ def __init__(self, canvas, toolbar=None):
         self.canvaslock = self.canvas.widgetlock
 
         for tool in self._default_tools:
-            self.add_tool(tool)
+            if tool is None:
+                if self.toolbar is not None:
+                    self.toolbar.add_separator(-1)
+            else:
+                self.add_tool(tool)
 
         self._last_cursor = self._default_cursor
 
@@ -3279,7 +3285,28 @@ def _get_toolbar(self, toolbar, canvas):
             toolbar = None
         return toolbar
 
-    #remove persistent instances
+    def get_active(self):
+        return {'toggled': self._toggled, 'instances': self._instances.keys()}
+
+    def get_tool_keymap(self, name):
+        keys = [k for k, i in self._keys.items() if i == name]
+        return keys
+
+    def set_tool_keymap(self, name, *keys):
+        if name not in self._tools:
+            raise AttributeError('%s not in Tools' % name)
+
+        active_keys = [k for k, i in self._keys.items() if i == name]
+        for k in active_keys:
+            del self._keys[k]
+
+        for key in keys:
+            for k in validate_stringlist(key):
+                if k in self._keys:
+                    warnings.warn('Key %s changed from %s to %s' %
+                                  (k, self._keys[k], name))
+                self._keys[k] = name
+
     def unregister(self, name):
         if self._toggled == name:
             self._handle_toggle(name, from_toolbar=False)
@@ -3310,6 +3337,9 @@ def add_tool(self, callback_class):
         self._tools[name] = tool
         if tool.keymap is not None:
             for k in validate_stringlist(tool.keymap):
+                if k in self._keys:
+                    warnings.warn('Key %s changed from %s to %s' %
+                                  (k, self._keys[k], name))
                 self._keys[k] = name
 
         if self.toolbar and tool.position is not None:
@@ -3573,3 +3603,9 @@ def toggle(self, name, callback=False):
 
     def remove_toolitem(self, name):
         pass
+
+    def move_toolitem(self, pos_ini, pos_fin):
+        pass
+
+    def set_toolitem_visibility(self, name, visible):
+        pass
diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
@@ -88,7 +88,7 @@ def activate(self, event):
 class ToolEnableNavigation(ToolBase):
     name = 'EnableOne'
     description = 'Enables one axes navigation'
-    keymap = range(1, 5)
+    keymap = range(1, 10)
 
     def activate(self, event):
         if event.inaxes is None:
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -807,8 +807,7 @@ def set_message(self, s):
 
     def toggle(self, name, callback=False):
         if name not in self._toolitems:
-            # TODO: raise a warning
-            print('Not in toolbar', name)
+            self.set_message('%s Not in toolbar' % name)
             return
 
         status = self._toolitems[name].get_active()
@@ -822,12 +821,31 @@ def toggle(self, name, callback=False):
 
     def remove_toolitem(self, name):
         if name not in self._toolitems:
-            #TODO: raise warning
-            print('Not in toolbar', name)
+            self.set_message('%s Not in toolbar' % name)
             return
         self._toolbar.remove(self._toolitems[name])
         del self._toolitems[name]
 
+    def add_separator(self, pos=-1):
+        toolitem = Gtk.SeparatorToolItem()
+        self._toolbar.insert(toolitem, pos)
+        toolitem.show()
+        return toolitem
+
+    def move_toolitem(self, pos_ini, pos_fin):
+        widget = self._toolbar.get_nth_item(pos_ini)
+        if not widget:
+            self.set_message('Impossible to remove tool %d' % pos_ini)
+            return
+        self._toolbar.remove(widget)
+        self._toolbar.insert(widget, pos_fin)
+
+    def set_toolitem_visibility(self, name, visible):
+        if name not in self._toolitems:
+            self.set_message('%s Not in toolbar' % name)
+            return
+        self._toolitems[name].set_visible(visible)
+
 
 class SaveFigureGTK3(SaveFigureBase):
 
