rgbface

jdh2358 · jdh2358 · commit ade0b60363c0 · 2004-02-15T19:32:30.000Z
svn path=/trunk/matplotlib/; revision=146
diff --git a/API_CHANGES b/API_CHANGES
@@ -16,7 +16,12 @@ API changes at 0.50
 
   * GDFONTPATH renamed to TTFPATH
 
-  * backend faceColor argument changed to gcFace
+  * backend faceColor argument changed to rgbFace
+
+  * colormap stuff moved to colors.py
+
+  * arg_to_rgb in backend_bases moved to class ColorConverter in
+    colors.py
 
   * GD users must upgrade to gd-2.0.22 and gdmodule-0.52 since new gd
     features (clipping, antialiased lines) are now used.
diff --git a/MANIFEST b/MANIFEST
@@ -6,7 +6,6 @@ INTERACTIVE
 KNOWN_BUGS
 LICENSE
 LICENSE_PAINT
-MANIFEST
 MANIFEST.in
 Makefile
 README
@@ -244,32 +243,6 @@ agg2/svg/agg_svg_path_tokenizer.h
 agg2/svg/svg_test.cpp
 examples/README
 examples/__init__.py
-examples/_tmp.py
-examples/_tmp_alignment_test.py
-examples/_tmp_arctest.py
-examples/_tmp_axes_demo.py
-examples/_tmp_bar_stacked.py
-examples/_tmp_barchart_demo.py
-examples/_tmp_color_demo.py
-examples/_tmp_csd_demo.py
-examples/_tmp_figtext.py
-examples/_tmp_histogram_demo.py
-examples/_tmp_legend_demo.py
-examples/_tmp_legend_demo2.py
-examples/_tmp_line_styles.py
-examples/_tmp_log_demo.py
-examples/_tmp_log_test.py
-examples/_tmp_mri_with_eeg.py
-examples/_tmp_multiple_figs_demo.py
-examples/_tmp_pcolor_demo.py
-examples/_tmp_psd_demo.py
-examples/_tmp_scatter_demo.py
-examples/_tmp_scatter_demo2.py
-examples/_tmp_simple_plot.py
-examples/_tmp_stock_demo.py
-examples/_tmp_table_demo.py
-examples/_tmp_text_handles.py
-examples/_tmp_text_themes.py
 examples/alignment_test.py
 examples/anim.py
 examples/arctest.py
@@ -278,7 +251,6 @@ examples/axes_props.py
 examples/backend_driver.py
 examples/bar_stacked.py
 examples/barchart_demo.py
-examples/batch_figs.py
 examples/break.py
 examples/color_demo.py
 examples/colours.py
@@ -349,7 +321,7 @@ matplotlib/axes.py
 matplotlib/axis.py
 matplotlib/backend_bases.py
 matplotlib/cbook.py
-matplotlib/colormap.py
+matplotlib/colors.py
 matplotlib/figure.py
 matplotlib/legend.py
 matplotlib/lines.py
@@ -363,6 +335,7 @@ matplotlib/backends/__init__.py
 matplotlib/backends/backend_agg.py
 matplotlib/backends/backend_gd.py
 matplotlib/backends/backend_gtk.py
+matplotlib/backends/backend_gtkagg.py
 matplotlib/backends/backend_gtkgd.py
 matplotlib/backends/backend_paint.py
 matplotlib/backends/backend_ps.py
@@ -371,6 +344,8 @@ matplotlib/backends/backend_wx.py
 matplotlib/backends/ttf_font_manager.py
 src/_backend_agg.cpp
 src/_backend_agg.h
+src/_gtkagg.cpp
+src/_gtkgd.c
 src/font.cpp
 test/README
 test/agg_font_test.py
@@ -414,13 +389,17 @@ test/vline_demo.py
 ttfquery/__init__.py
 ttfquery/__init__.pyc
 ttfquery/_scriptregistry.py
+ttfquery/_scriptregistry.pyc
 ttfquery/describe.py
+ttfquery/describe.pyc
 ttfquery/family_query.py
 ttfquery/findsystem.py
+ttfquery/findsystem.pyc
 ttfquery/font_family_groups.py
 ttfquery/glyph.py
 ttfquery/glyphquery.py
 ttfquery/guessdescription.py
 ttfquery/license.txt
 ttfquery/metadata_query.py
 ttfquery/ttffiles.py
+ttfquery/ttffiles.pyc
diff --git a/TODO b/TODO
@@ -199,13 +199,19 @@
 
 -- gd edge clipping is whacked - see arc test
 
--- font manager for paint and agg
+-- DONE 2004-02-15 font manager for paint and agg
 
 -- website docs for agg - eg, backends.html#Agg
 
 -- build win installer for paint, agg, matplotlib-0.50 with agg
 
 -- incorporate John Gill's PS patch
 
--- DONE 2004 -02-13 agg bug; when repeated calls to savefig are made,
+-- DONE 2004-02-13 agg bug; when repeated calls to savefig are made,
    the dpi setting in the second one is ignored.
+
+-- DONE alignment test: facecolor blue
+
+-- axes_demo - strange line artiface in paint
+
+-- figtext missing on ps backend
diff --git a/examples/backend_driver.py b/examples/backend_driver.py
@@ -0,0 +1,80 @@
+"""
+This is use to drive many of the examples across the image backends
+and is used for regression testing and comparing backend efficiency
+
+This example creates a lot of temp files name _tmp_*.py.  You'll
+probably want to remove them after the script runs
+
+"""
+
+from __future__ import division
+import os, time
+files = (
+    'alignment_test.py',
+    'arctest.py',
+    'axes_demo.py',
+    'bar_stacked.py',
+    'barchart_demo.py',
+    'color_demo.py',
+    'csd_demo.py',
+    'figtext.py',
+    'histogram_demo.py',
+    'legend_demo.py',
+    'legend_demo2.py',
+    'line_styles.py',
+    'log_demo.py',
+    'log_test.py',
+    'mri_with_eeg.py',
+    'multiple_figs_demo.py',
+    'pcolor_demo.py',
+    'psd_demo.py',
+    'scatter_demo.py',
+    'scatter_demo2.py',
+    'simple_plot.py',
+    'stock_demo.py',
+    'subplot_demo.py',
+    'table_demo.py',
+    'text_handles.py',
+    'text_themes.py',
+    )
+
+def drive(backend):
+
+    for fname in files:
+        lines = [
+            'from __future__ import division\n',
+            'import matplotlib\n',
+            'matplotlib.use("%s")\n' % backend]
+        print '\tdriving %s' % fname
+        for line in file(fname):
+            if line.strip().startswith('from __future__ import division'): continue
+            if line.strip().startswith('matplotlib.use'): continue
+            if line.strip().startswith('savefig'): continue
+            if line.strip().startswith('show'): continue
+            lines.append(line)
+        basename, ext = os.path.splitext(fname)
+        outfile = basename + '_%s'%backend
+        if backend in ('GTK', 'Wx'):
+            lines.append('show()')
+        else:
+            lines.append('savefig("%s", dpi=150)' % outfile)
+        tmpfile = '_tmp_%s.py' % basename
+        file(tmpfile, 'w').write(''.join(lines))
+        os.system('python %s' % tmpfile)
+
+times = {}
+backends = ('PS', 'GD', 'Paint', 'Agg', 'Template')
+#backends = ('Paint',)
+for backend in backends:
+    print 'testing %s' % backend
+    t0 = time.time()
+    drive(backend)
+    t1 = time.time()
+    times[backend] = (t1-t0)/60.0
+
+#print times
+for backend, elapsed in times.items():
+    print 'Backend %s took %1.2f minutes to complete' % ( backend, elapsed)
+    print '\ttemplate ratio %1.3f, template residual %1.3f' % (
+        elapsed/times['Template'], elapsed-times['Template'])
+    
diff --git a/examples/colours.py b/examples/colours.py
@@ -3,11 +3,11 @@
 """
 from Numeric import asarray
 from matplotlib.mlab import linspace
-from matplotlib.backend_bases import arg_to_rgb
+from matplotlib.colors import colorConverter
 
 def pastel(colour, weight=2.4):
     """ Convert colour into a nice pastel shade"""
-    rgb = asarray(arg_to_rgb(colour))
+    rgb = asarray(colorConverter.to_rgb(colour))
     # scale colour 
     maxc = max(rgb)
     if maxc < 1.0 and maxc > 0:
diff --git a/examples/text_handles.py b/examples/text_handles.py
@@ -28,12 +28,12 @@ def f(t):
 set(ttext, 'fontangle', 'italic')
 
 set(xtext, 'fontsize', 12)
-set(xtext, 'fontname', 'Courier')
-set(xtext, 'fontweight', 'ultrabold')
+set(xtext, 'fontname', 'courier')
+set(xtext, 'fontweight', 'bold')
 set(xtext, 'color', 'g')
 
 set(ytext, 'fontsize', 12)
-set(ytext, 'fontname', 'Helvetica')
+set(ytext, 'fontname', 'helvetica')
 set(ytext, 'fontweight', 'light')
 set(ytext, 'color', 'b')
 
@@ -42,5 +42,5 @@ def f(t):
 #yticklabels = get(gca(), 'yticklabels')
 #set(xticklabels, 'fontweight', 'bold')
 #set(yticklabels, 'fontangle', 'italic')
-
+savefig('text_handles')
 show()
diff --git a/examples/text_themes.py b/examples/text_themes.py
@@ -16,7 +16,7 @@ def f(t):
 plot(t1, f(t1), 'bo', t2, f(t2), 'k')
 title('Damped exponential decay', font, fontsize=14, color='r')
 text(2, 0.65, 'cos(2 pi t) exp(-t)', font, color='k')
-xlabel('time (s)', font)
+xlabel('time (s)', font, fontangle='italic')
 ylabel('voltage (mV)', font)
 
 savefig('text_themes')
diff --git a/setup.py b/setup.py
@@ -13,12 +13,13 @@
 from distutils.core import setup
 import sys,os
 import glob
-from setupext import build_gtkgd, build_agg, build_fonttools
+from setupext import build_gtkgd, build_agg, build_fonttools, build_gtkagg
 
 # set these flags to build the optional extension modules
-BUILD_FONTTOOLS = 0   # includes TTFQuey
-BUILD_GTKGD     = 0   # requires pygtk and GD src distros installed
-BUILD_AGG       = 1
+BUILD_FONTTOOLS    = 0   # includes TTFQuey
+BUILD_GTKGD        = 0   # requires pygtk and GD src distros installed
+BUILD_AGG          = 0
+BUILD_GTKAGG       = 0
 
 data = []
 data.extend(glob.glob('fonts/afm/*.afm'))
@@ -43,9 +44,14 @@
     build_fonttools(ext_modules, packages)
     build_agg(ext_modules, packages)
 
+if BUILD_GTKAGG:
+    build_fonttools(ext_modules, packages)
+    build_agg(ext_modules, packages)
+    build_gtkagg(ext_modules, packages)
+
 
 setup(name="matplotlib",
-      version= '0.50p',
+      version= '0.50q',
       description = "Matlab style python plotting package",
       author = "John D. Hunter",
       author_email="jdhunter@ace.bsd.uchicago.edu",
diff --git a/setupext.py b/setupext.py
