added recarray utils module

jdh2358 · jdh2358 · commit a203bf798356 · 2007-11-08T23:29:46.000Z
svn path=/trunk/matplotlib/; revision=4168
diff --git a/API_CHANGES b/API_CHANGES
@@ -1,3 +1,5 @@
+    Moved mlab.csv2rec -> recutils.csv2rec
+
     Added ax kwarg to pyplot.colorbar and Figure.colorbar so that
     one can specify the axes object from which space for the colorbar
     is to be taken, if one does not want to make the colorbar axes
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2007-11-08 Moved csv2rec to recutils and added other record array
+           utilities - JDH
+
 2007-11-08 If available, use existing pyparsing installation - DSD 
 
 2007-11-07 Removed old enthought.traits from lib/matplotlib, added 
diff --git a/examples/date_index_formatter.py b/examples/date_index_formatter.py
@@ -9,7 +9,7 @@
 """
 
 import numpy
-from matplotlib.mlab import csv2rec
+from matplotlib.recutils import csv2rec
 from pylab import figure, show
 from matplotlib.ticker import Formatter
 
diff --git a/examples/loadrec.py b/examples/loadrec.py
@@ -1,4 +1,4 @@
-from matplotlib.mlab import csv2rec
+from matplotlib.recutils import csv2rec
 from pylab import figure, show
 
 a = csv2rec('data/msft.csv')
diff --git a/examples/mathtext_examples.py b/examples/mathtext_examples.py
@@ -49,7 +49,7 @@
     r'$\widehat{abc}\widetilde{def}$',
     r'$\Gamma \Delta \Theta \Lambda \Xi \Pi \Sigma \Upsilon \Phi \Psi \Omega$',
     r'$\alpha \beta \gamma \delta \epsilon \zeta \eta \theta \iota \lambda \mu \nu \xi \pi \kappa \rho \sigma \tau \upsilon \phi \chi \psi$',
-    ur'Generic symbol: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
+    #ur'Generic symbol: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
     ]
 
 from pylab import *
@@ -63,12 +63,13 @@ def doall():
     axis([0, 3, -len(tests), 0])
     yticks(arange(len(tests)) * -1)
     for i, s in enumerate(tests):
-        print "%02d: %s" % (i, s)
+        print (i, s)
         text(0.1, -i, s, fontsize=20)
 
-    savefig('mathtext_example')
-    close('all')
-
+    #savefig('mathtext_example')
+    #close('all')
+    show()
+    
 if '--latex' in sys.argv:
     fd = open("mathtext_examples.ltx", "w")
     fd.write("\\documentclass{article}\n")
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -4068,6 +4068,8 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
 
            Optional kwargs control the PatchCollection properties:
         %(PatchCollection)s
+
+        A Collection instance is returned
         """
 
         if not self._hold: self.cla()
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -853,6 +853,7 @@ def safezip(*args):
             raise ValueError(_safezip_msg % (Nx, i+1, len(arg)))
     return zip(*args)
 
+
 class MemoryMonitor:
     def __init__(self, nmax=20000):
         self._nmax = nmax
@@ -895,12 +896,14 @@ def xy(self, i0=0, isub=1):
         x = npy.arange(i0, self._n, isub)
         return x, self._mem[i0:self._n:isub]
 
-    def plot(self, i0=0, isub=1):
-        from pylab import figure, show
-        fig = figure()
+    def plot(self, i0=0, isub=1, fig=None):
+        if fig is None:            
+            from pylab import figure, show
+            fig = figure()
+
         ax = fig.add_subplot(111)
         ax.plot(*self.xy(i0, isub))
-        show()
+        fig.canvas.draw()
 
 
 def print_cycles(objects, outstream=sys.stdout, show_progress=False):
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+ Moved mlab.csv2rec -> recutils.csv2rec`
	`2`	`+`
`1`	`3`	`Added ax kwarg to pyplot.colorbar and Figure.colorbar so that`
`2`	`4`	`one can specify the axes object from which space for the colorbar`
`3`	`5`	`is to be taken, if one does not want to make the colorbar axes`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from matplotlib.mlab import csv2rec`
	`1`	`+from matplotlib.recutils import csv2rec`
`2`	`2`	`from pylab import figure, show`
`3`	`3`
`4`	`4`	`a = csv2rec('data/msft.csv')`