Revision: 3585 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3585&view=rev Author: pkienzle Date: 2007年07月20日 06:21:42 -0700 (2007年7月20日) Log Message: ----------- Fix concatenate bug in contains() method Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/lines.py Modified: trunk/matplotlib/lib/matplotlib/lines.py =================================================================== --- trunk/matplotlib/lib/matplotlib/lines.py 2007年07月20日 08:56:16 UTC (rev 3584) +++ trunk/matplotlib/lib/matplotlib/lines.py 2007年07月20日 13:21:42 UTC (rev 3585) @@ -103,8 +103,10 @@ line_hits = (cx-px)**2 + (cy-py)**2 <= radius**2 #if any(line_hits): print "lines",xr[candidates] line_hits = line_hits & candidates - result = concatenate((nonzero(point_hits),nonzero(line_hits))) - return result + points, = point_hits.ravel().nonzero() + lines, = line_hits.ravel().nonzero() + #print points,lines + return concatenate((points,lines)) class Line2D(Artist): lineStyles = _lineStyles = { # hidden names deprecated This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 3598 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3598&view=rev Author: pkienzle Date: 2007年07月20日 16:11:17 -0700 (2007年7月20日) Log Message: ----------- Missing npy.concatenate post numpification Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/lines.py Modified: trunk/matplotlib/lib/matplotlib/lines.py =================================================================== --- trunk/matplotlib/lib/matplotlib/lines.py 2007年07月20日 19:17:14 UTC (rev 3597) +++ trunk/matplotlib/lib/matplotlib/lines.py 2007年07月20日 23:11:17 UTC (rev 3598) @@ -107,7 +107,7 @@ points, = point_hits.ravel().nonzero() lines, = line_hits.ravel().nonzero() #print points,lines - return concatenate((points,lines)) + return npy.concatenate((points,lines)) class Line2D(Artist): lineStyles = _lineStyles = { # hidden names deprecated This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4980 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4980&view=rev Author: mdboom Date: 2008年02月19日 07:56:10 -0800 (2008年2月19日) Log Message: ----------- Remove debugging code. Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/lines.py Modified: trunk/matplotlib/lib/matplotlib/lines.py =================================================================== --- trunk/matplotlib/lib/matplotlib/lines.py 2008年02月19日 15:52:06 UTC (rev 4979) +++ trunk/matplotlib/lib/matplotlib/lines.py 2008年02月19日 15:56:10 UTC (rev 4980) @@ -75,9 +75,6 @@ """Determine if any line segments are within radius of a point. Returns the list of line segments that are within that radius. """ - import pdb - pdb.set_trace() - # Process single points specially if len(x) < 2: res, = npy.nonzero( (cx - x)**2 + (cy - y)**2 <= radius**2 ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5752 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5752&view=rev Author: efiring Date: 2008年07月12日 14:04:09 -0700 (2008年7月12日) Log Message: ----------- Handle markerfacecolor=None etc. consistenty Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/lines.py Modified: trunk/matplotlib/lib/matplotlib/lines.py =================================================================== --- trunk/matplotlib/lib/matplotlib/lines.py 2008年07月12日 13:22:55 UTC (rev 5751) +++ trunk/matplotlib/lib/matplotlib/lines.py 2008年07月12日 21:04:09 UTC (rev 5752) @@ -215,12 +215,6 @@ if linestyle is None : linestyle=rcParams['lines.linestyle'] if marker is None : marker=rcParams['lines.marker'] if color is None : color=rcParams['lines.color'] - if markeredgecolor is None : - markeredgecolor='auto' - if markerfacecolor is None : - markerfacecolor='auto' - if markeredgewidth is None : - markeredgewidth=rcParams['lines.markeredgewidth'] if markersize is None : markersize=rcParams['lines.markersize'] if antialiased is None : antialiased=rcParams['lines.antialiased'] @@ -628,6 +622,8 @@ ACCEPTS: any matplotlib color """ + if ec is None : + ec = 'auto' self._markeredgecolor = ec def set_markeredgewidth(self, ew): @@ -636,6 +632,8 @@ ACCEPTS: float value in points """ + if ew is None : + ew = rcParams['lines.markeredgewidth'] self._markeredgewidth = ew def set_markerfacecolor(self, fc): @@ -644,6 +642,8 @@ ACCEPTS: any matplotlib color """ + if fc is None : + fc = 'auto' self._markerfacecolor = fc def set_markersize(self, sz): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.