From 9f70148f083006dadd47f474ae1af7bc43293779 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Wed, 12 Dec 2012 15:48:45 -0500 Subject: [PATCH] STY: Minor code clean up --- skimage/viewer/canvastools/base.py | 4 ++++ skimage/viewer/canvastools/line_tool.py | 13 +++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/skimage/viewer/canvastools/base.py b/skimage/viewer/canvastools/base.py index ed0feb30..dddca19a 100644 --- a/skimage/viewer/canvastools/base.py +++ b/skimage/viewer/canvastools/base.py @@ -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() diff --git a/skimage/viewer/canvastools/line_tool.py b/skimage/viewer/canvastools/line_tool.py index 9dd990b4..c2bdd724 100644 --- a/skimage/viewer/canvastools/line_tool.py +++ b/skimage/viewer/canvastools/line_tool.py @@ -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)