Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

MEP22: Navigation by events#3652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
WeatherGod merged 69 commits intomatplotlib:masterfromfariza:navigation-by-events
Apr 9, 2015
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
69 commits
Select commitHold shift + click to select a range
8cceed4
navigation and toolbar coexistence
farizaJan 23, 2014
3118a5a
mod keypress in figuremanager
farizaJan 23, 2014
b4d5fcf
helper methods in toolbar and navigation
farizaJan 24, 2014
1e8af47
Adding doc to base methods
farizaJan 24, 2014
622cb95
property for active_toggle
farizaJan 26, 2014
d1a9de4
simulate click
farizaJan 27, 2014
3f89d52
activate renamed to trigger
farizaJan 28, 2014
4f3c10b
toggle tools using enable/disable from its trigger method
farizaJan 29, 2014
6065daa
simplifying _handle_toggle
farizaJan 29, 2014
f6a2f19
reducing number of locks
farizaJan 29, 2014
05db3b6
changing toggle and persistent attributes for issubclass
farizaFeb 4, 2014
c08fe56
bug in combined key press
farizaFeb 4, 2014
b207a72
untoggle zoom and pan from keypress while toggled
farizaFeb 4, 2014
9266447
classmethods for default tools modification
farizaFeb 6, 2014
a53419a
adding zaxis and some pep8
farizaMay 1, 2014
704c717
removing legacy method dynamic update
farizaMay 6, 2014
5056729
tk backend
farizaMay 6, 2014
e6a4e1e
example working with Tk
farizaMay 6, 2014
8942c47
duplicate code in keymap tool initialization
farizaJul 24, 2014
022de6f
grammar corrections
farizaJul 24, 2014
2c9a195
moving views and positions to tools
farizaJul 24, 2014
cafe668
The views positions mixin automatically adds the clear as axobserver
farizaJul 25, 2014
224f745
bug when navigation was not defined
farizaJul 25, 2014
94c711e
Small refactor so that we first initiate the Navigation (ToolManager)…
OceanWolfJul 28, 2014
67257e7
Moved default_tool initilisation to FigureManagerBase and cleaned.
OceanWolfJul 29, 2014
ffa65d6
Temporary fix to backends
OceanWolfJul 29, 2014
6739ee0
removing persistent tools
farizaSep 3, 2014
d18206f
removing unregister
farizaSep 4, 2014
34a52c8
change cursor inmediately after toggle
farizaSep 5, 2014
c2da483
removing intoolbar
farizaOct 15, 2014
44a9b0e
events working
farizaOct 16, 2014
a2ed47f
using pydispatch
farizaOct 17, 2014
0665890
using navigation as signal handler
farizaOct 20, 2014
411e6e2
removing view positions singleton
farizaOct 20, 2014
d484ebd
moving set_cursor completely out of navigation
farizaOct 27, 2014
75bf97b
removing unused event class
farizaNov 10, 2014
6cc040b
underscore in tool_trigger-xxx
farizaNov 10, 2014
0ff5997
adding radio_group for toggle tools
farizaNov 14, 2014
af6734f
scroll to zoom in zoom/pan tools
farizaNov 28, 2014
78513d2
remove ToolAddedEvent incorporating the functionality into toolevent
farizaDec 5, 2014
377ff54
eliminating repeated loop
farizaJan 5, 2015
7dbbf58
replace draw by draw_idle in tools
farizaJan 21, 2015
dd66b57
rename mpl_connect
farizaJan 21, 2015
67a414f
cleaning navigation and toolbar dependencies
farizaFeb 4, 2015
e415d8d
Made NavigationBase.get_tool() more useful.
OceanWolfFeb 11, 2015
1213086
Refactored Toolbar out of NavigationBase
OceanWolfFeb 12, 2015
ba61dec
Some short cuts for adding tools
OceanWolfFeb 16, 2015
9f2ee2b
Lots of fixes
OceanWolfFeb 18, 2015
9da2b13
Rename ToolbarBase -> ToolContainerBase
OceanWolfFeb 18, 2015
110253f
Statusbar
OceanWolfFeb 20, 2015
e2804ea
tool group position
farizaFeb 26, 2015
9a64b7e
docstrings and small corrections by WeatherGod
farizaMar 23, 2015
64f947f
tkbackend updated
farizaMar 31, 2015
e8cd5d5
tacaswell comments aprl 1
farizaApr 1, 2015
4bbcf4e
renaming tool_trigger_event
farizaApr 1, 2015
73a2661
add_tools moved out of base classes
farizaApr 1, 2015
1b83628
figure.setter in tools
farizaApr 1, 2015
e4edd23
rename tools to default_tools to avoid confusion
farizaApr 1, 2015
d4ac2fb
docstring helper add_tools methods
farizaApr 1, 2015
a7640ef
rename navigation to toolmanager
farizaApr 2, 2015
48a6971
tkagg updated for toolmanager and tool groups
farizaApr 2, 2015
8dafe09
doc and minor code organization
farizaApr 2, 2015
a0695d0
whats new
farizaApr 3, 2015
328b169
missing object from class declaration
farizaApr 3, 2015
aac4744
remove comments and docstrings
farizaApr 3, 2015
f09b9ef
import with original name backend_tools
farizaApr 3, 2015
def3a52
rename 2 -> to, example without gtk only code
farizaApr 7, 2015
9ee7e25
zoom pan buttons order
farizaApr 7, 2015
5eae4e1
matplotlib.rcParams['toolbar'] == 'None' starts toolmanager but not t…
farizaApr 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
PrevPrevious commit
NextNext commit
renaming tool_trigger_event
  • Loading branch information
@fariza
fariza committedApr 7, 2015
commit4bbcf4e7005069eb5f289940f0b745955473da05
14 changes: 7 additions & 7 deletionslib/matplotlib/backend_bases.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand DownExpand Up@@ -3481,7 +3481,7 @@ def _tool_added_event(self, tool):
def _handle_toggle(self, tool, sender, canvasevent, data):
"""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Can you put docstrings on these with the expected types?

Copy link
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

done

Toggle tools, need to untoggle prior to using other Toggle tool
Called fromtool_trigger_event
Called fromtrigger_tool

Parameters
----------
Expand DownExpand Up@@ -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)
Expand DownExpand Up@@ -3543,8 +3543,8 @@ def _get_cls_to_instantiate(self, callback_class):
else:
return None

deftool_trigger_event(self, name, sender=None, canvasevent=None,
data=None):
deftrigger_tool(self, name, sender=None, canvasevent=None,
data=None):
"""
Trigger a tool and emit the tool_trigger_[name] event

Expand DownExpand Up@@ -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):
Expand DownExpand Up@@ -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):
"""
Expand Down
12 changes: 6 additions & 6 deletionslib/matplotlib/backend_tools.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
----------
Expand DownExpand Up@@ -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`)
"""
Expand DownExpand Up@@ -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
Expand DownExpand Up@@ -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"""
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp