SF.net SVN: matplotlib:[6842] trunk/matplotlib
Revision: 6842 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6842&view=rev Author: jdh2358 Date: 2009-01-27 12:34:49 + (Tue, 27 Jan 2009) Log Message: --- Merged revisions 6841 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint r6841 | jdh2358 | 2009-01-27 06:33:10 -0600 (Tue, 27 Jan 2009) | 1 line fixed set_pickradius bug Modified Paths: -- trunk/matplotlib/lib/matplotlib/lines.py Property Changed: trunk/matplotlib/ Property changes on: trunk/matplotlib ___ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6827 + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6841 Modified: trunk/matplotlib/lib/matplotlib/lines.py === --- trunk/matplotlib/lib/matplotlib/lines.py2009-01-27 12:33:10 UTC (rev 6841) +++ trunk/matplotlib/lib/matplotlib/lines.py2009-01-27 12:34:49 UTC (rev 6842) @@ -315,7 +315,7 @@ 'return the pick radius used for containment tests' return self.pickradius -def setpickradius(self,d): +def set_pickradius(self,d): """Sets the pick radius used for containment tests ACCEPTS: float distance in points This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6840] trunk/matplotlib/lib/matplotlib/backends/ backend_gtk.py
Revision: 6840 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6840&view=rev Author: mdboom Date: 2009-01-27 12:23:53 + (Tue, 27 Jan 2009) Log Message: --- Remove oops in commit. Modified Paths: -- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py === --- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py 2009-01-26 23:02:46 UTC (rev 6839) +++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py 2009-01-27 12:23:53 UTC (rev 6840) @@ -349,10 +349,7 @@ if self._need_redraw: x, y, w, h = self.allocation self._pixmap_prepare (w, h) -try: -self._render_figure(self._pixmap, w, h) -except: -pass +self._render_figure(self._pixmap, w, h) self._need_redraw = False x, y, w, h = event.area This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6841] branches/v0_98_5_maint/lib/matplotlib/lines. py
Revision: 6841 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6841&view=rev Author: jdh2358 Date: 2009-01-27 12:33:10 + (Tue, 27 Jan 2009) Log Message: --- fixed set_pickradius bug Modified Paths: -- branches/v0_98_5_maint/lib/matplotlib/lines.py Modified: branches/v0_98_5_maint/lib/matplotlib/lines.py === --- branches/v0_98_5_maint/lib/matplotlib/lines.py 2009-01-27 12:23:53 UTC (rev 6840) +++ branches/v0_98_5_maint/lib/matplotlib/lines.py 2009-01-27 12:33:10 UTC (rev 6841) @@ -313,7 +313,7 @@ 'return the pick radius used for containment tests' return self.pickradius -def setpickradius(self,d): +def set_pickradius(self,d): """Sets the pick radius used for containment tests ACCEPTS: float distance in points This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6843] trunk/toolkits/basemap/lib/mpl_toolkits/ basemap/netcdftime.py
Revision: 6843 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6843&view=rev Author: jswhit Date: 2009-01-27 17:41:33 + (Tue, 27 Jan 2009) Log Message: --- don't use fancy indexing in date2index (won't work for opendap datasets) Modified Paths: -- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/netcdftime.py Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/netcdftime.py === --- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/netcdftime.py 2009-01-27 12:34:49 UTC (rev 6842) +++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/netcdftime.py 2009-01-27 17:41:33 UTC (rev 6843) @@ -937,7 +937,9 @@ def _check_index(indices, dates, nctime, calendar): """Assert that the time indices given correspond to the given dates.""" -t = nctime[indices] +t = numpy.empty(len(indices), nctime.dtype) +for n,i in enumerate(indices): +t[n] = nctime[i] assert numpy.all( num2date(t, nctime.units, calendar) == dates) @@ -974,25 +976,20 @@ dt = t1 - t0 index[:] = (num-t0)/dt -# convert numpy scalars or single element arrays to python ints. -index = _toscalar(index) - # Checking that the index really corresponds to the given date. _check_index(index, dates, nctime, calendar) except AssertionError: -index = numpy.empty(numpy.alen(dates), int) - # If check fails, use brute force method. index[:] = numpy.digitize(num, nctime[:]) - 1 -# convert numpy scalars or single element arrays to python ints. -index = _toscalar(index) - # Perform check again. _check_index(index, dates, nctime, calendar) +# convert numpy scalars or single element arrays to python ints. +index = _toscalar(index) + return index This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
