added delimiter to pylab save

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

Author: jdh2358

.cvsignore

@@ -3,4 +3,3 @@ dist
 docs
 *.pyc
 .project
-matplotlibrc

CHANGELOG

@@ -1,5 +1,15 @@
+
+2006-01-18 Added comma delimiter for pylab save
+
+2006-01-12 Added Ryan's legend patch - JDH
+
+
 2006-1-12 Fixed numpy / numeric to use .dtype.char to keep in SYNC with numpy SVN
 
+
+===============================================================
+2006-1-11 0.86.1 released
+
 2006-1-11 Fixed setup.py for win32 build and added rc template to the MANIFEST.in
 
 2006-1-10 Added xpdf distiller option. matplotlibrc ps.usedistiller can now be

TODO

@@ -737,4 +737,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- handle lineprops.glade install file
 
--- support zoom to rect in x or y only
+-- support zoom to rect in x or y only
+
+-- add Ryan's patch

examples/simple_plot.py

@@ -1,5 +1,8 @@
 #!/usr/bin/env python
-
+"""
+Example: simple line plot.
+Show how to make and save a simple line plot with labels, title and grid
+"""
 from pylab import *
 
 t = arange(0.0, 1.0+0.01, 0.01)

lib/matplotlib/__init__.py

@@ -811,6 +811,20 @@ def __call__(self, s):
 
     'polaraxes.grid'         : [True, validate_bool],   # display polar grid or not
 
+    #legend properties
+    'legend.isaxes'	:	[True,validate_bool],
+    'legend.numpoints' 	:	[ 4,validate_int],      # the number of points in the legend line
+    'legend.fontsize' : ["small",validate_fontsize],
+    'legend.pad' 	:	[ 0.2, validate_float],         # the fractional whitespace inside the legend border
+    'legend.markerscale' 	:	[ 0.6, validate_float],    # the relative size of legend markers vs. original
+    # the following dimensions are in axes coords
+    'legend.labelsep' 	:	[ 0.005, validate_float],    # the vertical space between the legend entries
+    'legend.handlelen' 	:	[ 0.05, validate_float],  # the length of the legend lines
+    'legend.handletextsep' 	:	[ 0.02, validate_float], # the space between the legend line and legend text
+    'legend.axespad' 	:	[ 0.02, validate_float], # the border between the axes and legend edge
+    'legend.shadow' : [ False, validate_bool ],
+
+
     # tick properties
     'xtick.major.size'   : [5, validate_float],      # major xtick size in points
     'xtick.minor.size'   : [2, validate_float],      # minor xtick size in points
@@ -1179,3 +1193,30 @@ def tk_window_focus():
 verbose.report('interactive is %s'%rcParams['interactive'])
 verbose.report('platform is %s'%sys.platform)
 verbose.report('loaded modules: %s'%sys.modules.keys(), 'debug')
+
+class ExampleInfo:
+    pass
+
+class ExampleManager:
+    baseurl = 'http://matplotlib.sf.net'
+    urls = ['%s/%s'%(baseurl, subdir) for subdir in
+            ( 'examples', 'examples/widgets')]
+
+    def get_examples(self):
+        import urllib, re
+        rgx = re.compile('.*<A HREF="([^.]+\.py)">.*')
+        examples = []
+        for url in urls:
+            lines = urllib.urlopen(url).readlines()
+            for line in lines:
+                m = rgx.match(line)
+                if m is not None:
+                    examples.append('%s/%s'%(url, m.group(1)))
+        return examples
+            
+    def get_info(self, s):
+        """
+        return an ExampleInfo instance from s, the string content of
+        an example
+        """
+        pass

lib/matplotlib/legend.py

@@ -25,7 +25,7 @@
 from numerix import array, ones, Float
 
 
-from matplotlib import verbose
+from matplotlib import verbose, rcParams
 from artist import Artist
 from cbook import enumerate, is_string_like, iterable, silent_list
 from font_manager import FontProperties
@@ -110,18 +110,18 @@ class Legend(Artist):
 
 
     def __init__(self, parent, handles, labels, loc,
-                 isaxes=True,
-                 numpoints = 4,      # the number of points in the legend line
-                 prop = FontProperties(size='smaller'),
-                 pad = 0.2,          # the fractional whitespace inside the legend border
-                 markerscale = 0.6,    # the relative size of legend markers vs. original
+                 isaxes= None,
+                 numpoints = None,      # the number of points in the legend line
+                 prop = None,
+                 pad = None,          # the fractional whitespace inside the legend border
+                 markerscale = None,    # the relative size of legend markers vs. original
                  # the following 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
+                 labelsep = None,     # the vertical space between the legend entries
+                 handlelen = None,     # the length of the legend lines
+                 handletextsep = None, # the space between the legend line and legend text
+                 axespad = None,       # the border between the axes and legend edge
 
-                 shadow=False,
+                 shadow= None,
                  ):
         """
   parent                # the artist that contains the legend
@@ -146,19 +146,19 @@ def __init__(self, parent, handles, labels, loc,
             warnings.warn('Unrecognized location %s. Falling back on upper right; valid locations are\n%s\t' %(loc, '\n\t'.join(self.codes.keys())))
         if is_string_like(loc): loc = self.codes.get(loc, 1)
 
-        self.numpoints = numpoints
-        self.prop = prop
-        self.fontsize = prop.get_size_in_points()
-        self.pad = pad
-        self.markerscale = markerscale
-        self.labelsep = labelsep
-        self.handlelen = handlelen
-        self.handletextsep = handletextsep
-        self.axespad = axespad
-        self.shadow = shadow
-
-        self.isaxes = isaxes
-        if isaxes:  # parent is an Axes
+        proplist=[numpoints, pad, markerscale, labelsep, handlelen, handletextsep, axespad, shadow, isaxes]
+        propnames=['numpoints', 'pad', 'markerscale', 'labelsep', 'handlelen', 'handletextsep', 'axespad', 'shadow', 'isaxes']
+        for name, value in zip(propnames,proplist):
+            if value is None:
+                value=rcParams["legend."+name]
+            setattr(self,name,value)
+        if prop is None:
+            self.prop=FontProperties(size=rcParams["legend.fontsize"])
+        else:
+            self.prop=prop
+        self.fontsize = self.prop.get_size_in_points()
+
+        if self.isaxes:  # parent is an Axes
             self.set_figure(parent.figure)
         else:        # parent is a Figure
             self.set_figure(parent)

lib/matplotlib/numerix/__init__.py

@@ -1,7 +1,7 @@
 """
 numerix  imports either Numeric or numarray based on various selectors.
 
-0.  If the value "--numarray" or "--Numeric" is specified on the
+0.  If the value "--numpy","--numarray" or "--Numeric" is specified on the
     command line, then numerix imports the specified
     array package.
 

lib/matplotlib/pylab.py

@@ -1025,7 +1025,7 @@ def rcdefaults():
 if matplotlib.rcdefaults.__doc__ is not None:
     rcdefaults.__doc__ =   _shift_string(matplotlib.rcdefaults.__doc__)
 
-def save(fname, X, fmt='%.18e'):
+def save(fname, X, fmt='%.18e',delimiter=' '):
     """
     Save the data in X to file fname using fmt string to convert the
     data to strings
@@ -1041,6 +1041,8 @@ def save(fname, X, fmt='%.18e'):
     save('test2.out', x)        # x is 1D
     save('test3.out', x, fmt='%1.4e')  # use exponential notation
 
+    delimiter is used to separate the fields, eg delimiter ',' for
+    comma-separated values
     """
 
     if is_string_like(fname):
@@ -1061,7 +1063,7 @@ def save(fname, X, fmt='%.18e'):
         origShape = X.shape
         X.shape = len(X), 1
     for row in X:
-        fh.write(' '.join([fmt%val for val in row]) + '\n')
+        fh.write(delimiter.join([fmt%val for val in row]) + '\n')
 
     if origShape is not None:
         X.shape = origShape

matplotlibrc.template

@@ -165,6 +165,19 @@ grid.color       :   black   # grid color
 grid.linestyle   :   :       # dotted
 grid.linewidth   :   0.5     # in points
 
+### Legend
+legend.isaxes	:	True
+legend.numpoints 	:	4  # the number of points in the legend line
+legend.fontsize : 14
+legend.pad 	:	0.2 # the fractional whitespace inside the legend border
+legend.markerscale 	:	1.0    # the relative size of legend markers vs. original
+# the following dimensions are in axes coords
+legend.labelsep 	:	0.010 # the vertical space between the legend entries
+legend.handlelen 	:	0.05  # the length of the legend lines
+legend.handletextsep 	:	0.02 # the space between the legend line and legend text
+legend.axespad 	:	0.02       # the border between the axes and legend edge
+legend.shadow	:	False
+
 ### FIGURE
 # See http://matplotlib.sourceforge.net/matplotlib.figure.html#Figure
 figure.figsize   : 8, 6    # figure size in inches

src/_image.cpp

@@ -1278,7 +1278,7 @@ _image_module::frombuffer(const Py::Tuple& args) {
     imo->rbufIn->attach(buffer, imo->colsIn, imo->rowsIn, imo->colsIn*imo->BPP);
   }
 
-  return Py::Object();
+  return Py::asObject(imo); 
 }