renaming tool_trigger_event

Author: fariza

lib/matplotlib/backend_bases.py

@@ -3396,7 +3396,7 @@ def remove_tool(self, name):
 
         # If is a toggle tool and toggled, untoggle
         if getattr(tool, 'toggled', False):
-            self.tool_trigger_event(tool, 'navigation')
+            self.trigger_tool(tool, 'navigation')
 
         self._remove_keys(name)
 
@@ -3481,7 +3481,7 @@ def _tool_added_event(self, tool):
     def _handle_toggle(self, tool, sender, canvasevent, data):
         """
         Toggle tools, need to untoggle prior to using other Toggle tool
-        Called from tool_trigger_event
+        Called from trigger_tool
 
         Parameters
         ----------
@@ -3514,7 +3514,7 @@ def _handle_toggle(self, tool, sender, canvasevent, data):
         # Other tool in the radio_group is toggled
         else:
             # Untoggle previously toggled tool
-            self.tool_trigger_event(self._toggled[radio_group],
+            self.trigger_tool(self._toggled[radio_group],
                                     self,
                                     canvasevent,
                                     data)
@@ -3543,8 +3543,8 @@ def _get_cls_to_instantiate(self, callback_class):
         else:
             return None
 
-    def tool_trigger_event(self, name, sender=None, canvasevent=None,
-                           data=None):
+    def trigger_tool(self, name, sender=None, canvasevent=None,
+                     data=None):
         """
         Trigger a tool and emit the tool_trigger_[name] event
 
@@ -3594,7 +3594,7 @@ def _key_press(self, event):
         name = self._keys.get(event.key, None)
         if name is None:
             return
-        self.tool_trigger_event(name, canvasevent=event)
+        self.trigger_tool(name, canvasevent=event)
 
     @property
     def tools(self):
@@ -3709,7 +3709,7 @@ def trigger_tool(self, name):
             Name(id) of the tool triggered from within the container
 
         """
-        self.navigation.tool_trigger_event(name, sender=self)
+        self.navigation.trigger_tool(name, sender=self)
 
     def add_toolitem(self, name, group, position, image, description, toggle):
         """

lib/matplotlib/backend_tools.py

@@ -84,7 +84,7 @@ def trigger(self, sender, event, data=None):
         Called when this tool gets used
 
         This method is called by
-        `matplotlib.backend_bases.NavigationBase.tool_trigger_event`
+        `matplotlib.backend_bases.NavigationBase.trigger_tool`
 
         Parameters
         ----------
@@ -173,7 +173,7 @@ def disable(self, event=None):
         This can happen in different circumstances
 
         * Click on the toolbar tool button
-        * Call to `matplotlib.backend_bases.NavigationBase.tool_trigger_event`
+        * Call to `matplotlib.backend_bases.NavigationBase.trigger_tool`
         * Another `ToolToggleBase` derived tool is triggered
           (from the same `Navigation`)
         """
@@ -662,7 +662,7 @@ def __init__(self, *args):
     def _cancel_action(self):
         for zoom_id in self._ids_zoom:
             self.figure.canvas.mpl_disconnect(zoom_id)
-        self.navigation.tool_trigger_event('rubberband', self)
+        self.navigation.trigger_tool('rubberband', self)
         self.navigation.get_tool(_views_positions).refresh_locators()
         self._xypress = None
         self._button_pressed = None
@@ -731,9 +731,9 @@ def _mouse_move(self, event):
                 x1, y1, x2, y2 = a.bbox.extents
                 x, lastx = x1, x2
 
-            self.navigation.tool_trigger_event('rubberband',
-                                               self,
-                                               data=(x, y, lastx, lasty))
+            self.navigation.trigger_tool('rubberband',
+                                         self,
+                                         data=(x, y, lastx, lasty))
 
     def _release(self, event):
         """the release mouse button callback in zoom to rect mode"""