Skip to content

Commit 854069d

Browse files
committed
upgraded to agg23
svn path=/trunk/matplotlib/; revision=1286
1 parent 24e4a32 commit 854069d

File tree

5 files changed

+39
-14
lines changed

5 files changed

+39
-14
lines changed

CHANGELOG

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
New entries should be added at the top
22

3+
2005-05-10 Extended python agg wrapper and started implementing backend_agg2,
4+
an agg renderer based on the python wrapper. This will be
5+
more flexible and easier to extend than the current
6+
backend_agg. See also examples/agg_test.py - JDH
7+
8+
2005-05-09 Added Marcin's no legend patch to exclude lines from the
9+
autolegend builder
10+
11+
plot(x, y, label='nolegend')
12+
13+
2005-05-05 Upgraded to agg23
14+
315
2005-05-05 Added newscalarformatter_demo.py to examples. -DSD
416

517
2005-05-04 Added NewScalarFormatter. Improved formatting of ticklabels,

TODO

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,4 +703,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
703703

704704
-- DONE colorbar not updating in CVS
705705

706-
-- DONE tkagg figure not launching new figure until plot is called?
706+
-- DONE tkagg figure not launching new figure until plot is called?
707+
708+
-- clipping off in date_demo_rrule (agg 0.5 offset bug?)

makeswig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'agg',
77
)
88
SWIG = '/usr/local/bin/swig'
9-
AGGINCLUDE = 'agg22/include'
9+
AGGINCLUDE = 'agg23/include'
1010

1111
swigit = '%(SWIG)s -python -c++ -outdir lib/matplotlib -o src/%(SWIGFILE)s.cxx -I%(AGGINCLUDE)s swig/%(SWIGFILE)s.i '
1212

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696

9797
NUMERIX=["neither", "Numeric","numarray","both"][HAVE_NUMARRAY*2+HAVE_NUMERIC]
9898

99+
99100
if NUMERIX == "neither":
100101
raise RuntimeError("You must install Numeric, numarray, or both to build matplotlib")
101102

setupext.py

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
BUILT_CONTOUR = False
6666
BUILT_GDK = False
6767

68+
AGG_VERSION = 'agg23'
6869

6970
class CleanUpFile:
7071
"""CleanUpFile deletes the specified filename when self is destroyed."""
@@ -110,7 +111,7 @@ def add_agg_flags(module):
110111
module.libraries.append('png')
111112
module.libraries.append('z')
112113
add_base_flags(module)
113-
module.include_dirs.extend(['src','agg22/include', '.'])
114+
module.include_dirs.extend(['src','%s/include'%AGG_VERSION, '.'])
114115

115116
# put these later for correct link order
116117
module.libraries.extend(['stdc++', 'm'])
@@ -390,15 +391,16 @@ def build_agg(ext_modules, packages, numerix):
390391

391392
agg = ('agg_trans_affine.cpp',
392393
'agg_path_storage.cpp',
393-
'agg_vcgen_stroke.cpp',
394394
'agg_bezier_arc.cpp',
395395
'agg_curves.cpp',
396396
'agg_vcgen_dash.cpp',
397+
'agg_vcgen_stroke.cpp',
398+
#'agg_vcgen_markers_term.cpp',
397399
'agg_rasterizer_scanline_aa.cpp',
398400
)
399401

400402
if numerix in ["numarray","both"]: # Build for numarray
401-
deps = ['agg22/src/%s'%name for name in agg]
403+
deps = ['%s/src/%s'%(AGG_VERSION,name) for name in agg]
402404
deps.extend(('src/ft2font.cpp', 'src/mplutils.cpp'))
403405
deps.extend(glob.glob('CXX/*.cxx'))
404406
deps.extend(glob.glob('CXX/*.c'))
@@ -414,7 +416,7 @@ def build_agg(ext_modules, packages, numerix):
414416
add_ft2font_flags(module)
415417
ext_modules.append(module)
416418
if numerix in ["Numeric","both"]: # Build for Numeric
417-
deps = ['agg22/src/%s'%name for name in agg]
419+
deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
418420
deps.extend(('src/ft2font.cpp', 'src/mplutils.cpp'))
419421
deps.extend(glob.glob('CXX/*.cxx'))
420422
deps.extend(glob.glob('CXX/*.c'))
@@ -448,7 +450,7 @@ def build_image(ext_modules, packages, numerix):
448450
if numerix in ["numarray","both"]: # Build for numarray
449451
temp_copy('src/_image.cpp', 'src/_na_image.cpp')
450452
deps = ['src/_na_image.cpp', 'src/mplutils.cpp']
451-
deps.extend(['agg22/src/%s'%name for name in agg])
453+
deps.extend(['%s/src/%s'%(AGG_VERSION, name) for name in agg])
452454
deps.extend(glob.glob('CXX/*.cxx'))
453455
deps.extend(glob.glob('CXX/*.c'))
454456
module = Extension(
@@ -463,7 +465,7 @@ def build_image(ext_modules, packages, numerix):
463465
if numerix in ["Numeric","both"]: # Build for Numeric
464466
temp_copy('src/_image.cpp', 'src/_nc_image.cpp')
465467
deps = ['src/_nc_image.cpp', 'src/mplutils.cpp']
466-
deps.extend(['agg22/src/%s'%name for name in agg])
468+
deps.extend(['%s/src/%s'%(AGG_VERSION,name) for name in agg])
467469
deps.extend(glob.glob('CXX/*.cxx'))
468470
deps.extend(glob.glob('CXX/*.c'))
469471

@@ -480,16 +482,24 @@ def build_image(ext_modules, packages, numerix):
480482

481483
def build_swigagg(ext_modules, packages):
482484
# setup the swig agg wrapper
483-
deps = ['src/agg.cxx',
484-
'agg22/src/agg_path_storage.cpp',
485-
'agg22/src/agg_bezier_arc.cpp',
486-
'agg22/src/agg_trans_affine.cpp',
487-
]
485+
deps = ['src/agg.cxx']
486+
deps.extend(['%s/src/%s'%(AGG_VERSION, fname) for fname in
487+
(
488+
'agg_trans_affine.cpp',
489+
'agg_path_storage.cpp',
490+
'agg_bezier_arc.cpp',
491+
'agg_vcgen_dash.cpp',
492+
'agg_vcgen_stroke.cpp',
493+
'agg_rasterizer_scanline_aa.cpp',
494+
)
495+
])
496+
497+
488498
agg = Extension('matplotlib._agg',
489499
deps,
490500
)
491501

492-
agg.include_dirs.extend(['agg22/include', 'src', 'swig'])
502+
agg.include_dirs.extend(['%s/include'%AGG_VERSION, 'src', 'swig'])
493503
agg.libraries.extend(['stdc++', 'm'])
494504
ext_modules.append(agg)
495505

0 commit comments

Comments
 (0)