Revision: 4195 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4195&view=rev Author: mdboom Date: 2007年11月09日 12:15:52 -0800 (2007年11月09日) Log Message: ----------- Bugfix: [ 1808189 ] lw kwarg broken in errorbar (Thanks Joe Monaco). Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2007年11月09日 20:14:29 UTC (rev 4194) +++ trunk/matplotlib/lib/matplotlib/collections.py 2007年11月09日 20:15:52 UTC (rev 4195) @@ -217,10 +217,8 @@ ACCEPTS: float or sequence of floats """ self._linewidths = self._get_value(lw) + set_linewidths = set_lw = set_linewidth - def set_linewidths(self, lw): - self.set_linewidth(lw) - def set_color(self, c): """ Set both the edgecolor and the facecolor. @@ -798,7 +796,8 @@ """ self._lw = self._get_value(lw) - + set_linewidths = set_lw = set_linewidth + def set_linestyle(self, ls): """ Set the linestyles(s) for the collection. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4376 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4376&view=rev Author: efiring Date: 2007年11月18日 11:02:55 -0800 (2007年11月18日) Log Message: ----------- Use new update_dict from ScalarMappable in QuadMesh Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2007年11月18日 19:01:39 UTC (rev 4375) +++ trunk/matplotlib/lib/matplotlib/collections.py 2007年11月18日 19:02:55 UTC (rev 4376) @@ -322,15 +322,14 @@ return self._coordinates; def draw(self, renderer): - # does not call update_scalarmappable, need to update it - # when creating/changing ****** Why not? speed? if not self.get_visible(): return transform = self.get_transform() transoffset = self.get_transoffset() transform.freeze() transoffset.freeze() #print 'QuadMesh draw' - self.update_scalarmappable() ####################### + if self.check_update('array'): + self.update_scalarmappable() renderer.draw_quad_mesh( self._meshWidth, self._meshHeight, self._facecolors, self._coordinates[:,0], @@ -797,7 +796,7 @@ self._lw = self._get_value(lw) set_linewidths = set_lw = set_linewidth - + def set_linestyle(self, ls): """ Set the linestyles(s) for the collection. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5003 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5003&view=rev Author: mdboom Date: 2008年03月18日 11:35:10 -0700 (2008年3月18日) Log Message: ----------- Fixing set_alpha bug when there is no facecolors (thanks Michael Fitzgerald) Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2008年03月14日 12:22:28 UTC (rev 5002) +++ trunk/matplotlib/lib/matplotlib/collections.py 2008年03月18日 18:35:10 UTC (rev 5003) @@ -153,7 +153,7 @@ if self.have_units(): paths = [] - for path in self._paths: + for path in self.get_paths(): vertices = path.vertices xs, ys = vertices[:, 0], vertices[:, 1] xs = self.convert_xunits(xs) @@ -305,7 +305,8 @@ except TypeError: raise TypeError('alpha must be a float') else: artist.Artist.set_alpha(self, alpha) - self._facecolors[:, 3] = alpha + if len(self._facecolors): + self._facecolors[:, 3] = alpha self._edgecolors[:, 3] = alpha def get_linewidths(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5132 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5132&view=rev Author: mdboom Date: 2008年05月08日 10:24:15 -0700 (2008年5月08日) Log Message: ----------- Don't rasterize quadmeshes by default -- rasterizing is still somewhat experimental, so saving for after upcoming 0.98 beta release. Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2008年05月08日 16:49:50 UTC (rev 5131) +++ trunk/matplotlib/lib/matplotlib/collections.py 2008年05月08日 17:24:15 UTC (rev 5132) @@ -484,13 +484,11 @@ offsets = transOffset.transform_non_affine(offsets) transOffset = transOffset.get_affine() - renderer.start_rasterizing() renderer.draw_quad_mesh( transform.frozen(), self.clipbox, clippath, clippath_trans, self._meshWidth, self._meshHeight, self._coordinates, offsets, transOffset, self._facecolors, self._antialiased, self._showedges) - renderer.stop_rasterizing() renderer.close_group(self.__class__.__name__) class PolyCollection(Collection): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5409 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5409&view=rev Author: mdboom Date: 2008年06月06日 05:07:53 -0700 (2008年6月06日) Log Message: ----------- Fix bug in recent PolyCollection sizing change. Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2008年06月06日 03:45:57 UTC (rev 5408) +++ trunk/matplotlib/lib/matplotlib/collections.py 2008年06月06日 12:07:53 UTC (rev 5409) @@ -492,7 +492,7 @@ renderer.close_group(self.__class__.__name__) class PolyCollection(Collection): - def __init__(self, verts, sizes = (1, ), **kwargs): + def __init__(self, verts, sizes = None, **kwargs): """ verts is a sequence of ( verts0, verts1, ...) where verts_i is a sequence of xy tuples of vertices, or an equivalent @@ -518,10 +518,11 @@ def draw(self, renderer): # sizes is the area of the circle circumscribing the polygon # in points^2 - self._transforms = [ - transforms.Affine2D().scale( - (np.sqrt(x) * renderer.dpi / 72.0)) - for x in self._sizes] + if self._sizes is not None: + self._transforms = [ + transforms.Affine2D().scale( + (np.sqrt(x) * renderer.dpi / 72.0)) + for x in self._sizes] return Collection.draw(self, renderer) class BrokenBarHCollection(PolyCollection): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5607 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5607&view=rev Author: jdh2358 Date: 2008年06月20日 03:46:12 -0700 (2008年6月20日) Log Message: ----------- added get edgecolor accessor method to collections Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2008年06月20日 07:03:22 UTC (rev 5606) +++ trunk/matplotlib/lib/matplotlib/collections.py 2008年06月20日 10:46:12 UTC (rev 5607) @@ -309,6 +309,10 @@ return self._facecolors get_facecolors = get_facecolor + def get_edgecolor(self): + return self._edgecolors + get_edgecolors = get_edgecolor + def set_edgecolor(self, c): """ Set the edgecolor(s) of the collection. *c* can be a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5612 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5612&view=rev Author: jdh2358 Date: 2008年06月20日 07:21:56 -0700 (2008年6月20日) Log Message: ----------- removed redundant scalar mappable inheritance from line collections Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2008年06月20日 14:05:42 UTC (rev 5611) +++ trunk/matplotlib/lib/matplotlib/collections.py 2008年06月20日 14:21:56 UTC (rev 5612) @@ -642,7 +642,7 @@ _path_generator = mpath.Path.unit_regular_asterisk -class LineCollection(Collection, cm.ScalarMappable): +class LineCollection(Collection): """ All parameters must be sequences or scalars; if scalars, they will be converted to sequences. The property of the ith line This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5644 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5644&view=rev Author: mdboom Date: 2008年06月23日 05:58:30 -0700 (2008年6月23日) Log Message: ----------- Fix docstrings. Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2008年06月23日 12:52:01 UTC (rev 5643) +++ trunk/matplotlib/lib/matplotlib/collections.py 2008年06月23日 12:58:30 UTC (rev 5644) @@ -820,6 +820,7 @@ self._sizes = sizes self.set_transform(transforms.IdentityTransform()) self._paths = [mpath.Path.unit_circle()] + __init__.__doc__ = cbook.dedent(__init__.__doc__) % artist.kwdocd def draw(self, renderer): # sizes is the area of the circle circumscribing the polygon This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5764 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5764&view=rev Author: efiring Date: 2008年07月13日 13:51:25 -0700 (2008年7月13日) Log Message: ----------- Fix PatchCollection bug found by Ryan May Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2008年07月13日 20:29:55 UTC (rev 5763) +++ trunk/matplotlib/lib/matplotlib/collections.py 2008年07月13日 20:51:25 UTC (rev 5764) @@ -888,7 +888,7 @@ if match_original: def determine_facecolor(patch): - if patch.fill(): + if patch.fill: return patch.get_facecolor() return [0, 0, 0, 0] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5768 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5768&view=rev Author: mdboom Date: 2008年07月14日 05:54:59 -0700 (2008年7月14日) Log Message: ----------- Remove on-line of cruft (thanks, Ryan May) Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2008年07月14日 12:10:34 UTC (rev 5767) +++ trunk/matplotlib/lib/matplotlib/collections.py 2008年07月14日 12:54:59 UTC (rev 5768) @@ -93,7 +93,6 @@ if len(offsets.shape) == 1: offsets = offsets[np.newaxis,:] # Make it Nx2. if transOffset is not None: - Affine2D = transforms.Affine2D self._offsets = offsets self._transOffset = transOffset else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.