reorganized table

jdh2358 · jdh2358 · commit 6cc5c32cc76b · 2004-02-11T19:16:03.000Z
svn path=/trunk/matplotlib/; revision=139
diff --git a/KNOWN_BUGS b/KNOWN_BUGS
@@ -24,7 +24,7 @@ KNOWN BUGS
 
   - DONE parse error on lines like plot(bins, mu, bins, mu+sigma, '--')
 
-  - mri with eeg offsets whacked
+  - DONE 2004-02-11 mri with eeg offsets whacked
 
 GD 
 
diff --git a/Makefile b/Makefile
@@ -2,6 +2,9 @@
 # Copyright (C) 2003  <jdhunter@ace.bsd.uchicago.edu>
 # $Header$
 # $Log$
+# Revision 1.19  2004/02/11 19:16:01  jdh2358
+# reorganized table
+#
 # Revision 1.18  2004/02/11 00:07:44  jdh2358
 # relocated gtkgd ext mod
 #
@@ -75,6 +78,7 @@ MODULES =					\
 	matplotlib.backends.backend_gd		\
 	matplotlib.backends.backend_gtk		\
 	matplotlib.backends.backend_gtkgd	\
+	matplotlib.backends.backend_paint       \
 	matplotlib.backends.backend_ps		\
 	matplotlib.backends.backend_template	\
         matplotlib.backends.backend_wx          \
@@ -98,17 +102,21 @@ clean:
 	find examples \( -name "*.png" -o -name "*.ps"  -o -name "*.jpg" -o -name "*.eps" \) | xargs rm -f
 
 htmldocs: 
+	cp build/lib.linux-i686-2.3/matplotlib/backends/*.so matplotlib/backends/;\
 	rm -rf htdocs/matplotlib;\
 	cp -a matplotlib htdocs/;\
+	rm htdocs/matplotlib/backends/*.so;\
 	cp examples/*.py htdocs/examples;\
-	cp API_CHANGES htdocs/
+	cp API_CHANGES htdocs/;\
 	rm -f docs/*.html;\
 	${PYDOC} -w ${MODULES};\
 	mv *.html docs/
 	cd htdocs;\
 	${PYTHON} process_docs.py;\
 	${PYTHON} convert.py;\
-	tar cfz site.tar.gz *.html screenshots tut examples gd API_CHANGES 
+	tar cfz site.tar.gz *.html screenshots tut examples gd API_CHANGES;\
+	cd ..;\
+	rm matplotlib/backends/*.so;\
 
 release: ${DISTFILES}
 	${PYTHON} license.py ${VERSION};\
diff --git a/TODO b/TODO
@@ -170,7 +170,7 @@
 
 -- DONE 2004-02-06 allow pass of file handle to backend_gd
 
--- check clipping for GD
+-- DONE check clipping for GD
 
 -- Fix GD color allocation bug
 
@@ -181,12 +181,8 @@
 -- Separate out the backend web pages and get developers to maintain
    them.
 
--- FAQ 
+-- DONE FAQ 
 
-    * numarray
-    * pygtk path
-    * what's up with show
-
--- explaing the new interactive syntax on
+-- DONE 2004-02-11 explaing the new interactive syntax on
    http://matplotlib.sourceforge.net/interactive.html
 
diff --git a/examples/axes_demo.py b/examples/axes_demo.py
@@ -37,5 +37,5 @@
     set(a, 'xticks', [])
     set(a, 'yticks', [])
 
-savefig('axes_demo', dpi=150)
+savefig('axes_demo', dpi=600)
 show()
diff --git a/examples/histogram_demo.py b/examples/histogram_demo.py
@@ -5,11 +5,11 @@
 
 # the histogram of the data
 n, bins, patches = hist(x, 50, normed=1)
+
 # add a 'best fit' line
 y = normpdf( bins, mu, sigma)
 l = plot(bins, y, 'r--')
-set(l, 'linewidth', 2)
-#set(gca(), 'xlim', [40, 160])
+set(l, 'linewidth', 1)
 
 xlabel('Smarts')
 ylabel('Probability')
diff --git a/examples/mri_with_eeg.py b/examples/mri_with_eeg.py
@@ -1,11 +1,14 @@
 # note, this is currentl *very slow*.  I'm working on improving the
 # efficiency of pcolor.  If you want to run this example and your
 # computer is not very fast, I suggest you grab a cup of coffee while
-# it runs
+# it runs.  Look for major improvments in pcolor in future releases of
+# matplotlib when we add image handling capability in extension module
+# code
 
+from __future__ import division
 from matplotlib.matlab import *
 from matplotlib.lines import Line2D
-
+from matplotlib.transforms import Transform, Bound1D
 # I use if 1 to break up the different regions of code visually
 
 if 1:   # load the data
@@ -40,17 +43,28 @@
     t = arange(numSamples)/float(numSamples)*10.0
     ticklocs = []
     ax = subplot(212)
+
+    height = 72  # height of one EEG in pixels
+    # transform data to axes coord (0,1)
+    transy = Transform(Bound1D(-.05,.05), Bound1D(-.2,.2))
     for i in range(numRows):
-        thisLine = Line2D(ax.dpi, ax.bbox, t, data[:,i]-data[0,i],
-                          transx=ax.xaxis.transData, transy=ax.yaxis.transData)
-        thisLine.set_vertical_offset(3*i)
+        thisLine = Line2D(
+            ax.dpi, ax.bbox, t, data[:,i]-data[0,i],
+            transx=ax.xaxis.transData,
+            transy=transy)
+        offset = (i+1)/(numRows+1)
+        thisLine.set_vertical_offset(offset, ax.yaxis.transAxis)
+
         ax.add_line(thisLine)
-        ticklocs.append(3*i)
+        ticklocs.append(offset)
 
+    set(gca(), 'xlim', [0,10])
     set(gca(), 'xticks', arange(10))
-    set(gca(), 'yticks', ticklocs)
-    set(gca(), 'yticklabels', ['PG3', 'PG5', 'PG7', 'PG9'])
-    #set(gca(), 'ylim', [0, 20])
+    yticks = set(gca(), 'yticks', ticklocs)
+    set(gca(), 'yticklabels', ['PG3', 'PG5', 'PG7', 'PG9']) 
+
+    # set the yticks to use axes coords on the y axis
+    set(yticks, 'transform', ax.yaxis.transAxis)
     xlabel('time (s)')
 
 
diff --git a/examples/subplot_demo.py b/examples/subplot_demo.py
@@ -10,7 +10,8 @@ def f(t):
 t3 = arange(0.0, 2.0, 0.01)
 
 subplot(211)
-plot(t1, f(t1), 'bo', t2, f(t2), 'k')
+l = plot(t1, f(t1), 'bo', t2, f(t2), 'k')
+set(l, 'markerfacecolor', 'g')
 grid(True)
 title('A tale of 2 subplots')
 ylabel('Damped oscillation')
@@ -21,6 +22,6 @@ def f(t):
 xlabel('time (s)')
 ylabel('Undamped')
 
-savefig('subplot_demo')
+savefig('subplot_demo', dpi=600)
 show()
 
diff --git a/examples/system_monitor.py b/examples/system_monitor.py
@@ -6,15 +6,15 @@
 
 def get_memory():
     "Simulate a function that returns system memory"
-    return 100*(1+sin(0.5*pi*time.time()))
+    return 100*(0.5+0.5*sin(0.5*pi*time.time()))
 
 def get_cpu():
     "Simulate a function that returns cpu usage"
-    return 100*(1+sin(0.2*pi*(time.time()-0.25)))
+    return 100*(0.5+0.5*sin(0.2*pi*(time.time()-0.25)))
 
 def get_net():
     "Simulate a function that returns network bandwidth"
-    return 100*(1+sin(0.7*pi*(time.time()-0.1)))
+    return 100*(0.5+0.5*sin(0.7*pi*(time.time()-0.1)))
 
 def get_stats():
     return get_memory(), get_cpu(), get_net()
@@ -37,6 +37,7 @@ def get_stats():
 manager = get_current_fig_manager()
 def updatefig(*args):
     m,c,n = get_stats()
+
     pm.set_height(m)
     pc.set_height(c)
     pn.set_height(n)
diff --git a/setup.py b/setup.py
@@ -12,10 +12,10 @@
 
 ext_modules = []
 
-if 0: # how do I add '--with-gtkgd' flag checking?
+if 1: # how do I add '--with-gtkgd' flag checking?
     build_gtkgd(ext_modules)
 
-if 0: 
+if 1: 
     build_agg(ext_modules)
 
 setup(name="matplotlib",
diff --git a/setupext.py b/setupext.py
@@ -54,7 +54,7 @@ def add_agg_flags(module):
     include_dirs = ['/usr/X11R6/include', '/home/jdhunter/c/src/agg2/include',
                     '/usr/include/freetype1', 'src']
     library_dirs = ['/usr/X11R6/lib', '/home/jdhunter/c/src/agg2/src']
-    libraries = ['agg', 'X11', 'm', 'freetype']
+    libraries = ['agg', 'X11', 'm', 'freetype', 'png']
     extra_link_args = []
     module.include_dirs.extend(include_dirs)
     module.libraries.extend(libraries)
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
