wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-02 06:12:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename (dis)connect_event to (dis)connect_image_events.

Browse Source 
This clarifies action since these events are on the image viewer, not the plugin.
This commit is contained in:
Tony S Yu
2012-07-23 01:22:05 -04:00
parent 92ca837471
commit 36b0fbd84e
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/viewer/plugins/base.py
+7 -7
View File
@@ -69,7 +69,7 @@ class Plugin(QtGui.QDialog):
self.arguments.append(self.image_viewer.original_image)
if self.draws_on_image:
self.connect_event('draw_event', self.on_draw)
self.connect_image_event('draw_event', self.on_draw)
def on_draw(self, event):
"""Save image background when blitting.
@@ -108,17 +108,17 @@ class Plugin(QtGui.QDialog):
def closeEvent(self, event):
"""Disconnect all artists and events from ImageViewer.
Note that events must be connected using `self.connect_event` and
Note that events must be connected using `self.connect_image_event` and
artists must be appended to `self.artists`.
"""
self.disconnect_image_events()
self.remove_artists()
self.remove_image_artists()
self.image_viewer.plugins.remove(self)
self.image_viewer.redraw()
self.close()
def connect_event(self, event, callback):
"""Connect callback with an event.
def connect_image_event(self, event, callback):
"""Connect callback with an event in the image viewer.
This should be used in lieu of `figure.canvas.mpl_connect` since this
function stores call back ids for later clean up.
@@ -138,7 +138,7 @@ class Plugin(QtGui.QDialog):
for c in self.cids:
self.image_viewer.disconnect_event(c)
def remove_artists(self):
"""Disconnect artists that are connected to the *image plot*."""
def remove_image_artists(self):
"""Disconnect artists that are connected to the image viewer."""
for a in self.artists:
self.image_viewer.remove_artist(a)
skimage/viewer/plugins/lineprofile.py
+5 -5
View File
@@ -72,11 +72,11 @@ class LineProfile(PlotPlugin):
self.profile = self.ax.plot(scan_data, 'k-')[0]
self._autoscale_view()
self.connect_event('key_press_event', self.on_key_press)
self.connect_event('button_press_event', self.on_mouse_press)
self.connect_event('button_release_event', self.on_mouse_release)
self.connect_event('motion_notify_event', self.on_move)
self.connect_event('scroll_event', self.on_scroll)
self.connect_image_event('key_press_event', self.on_key_press)
self.connect_image_event('button_press_event', self.on_mouse_press)
self.connect_image_event('button_release_event', self.on_mouse_release)
self.connect_image_event('motion_notify_event', self.on_move)
self.connect_image_event('scroll_event', self.on_scroll)
self.image_viewer.redraw()