STY: Minor code clean up

This commit is contained in:
Tony S Yu
2012-12-12 15:48:45 -05:00
parent 16a720770a
commit 9f70148f08
2 changed files with 7 additions and 10 deletions
+4
View File
@@ -69,6 +69,10 @@ class CanvasToolBase(object):
self.ax.draw_artist(artist)
def redraw(self):
"""Redraw image and canvas artists.
This method should be called by subclasses when artists are updated.
"""
if self.useblit:
self.canvas.restore_region(self.img_background)
self._draw_artists()
+3 -10
View File
@@ -50,9 +50,7 @@ class LineTool(CanvasToolBase):
self.connect_event('key_press_event', self.on_key_press)
def on_mouse_press(self, event):
if event.button != 1:
return
if event.inaxes == None:
if event.button != 1 and event.inaxes == None:
return
idx, px_dist = self._handles.closest(event.x, event.y)
if px_dist < self.maxdist:
@@ -64,14 +62,11 @@ class LineTool(CanvasToolBase):
self._active_pt = None
def on_move(self, event):
if event.button != 1:
return
if self._active_pt is None:
if event.button != 1 or self._active_pt is None:
return
if not self.ax.in_axes(event):
return
x, y = event.xdata, event.ydata
self.update(x, y)
self.update(event.xdata, event.ydata)
def on_key_press(self, event):
if event.key == 'enter':
@@ -92,9 +87,7 @@ class LineTool(CanvasToolBase):
self._handles.set_data(np.transpose(self.end_pts))
self._line.set_linewidth(self.linewidth)
self.ax.relim()
self.redraw()
self.on_update(self.end_pts)