Added center and frame arguments for pie-charts

kpalin · kpalin · commit 0899015bf326 · 2014-08-29T11:05:14.000+03:00
diff --git a/examples/pie_and_polar_charts/pie_demo_features.py b/examples/pie_and_polar_charts/pie_demo_features.py
@@ -18,7 +18,6 @@
 """
 import matplotlib.pyplot as plt
 
-
 # The slices will be ordered and plotted counter-clockwise.
 labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
 sizes = [15, 30, 45, 10]
@@ -30,4 +29,31 @@
 # Set aspect ratio to be equal so that pie is drawn as a circle.
 plt.axis('equal')
 
+fig = plt.figure()
+ax = fig.gca()
+import numpy as np
+
+ax.pie(np.random.random(4), explode=explode, labels=labels, colors=colors,
+        autopct='%1.1f%%', shadow=True, startangle=90,
+       radius=0.25, center=(0,0),frame=True)
+ax.pie(np.random.random(4), explode=explode, labels=labels, colors=colors,
+        autopct='%1.1f%%', shadow=True, startangle=90,
+       radius=0.25, center=(1,1),frame=True)
+ax.pie(np.random.random(4), explode=explode, labels=labels, colors=colors,
+        autopct='%1.1f%%', shadow=True, startangle=90,
+       radius=0.25, center=(0,1),frame=True)
+ax.pie(np.random.random(4), explode=explode, labels=labels, colors=colors,
+        autopct='%1.1f%%', shadow=True, startangle=90,
+       radius=0.25, center=(1,0),frame=True)
+
+ax.set_xticks([0,1])
+ax.set_yticks([0,1])
+ax.set_xticklabels(["Sunny","Cloudy"])
+ax.set_yticklabels(["Dry","Rainy"])
+ax.set_xlim((-0.5,1.5))
+ax.set_ylim((-0.5,1.5))
+
+# Set aspect ratio to be equal so that pie is drawn as a circle.
+ax.set_aspect('equal')
+
 plt.show()
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -2320,7 +2320,8 @@ def stem(self, *args, **kwargs):
     def pie(self, x, explode=None, labels=None, colors=None,
             autopct=None, pctdistance=0.6, shadow=False, labeldistance=1.1,
             startangle=None, radius=None, counterclock=True,
-            wedgeprops=None, textprops=None):
+            wedgeprops=None, textprops=None, center = (0, 0),
+            frame=False ):
         r"""
         Plot a pie chart.
 
@@ -2330,7 +2331,8 @@ def pie(self, x, explode=None, labels=None, colors=None,
               colors=('b', 'g', 'r', 'c', 'm', 'y', 'k', 'w'),
               autopct=None, pctdistance=0.6, shadow=False,
               labeldistance=1.1, startangle=None, radius=None,
-              counterclock=True, wedgeprops=None, textprops=None)
+              counterclock=True, wedgeprops=None, textprops=None,
+              center = (0, 0), frame = False )
 
         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
@@ -2388,6 +2390,11 @@ def pie(self, x, explode=None, labels=None, colors=None,
           *textprops*: [ *None* | dict of key value pairs ]
             Dict of arguments to pass to the text objects.
 
+          *center*: [ (0,0) | sequence of 2 scalars ]
+          Center position of the chart.
+
+          *frame*: [ *False* | *True* ]
+            Plot axes frame with the chart.
 
         The pie chart will probably look best if the figure and axes are
         square, or the Axes aspect is equal.  e.g.::
@@ -2414,7 +2421,6 @@ def pie(self, x, explode=None, labels=None, colors=None,
           :class:`~matplotlib.text.Text` instances for the numeric
           labels.
         """
-        self.set_frame_on(False)
 
         x = np.asarray(x).astype(np.float32)
 
@@ -2431,7 +2437,7 @@ def pie(self, x, explode=None, labels=None, colors=None,
         if colors is None:
             colors = ('b', 'g', 'r', 'c', 'm', 'y', 'k', 'w')
 
-        center = 0, 0
+
         if radius is None:
             radius = 1
 
@@ -2514,10 +2520,12 @@ def pie(self, x, explode=None, labels=None, colors=None,
             theta1 = theta2
             i += 1
 
-        self.set_xlim((-1.25, 1.25))
-        self.set_ylim((-1.25, 1.25))
-        self.set_xticks([])
-        self.set_yticks([])
+        if not frame:
+            self.set_frame_on(False)
+            self.set_xlim((-1.25, 1.25))
+            self.set_ylim((-1.25, 1.25))
+            self.set_xticks([])
+            self.set_yticks([])
 
         if autopct is None:
             return slices, texts
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -3060,7 +3060,7 @@ def phase_spectrum(x, Fs=None, Fc=None, window=None, pad_to=None, sides=None,
 def pie(x, explode=None, labels=None, colors=None, autopct=None,
         pctdistance=0.6, shadow=False, labeldistance=1.1, startangle=None,
         radius=None, counterclock=True, wedgeprops=None, textprops=None,
-        hold=None):
+        hold=None,center=(0,0),frame=False):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
     washold = ax.ishold()
@@ -3072,7 +3072,8 @@ def pie(x, explode=None, labels=None, colors=None, autopct=None,
                      autopct=autopct, pctdistance=pctdistance, shadow=shadow,
                      labeldistance=labeldistance, startangle=startangle,
                      radius=radius, counterclock=counterclock,
-                     wedgeprops=wedgeprops, textprops=textprops)
+                     wedgeprops=wedgeprops, textprops=textprops,
+                     center=center,frame=frame)
         draw_if_interactive()
     finally:
         ax.hold(washold)
