Browse files

fexed wx to work on windows and linux

svn path=/trunk/matplotlib/; revision=148
  • Loading branch information...
1 parent 973651b commit 125a5ff00a14258dffb51ca6669e42e30ffb346d @jdh2358 jdh2358 committed Feb 16, 2004
Showing with 386 additions and 41 deletions.
  1. +10 −0 API_CHANGES
  2. +4 −2 DEVNOTES
  3. +10 −10 LICENSE
  4. +313 −0 MANIFEST
  5. +2 −1 MANIFEST.in
  6. +4 −0 Makefile
  7. +3 −2 TODO
  8. +4 −3 examples/backend_driver.py
  9. +2 −2 examples/object_picker.py
  10. +1 −1 examples/simple_plot.py
  11. +1 −1 examples/subplot_demo.py
  12. +25 −14 setup.py
  13. +7 −5 setupext.py
View
10 API_CHANGES
@@ -65,6 +65,16 @@ Migrating code:
FigureCanvas, not a Figure. The examples embedding_in_gtk.py,
embedding_in_gtk2.py, and mpl_with_glade.py all reflect the new
API so use these as a guide.
+
+ All prior calls to
+
+ figure.draw() and
+ figure.print_figure(args)
+
+ should now be
+
+ canvas.draw() and
+ canvas.print_figure(args)
Apologies for the inconvenience. This refactorization brings
significant more freedom in developing matplotlib and should bring
View
6 DEVNOTES
@@ -24,8 +24,10 @@ http://matplotlib.sourceforge.net
sf> tar xvfz site.tar.gz
-### Doing a release
-0) Run examples/batch_figs.py w/o errors
+### Doing a release
+
+0) Run examples/batch_figs.py w/o errors; run the backend specific
+ demos (object_picker, anim , embedding*)
0) Remove MANIFEST so it will be rebuilt by MANIFEST.in
View
20 LICENSE
@@ -1,4 +1,4 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 0.50e
+LICENSE AGREEMENT FOR MATPLOTLIB 0.50
--------------------------------------
1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and
@@ -9,30 +9,30 @@ documentation.
2. Subject to the terms and conditions of this License Agreement, JDH
hereby grants Licensee a nonexclusive, royalty-free, world-wide
license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use matplotlib 0.50e
+prepare derivative works, distribute, and otherwise use matplotlib 0.50
alone or in any derivative version, provided, however, that JDH's
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
2002, 2003 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 0.50e alone or in any derivative version prepared by
+matplotlib 0.50 alone or in any derivative version prepared by
Licensee.
3. In the event Licensee prepares a derivative work that is based on
-or incorporates matplotlib 0.50e or any part thereof, and wants to make
+or incorporates matplotlib 0.50 or any part thereof, and wants to make
the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib 0.50e.
+the changes made to matplotlib 0.50.
-4. JDH is making matplotlib 0.50e available to Licensee on an "AS IS"
+4. JDH is making matplotlib 0.50 available to Licensee on an "AS IS"
basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.50e WILL NOT
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.50 WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
-MATPLOTLIB 0.50e FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
+MATPLOTLIB 0.50 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 0.50e, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
+MATPLOTLIB 0.50, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
POSSIBILITY THEREOF.
6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee. This License Agreement does not grant permission to use JDH
trademarks or trade name in a trademark sense to endorse or promote
products or services of Licensee, or any third party.
-8. By copying, installing or otherwise using matplotlib 0.50e, Licensee
+8. By copying, installing or otherwise using matplotlib 0.50, Licensee
agrees to be bound by the terms and conditions of this License
Agreement.
View
313 MANIFEST
@@ -403,3 +403,316 @@ ttfquery/license.txt
ttfquery/metadata_query.py
ttfquery/ttffiles.py
ttfquery/ttffiles.pyc
+win32src/freetype1/freetype/.cvsignore
+win32src/freetype1/freetype/freetype.h
+win32src/freetype1/freetype/ft_conf.h
+win32src/freetype1/freetype/fterrid.h
+win32src/freetype1/freetype/ftnameid.h
+win32src/freetype1/freetype/header.h
+win32src/freetype1/freetype/ttapi.c
+win32src/freetype1/freetype/ttcache.c
+win32src/freetype1/freetype/ttcache.h
+win32src/freetype1/freetype/ttcalc.c
+win32src/freetype1/freetype/ttcalc.h
+win32src/freetype1/freetype/ttcmap.c
+win32src/freetype1/freetype/ttcmap.h
+win32src/freetype1/freetype/ttconfig.h
+win32src/freetype1/freetype/ttdebug.c
+win32src/freetype1/freetype/ttdebug.h
+win32src/freetype1/freetype/ttengine.h
+win32src/freetype1/freetype/ttextend.c
+win32src/freetype1/freetype/ttextend.h
+win32src/freetype1/freetype/ttf.def
+win32src/freetype1/freetype/ttfile.c
+win32src/freetype1/freetype/ttfile.h
+win32src/freetype1/freetype/ttgload.c
+win32src/freetype1/freetype/ttgload.h
+win32src/freetype1/freetype/ttinterp.c
+win32src/freetype1/freetype/ttinterp.h
+win32src/freetype1/freetype/ttload.c
+win32src/freetype1/freetype/ttload.h
+win32src/freetype1/freetype/ttmemory.c
+win32src/freetype1/freetype/ttmemory.h
+win32src/freetype1/freetype/ttmutex.c
+win32src/freetype1/freetype/ttmutex.h
+win32src/freetype1/freetype/ttobjs.c
+win32src/freetype1/freetype/ttobjs.h
+win32src/freetype1/freetype/ttraster.c
+win32src/freetype1/freetype/ttraster.h
+win32src/freetype1/freetype/tttables.h
+win32src/freetype1/freetype/tttags.h
+win32src/freetype1/freetype/tttypes.h
+win32src/freetype1/freetype/arch/amigaos/Makefile.gcc
+win32src/freetype1/freetype/arch/amigaos/freetype.c
+win32src/freetype1/freetype/arch/amigaos/ft_conf.h
+win32src/freetype1/freetype/arch/ansi/freetype.c
+win32src/freetype1/freetype/arch/ansi/ft_conf.h
+win32src/freetype1/freetype/arch/beos/Makefile
+win32src/freetype1/freetype/arch/beos/freetype.c
+win32src/freetype1/freetype/arch/beos/ft_conf.h
+win32src/freetype1/freetype/arch/beos/ttmutex.c
+win32src/freetype1/freetype/arch/debugger/Makefile
+win32src/freetype1/freetype/arch/debugger/freetype.c
+win32src/freetype1/freetype/arch/debugger/ft_conf.h
+win32src/freetype1/freetype/arch/mac/README
+win32src/freetype1/freetype/arch/mac/freetype.c
+win32src/freetype1/freetype/arch/mac/ft_conf.h
+win32src/freetype1/freetype/arch/mac/ttmmap.c
+win32src/freetype1/freetype/arch/msdos/Makefile.BC
+win32src/freetype1/freetype/arch/msdos/Makefile.MS
+win32src/freetype1/freetype/arch/msdos/Makefile.TC
+win32src/freetype1/freetype/arch/msdos/Makefile.VC
+win32src/freetype1/freetype/arch/msdos/Makefile.dm
+win32src/freetype1/freetype/arch/msdos/Makefile.gcc
+win32src/freetype1/freetype/arch/msdos/Makefile.wat
+win32src/freetype1/freetype/arch/msdos/depend.dos
+win32src/freetype1/freetype/arch/msdos/freetype.c
+win32src/freetype1/freetype/arch/msdos/ft_conf.h
+win32src/freetype1/freetype/arch/msdos/hugefile.c
+win32src/freetype1/freetype/arch/msdos/hugemem.c
+win32src/freetype1/freetype/arch/msdos/makedep
+win32src/freetype1/freetype/arch/os2/Makefile.dm
+win32src/freetype1/freetype/arch/os2/Makefile.emx
+win32src/freetype1/freetype/arch/os2/Makefile.icc
+win32src/freetype1/freetype/arch/os2/Makefile.wat
+win32src/freetype1/freetype/arch/os2/freetype.c
+win32src/freetype1/freetype/arch/os2/ft_conf.h
+win32src/freetype1/freetype/arch/os2/os2file.c
+win32src/freetype1/freetype/arch/unix/.cvsignore
+win32src/freetype1/freetype/arch/unix/Makefile.in
+win32src/freetype1/freetype/arch/unix/freetype.c
+win32src/freetype1/freetype/arch/unix/ttmmap.c
+win32src/freetype1/freetype/arch/vms/README
+win32src/freetype1/freetype/arch/vms/descrip.mms
+win32src/freetype1/freetype/arch/vms/ft_conf.h
+win32src/freetype1/freetype/arch/win16/Makefile.BC
+win32src/freetype1/freetype/arch/win16/Makefile.MS
+win32src/freetype1/freetype/arch/win16/Makefile.VC
+win32src/freetype1/freetype/arch/win16/depend.win
+win32src/freetype1/freetype/arch/win16/freetype.c
+win32src/freetype1/freetype/arch/win16/ft_conf.h
+win32src/freetype1/freetype/arch/win16/hugefile.c
+win32src/freetype1/freetype/arch/win16/hugemem.c
+win32src/freetype1/freetype/arch/win16/makedef
+win32src/freetype1/freetype/arch/win16/makedep
+win32src/freetype1/freetype/arch/win16/ttf.def
+win32src/freetype1/freetype/arch/win32/Makefile.BC
+win32src/freetype1/freetype/arch/win32/Makefile.CL
+win32src/freetype1/freetype/arch/win32/Makefile.Min
+win32src/freetype1/freetype/arch/win32/Makefile.VC
+win32src/freetype1/freetype/arch/win32/Makefile.gcc
+win32src/freetype1/freetype/arch/win32/depend.win
+win32src/freetype1/freetype/arch/win32/freetype.c
+win32src/freetype1/freetype/arch/win32/freetype.dsp
+win32src/freetype1/freetype/arch/win32/freetype.dsw
+win32src/freetype1/freetype/arch/win32/freetype.ide
+win32src/freetype1/freetype/arch/win32/freetype.mak
+win32src/freetype1/freetype/arch/win32/freetype.mdp
+win32src/freetype1/freetype/arch/win32/ft_conf.h
+win32src/freetype1/freetype/arch/win32/makedef
+win32src/freetype1/freetype/arch/win32/makedep
+win32src/freetype1/freetype/arch/win32/ttf.def
+win32src/freetype1/freetype/extend/ftxcmap.c
+win32src/freetype1/freetype/extend/ftxcmap.h
+win32src/freetype1/freetype/extend/ftxerr18.c
+win32src/freetype1/freetype/extend/ftxerr18.h
+win32src/freetype1/freetype/extend/ftxgasp.c
+win32src/freetype1/freetype/extend/ftxgasp.h
+win32src/freetype1/freetype/extend/ftxgdef.c
+win32src/freetype1/freetype/extend/ftxgdef.h
+win32src/freetype1/freetype/extend/ftxgpos.c
+win32src/freetype1/freetype/extend/ftxgpos.h
+win32src/freetype1/freetype/extend/ftxgsub.c
+win32src/freetype1/freetype/extend/ftxgsub.h
+win32src/freetype1/freetype/extend/ftxkern.c
+win32src/freetype1/freetype/extend/ftxkern.h
+win32src/freetype1/freetype/extend/ftxopen.c
+win32src/freetype1/freetype/extend/ftxopen.h
+win32src/freetype1/freetype/extend/ftxopenf.h
+win32src/freetype1/freetype/extend/ftxpost.c
+win32src/freetype1/freetype/extend/ftxpost.h
+win32src/freetype1/freetype/extend/ftxsbit.c
+win32src/freetype1/freetype/extend/ftxsbit.h
+win32src/freetype1/freetype/extend/ftxwidth.c
+win32src/freetype1/freetype/extend/ftxwidth.h
+win32src/freetype1/freetype/extend/readme.1st
+win32src/libpng/LICENSE
+win32src/libpng/libpng.rc
+win32src/libpng/libpng12.rc
+win32src/libpng/libpngpf.3
+win32src/libpng/png.c
+win32src/libpng/png.h
+win32src/libpng/pngasmrd.h
+win32src/libpng/pngconf.h
+win32src/libpng/pngerror.c
+win32src/libpng/pnggccrd.c
+win32src/libpng/pngget.c
+win32src/libpng/pngmem.c
+win32src/libpng/pngpread.c
+win32src/libpng/pngread.c
+win32src/libpng/pngrio.c
+win32src/libpng/pngrtran.c
+win32src/libpng/pngrutil.c
+win32src/libpng/pngset.c
+win32src/libpng/pngtrans.c
+win32src/libpng/pngvcrd.c
+win32src/libpng/pngwio.c
+win32src/libpng/pngwrite.c
+win32src/libpng/pngwtran.c
+win32src/libpng/pngwutil.c
+win32src/zlib/README
+win32src/zlib/adler32.c
+win32src/zlib/compress.c
+win32src/zlib/crc32.c
+win32src/zlib/crc32.h
+win32src/zlib/deflate.c
+win32src/zlib/deflate.h
+win32src/zlib/gzio.c
+win32src/zlib/infback.c
+win32src/zlib/inffast.c
+win32src/zlib/inffast.h
+win32src/zlib/inffixed.h
+win32src/zlib/inflate.c
+win32src/zlib/inflate.h
+win32src/zlib/inftrees.c
+win32src/zlib/inftrees.h
+win32src/zlib/trees.c
+win32src/zlib/trees.h
+win32src/zlib/uncompr.c
+win32src/zlib/zconf.h
+win32src/zlib/zconf.in.h
+win32src/zlib/zlib.h
+win32src/zlib/zlib1.def
+win32src/zlib/zlib1.rc
+win32src/zlib/zutil.c
+win32src/zlib/zutil.h
+win32src/zlib/amiga/Makefile.pup
+win32src/zlib/amiga/Makefile.sas
+win32src/zlib/as400/bndsrc
+win32src/zlib/as400/compile.clp
+win32src/zlib/as400/readme.txt
+win32src/zlib/as400/zlib.inc
+win32src/zlib/contrib/README.contrib
+win32src/zlib/contrib/visual-basic.txt
+win32src/zlib/contrib/ada/mtest.adb
+win32src/zlib/contrib/ada/read.adb
+win32src/zlib/contrib/ada/readme.txt
+win32src/zlib/contrib/ada/test.adb
+win32src/zlib/contrib/ada/zlib-streams.adb
+win32src/zlib/contrib/ada/zlib-streams.ads
+win32src/zlib/contrib/ada/zlib-thin.adb
+win32src/zlib/contrib/ada/zlib-thin.ads
+win32src/zlib/contrib/ada/zlib.adb
+win32src/zlib/contrib/ada/zlib.ads
+win32src/zlib/contrib/ada/zlib.gpr
+win32src/zlib/contrib/asm586/README.586
+win32src/zlib/contrib/asm586/match.S
+win32src/zlib/contrib/asm686/README.686
+win32src/zlib/contrib/asm686/match.S
+win32src/zlib/contrib/blast/Kopie van Makefile
+win32src/zlib/contrib/blast/Makefile
+win32src/zlib/contrib/blast/README
+win32src/zlib/contrib/blast/blast.c
+win32src/zlib/contrib/blast/blast.h
+win32src/zlib/contrib/blast/test.pk
+win32src/zlib/contrib/blast/test.txt
+win32src/zlib/contrib/delphi/ZLib.pas
+win32src/zlib/contrib/delphi/ZLibConst.pas
+win32src/zlib/contrib/delphi/readme.txt
+win32src/zlib/contrib/delphi/zlibd32.mak
+win32src/zlib/contrib/gzappend/gzappend.c
+win32src/zlib/contrib/infback9/README
+win32src/zlib/contrib/infback9/infback9.c
+win32src/zlib/contrib/infback9/infback9.h
+win32src/zlib/contrib/infback9/inffix9.h
+win32src/zlib/contrib/infback9/inflate9.h
+win32src/zlib/contrib/infback9/inftree9.c
+win32src/zlib/contrib/infback9/inftree9.h
+win32src/zlib/contrib/inflate86/inffas86.c
+win32src/zlib/contrib/inflate86/inffast.S
+win32src/zlib/contrib/iostream/test.cpp
+win32src/zlib/contrib/iostream/zfstream.cpp
+win32src/zlib/contrib/iostream/zfstream.h
+win32src/zlib/contrib/iostream2/zstream.h
+win32src/zlib/contrib/iostream2/zstream_test.cpp
+win32src/zlib/contrib/iostream3/README
+win32src/zlib/contrib/iostream3/TODO
+win32src/zlib/contrib/iostream3/test.cc
+win32src/zlib/contrib/iostream3/zfstream.cc
+win32src/zlib/contrib/iostream3/zfstream.h
+win32src/zlib/contrib/masm686/match.asm
+win32src/zlib/contrib/masmx86/gvmat32.asm
+win32src/zlib/contrib/masmx86/gvmat32c.c
+win32src/zlib/contrib/masmx86/inffas32.asm
+win32src/zlib/contrib/masmx86/mkasm.bat
+win32src/zlib/contrib/masmx86/readme.txt
+win32src/zlib/contrib/minizip/ChangeLogUnzip
+win32src/zlib/contrib/minizip/Makefile
+win32src/zlib/contrib/minizip/Makefile.orig
+win32src/zlib/contrib/minizip/Makefile.rej
+win32src/zlib/contrib/minizip/crypt.h
+win32src/zlib/contrib/minizip/ioapi.c
+win32src/zlib/contrib/minizip/ioapi.h
+win32src/zlib/contrib/minizip/iowin32.c
+win32src/zlib/contrib/minizip/iowin32.h
+win32src/zlib/contrib/minizip/miniunz.c
+win32src/zlib/contrib/minizip/miniunz.c.orig
+win32src/zlib/contrib/minizip/miniunz.c.rej
+win32src/zlib/contrib/minizip/minizip.c
+win32src/zlib/contrib/minizip/minizip.c.orig
+win32src/zlib/contrib/minizip/readme.old
+win32src/zlib/contrib/minizip/readme.txt
+win32src/zlib/contrib/minizip/test.zip
+win32src/zlib/contrib/minizip/unzip.c
+win32src/zlib/contrib/minizip/unzip.h
+win32src/zlib/contrib/minizip/zip.c
+win32src/zlib/contrib/minizip/zip.c.orig
+win32src/zlib/contrib/minizip/zip.h
+win32src/zlib/contrib/pascal/example.pas
+win32src/zlib/contrib/pascal/readme.txt
+win32src/zlib/contrib/pascal/zlibd32.mak
+win32src/zlib/contrib/pascal/zlibpas.pas
+win32src/zlib/contrib/puff/Makefile
+win32src/zlib/contrib/puff/README
+win32src/zlib/contrib/puff/puff.c
+win32src/zlib/contrib/puff/puff.h
+win32src/zlib/contrib/puff/zeros.raw
+win32src/zlib/contrib/testzlib/testzlib.c
+win32src/zlib/contrib/testzlib/testzlib.sln
+win32src/zlib/contrib/testzlib/testzlib.vcproj
+win32src/zlib/contrib/untgz/Makefile
+win32src/zlib/contrib/untgz/Makefile.msc
+win32src/zlib/contrib/untgz/Makefile.orig
+win32src/zlib/contrib/untgz/Makefile.rej
+win32src/zlib/contrib/untgz/untgz.c
+win32src/zlib/contrib/untgz/untgz.c.orig
+win32src/zlib/contrib/vstudio/readme.txt
+win32src/zlib/contrib/vstudio/vc7/gvmat32.obj
+win32src/zlib/contrib/vstudio/vc7/inffas32.obj
+win32src/zlib/contrib/vstudio/vc7/miniunz.vcproj
+win32src/zlib/contrib/vstudio/vc7/minizip.vcproj
+win32src/zlib/contrib/vstudio/vc7/zlib.rc
+win32src/zlib/contrib/vstudio/vc7/zlibstat.vcproj
+win32src/zlib/contrib/vstudio/vc7/zlibvc.def
+win32src/zlib/contrib/vstudio/vc7/zlibvc.sln
+win32src/zlib/contrib/vstudio/vc7/zlibvc.vcproj
+win32src/zlib/msdos/Makefile.bor
+win32src/zlib/msdos/Makefile.dj2
+win32src/zlib/msdos/Makefile.emx
+win32src/zlib/msdos/Makefile.msc
+win32src/zlib/msdos/Makefile.tc
+win32src/zlib/old/Make_vms.com
+win32src/zlib/old/Makefile.riscos
+win32src/zlib/old/README
+win32src/zlib/old/descrip.mms
+win32src/zlib/old/zlib.html
+win32src/zlib/old/os2/Makefile.os2
+win32src/zlib/old/os2/zlib.def
+win32src/zlib/qnx/package.qpg
+win32src/zlib/win32/DLL_FAQ.txt
+win32src/zlib/win32/Makefile.bor
+win32src/zlib/win32/Makefile.emx
+win32src/zlib/win32/Makefile.gcc
+win32src/zlib/win32/Makefile.msc
+win32src/zlib/win32/zlib.def
+win32src/zlib/win32/zlib1.rc
View
3 MANIFEST.in
@@ -14,4 +14,5 @@ recursive-include src *.cpp *.c *.h
recursive-include agg2 *.cpp *.c *.h
recursive-include FontTools *
recursive-include FontToolsSrc *
-recursive-include ttfquery *
+recursive-include ttfquery *
+recursive-include win32src *
View
4 Makefile
@@ -2,6 +2,9 @@
# Copyright (C) 2003 <jdhunter@ace.bsd.uchicago.edu>
# $Header$
# $Log$
+# Revision 1.20 2004/02/16 18:04:55 jdh2358
+# fexed wx to work on windows and linux
+#
# Revision 1.19 2004/02/11 19:16:01 jdh2358
# reorganized table
#
@@ -83,6 +86,7 @@ MODULES = \
matplotlib.backends.backend_template \
matplotlib.backends.backend_wx \
matplotlib.cbook \
+ matplotlib.colors \
matplotlib.figure \
matplotlib.legend \
matplotlib.lines \
View
5 TODO
@@ -201,7 +201,7 @@
-- DONE 2004-02-15 font manager for paint and agg
--- website docs for agg - eg, backends.html#Agg
+-- DONE - website docs for agg - eg, backends.html#Agg
-- build win installer for paint, agg, gd, matplotlib-0.50
@@ -218,4 +218,5 @@
-- table doesn't update on interactive
--- update fonts page with TTFPATH and info on how to use win32 fonts.
+-- DONE update fonts page with TTFPATH and info on how to use win32 fonts.
+
View
7 examples/backend_driver.py
@@ -54,7 +54,7 @@ def drive(backend):
lines.append(line)
basename, ext = os.path.splitext(fname)
outfile = basename + '_%s'%backend
- if backend in ('GTK', 'Wx'):
+ if backend in ('GTK', 'WX'):
lines.append('show()')
else:
lines.append('savefig("%s", dpi=150)' % outfile)
@@ -63,8 +63,9 @@ def drive(backend):
os.system('python %s' % tmpfile)
times = {}
-backends = ('PS', 'GD', 'Paint', 'Agg', 'Template')
-#backends = ('Paint',)
+backends = ['PS', 'GD', 'Paint', 'Agg', 'Template']
+backends.extend([ 'GTK', 'WX'])
+
for backend in backends:
print 'testing %s' % backend
t0 = time.time()
View
4 examples/object_picker.py
@@ -18,7 +18,7 @@
from matplotlib.lines import Line2D, lineStyles, lineMarkers
from matplotlib.transforms import Bound2D
from matplotlib.patches import draw_bbox
-from matplotlib.backend_bases import arg_to_rgb
+from matplotlib.colors import colorConverter
import gtk
@@ -107,7 +107,7 @@ def __init__(self, line, fig):
row += 1
- self.rgbLine = arg_to_rgb(self.line.get_color())
+ self.rgbLine = colorConverter.to_rgb(self.line.get_color())
def set_color(button):
rgb = get_color(self.rgbLine)
View
2 examples/simple_plot.py
@@ -9,5 +9,5 @@
ylabel('voltage (mV)')
title('About as simple as it gets, folks')
grid(True)
-savefig('simple_plot')
+savefig('simple_plot', dpi=300)
show()
View
2 examples/subplot_demo.py
@@ -17,7 +17,7 @@ def f(t):
ylabel('Damped oscillation')
subplot(212)
-plot(t3, cos(2*pi*t3), 'r<')
+plot(t3, cos(2*pi*t3), 'r>')
grid(True)
xlabel('time (s)')
ylabel('Undamped')
View
39 setup.py
@@ -1,26 +1,37 @@
"""
-matplotlib has added some extension module code and now includes the
-TTF modules fonttools and ttfquery (for GD, Paint, and Agg). To build
-the ttf modules, set the BUILD_FONTTOOLS flag
+matplotlib has added some extension module code which can optionally
+be built by setting the appropriate flag below.
+"""
-AGG is a new backend that wraps the antigrain geometry toolkit; set
-BUILD_AGG to 1 to build it. Agg makes heavy use of templates, so it
-probably requires a fairly recent compiler to build it.
+# Build the fonttools and TTFQuery packages, required by the Paint,
+# Agg and GD backends.
+BUILD_FONTTOOLS = 1
+# AGG is a new backend that wraps the antigrain geometry toolkit; set
+# BUILD_AGG to 1 to build it. Agg makes heavy use of templates, so it
+# probably requires a fairly recent compiler to build it. It makes
+# very nice antialiased output and also supports alpha blending
+BUILD_AGG = 1
-"""
+# The two builds below are experimental. They use an image backend
+# (eg GD or Agg) to render to the GTK canvas. The idea is that we
+# could use a single high quality image renderer to render to all the
+# GUI windows
+
+# build GTK GUI with Agg renderer ; requires pygtk src distros installed
+BUILD_GTKAGG = 0
+
+# build GTK GUI with GD renderer ; requires pygtk and GD src distros installed
+BUILD_GTKGD = 0
+
+
+## You shouldn't need to customize below this point
from distutils.core import setup
import sys,os
import glob
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 = 0
-BUILD_GTKAGG = 0
-
data = []
data.extend(glob.glob('fonts/afm/*.afm'))
data.extend(glob.glob('fonts/ttf/*.ttf'))
@@ -51,7 +62,7 @@
setup(name="matplotlib",
- version= '0.50q',
+ version= '0.50',
description = "Matlab style python plotting package",
author = "John D. Hunter",
author_email="jdhunter@ace.bsd.uchicago.edu",
View
12 setupext.py
@@ -130,15 +130,17 @@ def build_fonttools(ext_modules, packages):
global builtFonttools
# only build them if not already installed
- try: import ttfquery
- except ImportError: pass
- else:
- builtFonttools = True
- return
+ if sys.platform != 'win32':
+ try: import ttfquery
+ except ImportError: pass
+ else:
+ builtFonttools = True
+ return
if builtFonttools: return # only build it if you you haven't already
packages.extend(
['ttfquery',
+ 'FontTools',
'FontTools.fontTools',
'FontTools.fontTools.encodings',
'FontTools.fontTools.misc',

0 comments on commit 125a5ff

Please sign in to comment.