refinements to the rec editors plus examples

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

Author: jdh2358

CHANGELOG

@@ -1,3 +1,6 @@
+2008-04-30 Added some record array editing widgets for gtk -- see
+           examples/rec_edit*.py - JDH
+
 2008-04-29 Fix bug in mlab.sqrtm - MM
 
 2008-04-28 Fix bug in SVG text with Mozilla-based viewers (the symbol

examples/data/demodata.csv

@@ -0,0 +1,11 @@
+clientid,date,weekdays,gains,prices,up
+0,2008-04-30,Wed,-0.52458192906686452,7791404.0091921333,False
+1,2008-05-01,Thu,0.076191536201738269,3167180.7366340165,True
+2,2008-05-02,Fri,-0.86850970062880861,9589766.9613829032,False
+3,2008-05-03,Sat,-0.42701083852713395,8949415.1867596991,False
+4,2008-05-04,Sun,0.2532553652693274,937163.44375252665,True
+5,2008-05-05,Mon,-0.68151636911081892,949579.88022264629,False
+6,2008-05-06,Tue,0.0071911579626532168,7268426.906552773,True
+7,2008-05-07,Wed,0.67449747200412147,7517014.782897247,True
+8,2008-05-08,Thu,-1.1841008656818983,1920959.5423492221,False
+9,2008-05-09,Fri,-1.5803692595811152,8456240.6198725495,False

examples/date_demo.py

@@ -0,0 +1,14 @@
+"""
+Simple example showing how to plot a time series with datetime objects
+"""
+import datetime
+import matplotlib.pyplot as plt
+
+today = datetime.date.today()
+dates = [today+datetime.timedelta(days=i) for i in range(10)]
+
+fig = plt.figure()
+ax = fig.add_subplot(111)
+ax.plot(dates, range(10))
+fig.autofmt_xdate()
+plt.show()

examples/rec_edit_gtk_custom.py

@@ -0,0 +1,37 @@
+"""
+generate an editable gtk treeview widget for record arrays with custom
+formatting of the cells and show how to limit string entries to a list
+of strings
+"""
+import gtk
+import numpy as np
+import matplotlib.mlab as mlab
+import mpl_toolkits.gtktools as gtktools
+
+r = mlab.csv2rec('data/demodata.csv', converterd={'weekdays':str})
+
+
+formatd = mlab.get_formatd(r)
+formatd['date'] = mlab.FormatDate('%Y-%m-%d')
+formatd['prices'] = mlab.FormatMillions(precision=1)
+formatd['gain'] = mlab.FormatPercent(precision=2)
+
+# use a drop down combo for weekdays
+stringd = dict(weekdays=['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'])
+constant = ['clientid']   # block editing of this field
+
+
+liststore = gtktools.RecListStore(r, formatd=formatd, stringd=stringd)
+treeview = gtktools.RecTreeView(liststore, constant=constant)
+
+def mycallback(liststore, rownum, colname, oldval, newval):
+    print 'verify: old=%s, new=%s, rec=%s'%(oldval, newval, liststore.r[rownum][colname])
+
+liststore.callbacks.connect('cell_changed', mycallback)
+
+win = gtk.Window()
+win.set_title('click to edit')
+win.add(treeview)
+win.show_all()
+win.connect('delete-event', lambda *args: gtk.main_quit())
+gtk.main()

examples/rec_edit_gtk_simple.py

@@ -0,0 +1,15 @@
+"""
+Load a CSV file into a record array and edit it in a gtk treeview
+"""
+
+import gtk
+import numpy as np
+import matplotlib.mlab as mlab
+import mpl_toolkits.gtktools as gtktools
+
+r = mlab.csv2rec('data/demodata.csv', converterd={'weekdays':str})
+
+liststore, treeview, win = gtktools.edit_recarray(r)
+win.set_title('click to edit')
+win.connect('delete-event', lambda *args: gtk.main_quit())
+gtk.main()

lib/matplotlib/mlab.py

@@ -2170,7 +2170,7 @@ def csv2rec(fname, comments='#', skiprows=0, checkrows=0, delimiter=',',
     data type.  When set to zero all rows are validated.
 
     converterd, if not None, is a dictionary mapping column number or
-    munged column name to a converter function
+    munged column name to a converter function.
 
     names, if not None, is a list of header names.  In this case, no
     header will be read from the file
@@ -2256,11 +2256,18 @@ def newfunc(name, val):
                 return func(val)
         return newfunc
 
+
+    def mybool(x):
+        if x=='True': return True
+        elif x=='False': return False
+        else: raise ValueError('invalid bool')
+        
     dateparser = dateutil.parser.parse
     mydateparser = with_default_value(dateparser, datetime.date(1,1,1))
     myfloat = with_default_value(float, np.nan)
     myint = with_default_value(int, -1)
     mystr = with_default_value(str, '')
+    mybool = with_default_value(mybool, None)
 
     def mydate(x):
         # try and return a date object
@@ -2273,7 +2280,7 @@ def mydate(x):
 
     def get_func(name, item, func):
         # promote functions in this order
-        funcmap = {myint:myfloat, myfloat:mydate, mydate:mydateparser, mydateparser:mystr}
+        funcmap = {mybool:myint,myint:myfloat, myfloat:mydate, mydate:mydateparser, mydateparser:mystr}
         try: func(name, item)
         except:
             if func==mystr:
@@ -2294,7 +2301,7 @@ def get_converters(reader):
         converters = None
         for i, row in enumerate(reader):
             if i==0:
-                converters = [myint]*len(row)
+                converters = [mybool]*len(row)
             if checkrows and i>checkrows:
                 break
             #print i, len(names), len(row)
@@ -2308,6 +2315,9 @@ def get_converters(reader):
                     func = converters[j]
                     if len(item.strip()):
                         func = get_func(name, item, func)
+                else:
+                    # how should we handle custom converters and defaults?
+                    func = with_default_value(func, None)
                 converters[j] = func
         return converters
 
@@ -2427,6 +2437,13 @@ def toval(self, x):
     def fromstr(self, s):
         return int(s)
 
+class FormatBool(FormatObj):
+    def toval(self, x):
+        return x
+
+    def fromstr(self, s):
+        return bool(s)
+
 class FormatPercent(FormatFloat):
     def __init__(self, precision=4):
         FormatFloat.__init__(self, precision, scale=100.)
@@ -2465,6 +2482,7 @@ def fromstr(self, x):
 
 
 defaultformatd = {
+    np.bool_ : FormatBool(),
     np.int16 : FormatInt(),
     np.int32 : FormatInt(),
     np.int64 : FormatInt(),