From 1a199b4405324d73422b25b3e236b984d73a4ec7 Mon Sep 17 00:00:00 2001
From: Tony S Yu <tsyu80@gmail.com>
Date: Thu, 13 Dec 2012 22:25:53 -0500
Subject: [PATCH] ENH: Improve end_points setter

---
 skimage/viewer/canvastools/linetool.py | 37 +++++++++++++-------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/skimage/viewer/canvastools/linetool.py b/skimage/viewer/canvastools/linetool.py
index 0c14c2ae..59f22076 100644
--- a/skimage/viewer/canvastools/linetool.py
+++ b/skimage/viewer/canvastools/linetool.py
@@ -67,6 +67,21 @@ class LineTool(CanvasToolBase):
         self.connect_event('button_release_event', self.on_mouse_release)
         self.connect_event('motion_notify_event', self.on_move)
 
+    @property
+    def end_points(self):
+        return self._end_pts
+
+    @end_points.setter
+    def end_points(self, pts):
+        self._end_pts = pts
+
+        self._line.set_data(np.transpose(pts))
+        self._handles.set_data(np.transpose(pts))
+        self._line.set_linewidth(self.linewidth)
+
+        self.set_visible(True)
+        self.redraw()
+
     def on_mouse_press(self, event):
         if event.button != 1 and event.inaxes == None:
             return
@@ -93,29 +108,15 @@ class LineTool(CanvasToolBase):
         self.update(event.xdata, event.ydata)
         self.callback_on_move(self.geometry)
 
-    def update(self, x, y):
+    def update(self, x=None, y=None):
         if x is not None:
             self._end_pts[self._active_pt, :] = x, y
-        self._line.set_data(np.transpose(self._end_pts))
-        self._handles.set_data(np.transpose(self._end_pts))
-        self._line.set_linewidth(self.linewidth)
-
-        self.redraw()
+        self.end_points = self._end_pts
 
     @property
     def geometry(self):
         return self.end_points
 
-    @property
-    def end_points(self):
-        return self._end_pts
-
-    @end_points.setter
-    def end_points(self, pts):
-        self._end_pts = pts
-        self.set_visible(True)
-        self.update(None, None)
-
 
 class ThickLineTool(LineTool):
     """Widget for line selection in a plot.
@@ -180,13 +181,13 @@ class ThickLineTool(LineTool):
 
     def _thicken_scan_line(self):
         self.linewidth += 1
-        self.update(None, None)
+        self.update()
         self.callback_on_change(self.geometry)
 
     def _shrink_scan_line(self):
         if self.linewidth > 1:
             self.linewidth -= 1
-            self.update(None, None)
+            self.update()
             self.callback_on_change(self.geometry)