added agg backend, changed facecolor to gcface

jdh2358 · jdh2358 · commit a1e3dba532b7 · 2004-02-10T21:36:01.000Z
svn path=/trunk/matplotlib/; revision=135
diff --git a/MANIFEST b/MANIFEST
@@ -28,6 +28,7 @@ examples/break.py
 examples/color_demo.py
 examples/csd_demo.py
 examples/data_helper.py
+examples/data_table_demo.py
 examples/dynamic_demo.py
 examples/dynamic_demo_wx.py
 examples/embedding_in_gtk.py
@@ -61,6 +62,7 @@ examples/simple_plot.py
 examples/stock_demo.py
 examples/subplot_demo.py
 examples/system_monitor.py
+examples/table_demo.py
 examples/text_handles.py
 examples/text_themes.py
 examples/vline_demo.py
@@ -164,6 +166,7 @@ matplotlib/backends/backend_ps.py
 matplotlib/backends/backend_template.py
 matplotlib/backends/backend_wx.py
 matplotlib/backends/ttf_font_manager.py
+src/_backend_agg.cpp
 test/README
 test/alignment_test.py
 test/bar_test.py
@@ -183,15 +186,19 @@ test/manset.py
 test/matplotlibc_test.py
 test/memleak.py
 test/memleak2.py
+test/memleak3.py
 test/mesh_test.py
 test/plot_bug.py
+test/plotraw.py
 test/print_only.py
 test/rounding.py
 test/semilog_test.py
 test/specgram_demo.py
 test/table_demo.py
+test/table_demo3.py
 test/table_test.py
 test/table_test2.py
 test/test.py
+test/test_backend_agg.py
 test/transtest.py
 test/vline_demo.py
diff --git a/examples/scatter_demo2.py b/examples/scatter_demo2.py
@@ -8,13 +8,15 @@
 
 volume = 0.003*intc.volume[:-2]/intc.volume[0]
 close = 0.003*intc.close[:-2]/0.003*intc.open[:-2]
-scatter(delta1[:-1], delta1[1:], c=close, s=volume)
+p = scatter(delta1[:-1], delta1[1:], c=close, s=volume)
+set(p, 'alpha', 0.5)
 set(gca(), 'xticks', arange(-0.06, 0.061, 0.02))
 set(gca(), 'yticks', arange(-0.06, 0.061, 0.02))
 xlabel('Delta day i')
 ylabel('Delta day i+1')
 title('Delta price as a function of volume and percent change')
 grid(True)
+savefig('scatter_demo2')
 show()
 
 
diff --git a/examples/subplot_demo.py b/examples/subplot_demo.py
@@ -21,6 +21,6 @@ def f(t):
 xlabel('time (s)')
 ylabel('Undamped')
 
-#savefig('subplot_demo', dpi=600)
+savefig('subplot_demo')
 show()
 
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 import sys,os
 
 import glob
-from setupext import build_gtkgd
+from setupext import build_gtkgd, build_agg
 
 
 data = []
@@ -15,6 +15,8 @@
 if 0: # how do I add '--with-gtkgd' flag checking?
     build_gtkgd(ext_modules)
 
+if 1: 
+    build_agg(ext_modules)
 
 setup(name="matplotlib",
       version= '0.50i',
diff --git a/setupext.py b/setupext.py
@@ -4,6 +4,7 @@
 """
 import sys, os
 from distutils.core import Extension
+
 def getoutput(s):
     'get the output of a system command'
     return os.popen(s).read().strip()
@@ -42,11 +43,27 @@ def add_gd_flags(module):
 def build_gtkgd(ext_modules):
     module = Extension('matplotlib._gtkgd',
                        ['src/_gtkgd.c'],
-                       library_dirs = [],
-                       libraries = [],
-                       include_dirs = [],
-                       extra_link_args = [],
                        )
     add_pygtk_flags(module)
     add_gd_flags(module)
     ext_modules.append(module)    
+
+
+def add_agg_flags(module):
+    'Add the module flags to build extensions which use gtk'
+    include_dirs = ['/usr/X11R6/include', '/home/jdhunter/c/src/agg2/include']
+    library_dirs = ['/usr/X11R6/lib', '/home/jdhunter/c/src/agg2/src']
+    libraries = ['agg', 'X11', 'm']
+    extra_link_args = []
+    module.include_dirs.extend(include_dirs)
+    module.libraries.extend(libraries)
+    module.library_dirs.extend(library_dirs)
+    module.extra_link_args.extend(extra_link_args)
+
+def build_agg(ext_modules):
+    module = Extension('matplotlib.backends._backend_agg',
+                       ['src/_backend_agg.cpp'],
+                       )
+    add_agg_flags(module)
+    ext_modules.append(module)    
+
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
