matplotlib-checkins Mailing List for matplotlib

Revision: 6062
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6062&view=rev
Author: mdboom
Date: 2008年09月03日 19:58:01 +0000 (2008年9月03日)
Log Message:
-----------
Add donut demo (to demonstrate compound paths)
Modified Paths:
--------------
 trunk/matplotlib/examples/tests/backend_driver.py
Added Paths:
-----------
 trunk/matplotlib/examples/api/donut_demo.py
Added: trunk/matplotlib/examples/api/donut_demo.py
===================================================================
--- trunk/matplotlib/examples/api/donut_demo.py	 (rev 0)
+++ trunk/matplotlib/examples/api/donut_demo.py	2008年09月03日 19:58:01 UTC (rev 6062)
@@ -0,0 +1,54 @@
+import numpy as np
+import matplotlib.path as mpath
+import matplotlib.patches as mpatches
+import matplotlib.pyplot as plt
+
+def wise(v):
+ if v == 1:
+ return "CCW"
+ else:
+ return "CW"
+
+def make_circle(r):
+ t = np.arange(0, np.pi * 2.0, 0.01)
+ t = t.reshape((len(t), 1))
+ x = r * np.cos(t)
+ y = r * np.sin(t)
+ return np.hstack((x, y))
+
+Path = mpath.Path
+
+fig = plt.figure()
+ax = fig.add_subplot(111)
+
+inside_vertices = make_circle(0.5)
+outside_vertices = make_circle(1.0)
+codes = np.ones(len(inside_vertices), dtype=mpath.Path.code_type) * mpath.Path.LINETO
+codes[0] = mpath.Path.MOVETO
+
+for i, (inside, outside) in enumerate(((1, 1), (1, -1), (-1, 1), (-1, -1))):
+ # Concatenate the inside and outside subpaths together, changing their
+ # order as needed
+ vertices = np.concatenate((outside_vertices[::outside],
+ inside_vertices[::inside]))
+ # Shift the path
+ vertices[:, 0] += i * 2.5
+ # The codes will be all "LINETO" commands, except for "MOVETO"s at the
+ # beginning of each subpath
+ all_codes = np.concatenate((codes, codes))
+ # Create the Path object
+ path = mpath.Path(vertices, all_codes)
+ # Add plot it
+ patch = mpatches.PathPatch(path, facecolor='#885500', edgecolor='black')
+ ax.add_patch(patch)
+
+ ax.annotate("Outside %s,\nInside %s" % (wise(outside), wise(inside)),
+ (i * 2.5, -1.5), va="top", ha="center")
+
+ax.set_xlim(-2,10)
+ax.set_ylim(-3,2)
+ax.set_title('Mmm, donuts!')
+ax.set_aspect(1.0)
+plt.show()
+
+
Modified: trunk/matplotlib/examples/tests/backend_driver.py
===================================================================
--- trunk/matplotlib/examples/tests/backend_driver.py	2008年09月03日 19:15:22 UTC (rev 6061)
+++ trunk/matplotlib/examples/tests/backend_driver.py	2008年09月03日 19:58:01 UTC (rev 6062)
@@ -126,6 +126,8 @@
 api_files = [
 'colorbar_only.py',
 'color_cycle.py',
+ 'donut_demo.py',
+ 'path_patch_demo.py'
 ]
 
 units_dir = os.path.join('..', 'units')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6061
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6061&view=rev
Author: mdboom
Date: 2008年09月03日 19:15:22 +0000 (2008年9月03日)
Log Message:
-----------
[ 2091036 ] Using log axes with base 2 fails
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/lib/matplotlib/scale.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008年09月01日 22:50:47 UTC (rev 6060)
+++ trunk/matplotlib/CHANGELOG	2008年09月03日 19:15:22 UTC (rev 6061)
@@ -1,3 +1,5 @@
+2008年09月03日 Fix log with base 2 - MGD
+
 2008年09月01日 Added support for bilinear interpolation in
 NonUniformImage; patch by Gregory Lielens. - EF
 
Modified: trunk/matplotlib/lib/matplotlib/scale.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/scale.py	2008年09月01日 22:50:47 UTC (rev 6060)
+++ trunk/matplotlib/lib/matplotlib/scale.py	2008年09月03日 19:15:22 UTC (rev 6061)
@@ -91,7 +91,7 @@
 def transform(self, a):
 a = _mask_non_positives(a * 2.0)
 if isinstance(a, MaskedArray):
- return ma.log2(a)
+ return ma.log(a) / np.log(2)
 return np.log2(a)
 
 def inverted(self):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.