SF.net SVN: matplotlib:[5893] trunk/matplotlib/lib/matplotlib/lines.py

[<pki...@us...>]

Revision: 5893
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5893&view=rev
Author:   pkienzle
Date:     2008-07-26 22:23:06 +0000 (Sat, 26 Jul 2008)

Log Message:
-----------
fix contains() method for Lines

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/lines.py

Modified: trunk/matplotlib/lib/matplotlib/lines.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/lines.py	2008-07-26 19:32:47 UTC (rev 5892)
+++ trunk/matplotlib/lib/matplotlib/lines.py	2008-07-26 22:23:06 UTC (rev 5893)
@@ -236,33 +236,43 @@
         if not is_numlike(self.pickradius):
             raise ValueError,"pick radius should be a distance"
 
+        # Make sure we have data to plot
         if self._invalid:
             self.recache()
         if len(self._xy)==0: return False,{}
-        tpath = self._transformed_path.get_fully_transformed_path()
-        xyt = tpath.vertices
-        xt = xyt[:, 0]
-        yt = xyt[:, 1]
 
+        # Convert points to pixels
+        path, affine = self._transformed_path.get_transformed_path_and_affine()
+        path = affine.transform_path(path)
+        xy = path.vertices
+        xt = xy[:, 0]
+        yt = xy[:, 1]
+
+        # Convert pick radius from points to pixels
         if self.figure == None:
-            print str(self),' has no figure set'
+            warning.warn('no figure set when check if mouse is on line')
             pixels = self.pickradius
         else:
             pixels = self.figure.dpi/72. * self.pickradius
 
+        # Check for collision
         if self._linestyle in ['None',None]:
             # If no line, return the nearby point(s)
-            d = np.sqrt((xt-mouseevent.x)**2 + (yt-mouseevent.y)**2)
-            ind, = np.nonzero(np.less_equal(d, pixels))
+            d = (xt-mouseevent.x)**2 + (yt-mouseevent.y)**2
+            ind, = np.nonzero(np.less_equal(d, pixels**2))
         else:
             # If line, return the nearby segment(s)
             ind = segment_hits(mouseevent.x,mouseevent.y,xt,yt,pixels)
-        if 0:
-            print 'linestyle',self._linestyle
-            print 'xt', xt, mouseevent.x
-            print 'yt', yt, mouseevent.y
-            print 'dx,dy', (xt-mouseevent.x)**2., (yt-mouseevent.y)**2.
+
+        # Debugging message
+        if False and self._label != u'':
+            print "Checking line",self._label,"at",mouseevent.x,mouseevent.y
+            print 'xt', xt
+            print 'yt', yt
+            #print 'dx,dy', (xt-mouseevent.x)**2., (yt-mouseevent.y)**2.
             print 'ind',ind
+
+        # Return the point(s) within radius
         return len(ind)>0,dict(ind=ind)
 
     def get_pickradius(self):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.