Merge branch 'BigPieSmallPie' of https://github.com/HubertHolin/matplotlib into HubertHolin-BigPieSmallPie

efiring · efiring · commit f093e2292bae · 2012-05-27T11:17:41.000-10:00
Conflicts:
	lib/matplotlib/axes.py
	lib/matplotlib/pyplot.py

string.diff
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
@@ -11,6 +11,13 @@ help figure out possible sources of the changes you are experiencing.
 For new features that were added to matplotlib, please see
 :ref:`whats-new`.
 
+Changes in 1.2.x
+================
+
+* In :meth:`~matplotlib.pyplot.pie` and :meth:`~matplotlib.Axes.pie`, one can
+  now set the radius of the pie; setting the *radius* to 'None' (the default
+  value), will result in a pie with a radius of 1 as before.
+
 Changes in 1.1.x
 ================
 
diff --git a/examples/pylab_examples/pie_demo2.py b/examples/pylab_examples/pie_demo2.py
@@ -0,0 +1,43 @@
+"""
+Make a pie charts of varying size - see
+http://matplotlib.sf.net/matplotlib.pylab.html#-pie for the docstring.
+
+This example shows a basic pie charts with labels optional features,
+like autolabeling the percentage, offsetting a slice with "explode"
+and adding a shadow, in different sizes.
+
+"""
+from pylab import *
+from matplotlib.gridspec import GridSpec
+
+# Some data
+
+labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
+fracs = [15,30,45, 10]
+
+explode=(0, 0.05, 0, 0)
+
+# Make square figures and axes
+
+the_grid = GridSpec(2, 2)
+
+figure(1, figsize=(6,6))
+
+subplot(the_grid[0, 0])
+
+pie(fracs, labels=labels, autopct='%1.1f%%', shadow=True)
+
+subplot(the_grid[0, 1])
+
+pie(fracs, explode=explode, labels=labels, autopct='%1.1f%%', shadow=True)
+
+subplot(the_grid[1, 0])
+
+pie(fracs, labels=labels, autopct='%1.1f%%', shadow=True, radius=0.5)
+
+subplot(the_grid[1, 1])
+
+pie(fracs, explode=explode, labels=labels, autopct='%1.1f%%', shadow=True,
+	radius=0.5)
+
+show()
diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py
@@ -161,6 +161,7 @@
     'pcolor_log.py',
     'pcolor_small.py',
     'pie_demo.py',
+    'pie_demo2.py',
     'plotfile_demo.py',
     'polar_bar.py',
     'polar_demo.py',
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -5005,14 +5005,14 @@ def stem(self, x, y, linefmt='b-', markerfmt='bo', basefmt='r-',
 
     def pie(self, x, explode=None, labels=None, colors=None,
             autopct=None, pctdistance=0.6, shadow=False,
-            labeldistance=1.1, startangle=None):
+            labeldistance=1.1, startangle=None, radius=None):
         r"""
         Call signature::
 
           pie(x, explode=None, labels=None,
               colors=('b', 'g', 'r', 'c', 'm', 'y', 'k', 'w'),
-              autopct=None, pctdistance=0.6, labeldistance=1.1,
-              shadow=False, startangle=None)
+              autopct=None, pctdistance=0.6, shadow=False,
+              labeldistance=1.1, startangle=None, radius=None)
 
         Make a pie chart of array *x*.  The fractional area of each
         wedge is given by x/sum(x).  If sum(x) <= 1, then the values
@@ -5054,6 +5054,9 @@ def pie(self, x, explode=None, labels=None, colors=None,
             If not *None*, rotates the start of the pie chart by *angle*
             degrees counterclockwise from the x-axis.
 
+          *radius*: [ *None* | scalar ]
+          The radius of the pie, if *radius* is *None* it will be set to 1.
+
         The pie chart will probably look best if the figure and axes are
         square.  Eg.::
 
@@ -5090,8 +5093,8 @@ def pie(self, x, explode=None, labels=None, colors=None,
 
 
         center = 0,0
-        radius = 1
-        i = 0
+        if radius is None:
+            radius = 1
 
         # Starting theta1 is the start fraction of the circle
         if startangle is None:
@@ -5102,6 +5105,8 @@ def pie(self, x, explode=None, labels=None, colors=None,
         texts = []
         slices = []
         autotexts = []
+
+        i = 0
         for frac, label, expl in cbook.safezip(x,labels, explode):
             x, y = center
             theta2 = theta1 + frac
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -2442,15 +2442,15 @@ def pcolormesh(*args, **kwargs):
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @autogen_docstring(Axes.pie)
-def pie(x, explode=None, labels=None, colors=None, autopct=None, pctdistance=0.6, shadow=False, labeldistance=1.1, startangle=None, hold=None):
+def pie(x, explode=None, labels=None, colors=None, autopct=None, pctdistance=0.6, shadow=False, labeldistance=1.1, startangle=None, radius=None, hold=None):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
     washold = ax.ishold()
 
     if hold is not None:
         ax.hold(hold)
     try:
-        ret = ax.pie(x, explode, labels, colors, autopct, pctdistance, shadow, labeldistance, startangle)
+        ret = ax.pie(x, explode, labels, colors, autopct, pctdistance, shadow, labeldistance, startangle, radius)
         draw_if_interactive()
     finally:
         ax.hold(washold)
