added pie charts

svn path=/trunk/matplotlib/; revision=815

Author: jdh2358

CHANGELOG

@@ -1,5 +1,7 @@
 New entries should be added at the top
 
+2004-12-27 Added pie charts and new example/pie_demo.py
+
 2004-12-23 Fixed an agg text rotation alignment bug, fixed some text
            kwarg processing bugs, and added examples/text_rotation.py
            to explain and demonstrate how text rotations and alignment

TODO

@@ -15,7 +15,7 @@
 
 -- DONE with pango : enable anti aliasing for fonts
 
--- enable fancy text labels (eg, greek letters, math symbols,
+-- DONE enable fancy text labels (eg, greek letters, math symbols,
    superscripts) ala TeX or unicode
 
 -- DROPPED add a color selection dialog for the background, lines, and text
@@ -25,7 +25,7 @@
 
 -- write a user guide
 
--- allow more intelligent choice of tick labels and locs when panning and
+-- DONE allow more intelligent choice of tick labels and locs when panning and
    zooming.
 
 -- figure out why the positioning of dialog boxes based on position
@@ -62,14 +62,13 @@
    plot(t1, p1, 'o', t2, p2, ogtt.times, ogtt.cpeptide, 's')
 
 
-
 -- DONE xlabel is lower than it needs to be
 
 -- DONE 2003-05-12 Removed some of the state handling of text labels
    so they always redraw: interactive setting of x/ylabels doesn't
    redraw all labels unless you click a forced redraw
 
--- When you change a property using the OO interface in interactive,
+-- CLOSED When you change a property using the OO interface in interactive,
    the figure doesn't know to redraw.  
 
    Some possibilities:
@@ -90,8 +89,7 @@
 -- DONE 2003-05-12 with window.window.raise_() : raise the figure
    returned by figure but don't give it the focus
 
-
--- when you toggle an axes for interactive navigation, make sure a
+-- CLOSED when you toggle an axes for interactive navigation, make sure a
    checked on appears as the default is one is checked
 
 -- DONE compile pygtk for threads on win32.
@@ -109,7 +107,7 @@
 
 -- fix CTRL-z bug in interactive2.py
 
--- Allow gca not gca(); ditto for gcf()
+-- CLOSED Allow gca not gca(); ditto for gcf()
 
 -- DONE Fix legend to take a vector of line handles
 
@@ -135,7 +133,7 @@
 
 -- DONE 2003-11-20 - make a nice errorbar and scatter screenshot   
 
--- finish contour
+-- DONE finish contour
 
 -- allow rectangle select region for zoom tool
 
@@ -224,8 +222,7 @@
 
 -- DONE decreasing axes - James Boyle <boyle5@llnl.gov>
 
-
--- check out Helge's contour
+-- CLOSED check out Helge's contour
 
 -- DONE 2004-02-23 with points_to_pixels.  fonts too big on wx
 
@@ -254,7 +251,7 @@
 
 -- DONE integrate numerix chooser with matplotlib.__init__
 
--- figure out how to make draw if interactive play nicely
+-- CLOSED figure out how to make draw if interactive play nicely
 
 -- DONE - (Todd updated docs) - python2.2 no default tkinter
 
@@ -276,15 +273,15 @@
 
 -- DONE - mathtext size not scaling with DPI
 
--- implement Paul's mathtext parser fixes
+-- CLOSED implement Paul's mathtext parser fixes
 
--- rotated mathtext
+-- DONE rotated mathtext
 
 -- DONE fix mathtext sub and super layout
 
 -- DONE get a sf request to remove fonttools and ttfquery
 
--- add polar plots
+-- DONE add polar plots
 
 -- add pie charts
 
@@ -306,7 +303,7 @@
 
 -- DONE - text_themes is segfaulting on gtkagg
 
--- mathtext s l o w
+-- DONE mathtext s l o w
 
 -- DONE ps backend fails alignment test
 
@@ -339,7 +336,7 @@
 
 -- DONE fix color on errorbar lines
 
--- savefig to file handle.
+-- DONE savefig to file handle.
 
 -- add agg and and image generic tostring methods
 
@@ -455,7 +452,7 @@
 
 -- add wxagg extension code to goals
 
--- major and minor ticks for log and major and minor grid on/off
+-- DONE major and minor ticks for log and major and minor grid on/off
 
 -- make the subplot slider function
 
@@ -481,7 +478,7 @@
 
 -- DONE add new connect to API_CHANGES
 
--- port new toolbar to embedding examples
+-- DONE port new toolbar to embedding examples
 
 -- DONE \sum height problem - see mathtext_tut
 
@@ -546,7 +543,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 -- tick bug on preserve, possibly center preserved image, flagt to
    reshape axes on preserve
 
-
 -- test rellinks in pydoc
 
 -- port transforms to backend and break up long arrays in agg and svg
@@ -595,13 +591,11 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- figure should increment the figure if one already exists
 
--- majbase and minbase to plot
-
--- DONE oplot
+-- CLOSED oplot
 
--- override setattr in matlab interface for artists.
+-- CLOSED override setattr in matlab interface for artists.
 
--- cmap observer bug - see
+-- DONE cmap observer bug - see
    ~/python/matplotlib_support/test/cmap_observer_bug.py
 
 -- DONE add connect function.
@@ -616,4 +610,4 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- update ticklabels and range for colorbar when clim changes
 
--- agg rotation bug for angles > 180
+-- DONE agg rotation bug for angles > 180

boilerplate.py

@@ -61,6 +61,7 @@ def %(func)s(*args, **kwargs):
     'loglog',
     'pcolor',
     'pcolor_classic',
+    'pie', 
     'plot',
     'plot_date',
     'psd',

examples/backend_driver.py

@@ -48,6 +48,7 @@
     'pcolor_demo.py',
     'pcolor_demo2.py',
     'pcolor_small.py',
+    'pie_demo.py',
     'polar_demo.py',
     'polar_scatter.py',
     'psd_demo.py',

examples/dynamic_image_gtkagg.py

@@ -20,7 +20,6 @@
 z = sin(x) + cos(y)
 im = a.imshow( z, cmap=cm.jet)#, interpolation='nearest')
 
-
 manager = get_current_fig_manager()
 cnt = 0
 tstart = time.time()

lib/matplotlib/axes.py

@@ -3,9 +3,12 @@
 import math, sys
 
 # do not import numerix max!  we are using python max.  
-from numerix import absolute, arange, array, asarray, ones, transpose, \
-     log, log10, Float, ravel, zeros, Int32, Float64, ceil, indices, \
+
+from numerix import absolute, arange, array, asarray, ones, divide,\
+     transpose, log, log10, Float, Float32, ravel, zeros,\
+     Int32, Float64, ceil, indices, \
      shape, which, where
+
 from numerix import max as nxmax
 from numerix import min as nxmin
 import _contour
@@ -28,7 +31,7 @@
 
 from mlab import meshgrid
 from matplotlib import rcParams
-from patches import Rectangle, Circle, Polygon, bbox_artist
+from patches import Rectangle, Circle, Polygon, Wedge, bbox_artist
 from table import Table
 from text import Text, _process_text_args
 from transforms import Bbox, Point, Value, Affine, NonseparableTransformation
@@ -1974,6 +1977,115 @@ def pcolor_classic(self, *args, **kwargs):
         return patches
 
 
+    def pie(self, x, explode=None, labels=None,
+            colors=('b', 'g', 'r', 'c', 'm', 'y', 'k', 'w'),
+            autopct=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 of x give the
+fractional area directly and the array will not be normalized.
+
+  - explode, if not None, is a len(x) array which specifies the
+    fraction of the radius to offset that wedge.
+
+  - colors is a sequence of matplotlib color args that the pie chart
+    will cycle.
+
+  - labels, if not None, is a len(x) list of labels.
+
+  - autopct, if not None, is a string or function used to label the
+    wedges with their numeric value.  The label will be placed inside
+    the wedge.  If it is a format string, the label will be fmt%pct.
+    If it is a function, it will be called
+
+The pie chart will probably look best if the figure and axes are
+square.  Eg,
+
+  figure(figsize=(8,8))
+  ax = axes([0.1, 0.1, 0.8, 0.8])
+
+Return value:
+
+  If autopct is None, return a list of (patches, texts), where patches
+  is a sequence of matplotlib.patches.Wedge instances and texts is a
+  list of the label Text instnaces
+
+  If autopct is not None, return (patches, texts, autotexts), where
+  patches and texts are as above, and autotexts is a list of text
+  instances for the numeric labels
+  """
+        self.set_frame_on(False)
+
+        x = asarray(x).astype(Float32)
+
+        sx = float(sum(x))
+        if sx>1: x = divide(x,sx)
+
+        if labels is None: labels = ['']*len(x)
+        if explode is None: explode = [0]*len(x)
+        assert(len(x)==len(labels))
+        assert(len(x)==len(explode))    
+
+
+        center = 0,0
+        radius = 1
+        theta1 = 0
+        i = 0
+        texts = []
+        slices = []
+        autotexts = []
+        for frac, label, expl in zip(x,labels, explode):
+            x, y = center
+            theta2 = theta1 + frac
+            thetam = 2*math.pi*0.5*(theta1+theta2)
+            x += expl*math.cos(thetam)
+            y += expl*math.sin(thetam)
+
+            w = Wedge((x,y), radius, 360.*theta1, 360.*theta2,
+                      facecolor=colors[i%len(colors)])
+            slices.append(w)
+            self.add_patch(w)
+            self.set_label(label)
+
+
+            xt = x + 1.1*radius*math.cos(thetam)
+            yt = y + 1.1*radius*math.sin(thetam)
+
+            t = self.text(xt, yt, label,
+                          size=rcParams['tick.labelsize'],
+                          horizontalalignment='center',
+                          verticalalignment='center')        
+
+            texts.append(t)
+
+            if autopct is not None:
+                xt = x + 0.6*radius*math.cos(thetam)
+                yt = y + 0.6*radius*math.sin(thetam)
+                if is_string_like(autopct):
+                    s = autopct%(100.*frac)
+                elif callable(autopct):
+                    s = autopct(100.*frac)
+                else:
+                    raise TypeError('autopct must be callable or a format string')
+
+                t = self.text(xt, yt, s,
+                              horizontalalignment='center',
+                              verticalalignment='center')
+                autotexts.append(t)
+
+
+            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 autopct is None: return slices, texts
+        else: return slices, texts, autotexts
+
     def plot(self, *args, **kwargs):
         """\
 PLOT(*args, **kwargs)        

lib/matplotlib/patches.py

@@ -1,5 +1,5 @@
 from __future__ import division
-
+import math
 from matplotlib import rcParams
 from numerix import array, arange, sin, cos, pi, Float
 from artist import Artist
@@ -308,7 +308,29 @@ def __init__(self, xy, **kwargs):
     def get_verts(self):
         return self.xy
 
-    
+
+class Wedge(Polygon):
+    def __init__(self, center, r, theta1, theta2,
+                 dtheta=0.1, **kwargs):
+        """
+        Draw a wedge centered at x,y tuple center with radius r that
+        sweeps theta1 to theta2 (angles)
+
+        
+        kwargs are Polygon keyword args
+
+        dtheta is the resolution in degrees
+
+        """
+        xc, yc = center
+        rads = (math.pi/180.)*arange(theta1, theta2+0.1*dtheta, dtheta)
+        xs = r*cos(rads)+xc
+        ys = r*sin(rads)+yc
+        verts = [center]
+        verts.extend([(x,y) for x,y in zip(xs,ys)])
+
+        Polygon.__init__(self, verts, **kwargs)
+
 class Circle(RegularPolygon):
     """
     A circle patch