10000 renaming tool_trigger_event · matplotlib/matplotlib@4bbcf4e · GitHub
[go: up one dir, main page]

Skip to content

Commit 4bbcf4e

Browse files
committed
renaming tool_trigger_event
1 parent e8cd5d5 commit 4bbcf4e

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

lib/matplotlib/backend_bases.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3396,7 +3396,7 @@ def remove_tool(self, name):
33963396

33973397
# If is a toggle tool and toggled, untoggle
33983398
if getattr(tool, 'toggled', False):
3399-
self.tool_trigger_event(tool, 'navigation')
3399+
self.trigger_tool(tool, 'navigation')
34003400

34013401
self._remove_keys(name)
34023402

@@ -3481,7 +3481,7 @@ def _tool_added_event(self, tool):
34813481
def _handle_toggle(self, tool, sender, canvasevent, data):
34823482
"""
34833483
Toggle tools, need to untoggle prior to using other Toggle tool
3484-
Called from tool_trigger_event
3484+
Called from trigger_tool
34853485
34863486
Parameters
34873487
----------
@@ -3514,7 +3514,7 @@ def _handle_toggle(self, tool, sender, canvasevent, data):
35143514
# Other tool in the radio_group is toggled
35153515
else:
35163516
# Untoggle previously toggled tool
3517-
self.tool_trigger_event(self._toggled[radio_group],
3517+
self.trigger_tool(self._toggled[radio_group],
35183518
self,
35193519
canvasevent,
35203520
data)
@@ -3543,8 +3543,8 @@ def _get_cls_to_instantiate(self, callback_class):
35433543
else:
35443544
return None
35453545

3546-
def tool_trigger_event(self, name, sender=None, canvasevent=None,
3547-
data=None):
3546+
def trigger_tool(self, name, sender=None, canvasevent=None,
3547+
data=None):
35483548
"""
35493549
Trigger a tool and emit the tool_trigger_[name] event
35503550
@@ -3594,7 +3594,7 @@ def _key_press(self, event):
35943594
name = self._keys.get(event.key, None)
35953595
if name is None:
35963596
return
3597-
self.tool_trigger_event(name, canvasevent=event)
3597+
self.trigger_tool(name, canvasevent=event)
35983598

35993599
@property
36003600
def tools(self):
@@ -3709,7 +3709,7 @@ def trigger_tool(self, name):
37093709
Name(id) of the tool triggered from within the container
37103710
37113711
"""
3712-
self.navigation.tool_trigger_event(name, sender=self)
3712+
self.navigation.trigger_tool(name, sender=self)
37133713

37143714
def add_toolitem(self, name, group, position, image, description, toggle):
37153715
"""

lib/matplotlib/backend_tools.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def trigger(self, sender, event, data=None):
8484
Called when this tool gets used
8585
8686
This method is called by
87-
`matplotlib.backend_bases.NavigationBase.tool_trigger_event`
87+
`matplotlib.backend_bases.NavigationBase.trigger_tool`
8888
8989
Parameters
9090
----------
@@ -173,7 +173,7 @@ def disable(self, event=None):
173173
This can happen in different circumstances
174174
175175
* Click on the toolbar tool button
176-
* Call to `matplotlib.backend_bases.NavigationBase.tool_trigger_event`
176+
* Call to `matplotlib.backend_bases.NavigationBase.trigger_tool`
177177
* Another `ToolToggleBase` derived tool is triggered
178178
(from the same `Navigation`)
179179
"""
@@ -662,7 +662,7 @@ def __init__(self, *args):
662662
def _cancel_action(self):
663663
for zoom_id in self._ids_zoom:
664664
self.figure.canvas.mpl_disconnect(zoom_id)
665-
self.navigation.tool_trigger_event('rubberband', self)
665+
self.navigation.trigger_tool('rubberband', self)
666666
self.navigation.get_tool(_views_positions).refresh_locators()
667667
self._xypress = None
668668
self._button_pressed = None
@@ -731,9 +731,9 @@ def _mouse_move(self, event):
731731
x1, y1, x2, y2 = a.bbox.extents
732732
x, lastx = x1, x2
733733

734-
self.navigation.tool_trigger_event('rubberband',
735-
self,
736-
data=(x, y, lastx, lasty))
734+
self.navigation.trigger_tool('rubberband',
735+
self,
736+
data=(x, y, lastx, lasty))
737737

738738
def _release(self, event):
739739
"""the release mouse button callback in zoom to rect mode"""

0 commit comments

Comments
 (0)
0