added shadow effect

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

Author: jdh2358

CHANGELOG

@@ -1,5 +1,8 @@
 New entries should be added at the top
 
+2004-12-27 Added Shadow class and added shadow kwarg to legend and pie
+           for shadow effect - JDH
+
 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

Makefile

@@ -12,7 +12,7 @@ RELEASE = matplotlib-${VERSION}
 
 clean: 
 	${PYTHON} setup.py clean;\
-	rm -f *.png *.ps *.eps *.svg
+	rm -f *.png *.ps *.eps *.svg *.jpg
 	find . -name "_tmp*.py" | xargs rm -f;\
 	find . \( -name "*~" -o -name "*.pyc" \) | xargs rm -f;\
 	find examples \( -name "*.svg" -o -name "*.png" -o -name "*.ps"  -o -name "*.jpg" -o -name "*.eps" -o -name "*.tar" -name "*.gz" \) | xargs rm -f

examples/legend_demo.py

@@ -17,7 +17,7 @@
 ax = subplot(111)
 plot(a,c,'k--',a,d,'k:',a,c+d,'k')
 legend(('Model length', 'Data length', 'Total message length'),
-       'upper center')
+       'upper center', shadow=True)
 ax.set_ylim([-1,20])
 ax.grid(0)
 xlabel('Model complexity --->')

examples/legend_demo2.py

@@ -13,7 +13,7 @@
 l2, l3 = plot(t2, sin(2*pi*t2), '--go', t1, log(1+t1), '.')
 l4,    = plot(t2, exp(-t2)*sin(2*pi*t2), 'rs-.')
 
-legend( (l2, l4), ('oscillatory', 'damped'), 'upper right')
+legend( (l2, l4), ('oscillatory', 'damped'), 'upper right', shadow=True)
 xlabel('time')
 ylabel('volts')
 title('Damped oscillation')

examples/pie_demo.py

@@ -0,0 +1,35 @@
+"""
+Make a pie chart - see
+http://matplotlib.sf.net/matplotlib.pylab.html#-pie for the docstring.
+
+This example shows a basic pie chart with labels in figure 1, and in
+figure 2 uses a couple of optional features, like autolabeling the
+percentage a wedge represents and offsetting a slice
+
+
+"""
+from pylab import *
+    
+# make a square figure and axes
+figure(1, figsize=(8,8))
+ax = axes([0.1, 0.1, 0.8, 0.8])
+
+labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
+fracs = [15,30,45, 10]
+
+figure(1)
+pie(fracs, labels=labels)
+
+# figure(2) showa some optional features.  autopct is used to label
+# the percentage of the pie, and can be a format string or a function
+# which takes a percentage and returns a string.  explode is a
+# len(fracs) sequuence which gives the fraction of the radius to
+# offset that slice.
+
+figure(2, figsize=(8,8))
+explode=(0, 0.05, 0, 0)
+pie(fracs, explode=explode, labels=labels, autopct='%1.1f%%', shadow=True)
+
+savefig('pie_demo')
+show()
+    

lib/matplotlib/artist.py

@@ -59,6 +59,10 @@ def get_transform(self):
     def is_figure_set(self):
         return self.figure is not None
 
+    def get_figure(self):
+        'return the figure instance'
+        return self.figure
+    
     def set_figure(self, fig):
         """
 Set the figure instance the artist belong to

lib/matplotlib/axes.py

@@ -31,7 +31,7 @@
 
 from mlab import meshgrid
 from matplotlib import rcParams
-from patches import Rectangle, Circle, Polygon, Wedge, bbox_artist
+from patches import Rectangle, Circle, Polygon, Wedge, Shadow, bbox_artist
 from table import Table
 from text import Text, _process_text_args
 from transforms import Bbox, Point, Value, Affine, NonseparableTransformation
@@ -322,7 +322,7 @@ def __init__(self, fig, rect,
         # funcs used to format x and y - fall back on major formatters
         self.fmt_xdata = None  
         self.fmt_ydata = None
-
+        
     def set_figure(self, fig):
         """
 Set the Axes figure
@@ -1643,6 +1643,7 @@ def legend(self, *args, **kwargs):
   handlelen = 0.05     # the length of the legend lines
   handletextsep = 0.02 # the space between the legend line and legend text
   axespad = 0.02       # the border between the axes and legend edge
+  shadow = False       # if True, draw a shadow behind legend
         """
 
         def get_handles():
@@ -1980,6 +1981,7 @@ def pcolor_classic(self, *args, **kwargs):
     def pie(self, x, explode=None, labels=None,
             colors=('b', 'g', 'r', 'c', 'm', 'y', 'k', 'w'),
             autopct=None,
+            shadow=False
             ):
         """
 Make a pie chart of array x.  The fractional area of each wedge is
@@ -1999,6 +2001,8 @@ def pie(self, x, explode=None, labels=None,
     the wedge.  If it is a format string, the label will be fmt%pct.
     If it is a function, it will be called
 
+  - shadow, if True, will draw a shadow beneath the pie.
+  
 The pie chart will probably look best if the figure and axes are
 square.  Eg,
 
@@ -2044,10 +2048,20 @@ def pie(self, x, explode=None, labels=None,
 
             w = Wedge((x,y), radius, 360.*theta1, 360.*theta2,
                       facecolor=colors[i%len(colors)])
-            slices.append(w)
+            slices.append(w) 
             self.add_patch(w)
             self.set_label(label)
 
+            if shadow:
+                # make sure to add a shadow after the call to
+                # add_patch so the figure and transform props will be
+                # set
+                shad = Shadow(w, -0.02, -0.02,
+                              #props={'facecolor':w.get_facecolor()}
+                              )
+                shad.set_zorder(0.9*w.get_zorder())
+                self.add_patch(shad) 
+
 
             xt = x + 1.1*radius*math.cos(thetam)
             yt = y + 1.1*radius*math.sin(thetam)

lib/matplotlib/backends/backend_ps.py

@@ -400,8 +400,9 @@ def _draw_ps(self, ps, gc, rgbFace, command=None):
             self._pswriter.write('%s clipbox\n' % _nums_to_str(w,h,x,y))
         self._pswriter.write(ps.strip()+'\n')
         if rgbFace:
+            #print 'rgbface', rgbFace
             self._pswriter.write("gsave\n")
-            self.set_color(store=0,*rgbFace)
+            self.set_color(store=0, *rgbFace)
             self._pswriter.write("fill\n")
             self._pswriter.write("grestore\n")
         self._pswriter.write("stroke\n")

lib/matplotlib/colors.py

@@ -583,4 +583,5 @@ def is_mappable(self):
         return hasattr(self, '_A') and self._A is not None and self._A.shape<=2
 
 
-
+    
+    

lib/matplotlib/legend.py

@@ -31,7 +31,7 @@
 from font_manager import FontProperties
 from lines import Line2D
 from mlab import linspace
-from patches import Patch, Rectangle, bbox_artist, draw_bbox
+from patches import Patch, Rectangle, Shadow, bbox_artist, draw_bbox
 from collections import LineCollection
 from text import Text
 from transforms import Bbox, Point, Value, get_bbox_transform, bbox_all,\
@@ -89,6 +89,7 @@ def __init__(self, parent, handles, labels, loc,
                  handletextsep = 0.02, # the space between the legend line and legend text
                  axespad = 0.02,       # the border between the axes and legend edge
 
+                 shadow=False,
                  ):
         """
   parent                # the artist that contains the legend
@@ -99,6 +100,7 @@ def __init__(self, parent, handles, labels, loc,
   numpoints = 4         # the number of points in the legend line
   fontprop = FontProperties('smaller')  # the font property
   pad = 0.2             # the fractional whitespace inside the legend border
+  shadow                # if True, draw a shadow behind legend 
 
 The following dimensions are in axes coords
   labelsep = 0.005     # the vertical space between the legend entries
@@ -119,6 +121,7 @@ def __init__(self, parent, handles, labels, loc,
         self.handlelen = handlelen
         self.handletextsep = handletextsep
         self.axespad = axespad
+        self.shadow = shadow
 
         if isaxes:  # parent is an Axes
             self.set_figure(parent.figure)
@@ -162,7 +165,13 @@ def _approx_text_height(self):
     def draw(self, renderer):
         renderer.open_group('legend')
         self._update_positions(renderer)
-        if self._drawFrame:  self.legendPatch.draw(renderer)
+        if self._drawFrame:
+            if self.shadow:
+                shadow = Shadow(self.legendPatch, -0.005, -0.005)
+                shadow.draw(renderer)
+            self.legendPatch.draw(renderer)
+        
+
         for h in self.handles:            
             if h is not None:
 		h.draw(renderer)

lib/matplotlib/patches.py

@@ -45,11 +45,14 @@ def __init__(self,
                 func(v)
 
     def copy_properties(self, other):
-        self._edgecolor = other._edgecolor
-        self._facecolor = other._facecolor
-        self.fill = other.fill
-        self._linewidth= other._linewidth
-
+        self.set_edgecolor(other.get_edgecolor())
+        self.set_facecolor(other.get_facecolor())
+        self.set_fill(other.get_fill())
+        self.set_linewidth(other.get_linewidth())
+        self.set_transform(other.get_transform())
+        self.set_figure(other.get_figure())
+        self.set_alpha(other.get_alpha())                
+        
     def get_antialiased(self):
         return self._antialiased
 
@@ -102,7 +105,12 @@ def set_fill(self, b):
 """
         self.fill = b
 
-    
+    def get_fill(self):
+        'return whether fill is set'
+        return self.fill
+
+     
+        
     def draw(self, renderer):
 
         #renderer.open_group('patch')
@@ -120,9 +128,9 @@ def draw(self, renderer):
 
         verts = self.get_verts()        
         tverts = self._transform.seq_xy_tups(verts)
-
         renderer.draw_polygon(gc, rgbFace, tverts)
 
+ 
         #renderer.close_group('patch')
 
     def get_verts(self):
@@ -171,7 +179,45 @@ def get_ec(self):
     def get_fc(self):
         'alias for get_facecolor'
         return self.get_facecolor()
-        
+
+class Shadow(Patch):
+    def __init__(self, patch, ox, oy, props=None):
+        """
+Create a shadow of the patch offset by ox, oy.  props, if not None is
+a patch property update dictionary.  If None, the shadow will have
+have the same color as the face, but darkened
+"""
+        Patch.__init__(self)
+        self.ox, self.oy = ox, oy
+        self.patch = patch
+        self.props = props
+        self._update()
+
+    def _update(self):        
+        self.copy_properties(self.patch)
+        if self.props is not None:
+            self.update(self.props)
+        else:
+            r,g,b,a = colorConverter.to_rgba(self.patch.get_facecolor())
+            rho = 0.3
+            r = rho*r
+            g = rho*g
+            b = rho*b
+
+            self.set_facecolor((r,g,b))
+            self.set_edgecolor((r,g,b))
+                   
+    def get_verts(self):
+        verts = self.patch.get_verts()
+        xs = [x+self.ox for x,y in verts]
+        ys = [y+self.oy for x,y in verts]
+        return zip(xs, ys)
+
+    def _draw(self, renderer):
+        'draw the shadow'
+        self._update()
+        Patch.draw(self, renderer)
+
 class Rectangle(Patch):
     """
     Draw a rectangle with lower left at xy=(x,y) with specified