matplotlib-checkins Mailing List for matplotlib

Revision: 5977
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5977&view=rev
Author: mdboom
Date: 2008年08月05日 19:32:44 +0000 (2008年8月05日)
Log Message:
-----------
[ 2033106 ] Wrong exception raised (typo) in axes3d.py
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/axes3d.py
Modified: trunk/matplotlib/lib/matplotlib/axes3d.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes3d.py	2008年08月05日 19:02:30 UTC (rev 5976)
+++ trunk/matplotlib/lib/matplotlib/axes3d.py	2008年08月05日 19:32:44 UTC (rev 5977)
@@ -1 +1 @@
-raise NotImplmentedError('axes3d is not supported in matplotlib-0.98. You may want to try the 0.91.x maintenance branch')
+raise NotImplementedError('axes3d is not supported in matplotlib-0.98. You may want to try the 0.91.x maintenance branch')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5976
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5976&view=rev
Author: mdboom
Date: 2008年08月05日 19:02:30 +0000 (2008年8月05日)
Log Message:
-----------
Fix RGBA arrays in collections.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/axes.py
 trunk/matplotlib/lib/matplotlib/collections.py
 trunk/matplotlib/lib/matplotlib/patches.py
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2008年08月05日 17:44:55 UTC (rev 5975)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2008年08月05日 19:02:30 UTC (rev 5976)
@@ -3797,14 +3797,18 @@
 # if color looks like a color string, an RGB tuple or a
 # scalar, then repeat it by nbars
 if (is_string_like(color) or
- (iterable(color) and len(color)==3 and nbars!=3) or
+ (iterable(color) and
+ len(color) in (3, 4) and
+ nbars != len(color)) or
 not iterable(color)):
 color = [color]*nbars
 
 # if edgecolor looks like a color string, an RGB tuple or a
 # scalar, then repeat it by nbars
 if (is_string_like(edgecolor) or
- (iterable(edgecolor) and len(edgecolor)==3 and nbars!=3) or
+ (iterable(edgecolor) and
+ len(edgecolor) in (3, 4) and
+ nbars != len(edgecolor)) or
 not iterable(edgecolor)):
 edgecolor = [edgecolor]*nbars
 
Modified: trunk/matplotlib/lib/matplotlib/collections.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/collections.py	2008年08月05日 17:44:55 UTC (rev 5975)
+++ trunk/matplotlib/lib/matplotlib/collections.py	2008年08月05日 19:02:30 UTC (rev 5976)
@@ -332,6 +332,7 @@
 """
 if c is None: c = mpl.rcParams['patch.facecolor']
 self._facecolors = _colors.colorConverter.to_rgba_array(c, self._alpha)
+ self._facecolors_original = c
 
 set_facecolors = set_facecolor
 
@@ -363,6 +364,7 @@
 else:
 if c is None: c = mpl.rcParams['patch.edgecolor']
 self._edgecolors = _colors.colorConverter.to_rgba_array(c, self._alpha)
+ self._edgecolors_original = c
 
 set_edgecolors = set_edgecolor
 
@@ -378,11 +380,13 @@
 else:
 artist.Artist.set_alpha(self, alpha)
 try:
- self._facecolors[:, 3] = alpha
+ self._facecolors = _colors.colorConverter.to_rgba_array(
+ self._facecolors_original, self._alpha)
 except (AttributeError, TypeError, IndexError):
 pass
 try:
- self._edgecolors[:, 3] = alpha
+ self._edgecolors = _colors.colorConverter.to_rgba_array(
+ self._edgecolors_original, self._alpha)
 except (AttributeError, TypeError, IndexError):
 pass
 
Modified: trunk/matplotlib/lib/matplotlib/patches.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/patches.py	2008年08月05日 17:44:55 UTC (rev 5975)
+++ trunk/matplotlib/lib/matplotlib/patches.py	2008年08月05日 19:02:30 UTC (rev 5976)
@@ -263,7 +263,6 @@
 gc.set_linewidth(self._linewidth)
 gc.set_linestyle(self._linestyle)
 
- gc.set_alpha(self._alpha)
 gc.set_antialiased(self._antialiased)
 self._set_gc_clip(gc)
 gc.set_capstyle('projecting')
@@ -271,8 +270,11 @@
 if (not self.fill or self._facecolor is None or
 (cbook.is_string_like(self._facecolor) and self._facecolor.lower()=='none')):
 rgbFace = None
+ gc.set_alpha(1.0)
 else:
- rgbFace = colors.colorConverter.to_rgb(self._facecolor)
+ r, g, b, a = colors.colorConverter.to_rgba(self._facecolor, self._alpha)
+ rgbFace = (r, g, b)
+ gc.set_alpha(a)
 
 if self._hatch:
 gc.set_hatch(self._hatch )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5975
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5975&view=rev
Author: mdboom
Date: 2008年08月05日 17:44:55 +0000 (2008年8月05日)
Log Message:
-----------
Fix Nx3 color array bug.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/colors.py
Modified: trunk/matplotlib/lib/matplotlib/colors.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/colors.py	2008年08月05日 17:25:12 UTC (rev 5974)
+++ trunk/matplotlib/lib/matplotlib/colors.py	2008年08月05日 17:44:55 UTC (rev 5975)
@@ -337,11 +337,21 @@
 # If c is a list it must be maintained as the same list
 # with modified items so that items can be appended to
 # it. This is needed for examples/dynamic_collections.py.
- if not isinstance(c, (list, np.ndarray)): # specific; don't need duck-typing
- c = list(c)
+ if isinstance(c, np.ndarray):
+ if len(c.shape) != 2:
+ raise ValueError("Color array must be two-dimensional")
+ if c.shape[1] != 4:
+ output = np.zeros((c.shape[0], 4))
+ else:
+ output = c
+ elif not isinstance(c, list):
+ output = list(c)
+ else:
+ output = c
+
 for i, cc in enumerate(c):
- c[i] = self.to_rgba(cc, alpha) # change in place
- result = c
+ output[i] = self.to_rgba(cc, alpha) # change in place
+ result = output
 return np.asarray(result, np.float_)
 
 colorConverter = ColorConverter()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5974
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5974&view=rev
Author: mdboom
Date: 2008年08月05日 17:25:12 +0000 (2008年8月05日)
Log Message:
-----------
[ 2031308 ] FontProperties and Latex code (FontProperties should be
copied into the text instance so they can be re-used without side
effects)
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/text.py
Modified: trunk/matplotlib/lib/matplotlib/text.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/text.py	2008年08月04日 18:43:08 UTC (rev 5973)
+++ trunk/matplotlib/lib/matplotlib/text.py	2008年08月05日 17:25:12 UTC (rev 5974)
@@ -647,7 +647,7 @@
 """
 if is_string_like(fp):
 fp = FontProperties(fp)
- self._fontproperties = fp
+ self._fontproperties = fp.copy()
 
 artist.kwdocd['Text'] = artist.kwdoc(Text)
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.