Add a "radius" argument to pie drawing functions.

HubertHolin · HubertHolin · commit 19ab81bf95e9 · 2012-05-17T00:48:02.000+02:00
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
@@ -20,6 +20,14 @@ Changes in 1.1.x
   will now always mean that the nearest-neighbor interpolation is performed.
   If you want the no-op interpolation to be performed, choose 'none'.
 
+* In :meth:`~matplotlib.pyplot.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.
+
+* In :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.
+
 * There were errors in how the tri-functions were handling input parameters
   that had to be fixed. If your tri-plots are not working correctly anymore,
   or you were working around apparent mistakes, please see issue #203 in the
diff --git a/examples/pylab_examples/pie_demo2.py b/examples/pylab_examples/pie_demo2.py
@@ -0,0 +1,48 @@
+"""
+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.
+
+Requires matplotlib0-0.70 or later
+
+"""
+from pylab import *
+import matplotlib.gridspec as gridspec
+import matplotlib.pyplot as pyplot
+
+
+# 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 = matplotlib.gridspec.GridSpec(2, 2)
+
+figure(1, figsize=(6,6))
+
+pyplot.subplot(the_grid[0, 0])
+
+pie(fracs, labels = labels, autopct = '%1.1f%%', shadow = True)
+
+pyplot.subplot(the_grid[0, 1])
+
+pie(fracs, explode=explode, labels = labels, autopct = '%1.1f%%', shadow = True)
+
+pyplot.subplot(the_grid[1, 0])
+
+pie(fracs, labels = labels, autopct = '%1.1f%%', shadow = True, radius = 0.5)
+
+pyplot.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,13 +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):
+            labeldistance=1.1, 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)
+              autopct=None, pctdistance=0.6, labeldistance=1.1, shadow=False,
+              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
@@ -5048,6 +5049,9 @@ def pie(self, x, explode=None, labels=None, colors=None,
           *shadow*: [ *False* | *True* ]
             Draw a shadow beneath the pie.
 
+          *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.::
 
@@ -5084,7 +5088,7 @@ def pie(self, x, explode=None, labels=None, colors=None,
 
 
         center = 0,0
-        radius = 1
+        if radius is None: radius = 1
         theta1 = 0
         i = 0
         texts = []
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.59999999999999998, shadow=False, labeldistance=1.1000000000000001, hold=None):
+def pie(x, explode=None, labels=None, colors=None, autopct=None, pctdistance=0.59999999999999998, shadow=False, labeldistance=1.1000000000000001, 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)
+        ret = ax.pie(x, explode, labels, colors, autopct, pctdistance, shadow, labeldistance, radius)
         draw_if_interactive()
     finally:
         ax.hold(washold)
