added latex font name to tex prefix

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

Author: jdh2358

CHANGELOG

@@ -1,3 +1,10 @@
+2006-01-20 Added a converters dict to pylab load to convert selected
+           coloumns to float -- especially useful for files with date
+           strings, uses a datestr2num converter - JDH
+
+2006-01-20 Added datestr2num to matplotlib dates to convert a string
+           or sequence of strings to a matplotlib datenum
+
 2006-01-18 Added quadrilateral pcolormesh patch 1409190 by Alex Mont
            and Paul Kienzle -- this is *Agg only for now.  See
            examples/quadmesh_demo.py - JDH

MANIFEST.in

@@ -4,6 +4,7 @@ include Makefile  MANIFEST.in MANIFEST
 include matplotlibrc.template matplotlibrc
 include __init__.py setupext.py setup.py makeswig.py
 include examples/data/*
+include lib/matplotlib/toolkits
 include images/*
 recursive-include fonts *
 recursive-include license LICENSE*

examples/load_converter.py

@@ -0,0 +1,13 @@
+from pylab import figure, show, datestr2num, load
+
+
+
+X = load('data/msft.csv', delimiter=',',
+         converters={0:datestr2num}, skiprows=1)
+dates = X[:,0]
+close = X[:,2]
+
+fig = figure()
+ax = fig.add_subplot(111)
+ax.plot_date(dates, close)
+show()

lib/matplotlib/dates.py

@@ -84,13 +84,14 @@
 except ImportError:
     raise ValueError('matplotlib %s date handling requires python2.3' % matplotlib.__version__)
 
-from cbook import iterable
+from cbook import iterable, is_string_like
 from pytz import timezone
 from numerix import arange, asarray
 from ticker import Formatter, Locator, Base
 from dateutil.rrule import rrule, MO, TU, WE, TH, FR, SA, SU, YEARLY,\
      MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY, SECONDLY
 from dateutil.relativedelta import relativedelta
+import dateutil.parser
 
 UTC = timezone('UTC')
 
@@ -163,6 +164,18 @@ def _from_ordinalf(x, tz=None):
 
     return dt
 
+def datestr2num(d):
+    """
+    Convert a date string to a datenum using dateutil.parser.parse
+    d can be a single string or a sequence of strings
+    """
+    if is_string_like(d):
+        dt = dateutil.parser.parse(d)
+        return date2num(dt)
+    else:
+        return date2num([dateutil.parser.parse(s) for s in d])
+    
+    
 def date2num(d):
     """
     d is either a datetime instance or a sequence of datetimes

lib/matplotlib/pylab.py

@@ -232,7 +232,7 @@
 # eg a bad pytz install.  I don't want to break all of matplotlib for
 # date support
 try:
-    from dates import date2num, num2date, drange, epoch2num, num2epoch, mx2num,\
+    from dates import date2num, num2date, datestr2num, drange, epoch2num, num2epoch, mx2num,\
             DateFormatter, IndexDateFormatter, DateLocator,\
             RRuleLocator, YearLocator, MonthLocator, WeekdayLocator,\
             DayLocator, HourLocator, MinuteLocator, SecondLocator,\
@@ -951,7 +951,7 @@ def imread(*args, **kwargs):
     imread.__doc__ = _shift_string(_imread.__doc__)
 
 
-def load(fname,comments='%',delimiter=None):
+def load(fname,comments='%',delimiter=None, converters=None,skiprows=0):
     """
     Load ASCII data from fname into an array and return the array.
 
@@ -985,8 +985,14 @@ def load(fname,comments='%',delimiter=None):
     file. If delimiter is unspecified or none, any whitespace string is
     a separator.
 
+    converters, if not None, is a dictionary mapping column number to
+    a function that will convert that column to a float.  Eg, if
+    column 0 is a date string: converters={0:datestr2num}
+
+    skiprows is the number of rows from the top to skip
     """
 
+    if converters is None: converters = {}
     if is_string_like(fname):
         if fname.endswith('.gz'):
             import gzip
@@ -999,10 +1005,11 @@ def load(fname,comments='%',delimiter=None):
         raise ValueError('fname must be a string or file handle')
     X = []
     numCols = None
-    for line in fh:
+    for i,line in enumerate(fh):
+        if i<skiprows: continue
         line = line[:line.find(comments)].strip()
         if not len(line): continue
-        row = [float(val) for val in line.split(delimiter)]
+        row = [converters.get(i,float)(val) for i,val in enumerate(line.split(delimiter))]
         thisLen = len(row)
         if numCols is not None and thisLen != numCols:
             raise ValueError('All rows must have the same number of columns')

lib/matplotlib/texmanager.py

@@ -74,7 +74,10 @@ def __init__(self):
 
 
     def get_prefix(self, tex):
-        return md5.md5(tex).hexdigest()
+        s = tex
+        if rcParams['text.tex.engine'] == 'latex':
+            s+='latex font: %s'%rcParams['font.latex.package']
+        return md5.md5(s).hexdigest()
 
     def get_tex_command(self, tex, fname):