applied norberts legend patches

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

Author: jdh2358

CHANGELOG

@@ -1,5 +1,8 @@
 New entries should be added at the top
 
+2004-11-23 applied Norbert's patched and exposed legend configuration
+           to kwargs - JDH
+
 2004-11-23 backend_gtk.py: added a default exception handler
 
 2004-11-18 backend_gtk.py: change so that the backend knows about all image

lib/matplotlib/__init__.py

@@ -286,6 +286,11 @@ def get_home():
 
 def _get_data_path():
     'get the path to matplotlib data'
+
+    if os.environ.has_key('MATPLOTLIBDATA'):
+        path = os.environ['MATPLOTLIBDATA']
+        if os.path.isdir(path): return path
+
     path = os.path.join(distutils.sysconfig.PREFIX, 'share', 'matplotlib')
     if os.path.isdir(path): return path
 
@@ -297,10 +302,6 @@ def _get_data_path():
                         'share','matplotlib')
     if os.path.isdir(path): return path
 
-    if os.environ.has_key('MATPLOTLIBDATA'):
-        path = os.environ['MATPLOTLIBDATA']
-        if os.path.isdir(path): return path
-
 
     # CODE ADDED TO SUPPORT PY2EXE - you will need to copy
     # C:\Python23\share\matplotlib into your dist dir.  See
@@ -459,7 +460,7 @@ def validate_verbose_erro(s):
 defaultParams = {
     'backend'           : ['GTK', str],
     'numerix'           : ['Numeric', validate_numerix],
-    'toolbar'           : ['classic', validate_toolbar],
+    'toolbar'           : ['toolbar2', validate_toolbar],
     'datapath'          : [get_data_path(), validate_path_exists],
     'interactive'       : [False, validate_bool],
     'timezone'          : ['UTC', str],    

lib/matplotlib/axes.py

@@ -138,25 +138,27 @@ def _clear_color_cycle(self):
         self.count = 0
 
     def __call__(self, *args, **kwargs):
-        
+
         ret =  self._grab_next_args(*args, **kwargs)
         return ret
 
     def set_lineprops(self, line, **kwargs):
         assert self.command == 'plot', 'set_lineprops only works with "plot"'
         for key, val in kwargs.items():
             funcName = "set_%s"%key
-            if hasattr(line,funcName):
-                func = getattr(line,funcName)
-                func(val)
+            if not hasattr(line,funcName):
+                raise TypeError, 'There is no line property "%s"'%key
+            func = getattr(line,funcName)
+            func(val)
 
     def set_patchprops(self, fill_poly, **kwargs):
         assert self.command == 'fill', 'set_patchprops only works with "fill"'
         for key, val in kwargs.items():
             funcName = "set_%s"%key
-            if hasattr(fill_poly,funcName):
-                func = getattr(fill_poly,funcName)
-                func(val)
+            if not hasattr(fill_poly,funcName):
+                raise TypeError, 'There is no patch property "%s"'%key
+            func = getattr(fill_poly,funcName)
+            func(val)
 
 
     def is_filled(self, marker):
@@ -296,8 +298,7 @@ class Axes(Artist):
 
     def __init__(self, fig, rect,
                  axisbg = None, # defaults to rc axes.facecolor
-                 frameon = True,
-                 **kwargs):
+                 frameon = True):
         Artist.__init__(self)
 
 
@@ -928,7 +929,7 @@ def csd(self, x, y, NFFT=256, Fs=2, detrend=mlab.detrend_none,
 
         return pxy, freqs
 
-    def draw(self, renderer, *args, **kwargs):
+    def draw(self, renderer):
         "Draw everything (plot lines, axes, labels)"
 
         renderer.open_group('axes')
@@ -1440,18 +1441,29 @@ def legend(self, *args, **kwargs):
   loc = 0, 1 is left top
   loc = 0.5, 0.5 is center, center
 
-and so on
+and so on.  The following kwargs are supported
+
+  numpoints = 4         # the number of points in the legend line
+  prop = FontProperties('smaller')  # the font properties
+  pad = 0.2             # the fractional whitespace inside the legend border
+
+  # The kwarg dimensions are in axes coords
+  labelsep = 0.005     # the vertical space between the legend entries
+  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
         """
 
-        loc = kwargs.get('loc', 1)
         if len(args)==0:
             labels = [line.get_label() for line in self.lines]
             lines = self.lines
+            loc = kwargs.pop('loc', 1)
 
         elif len(args)==1:
             # LABELS
             labels = args[0]
             lines = [line for line, label in zip(self.lines, labels)]
+            loc = kwargs.pop('loc', 1)
 
         elif len(args)==2:
             if is_string_like(args[1]) or isinstance(args[1], int):
@@ -1461,6 +1473,7 @@ def legend(self, *args, **kwargs):
             else:
                 # LINES, LABELS
                 lines, labels = args
+                loc = kwargs.pop('loc', 1)
 
         elif len(args)==3:
             # LINES, LABELS, LOC
@@ -1469,7 +1482,7 @@ def legend(self, *args, **kwargs):
             raise RuntimeError('Invalid arguments to legend')
 
         lines = flatten(lines)
-        self.legend_ = Legend(self, lines, labels, loc)
+        self.legend_ = Legend(self, lines, labels, loc, **kwargs)
         return self.legend_
 
     def loglog(self, *args, **kwargs):
@@ -1493,11 +1506,11 @@ def loglog(self, *args, **kwargs):
   * subsy: the location of the minor yticks; None defaults to range(2,basey)    
         """
         if not self._hold: self.cla()
-        dx = {'basex': kwargs.get('basex', 10),
-              'subsx': kwargs.get('subsx', None),
+        dx = {'basex': kwargs.pop('basex', 10),
+              'subsx': kwargs.pop('subsx', None),
               }
-        dy = {'basey': kwargs.get('basey', 10),
-              'subsy': kwargs.get('subsy', None),
+        dy = {'basey': kwargs.pop('basey', 10),
+              'subsy': kwargs.pop('subsy', None),
               }
 
         self.set_xscale('log', **dx)
@@ -1583,12 +1596,14 @@ def pcolor(self, *args, **kwargs):
         """
         if not self._hold: self.cla()
 
-        alpha = kwargs.get('alpha', 1.0)
-        norm = kwargs.get('norm')
-        cmap = kwargs.get('cmap')        
-        vmin = kwargs.get('vmin')
-        vmax = kwargs.get('vmax')        
-        shading = kwargs.get('shading', 'faceted')
+        alpha = kwargs.pop('alpha', 1.0)
+        norm = kwargs.pop('norm')
+        cmap = kwargs.pop('cmap')        
+        vmin = kwargs.pop('vmin')
+        vmax = kwargs.pop('vmax')        
+        shading = kwargs.pop('shading', 'faceted')
+        if len(kwargs):
+            raise TypeError, 'Unknown argument "%s"'%kwargs.keys()[0]
 
         if len(args)==1:
             C = args[0]
@@ -1597,7 +1612,7 @@ def pcolor(self, *args, **kwargs):
         elif len(args)==3:
             X, Y, C = args
         else:
-            raise RuntimeError('Illegal arguments to pcolor; see help(pcolor)')
+            raise TypeError, 'Illegal arguments to pcolor; see help(pcolor)'
 
         Nx, Ny = X.shape
         patches = []
@@ -1701,7 +1716,12 @@ def pcolor_classic(self, *args, **kwargs):
         """
 
         if not self._hold: self.cla()
-        shading = kwargs.get('shading', 'faceted')
+        shading = kwargs.pop('shading', 'faceted')
+        cmap = kwargs.pop('cmap', cm.get_cmap())
+        norm = kwargs.pop('norm', normalize())
+        alpha = kwargs.pop('alpha', 1.0)
+        if len(kwargs):
+            raise TypeError, 'Unknown argument "%s"'%kwargs.keys()[0]
 
         if len(args)==1:
             C = args[0]
@@ -1710,18 +1730,13 @@ def pcolor_classic(self, *args, **kwargs):
         elif len(args)==3:
             X, Y, C = args
         else:
-            raise RuntimeError('Illegal arguments to pcolor; see help(pcolor)')
+            raise TypeError, 'Illegal arguments to pcolor; see help(pcolor)'
 
-
         Nx, Ny = X.shape
 
-        cmap = kwargs.get('cmap', cm.get_cmap())
-        norm = kwargs.get('norm', normalize())
         if isinstance(norm, normalize) and not norm.scaled():
             norm.autoscale(C)
 
-
-        alpha = kwargs.get('alpha', 1.0)
         nc = norm(C)
         RGBA = cmap(nc, alpha)
 
@@ -2210,8 +2225,8 @@ def semilogx(self, *args, **kwargs):
 
         """
 
-        d = {'basex': kwargs.get('basex', 10),
-             'subsx': kwargs.get('subsx', None),
+        d = {'basex': kwargs.pop('basex', 10),
+             'subsx': kwargs.pop('subsx', None),
              }
 
         self.set_xscale('log', **d)
@@ -2236,8 +2251,8 @@ def semilogy(self, *args, **kwargs):
       range(2,basey)
 
         """
-        d = {'basey': kwargs.get('basey', 10),
-             'subsy': kwargs.get('subsy', None),
+        d = {'basey': kwargs.pop('basey', 10),
+             'subsy': kwargs.pop('subsy', None),
              }
 
         self.set_yscale('log', **d)
@@ -2755,7 +2770,7 @@ class SubplotBase:
       Subplot(211)    # 2 rows, 1 column, first (upper) plot
     """
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args):
         # Axes __init__ below
 
         if len(args)==1:
@@ -2825,7 +2840,7 @@ class Subplot(SubplotBase, Axes):
       Subplot(211)    # 2 rows, 1 column, first (upper) plot
     """
     def __init__(self, fig, *args, **kwargs):
-        SubplotBase.__init__(self, *args, **kwargs)        
+        SubplotBase.__init__(self, *args)        
         Axes.__init__(self, fig, [self.figLeft, self.figBottom, self.figW, self.figH], **kwargs)
 
 
@@ -3143,6 +3158,6 @@ class PolarSubplot(SubplotBase, PolarAxes):
       Subplot(211)    # 2 rows, 1 column, first (upper) plot
     """
     def __init__(self, fig, *args, **kwargs):
-        SubplotBase.__init__(self, *args, **kwargs)        
+        SubplotBase.__init__(self, *args)        
         PolarAxes.__init__(self, fig, [self.figLeft, self.figBottom, self.figW, self.figH], **kwargs)
 

lib/matplotlib/figure.py

@@ -265,7 +265,7 @@ def draw(self, renderer):
     def get_axes(self):
         return self.axes
 
-    def legend(self, handles, labels, loc):
+    def legend(self, handles, labels, loc, **kwargs):
         """
         Place a legend in the figure.  Labels are a sequence of
         strings, handles is a sequence of line or patch instances, and
@@ -296,7 +296,7 @@ def legend(self, handles, labels, loc):
 
 
         handles = flatten(handles)
-        l = Legend(self, handles, labels, loc, isaxes=False)
+        l = Legend(self, handles, labels, loc, isaxes=False, **kwargs)
         self._set_artist_props(l)
         self.legends.append(l)
         return l