Revision: 4896 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4896&view=rev Author: efiring Date: 2008年01月25日 16:11:36 -0800 (2008年1月25日) Log Message: ----------- Apply patch by Manuel Metz to scatter docstring. Modified Paths: -------------- branches/v0_91_maint/lib/matplotlib/axes.py Modified: branches/v0_91_maint/lib/matplotlib/axes.py =================================================================== --- branches/v0_91_maint/lib/matplotlib/axes.py 2008年01月26日 00:08:57 UTC (rev 4895) +++ branches/v0_91_maint/lib/matplotlib/axes.py 2008年01月26日 00:11:36 UTC (rev 4896) @@ -4047,10 +4047,22 @@ 'p' : pentagram 'h' : hexagon '8' : octagon - - If marker is None and verts is not None, verts is a sequence - of (x,y) vertices for a custom scatter symbol. - + + The marker can also be a tuple (numsides, style, angle), which will + create a custom, regular symbol. + + numsides is the number of sides + + style is the style of the regular symbol: + 0 : a regular polygon + 1 : a star-like symbol + 2 : an asterisk + + angle is the angle of rotation of the symbol + + Finally, marker can be (verts, 0), verts is a sequence of (x,y) + vertices for a custom scatter symbol. + s is a size argument in points squared. Any or all of x, y, s, and c may be masked arrays, in which This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4904 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4904&view=rev Author: jrevans Date: 2008年01月28日 10:02:31 -0800 (2008年1月28日) Log Message: ----------- Fixed a bug where plotting a singe point unitized errorbar data would fail. Fixed a bug where plotting errorbar data where the error is a duration for a time valued axes would fail. Modified Paths: -------------- branches/v0_91_maint/lib/matplotlib/axes.py Modified: branches/v0_91_maint/lib/matplotlib/axes.py =================================================================== --- branches/v0_91_maint/lib/matplotlib/axes.py 2008年01月28日 15:43:55 UTC (rev 4903) +++ branches/v0_91_maint/lib/matplotlib/axes.py 2008年01月28日 18:02:31 UTC (rev 4904) @@ -331,7 +331,6 @@ self.set_patchprops(seg, **kwargs) ret.append(seg) - if self.command == 'plot': func = makeline else: func = makefill if multicol: @@ -2513,10 +2512,6 @@ ymin = npy.asarray(ymin) ymax = npy.asarray(ymax) - if len(ymin)==1: - ymin = ymin*npy.ones(x.shape, x.dtype) - if len(ymax)==1: - ymax = ymax*npy.ones(x.shape, x.dtype) if len(ymin)!=len(x): raise ValueError, 'ymin and x are unequal sized sequences' @@ -2533,12 +2528,17 @@ self.add_collection(coll) coll.update(kwargs) - minx = x.min() - maxx = x.max() - miny = min(ymin.min(), ymax.min()) - maxy = max(ymin.max(), ymax.max()) - minx, maxx = self.convert_xunits((minx, maxx)) - miny, maxy = self.convert_yunits((miny, maxy)) + # We do the conversion first since not all unitized data is uniform + xx = self.convert_xunits( x ) + yymin = self.convert_yunits( ymin ) + yymax = self.convert_yunits( ymax ) + + minx = min( xx ) + maxx = max( xx ) + + miny = min( min(yymin), min(yymax) ) + maxy = max( max(yymin), max(yymax) ) + corners = (minx, miny), (maxx, maxy) self.update_datalim(corners) self.autoscale_view() @@ -2644,7 +2644,6 @@ autoscaled; default True. See Axes.autoscale_view for more information """ - scalex = kwargs.pop( 'scalex', True) scaley = kwargs.pop( 'scaley', True) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4907 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4907&view=rev Author: mdboom Date: 2008年01月29日 12:24:58 -0800 (2008年1月29日) Log Message: ----------- Allow updating of shared axes when calling Axes.axis() (Thanks Jorgen Stenarson) Modified Paths: -------------- branches/v0_91_maint/lib/matplotlib/axes.py Modified: branches/v0_91_maint/lib/matplotlib/axes.py =================================================================== --- branches/v0_91_maint/lib/matplotlib/axes.py 2008年01月29日 20:19:27 UTC (rev 4906) +++ branches/v0_91_maint/lib/matplotlib/axes.py 2008年01月29日 20:24:58 UTC (rev 4907) @@ -1006,7 +1006,7 @@ try: v[0] except IndexError: - emit = kwargs.get('emit', False) + emit = kwargs.get('emit', True) xmin = kwargs.get('xmin', None) xmax = kwargs.get('xmax', None) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4987 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4987&view=rev Author: mdboom Date: 2008年02月25日 12:21:39 -0800 (2008年2月25日) Log Message: ----------- [ 1901410 ] Newbie bug report: clip_on set to False actually True Modified Paths: -------------- branches/v0_91_maint/lib/matplotlib/axes.py Modified: branches/v0_91_maint/lib/matplotlib/axes.py =================================================================== --- branches/v0_91_maint/lib/matplotlib/axes.py 2008年02月21日 19:13:46 UTC (rev 4986) +++ branches/v0_91_maint/lib/matplotlib/axes.py 2008年02月25日 20:21:39 UTC (rev 4987) @@ -2236,7 +2236,7 @@ #if t.get_clip_on(): t.set_clip_box(self.bbox) - if kwargs.has_key('clip_on'): t.set_clip_box(self.bbox) + if kwargs.get('clip_on'): t.set_clip_box(self.bbox) return t text.__doc__ = cbook.dedent(text.__doc__) % martist.kwdocd @@ -4046,22 +4046,22 @@ 'p' : pentagram 'h' : hexagon '8' : octagon - + The marker can also be a tuple (numsides, style, angle), which will create a custom, regular symbol. - + numsides is the number of sides - + style is the style of the regular symbol: 0 : a regular polygon 1 : a star-like symbol 2 : an asterisk - + angle is the angle of rotation of the symbol - + Finally, marker can be (verts, 0), verts is a sequence of (x,y) vertices for a custom scatter symbol. - + s is a size argument in points squared. Any or all of x, y, s, and c may be masked arrays, in which This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5033 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5033&view=rev Author: jdh2358 Date: 2008年04月09日 11:54:54 -0700 (2008年4月09日) Log Message: ----------- small fix for vlines w/ len 1 args Modified Paths: -------------- branches/v0_91_maint/lib/matplotlib/axes.py Modified: branches/v0_91_maint/lib/matplotlib/axes.py =================================================================== --- branches/v0_91_maint/lib/matplotlib/axes.py 2008年04月07日 22:26:21 UTC (rev 5032) +++ branches/v0_91_maint/lib/matplotlib/axes.py 2008年04月09日 18:54:54 UTC (rev 5033) @@ -2442,10 +2442,11 @@ y = npy.asarray(y) if len(xmin)==1: - xmin = xmin*npy.ones(y.shape, y.dtype) + xmin = npy.resize( xmin, y.shape ) if len(xmax)==1: - xmax = xmax*npy.ones(y.shape, y.dtype) + xmax = npy.resize( xmax, y.shape ) + xmin = npy.asarray(xmin) xmax = npy.asarray(xmax) @@ -2512,7 +2513,12 @@ ymin = npy.asarray(ymin) ymax = npy.asarray(ymax) + if len(ymin)==1: + ymin = npy.resize( ymin, x.shape ) + if len(ymax)==1: + ymax = npy.resize( ymax, x.shape ) + if len(ymin)!=len(x): raise ValueError, 'ymin and x are unequal sized sequences' if len(ymax)!=len(x): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5385 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5385&view=rev Author: jdh2358 Date: 2008年06月04日 11:17:23 -0700 (2008年6月04日) Log Message: ----------- fixed some bugs introduced in the xaxis_date fix Modified Paths: -------------- branches/v0_91_maint/lib/matplotlib/axes.py Modified: branches/v0_91_maint/lib/matplotlib/axes.py =================================================================== --- branches/v0_91_maint/lib/matplotlib/axes.py 2008年06月04日 18:15:05 UTC (rev 5384) +++ branches/v0_91_maint/lib/matplotlib/axes.py 2008年06月04日 18:17:23 UTC (rev 5385) @@ -1174,9 +1174,8 @@ # limits and set the bound to be the bounds of the xydata. # Otherwise, it will compute the bounds of it's current data # and the data in xydata + if iterable(xys) and not len(xys): return xys = npy.asarray(xys) - - self.dataLim.update_numerix_xy(xys, -1) @@ -1187,6 +1186,7 @@ # Otherwise, it will compute the bounds of it's current data # and the data in xydata #print type(x), type(y) + if iterable(x) and not len(x): return self.dataLim.update_numerix(x, y, -1) def _get_verts_in_data_coords(self, trans, xys): @@ -1869,15 +1869,16 @@ dmin, dmax = self.convert_xunits([dmin, dmax]) self.viewLim.intervalx().set_bounds(dmin, dmax) - self.viewLim.intervalx().set_bounds(dmin, dmax) + self.dataLim.intervalx().set_bounds(dmin, dmax) locator = self.xaxis.get_major_locator() if not isinstance(locator, mdates.DateLocator): locator = mdates.AutoDateLocator(tz) self.xaxis.set_major_locator(locator) - locator.refresh() + locator.refresh() + formatter = self.xaxis.get_major_formatter() if not isinstance(formatter, mdates.DateFormatter): formatter = mdates.AutoDateFormatter(locator) @@ -1894,19 +1895,20 @@ # have been updated than the ignore setting dmax = today = datetime.date.today() dmin = today-datetime.timedelta(days=10) - self._process_unit_info(xdata=(dmin, dmax)) + self._process_unit_info(ydata=(dmin, dmax)) - dmin, dmax = self.convert_xunits([dmin, dmax]) + dmin, dmax = self.convert_yunits([dmin, dmax]) self.viewLim.intervaly().set_bounds(dmin, dmax) - self.viewLim.intervaly().set_bounds(dmin, dmax) + self.dataLim.intervaly().set_bounds(dmin, dmax) locator = self.yaxis.get_major_locator() if not isinstance(locator, mdates.DateLocator): locator = mdates.AutoDateLocator(tz) self.yaxis.set_major_locator(locator) - locator.refresh() + locator.refresh() + formatter = self.xaxis.get_major_formatter() if not isinstance(formatter, mdates.DateFormatter): formatter = mdates.AutoDateFormatter(locator) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5488 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5488&view=rev Author: efiring Date: 2008年06月12日 11:02:18 -0700 (2008年6月12日) Log Message: ----------- Support hold in quiver, contour, contourf Modified Paths: -------------- branches/v0_91_maint/lib/matplotlib/axes.py Modified: branches/v0_91_maint/lib/matplotlib/axes.py =================================================================== --- branches/v0_91_maint/lib/matplotlib/axes.py 2008年06月12日 17:16:15 UTC (rev 5487) +++ branches/v0_91_maint/lib/matplotlib/axes.py 2008年06月12日 18:02:18 UTC (rev 5488) @@ -4334,6 +4334,7 @@ quiverkey.__doc__ = mquiver.QuiverKey.quiverkey_doc def quiver(self, *args, **kw): + if not self._hold: self.cla() q = mquiver.Quiver(self, *args, **kw) self.add_collection(q) self.update_datalim_numerix(q.X, q.Y) @@ -5002,11 +5003,13 @@ def contour(self, *args, **kwargs): + if not self._hold: self.cla() kwargs['filled'] = False return mcontour.ContourSet(self, *args, **kwargs) contour.__doc__ = mcontour.ContourSet.contour_doc def contourf(self, *args, **kwargs): + if not self._hold: self.cla() kwargs['filled'] = True return mcontour.ContourSet(self, *args, **kwargs) contourf.__doc__ = mcontour.ContourSet.contour_doc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.