Skip to content

Commit 3f89d52

Browse files
committed
activate renamed to trigger
1 parent d1a9de4 commit 3f89d52

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

examples/user_interfaces/navigation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ListTools(ToolBase):
1515
#Where to put it in the toolbar, -1 = at the end, None = Not in toolbar
1616
position = -1
1717

18-
def activate(self, event):
18+
def trigger(self, event):
1919
#The most important attributes are navigation and figure
2020
self.navigation.list_tools()
2121

@@ -28,7 +28,7 @@ class CopyTool(ToolBase):
2828
description = 'Copy canvas'
2929
position = -1
3030

31-
def activate(self, event):
31+
def trigger(self, event):
3232
from gi.repository import Gtk, Gdk, GdkPixbuf
3333
clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD)
3434
window = self.figure.canvas.get_window()

lib/matplotlib/backend_bases.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3472,7 +3472,7 @@ def _tool_activate(self, name, event, from_toolbar):
34723472
self._handle_toggle(name, event=event, from_toolbar=from_toolbar)
34733473
elif tool.persistent:
34743474
instance = self._get_instance(name)
3475-
instance.activate(event)
3475+
instance.trigger(event)
34763476
else:
34773477
#Non persistent tools, are
34783478
#instantiated and forgotten (reminds me an exgirlfriend?)
@@ -3521,7 +3521,7 @@ def _handle_toggle(self, name, event=None, from_toolbar=False):
35213521

35223522
instance = self._get_instance(name)
35233523
if self._toggled is None:
3524-
instance.activate(None)
3524+
instance.trigger(None)
35253525
self._toggled = name
35263526

35273527
elif self._toggled == name:
@@ -3533,7 +3533,7 @@ def _handle_toggle(self, name, event=None, from_toolbar=False):
35333533
self.toolbar._toggle(self._toggled, False)
35343534

35353535
self._get_instance(self._toggled).deactivate(None)
3536-
instance.activate(None)
3536+
instance.trigger(None)
35373537
self._toggled = name
35383538

35393539
for a in self.canvas.figure.get_axes():

lib/matplotlib/backend_tools.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ class ToolBase(object):
9797
def __init__(self, figure, event=None):
9898
self.figure = figure
9999
self.navigation = figure.canvas.manager.navigation
100-
self.activate(event)
100+
self.trigger(event)
101101

102-
def activate(self, event):
102+
def trigger(self, event):
103103
"""Called when tool is used
104104
105105
Parameters
@@ -118,15 +118,15 @@ class ToolPersistentBase(ToolBase):
118118
119119
Notes
120120
-----
121-
The difference with `ToolBase` is that `activate` method
121+
The difference with `ToolBase` is that `trigger` method
122122
is not called automatically at initialization
123123
"""
124124
persistent = True
125125

126126
def __init__(self, figure, event=None):
127127
self.figure = figure
128128
self.navigation = figure.canvas.manager.navigation
129-
#persistent tools don't call activate a at instantiation
129+
#persistent tools don't call trigger a at instantiation
130130

131131
def unregister(self, *args):
132132
"""Unregister the tool from the instances of Navigation
@@ -196,7 +196,7 @@ class ToolQuit(ToolBase):
196196
description = 'Quit the figure'
197197
keymap = rcParams['keymap.quit']
198198

199-
def activate(self, event):
199+
def trigger(self, event):
200200
Gcf.destroy_fig(self.figure)
201201

202202

@@ -207,7 +207,7 @@ class ToolEnableAllNavigation(ToolBase):
207207
description = 'Enables all axes navigation'
208208
keymap = rcParams['keymap.all_axes']
209209

210-
def activate(self, event):
210+
def trigger(self, event):
211211
if event.inaxes is None:
212212
return
213213

@@ -225,7 +225,7 @@ class ToolEnableNavigation(ToolBase):
225225
description = 'Enables one axes navigation'
226226
keymap = range(1, 10)
227227

228-
def activate(self, event):
228+
def trigger(self, event):
229229
if event.inaxes is None:
230230
return
231231

@@ -244,7 +244,7 @@ class ToolToggleGrid(ToolBase):
244244
description = 'Toogle Grid'
245245
keymap = rcParams['keymap.grid']
246246

247-
def activate(self, event):
247+
def trigger(self, event):
248248
if event.inaxes is None:
249249
return
250250
event.inaxes.grid()
@@ -257,7 +257,7 @@ class ToolToggleFullScreen(ToolBase):
257257
description = 'Toogle Fullscreen mode'
258258
keymap = rcParams['keymap.fullscreen']
259259

260-
def activate(self, event):
260+
def trigger(self, event):
261261
self.figure.canvas.manager.full_screen_toggle()
262262

263263

@@ -267,7 +267,7 @@ class ToolToggleYScale(ToolBase):
267267
description = 'Toogle Scale Y axis'
268268
keymap = rcParams['keymap.yscale']
269269

270-
def activate(self, event):
270+
def trigger(self, event):
271271
ax = event.inaxes
272272
if ax is None:
273273
return
@@ -287,7 +287,7 @@ class ToolToggleXScale(ToolBase):
287287
description = 'Toogle Scale X axis'
288288
keymap = rcParams['keymap.xscale']
289289

290-
def activate(self, event):
290+
def trigger(self, event):
291291
ax = event.inaxes
292292
if ax is None:
293293
return
@@ -309,7 +309,7 @@ class ToolHome(ToolBase):
309309
keymap = rcParams['keymap.home']
310310
position = -1
311311

312-
def activate(self, *args):
312+
def trigger(self, *args):
313313
self.navigation.views.home()
314314
self.navigation.positions.home()
315315
self.navigation.update_view()
@@ -324,7 +324,7 @@ class ToolBack(ToolBase):
324324
keymap = rcParams['keymap.back']
325325
position = -1
326326

327-
def activate(self, *args):
327+
def trigger(self, *args):
328328
self.navigation.views.back()
329329
self.navigation.positions.back()
330330
# self.set_history_buttons()
@@ -339,7 +339,7 @@ class ToolForward(ToolBase):
339339
keymap = rcParams['keymap.forward']
340340
position = -1
341341

342-
def activate(self, *args):
342+
def trigger(self, *args):
343343
self.navigation.views.forward()
344344
self.navigation.positions.forward()
345345
# self.set_history_buttons()
@@ -378,7 +378,7 @@ def __init__(self, *args):
378378
self._button_pressed = None
379379
self._xypress = None
380380

381-
def activate(self, event):
381+
def trigger(self, event):
382382
self.navigation.canvaslock(self)
383383
self.navigation.presslock(self)
384384
self.navigation.releaselock(self)
@@ -607,7 +607,7 @@ def __init__(self, *args):
607607
self._button_pressed = None
608608
self._xypress = None
609609

610-
def activate(self, event):
610+
def trigger(self, event):
611611
self.navigation.canvaslock(self)
612612
self.navigation.presslock(self)
613613
self.navigation.releaselock(self)

lib/matplotlib/backends/backend_gtk3.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ def get_filechooser(self):
859859
fc.set_current_name(self.figure.canvas.get_default_filename())
860860
return fc
861861

862-
def activate(self, *args):
862+
def trigger(self, *args):
863863
chooser = self.get_filechooser()
864864
fname, format_ = chooser.get_filename_from_user()
865865
chooser.destroy()
@@ -920,7 +920,7 @@ def __init__(self, *args, **kwargs):
920920
def _get_canvas(self, fig):
921921
return self.canvas.__class__(fig)
922922

923-
def activate(self, event):
923+
def trigger(self, event):
924924
self.present()
925925

926926

0 commit comments

Comments
 (0)