You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(115) |
Aug
(120) |
Sep
(137) |
Oct
(170) |
Nov
(461) |
Dec
(263) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(120) |
Feb
(74) |
Mar
(35) |
Apr
(74) |
May
(245) |
Jun
(356) |
Jul
(240) |
Aug
(115) |
Sep
(78) |
Oct
(225) |
Nov
(98) |
Dec
(271) |
| 2009 |
Jan
(132) |
Feb
(84) |
Mar
(74) |
Apr
(56) |
May
(90) |
Jun
(79) |
Jul
(83) |
Aug
(296) |
Sep
(214) |
Oct
(76) |
Nov
(82) |
Dec
(66) |
| 2010 |
Jan
(46) |
Feb
(58) |
Mar
(51) |
Apr
(77) |
May
(58) |
Jun
(126) |
Jul
(128) |
Aug
(64) |
Sep
(50) |
Oct
(44) |
Nov
(48) |
Dec
(54) |
| 2011 |
Jan
(68) |
Feb
(52) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
(5) |
2
(4) |
3
(2) |
4
(4) |
5
(2) |
|
6
(32) |
7
(34) |
8
(19) |
9
(6) |
10
(7) |
11
(14) |
12
(1) |
|
13
(2) |
14
(8) |
15
(5) |
16
(5) |
17
(8) |
18
(8) |
19
(6) |
|
20
(9) |
21
(12) |
22
(1) |
23
(2) |
24
(8) |
25
(2) |
26
(1) |
|
27
(2) |
28
(3) |
29
|
30
(2) |
|
|
|
Revision: 7760 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7760&view=rev Author: sameerd Date: 2009年09月14日 19:32:27 +0000 (2009年9月14日) Log Message: ----------- added jointype == "inner" to mlab.recs_join Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/mlab.py Modified: trunk/matplotlib/lib/matplotlib/mlab.py =================================================================== --- trunk/matplotlib/lib/matplotlib/mlab.py 2009年09月14日 19:16:49 UTC (rev 7759) +++ trunk/matplotlib/lib/matplotlib/mlab.py 2009年09月14日 19:32:27 UTC (rev 7760) @@ -1893,23 +1893,29 @@ return newrec -def recs_join(key, name, recs,missing=0.): +def recs_join(key, name, recs, jointype='outer', missing=0.): """ - Join a sequence of record arrays on key + Join a sequence of record arrays on single column key. + This function only joins a single column of the multiple record arrays + *key* is the column name that acts as a key *name* - is the name that we want to join + is the name of the column that we want to join + *recs* + is a list of record arrays to join + + *jointype* + is a string 'inner' or 'outer' + *missing" - is what the missing fields are replaced by + is what any missing field is replaced by - *recarrays* - is a list of record arrays to join - returns a record array with columns [rowkey, name1, name2, ... namen] + returns a record array with columns [rowkey, name1, name2, ... namen]. Example:: @@ -1917,12 +1923,21 @@ """ results = [] + aligned_iters = cbook.align_iterators(operator.attrgetter(key), *[iter(r) for r in recs]) + def extract(r): if r is None: return missing else: return r[name] - for rowkey, row in cbook.align_iterators(operator.attrgetter(key), *[iter(r) for r in recs]): - results.append([rowkey] + map(extract, row)) + + if jointype == "outer": + for rowkey, row in aligned_iters: + results.append([rowkey] + map(extract, row)) + elif jointype == "inner": + for rowkey, row in aligned_iters: + if None not in row: # throw out any Nones + results.append([rowkey] + map(extract, row)) + names = ",".join([key] + ["%s%d" % (name, d) for d in range(len(recs))]) return np.rec.fromrecords(results, names=names) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7759 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7759&view=rev Author: mdboom Date: 2009年09月14日 19:16:49 +0000 (2009年9月14日) Log Message: ----------- Improve speed of gallery thumbnail generation using multiprocessing Modified Paths: -------------- trunk/matplotlib/doc/sphinxext/gen_gallery.py Modified: trunk/matplotlib/doc/sphinxext/gen_gallery.py =================================================================== --- trunk/matplotlib/doc/sphinxext/gen_gallery.py 2009年09月14日 17:16:41 UTC (rev 7758) +++ trunk/matplotlib/doc/sphinxext/gen_gallery.py 2009年09月14日 19:16:49 UTC (rev 7759) @@ -39,15 +39,14 @@ 'matplotlib_icon', ]) - print - print "generating gallery: ", data = [] + thumbnails = {} + for subdir in ('api', 'pylab_examples', 'mplot3d', 'widgets', 'axes_grid' ): origdir = os.path.join('build', rootdir, subdir) thumbdir = os.path.join(outdir, rootdir, subdir, 'thumbnails') if not os.path.exists(thumbdir): os.makedirs(thumbdir) - print subdir, for filename in sorted(glob.glob(os.path.join(origdir, '*.png'))): if filename.endswith("hires.png"): @@ -56,16 +55,14 @@ path, filename = os.path.split(filename) basename, ext = os.path.splitext(filename) if basename in skips: - sys.stdout.write('[skipping %s]' % basename) - sys.stdout.flush() continue # Create thumbnails based on images in tmpdir, and place # them within the build tree orig_path = str(os.path.join(origdir, filename)) thumb_path = str(os.path.join(thumbdir, filename)) - if out_of_date(orig_path, thumb_path): - image.thumbnail(orig_path, thumb_path, scale=0.3) + if out_of_date(orig_path, thumb_path) or True: + thumbnails[orig_path] = thumb_path m = multiimage.match(basename) if m is None: @@ -77,10 +74,6 @@ data.append((subdir, basename, os.path.join(rootdir, subdir, 'thumbnails', filename))) - sys.stdout.write(".") - sys.stdout.flush() - print - link_template = """\ <a href="%s"><img src="%s" border="0" alt="%s"/></a> """ @@ -99,5 +92,21 @@ fh.write(template%'\n'.join(rows)) fh.close() + try: + import multiprocessing + def make_thumbnail(args): + image.thumbnail(args[0], args[1], 0.3) + + app.builder.info("generating thumbnails... ", nonl=True) + pool = multiprocessing.Pool() + pool.map(make_thumbnail, thumbnails.iteritems()) + app.builder.info("done") + + except ImportError: + for key in app.builder.status_iterator( + thumbnails.iterkeys(), "generating thumbnails... ", + length=len(thumbnails)): + image.thumbnail(key, thumbnails[key], 0.3) + def setup(app): app.connect('env-updated', gen_gallery) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7758 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7758&view=rev Author: mdboom Date: 2009年09月14日 17:16:41 +0000 (2009年9月14日) Log Message: ----------- Merged revisions 7756 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint ........ r7756 | mdboom | 2009年09月14日 13:11:06 -0400 (2009年9月14日) | 1 line Minor doc fixes ........ Modified Paths: -------------- trunk/matplotlib/doc/users/image_tutorial.rst trunk/matplotlib/lib/matplotlib/axes.py trunk/matplotlib/lib/matplotlib/font_manager.py trunk/matplotlib/lib/matplotlib/mlab.py Property Changed: ---------------- trunk/matplotlib/ trunk/matplotlib/doc/pyplots/README trunk/matplotlib/doc/sphinxext/gen_gallery.py trunk/matplotlib/doc/sphinxext/gen_rst.py trunk/matplotlib/examples/misc/multiprocess.py trunk/matplotlib/examples/mplot3d/contour3d_demo.py trunk/matplotlib/examples/mplot3d/contourf3d_demo.py trunk/matplotlib/examples/mplot3d/polys3d_demo.py trunk/matplotlib/examples/mplot3d/scatter3d_demo.py trunk/matplotlib/examples/mplot3d/surface3d_demo.py trunk/matplotlib/examples/mplot3d/wire3d_demo.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7755 + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7757 Modified: svn:mergeinfo - /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Property changes on: trunk/matplotlib/doc/pyplots/README ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Modified: trunk/matplotlib/doc/users/image_tutorial.rst =================================================================== --- trunk/matplotlib/doc/users/image_tutorial.rst 2009年09月14日 17:12:19 UTC (rev 7757) +++ trunk/matplotlib/doc/users/image_tutorial.rst 2009年09月14日 17:16:41 UTC (rev 7758) @@ -179,7 +179,7 @@ In [6]: lum_img = img[:,:,0] -This is array slicing. You can read more `here +This is array slicing. You can read more in the `Numpy tutorial <http://www.scipy.org/Tentative_NumPy_Tutorial>`_. .. sourcecode:: ipython @@ -229,8 +229,8 @@ imgplot = plt.imshow(lum_img) imgplot.set_cmap('spectral') -There are many other colormap schemes available. See a list and -images of the colormaps `here +There are many other colormap schemes available. See the `list and +images of the colormaps <http://matplotlib.sourceforge.net/examples/pylab_examples/show_colormaps.html>`_. .. _Color Bars Property changes on: trunk/matplotlib/examples/misc/multiprocess.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/misc/log.py:5753-5771 /branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint/examples/misc/log.py:5753-5771 /branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Modified: trunk/matplotlib/lib/matplotlib/axes.py =================================================================== --- trunk/matplotlib/lib/matplotlib/axes.py 2009年09月14日 17:12:19 UTC (rev 7757) +++ trunk/matplotlib/lib/matplotlib/axes.py 2009年09月14日 17:16:41 UTC (rev 7758) @@ -7399,8 +7399,8 @@ window = mlab.window_hanning, noverlap=0, pad_to=None, sides='default', scale_by_freq=None, **kwargs) - cohere the coherence between *x* and *y*. Coherence is the normalized - cross spectral density: + :meth:`cohere` the coherence between *x* and *y*. Coherence + is the normalized cross spectral density: .. math:: Modified: trunk/matplotlib/lib/matplotlib/font_manager.py =================================================================== --- trunk/matplotlib/lib/matplotlib/font_manager.py 2009年09月14日 17:12:19 UTC (rev 7757) +++ trunk/matplotlib/lib/matplotlib/font_manager.py 2009年09月14日 17:16:41 UTC (rev 7758) @@ -12,12 +12,12 @@ font specification <http://www.w3.org/TR/1998/REC-CSS2-19980512/>`_. Future versions may implement the Level 2 or 2.1 specifications. -Experimental support is included for using `fontconfig -<http://www.fontconfig.org>`_ on Unix variant plaforms (Linux, OS X, -Solaris). To enable it, set the constant ``USE_FONTCONFIG`` in this -file to ``True``. Fontconfig has the advantage that it is the -standard way to look up fonts on X11 platforms, so if a font is -installed, it is much more likely to be found. +Experimental support is included for using `fontconfig` on Unix +variant platforms (Linux, OS X, Solaris). To enable it, set the +constant ``USE_FONTCONFIG`` in this file to ``True``. Fontconfig has +the advantage that it is the standard way to look up fonts on X11 +platforms, so if a font is installed, it is much more likely to be +found. """ """ Modified: trunk/matplotlib/lib/matplotlib/mlab.py =================================================================== --- trunk/matplotlib/lib/matplotlib/mlab.py 2009年09月14日 17:12:19 UTC (rev 7757) +++ trunk/matplotlib/lib/matplotlib/mlab.py 2009年09月14日 17:16:41 UTC (rev 7758) @@ -366,12 +366,16 @@ *x* Array or sequence containing the data + %(PSD)s + Returns the tuple (*Pxx*, *freqs*). Refs: + Bendat & Piersol -- Random Data: Analysis and Measurement Procedures, John Wiley & Sons (1986) + """ Pxx,freqs = csd(x, x, NFFT, Fs, detrend, window, noverlap, pad_to, sides, scale_by_freq) @@ -394,7 +398,9 @@ *x*, *y* Array or sequence containing the data + %(PSD)s + Returns the tuple (*Pxy*, *freqs*). Refs: @@ -420,7 +426,9 @@ If *x* is real (i.e. non-complex) only the spectrum of the positive frequencie is returned. If *x* is complex then the complete spectrum is returned. + %(PSD)s + Returns a tuple (*Pxx*, *freqs*, *t*): - *Pxx*: 2-D array, columns are the periodograms of @@ -463,11 +471,13 @@ *x*, *y* Array or sequence containing the data + %(PSD)s + The return value is the tuple (*Cxy*, *f*), where *f* are the frequencies of the coherence vector. For cohere, scaling the - individual densities by the sampling frequency has no effect, since - the factors cancel out. + individual densities by the sampling frequency has no effect, + since the factors cancel out. .. seealso:: Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756 Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741,7745,7751 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741,7745,7751,7756 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7757 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7757&view=rev Author: mdboom Date: 2009年09月14日 17:12:19 +0000 (2009年9月14日) Log Message: ----------- Merged revisions 7751 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint ........ r7751 | jdh2358 | 2009年09月12日 17:11:42 -0400 (2009年9月12日) | 1 line tagging for 99.1 release candiate ........ Modified Paths: -------------- trunk/matplotlib/README.txt trunk/matplotlib/make.osx Property Changed: ---------------- trunk/matplotlib/ trunk/matplotlib/doc/pyplots/README trunk/matplotlib/doc/sphinxext/gen_gallery.py trunk/matplotlib/doc/sphinxext/gen_rst.py trunk/matplotlib/examples/misc/multiprocess.py trunk/matplotlib/examples/mplot3d/contour3d_demo.py trunk/matplotlib/examples/mplot3d/contourf3d_demo.py trunk/matplotlib/examples/mplot3d/polys3d_demo.py trunk/matplotlib/examples/mplot3d/scatter3d_demo.py trunk/matplotlib/examples/mplot3d/surface3d_demo.py trunk/matplotlib/examples/mplot3d/wire3d_demo.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7745,7749 + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7755 Modified: svn:mergeinfo - /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Modified: trunk/matplotlib/README.txt =================================================================== --- trunk/matplotlib/README.txt 2009年09月14日 17:11:06 UTC (rev 7756) +++ trunk/matplotlib/README.txt 2009年09月14日 17:12:19 UTC (rev 7757) @@ -1,61 +1,45 @@ -Overview of the matplotlib src tree -=================================== +matplotlib for MacOS X 10.3.9 or later and Python 2.5 and Python 2.6 -This is the source directory for matplotlib, which contains the -following files and directories. +matplotlib is a python 2D plotting library which produces publication +quality figures in a variety of hardcopy formats and interactive +environments across platforms. matplotlib can be used in python +scripts, the python and ipython shell (ala matlab or mathematica), web +application servers, and various graphical user interface toolkits. -* doc - the matplotlib documentation. See doc/users for the user's - documentation and doc/devel for the developers documentation +Home page: <http://matplotlib.sourceforge.net/> -* examples - a bunch of examples using matplotib. See - examples/README.txt for information +Before running matplotlib, you must install numpy. Binary installers +for all these packages are available here: -* setup.cfg.template - used to configure the matplotlib build process. - Copy this file to setup.cfg if you want to override the default - build behavior + <http://pythonmac.org/packages/py25-fat/index.html>. -* matplotlibrc.template - a template file used to generate the - matplotlibrc config file at build time. The matplotlibrc file will - be installed in matplotlib/mpl-data/matplotlibrc +*** Back Ends *** -* lib - the python src code. matplotlib ships several third party - packages here. The subdirectory lib/matplotlib contains the python - src code for matplotlib +You may use TkAgg or WXAgg back ends; Qt and GTK support is not +provided in this package. By default this matplotlib uses TkAgg +because Tcl/Tk is included with MacOS X. -* src - the matplotlib extension code, mostly C++ +If you wish to use WXAgg then: +* Install wxPython from: + <http://pythonmac.org/packages/py25-fat/index.html>. +* Configure a matplotlibrc file, as described below. -* ttconv - some truetype font utilities +For TkAgg you may use Apple's built-in Tcl/Tk or install your own 8.4.x -* license - all the licenses for code included with matplotlib. - matplotlib uses only BSD compatible code +*** Configuring a matplotlibrc file *** -* unit - some unit tests +If you wish to change any matplotlib settings, create a file: + ~/.matplotlib/matplotlibrc -* CHANGELOG - all the significant changes to matplotlib, organized by - release. The top of this file will show you the most recent changes -* API_CHANGES - any change that alters the API is listed here. The - entries are organized by release, with most recent entries first +that contains at least the following information. The values shown are +the defaults in the internal matplotlibrc file; change them as you see +fit: -* MIGRATION.txt - instructions on moving from the 0.91 code to the - 0.98 trunk. +# the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg WXAgg +# Agg Cairo GD GDK Paint PS PDF SVG Template +backend : TkAgg +interactive : False # see http://matplotlib.sourceforge.net/interactive.html -* SEGFAULTS - some tips for how to diagnose and debug segfaults - -* setup.py - the matplotlib build script - -* setupext.py - some helper code for setup.py to build the matplotlib - extensions - -* boilerplate.py - some code to automatically generate the pyplot - wrappers - -* DEVNOTES - deprecated developer notes. TODO: update and move to the - doc/devel framework - -* FILETYPES - This is a table of the output formats supported by each - backend. TODO: move to doc/users - -* INTERACTIVE - instructions on using matplotlib interactively, eg - from the python shell. TODO: update and move to doc/users. - +See also +<http://matplotlib.sourceforge.net/users/customizing.html> Property changes on: trunk/matplotlib/doc/pyplots/README ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/examples/misc/multiprocess.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/misc/log.py:5753-5771 /branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint/examples/misc/log.py:5753-5771 /branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751 Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741,7745 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741,7745,7751 Modified: trunk/matplotlib/make.osx =================================================================== --- trunk/matplotlib/make.osx 2009年09月14日 17:11:06 UTC (rev 7756) +++ trunk/matplotlib/make.osx 2009年09月14日 17:12:19 UTC (rev 7757) @@ -1,6 +1,7 @@ # build mpl into a local install dir with # PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install +MPLVERSION=0.99.1rc1 PYVERSION=2.6 PYTHON=python${PYVERSION} ZLIBVERSION=1.2.3 @@ -11,8 +12,8 @@ ## You shouldn't need to configure past this point PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig" -CFLAGS_DEPS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk" -LDFLAGS_DEPS="-arch i386 -arch ppc -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" +CFLAGS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk" +LDFLAGS="-arch i386 -arch ppc -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" clean: rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \ @@ -34,10 +35,10 @@ tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\ cd zlib-${ZLIBVERSION} &&\ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ - export CFLAGS=${CFLAGS_DEPS} &&\ - export LDFLAGS=${LDFLAGS_DEPS} &&\ + export CFLAGS=${CFLAGS} &&\ + export LDFLAGS=${LDFLAGS} &&\ ./configure --prefix=${PREFIX}&&\ - MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 install&& \ + MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} make -j3 install&& \ unset MACOSX_DEPLOYMENT_TARGET png: zlib @@ -46,8 +47,8 @@ tar xvfj libpng-${PNGVERSION}.tar.bz2 cd libpng-${PNGVERSION} &&\ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ - export CFLAGS=${CFLAGS_DEPS} &&\ - export LDFLAGS=${LDFLAGS_DEPS} &&\ + export CFLAGS=${CFLAGS} &&\ + export LDFLAGS=${LDFLAGS} &&\ ./configure --disable-dependency-tracking --prefix=${PREFIX} &&\ make -j3 install&&\ cp .libs/libpng.a . &&\ @@ -60,8 +61,8 @@ tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\ cd freetype-${FREETYPEVERSION} &&\ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ - export CFLAGS=${CFLAGS_DEPS} &&\ - export LDFLAGS=${LDFLAGS_DEPS} &&\python/svn/bison/scripts/ + export CFLAGS=${CFLAGS} &&\ + export LDFLAGS=${LDFLAGS} &&\ ./configure --prefix=${PREFIX} &&\ make -j3 install &&\ cp objs/.libs/libfreetype.a . &&\ @@ -74,15 +75,23 @@ mpl_build: export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ - export CFLAGS=${CFLAGS_DEPS} &&\ - export LDFLAGS=${LDFLAGS_DEPS} &&\ - python setup.py build + export CFLAGS=${CFLAGS} &&\ + export LDFLAGS=${LDFLAGS} &&\ + ${PYTHON} setup.py build mpl_install: export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ - export CFLAGS=${CFLAGS_DEPS} &&\ - export LDFLAGS=${LDFLAGS_DEPS} &&\ - export LD_LIBRARY_PATH=${PREFIX}/lib &&\ - export DYLD_LIBRARY_PATH=${PREFIX}/lib &&\ - python setup.py install --prefix=${PREFIX} + export CFLAGS=${CFLAGS} &&\ + export LDFLAGS=${LDFLAGS} &&\ + ${PYTHON} setup.py install --prefix=${PREFIX} + + +binaries: + unset PKG_CONFIG_PATH &&\ + cp release/osx/data/setup.cfg release/osx/data/ReadMe.txt . &&\ + export CFLAGS=${CFLAGS} &&\ + export LDFLAGS=${LDFLAGS} &&\ + /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg --readme=ReadMe.txt &&\ + hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.dmg &&\ + ${PYTHON} setupegg.py bdist_egg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7756 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7756&view=rev Author: mdboom Date: 2009年09月14日 17:11:06 +0000 (2009年9月14日) Log Message: ----------- Minor doc fixes Modified Paths: -------------- branches/v0_99_maint/doc/users/image_tutorial.rst branches/v0_99_maint/lib/matplotlib/axes.py branches/v0_99_maint/lib/matplotlib/font_manager.py branches/v0_99_maint/lib/matplotlib/mlab.py Modified: branches/v0_99_maint/doc/users/image_tutorial.rst =================================================================== --- branches/v0_99_maint/doc/users/image_tutorial.rst 2009年09月14日 17:02:32 UTC (rev 7755) +++ branches/v0_99_maint/doc/users/image_tutorial.rst 2009年09月14日 17:11:06 UTC (rev 7756) @@ -179,7 +179,7 @@ In [6]: lum_img = img[:,:,0] -This is array slicing. You can read more `here +This is array slicing. You can read more in the `Numpy tutorial <http://www.scipy.org/Tentative_NumPy_Tutorial>`_. .. sourcecode:: ipython @@ -229,8 +229,8 @@ imgplot = plt.imshow(lum_img) imgplot.set_cmap('spectral') -There are many other colormap schemes available. See a list and -images of the colormaps `here +There are many other colormap schemes available. See the `list and +images of the colormaps <http://matplotlib.sourceforge.net/examples/pylab_examples/show_colormaps.html>`_. .. _Color Bars Modified: branches/v0_99_maint/lib/matplotlib/axes.py =================================================================== --- branches/v0_99_maint/lib/matplotlib/axes.py 2009年09月14日 17:02:32 UTC (rev 7755) +++ branches/v0_99_maint/lib/matplotlib/axes.py 2009年09月14日 17:11:06 UTC (rev 7756) @@ -7438,8 +7438,8 @@ window = mlab.window_hanning, noverlap=0, pad_to=None, sides='default', scale_by_freq=None, **kwargs) - cohere the coherence between *x* and *y*. Coherence is the normalized - cross spectral density: + :meth:`cohere` the coherence between *x* and *y*. Coherence + is the normalized cross spectral density: .. math:: Modified: branches/v0_99_maint/lib/matplotlib/font_manager.py =================================================================== --- branches/v0_99_maint/lib/matplotlib/font_manager.py 2009年09月14日 17:02:32 UTC (rev 7755) +++ branches/v0_99_maint/lib/matplotlib/font_manager.py 2009年09月14日 17:11:06 UTC (rev 7756) @@ -12,12 +12,12 @@ font specification <http://www.w3.org/TR/1998/REC-CSS2-19980512/>`_. Future versions may implement the Level 2 or 2.1 specifications. -Experimental support is included for using `fontconfig -<http://www.fontconfig.org>`_ on Unix variant plaforms (Linux, OS X, -Solaris). To enable it, set the constant ``USE_FONTCONFIG`` in this -file to ``True``. Fontconfig has the advantage that it is the -standard way to look up fonts on X11 platforms, so if a font is -installed, it is much more likely to be found. +Experimental support is included for using `fontconfig` on Unix +variant platforms (Linux, OS X, Solaris). To enable it, set the +constant ``USE_FONTCONFIG`` in this file to ``True``. Fontconfig has +the advantage that it is the standard way to look up fonts on X11 +platforms, so if a font is installed, it is much more likely to be +found. """ """ @@ -707,7 +707,7 @@ def __hash__(self): l = [(k, getattr(self, "get" + k)()) for k in sorted(self.__dict__)] return hash(repr(l)) - + def __str__(self): return self.get_fontconfig_pattern() Modified: branches/v0_99_maint/lib/matplotlib/mlab.py =================================================================== --- branches/v0_99_maint/lib/matplotlib/mlab.py 2009年09月14日 17:02:32 UTC (rev 7755) +++ branches/v0_99_maint/lib/matplotlib/mlab.py 2009年09月14日 17:11:06 UTC (rev 7756) @@ -362,12 +362,16 @@ *x* Array or sequence containing the data + %(PSD)s + Returns the tuple (*Pxx*, *freqs*). Refs: + Bendat & Piersol -- Random Data: Analysis and Measurement Procedures, John Wiley & Sons (1986) + """ Pxx,freqs = csd(x, x, NFFT, Fs, detrend, window, noverlap, pad_to, sides, scale_by_freq) @@ -391,7 +395,9 @@ *x*, *y* Array or sequence containing the data + %(PSD)s + Returns the tuple (*Pxy*, *freqs*). Refs: @@ -418,7 +424,9 @@ If *x* is real (i.e. non-complex) only the spectrum of the positive frequencie is returned. If *x* is complex then the complete spectrum is returned. + %(PSD)s + Returns a tuple (*Pxx*, *freqs*, *t*): - *Pxx*: 2-D array, columns are the periodograms of @@ -462,11 +470,13 @@ *x*, *y* Array or sequence containing the data + %(PSD)s + The return value is the tuple (*Cxy*, *f*), where *f* are the frequencies of the coherence vector. For cohere, scaling the - individual densities by the sampling frequency has no effect, since - the factors cancel out. + individual densities by the sampling frequency has no effect, + since the factors cancel out. .. seealso:: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7755 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7755&view=rev Author: mdboom Date: 2009年09月14日 17:02:32 +0000 (2009年9月14日) Log Message: ----------- Minor documentation fixes. Modified Paths: -------------- trunk/matplotlib/examples/api/watermark_image.py trunk/matplotlib/lib/matplotlib/axes.py trunk/matplotlib/lib/matplotlib/pyplot.py Modified: trunk/matplotlib/examples/api/watermark_image.py =================================================================== --- trunk/matplotlib/examples/api/watermark_image.py 2009年09月14日 13:28:43 UTC (rev 7754) +++ trunk/matplotlib/examples/api/watermark_image.py 2009年09月14日 17:02:32 UTC (rev 7755) @@ -3,7 +3,6 @@ """ import numpy as np import matplotlib -matplotlib.use('Agg') import matplotlib.cbook as cbook import matplotlib.image as image import matplotlib.pyplot as plt Modified: trunk/matplotlib/lib/matplotlib/axes.py =================================================================== --- trunk/matplotlib/lib/matplotlib/axes.py 2009年09月14日 13:28:43 UTC (rev 7754) +++ trunk/matplotlib/lib/matplotlib/axes.py 2009年09月14日 17:02:32 UTC (rev 7755) @@ -5519,6 +5519,7 @@ **Example:** .. plot:: mpl_examples/pylab_examples/hexbin_demo.py + """ if not self._hold: self.cla() Modified: trunk/matplotlib/lib/matplotlib/pyplot.py =================================================================== --- trunk/matplotlib/lib/matplotlib/pyplot.py 2009年09月14日 13:28:43 UTC (rev 7754) +++ trunk/matplotlib/lib/matplotlib/pyplot.py 2009年09月14日 17:02:32 UTC (rev 7755) @@ -1596,7 +1596,7 @@ def autogen_docstring(base): """Autogenerated wrappers will get their docstring from a base function with an addendum.""" - msg = "Additional kwargs: hold = [True|False] overrides default hold state" + msg = "\n\nAdditional kwargs: hold = [True|False] overrides default hold state" addendum = docstring.Appender(msg, '\n\n') return lambda func: addendum(docstring.copy_dedent(base)(func)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7754 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7754&view=rev Author: mdboom Date: 2009年09月14日 13:28:43 +0000 (2009年9月14日) Log Message: ----------- Add symlink for axes_grid examples to SVN Added Paths: ----------- trunk/matplotlib/doc/mpl_toolkits/axes_grid/examples Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/examples =================================================================== --- trunk/matplotlib/doc/mpl_toolkits/axes_grid/examples (rev 0) +++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/examples 2009年09月14日 13:28:43 UTC (rev 7754) @@ -0,0 +1 @@ +link ../../../examples/axes_grid/ \ No newline at end of file Property changes on: trunk/matplotlib/doc/mpl_toolkits/axes_grid/examples ___________________________________________________________________ Added: svn:special + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7753 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7753&view=rev Author: leejjoon Date: 2009年09月13日 05:44:21 +0000 (2009年9月13日) Log Message: ----------- AxesGrid: add modified version of colorbar Modified Paths: -------------- trunk/matplotlib/CHANGELOG trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axislines.rst trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst trunk/matplotlib/examples/axes_grid/demo_axes_grid.py trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_grid.py Added Paths: ----------- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_of_inset_axes.py trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_axes_divider.py trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_inset_locator.py trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_new_colorbar.py trunk/matplotlib/examples/axes_grid/demo_axes_grid2.py trunk/matplotlib/examples/axes_grid/demo_colorbar_with_inset_locator.py trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py Modified: trunk/matplotlib/CHANGELOG =================================================================== --- trunk/matplotlib/CHANGELOG 2009年09月13日 05:42:01 UTC (rev 7752) +++ trunk/matplotlib/CHANGELOG 2009年09月13日 05:44:21 UTC (rev 7753) @@ -1,3 +1,6 @@ +2009年09月13日 AxesGrid : add modified version of colorbar. Add colorbar + location howto. - JJL + 2009年09月07日 AxesGrid : implemented axisline style. Added a demo examples/axes_grid/demo_axisline_style.py- JJL Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_of_inset_axes.py =================================================================== --- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_of_inset_axes.py (rev 0) +++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_of_inset_axes.py 2009年09月13日 05:44:21 UTC (rev 7753) @@ -0,0 +1,49 @@ +import matplotlib.pyplot as plt + +from mpl_toolkits.axes_grid.inset_locator import inset_axes, zoomed_inset_axes +from mpl_toolkits.axes_grid.colorbar import colorbar + +def get_demo_image(): + from matplotlib.cbook import get_sample_data + import numpy as np + f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False) + z = np.load(f) + # z is a numpy array of 15x15 + return z, (-3,4,-4,3) + + +fig = plt.figure(1, [5,4]) +ax = fig.add_subplot(111) + +Z, extent = get_demo_image() + +ax.set(aspect=1, + xlim=(-15, 15), + ylim=(-20, 5)) + + +axins = zoomed_inset_axes(ax, 2, loc=2) # zoom = 6 +im = axins.imshow(Z, extent=extent, interpolation="nearest", + origin="lower") + +plt.xticks(visible=False) +plt.yticks(visible=False) + + +# colorbar +cax = inset_axes(axins, + width="5%", # width = 10% of parent_bbox width + height="100%", # height : 50% + loc=3, + bbox_to_anchor=(1.05, 0., 1, 1), + bbox_transform=axins.transAxes, + borderpad=0, + ) + + +colorbar(im, cax=cax) #, ticks=[1,2,3]) + + +plt.draw() +plt.show() + Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_axes_divider.py =================================================================== --- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_axes_divider.py (rev 0) +++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_axes_divider.py 2009年09月13日 05:44:21 UTC (rev 7753) @@ -0,0 +1,25 @@ +import matplotlib.pyplot as plt +from mpl_toolkits.axes_grid.axes_divider import make_axes_locatable + +from mpl_toolkits.axes_grid.colorbar import colorbar +# from matplotlib.pyplot import colorbar + +fig = plt.figure(1, figsize=(6, 3)) +fig.subplots_adjust(wspace=0.5) + +ax1 = fig.add_subplot(121) +im1 = ax1.imshow([[1,2],[3,4]]) + +ax1_divider = make_axes_locatable(ax1) +cax1 = ax1_divider.append_axes("right", size="7%", pad="2%") +cb1 = colorbar(im1, cax=cax1) + +ax2 = fig.add_subplot(122) +im2 = ax2.imshow([[1,2],[3,4]]) + +ax2_divider = make_axes_locatable(ax2) +cax2 = ax2_divider.append_axes("top", size="7%", pad="2%") +cb2 = colorbar(im2, cax=cax2, orientation="horizontal") +cax2.xaxis.set_ticks_position("top") +plt.show() + Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_inset_locator.py =================================================================== --- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_inset_locator.py (rev 0) +++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_inset_locator.py 2009年09月13日 05:44:21 UTC (rev 7753) @@ -0,0 +1,40 @@ +import matplotlib.pyplot as plt + +from mpl_toolkits.axes_grid.inset_locator import inset_axes +from mpl_toolkits.axes_grid.colorbar import colorbar + +fig = plt.figure(1, [6, 3]) + +# first subplot +ax1 = fig.add_subplot(121) + +axins1 = inset_axes(ax1, + width="50%", # width = 10% of parent_bbox width + height="5%", # height : 50% + loc=1) + +im1=ax1.imshow([[1,2],[2, 3]]) +colorbar(im1, cax=axins1, orientation="horizontal", ticks=[1,2,3]) +axins1.xaxis.set_ticks_position("bottom") + +# first subplot +ax = fig.add_subplot(122) + +axins = inset_axes(ax, + width="5%", # width = 10% of parent_bbox width + height="50%", # height : 50% + loc=3, + bbox_to_anchor=(1.05, 0., 1, 1), + bbox_transform=ax.transAxes, + borderpad=0, + ) + +# Controlling the placement of the inset axes is basically same as that +# of the legend. you may want to play with the borderpad value and +# the bbox_to_anchor coordinate. + +im=ax.imshow([[1,2],[2, 3]]) +colorbar(im, cax=axins, ticks=[1,2,3]) + +plt.draw() +plt.show() Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_new_colorbar.py =================================================================== --- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_new_colorbar.py (rev 0) +++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_new_colorbar.py 2009年09月13日 05:44:21 UTC (rev 7753) @@ -0,0 +1,21 @@ +import matplotlib.pyplot as plt + +plt.rcParams["text.usetex"]=False + +fig = plt.figure(1, figsize=(6, 3)) + +ax1 = fig.add_subplot(121) +im1 = ax1.imshow([[1,2],[3,4]]) +cb1 = plt.colorbar(im1) +cb1.ax.set_yticks([1, 3]) +ax1.set_title("Original MPL's colorbar w/\nset_yticks([1,3])", size=10) + +from mpl_toolkits.axes_grid.colorbar import colorbar +ax2 = fig.add_subplot(122) +im2 = ax2.imshow([[1,2],[3,4]]) +cb2 = colorbar(im2) +cb2.ax.set_yticks([1, 3]) +ax2.set_title("AxesGrid's colorbar w/\nset_yticks([1,3])", size=10) + +plt.show() + Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst =================================================================== --- trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst 2009年09月13日 05:42:01 UTC (rev 7752) +++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst 2009年09月13日 05:44:21 UTC (rev 7753) @@ -8,10 +8,12 @@ ease displaying multiple images in matplotlib. While the aspect parameter in matplotlib adjust the position of the single axes, AxesGrid toolkit provides a framework to adjust the position of -multiple axes according to their aspects. +multiple axes according to their aspects. +.. image:: ../../_static/demo_axes_grid.png + Documentation ============= @@ -19,4 +21,5 @@ :maxdepth: 2 users/index.rst + howtos/index.rst api/index.rst Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst =================================================================== --- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst 2009年09月13日 05:42:01 UTC (rev 7752) +++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst 2009年09月13日 05:44:21 UTC (rev 7753) @@ -81,12 +81,12 @@ See the example, -.. plot:: mpl_toolkits/axes_grid/figures/simple_axes_divider2.py +.. plot:: mpl_toolkits/axes_grid/examples/simple_axes_divider2.py :include-source: You can adjust the size of the each axes accroding to their x or y data limits (AxesX and AxesY), similar to the axes aspect parameter. -.. plot:: mpl_toolkits/axes_grid/figures/simple_axes_divider3.py +.. plot:: mpl_toolkits/axes_grid/examples/simple_axes_divider3.py :include-source: Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axislines.rst =================================================================== --- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axislines.rst 2009年09月13日 05:42:01 UTC (rev 7752) +++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axislines.rst 2009年09月13日 05:44:21 UTC (rev 7753) @@ -29,7 +29,7 @@ * a curvelinear grid. * a floating axis -.. plot:: mpl_toolkits/axes_grid/figures/demo_floating_axis.py +.. plot:: mpl_toolkits/axes_grid/examples/demo_floating_axis.py *axes_grid.axislines.Axes* defines a *axis* attribute, which is a @@ -211,7 +211,7 @@ ax1.parasites.append(ax2) -.. plot:: mpl_toolkits/axes_grid/figures/demo_curvelinear_grid.py +.. plot:: mpl_toolkits/axes_grid/examples/demo_curvelinear_grid.py Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst =================================================================== --- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst 2009年09月13日 05:42:01 UTC (rev 7752) +++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst 2009年09月13日 05:44:21 UTC (rev 7753) @@ -35,7 +35,7 @@ padding between them cannot be easily done in matplotlib. AxesGrid is used in such case. -.. plot:: mpl_toolkits/axes_grid/figures/simple_axesgrid.py +.. plot:: mpl_examples/axes_grid/simple_axesgrid.py :include-source: * The postion of each axes is determined at the drawing time (see @@ -49,7 +49,7 @@ height. The widths (height) of the axes in the same row (column) are scaled according to their view limits (xlim or ylim). - .. plot:: mpl_toolkits/axes_grid/figures/simple_axesgrid2.py + .. plot:: mpl_toolkits/axes_grid/examples/simple_axesgrid2.py :include-source: * xaxis are shared among axes in a same column. Similarly, yaxis are @@ -137,7 +137,7 @@ The examples below show what you can do with AxesGrid. -.. plot:: mpl_toolkits/axes_grid/figures/demo_axes_grid.py +.. plot:: mpl_toolkits/axes_grid/examples/demo_axes_grid.py RGB Axes @@ -158,7 +158,7 @@ origin="lower", interpolation="nearest") -.. plot:: mpl_toolkits/axes_grid/figures/simple_rgb.py +.. plot:: mpl_toolkits/axes_grid/examples/simple_rgb.py @@ -219,7 +219,7 @@ See the full source code below. -.. plot:: mpl_toolkits/axes_grid/figures/scatter_hist.py +.. plot:: mpl_toolkits/axes_grid/examples/scatter_hist.py The scatter_hist using the AxesDivider has some advantage over the @@ -246,7 +246,7 @@ Example 1. twinx ---------------- -.. plot:: mpl_toolkits/axes_grid/figures/parasite_simple.py +.. plot:: mpl_toolkits/axes_grid/examples/parasite_simple.py :include-source: Example 2. twin @@ -257,7 +257,7 @@ accordingly. -.. plot:: mpl_toolkits/axes_grid/figures/parasite_simple2.py +.. plot:: mpl_toolkits/axes_grid/examples/parasite_simple2.py @@ -290,13 +290,13 @@ ax.axis["top"].set_visible(False) -.. plot:: mpl_toolkits/axes_grid/figures/simple_axisline3.py +.. plot:: mpl_toolkits/axes_grid/examples/simple_axisline3.py SubplotZero gives you two more additional (floating?) axis of x=0 and y=0 (in data coordinate) -.. plot:: mpl_toolkits/axes_grid/figures/simple_axisline2.py +.. plot:: mpl_toolkits/axes_grid/examples/simple_axisline2.py :include-source: @@ -315,7 +315,7 @@ r"$\pi$", r"$\frac{3}{2}\pi$", r"2ドル\pi$"]) -.. plot:: mpl_toolkits/axes_grid/figures/simple_axisline4.py +.. plot:: mpl_toolkits/axes_grid/examples/simple_axisline4.py AxisLine Axes lets you create a custom axis, :: @@ -330,7 +330,7 @@ And, you can use it with parasiteAxes. -.. plot:: mpl_toolkits/axes_grid/figures/demo_parasite_axes2.py +.. plot:: mpl_toolkits/axes_grid/examples/demo_parasite_axes2.py AnchoredArtists @@ -343,7 +343,7 @@ in the example below will have width and height in the data coordinate. -.. plot:: mpl_toolkits/axes_grid/figures/simple_anchored_artists.py +.. plot:: mpl_toolkits/axes_grid/examples/simple_anchored_artists.py :include-source: @@ -377,7 +377,7 @@ creates an inset axes whose data scale is half of the parent axes. Here is complete examples. -.. plot:: mpl_toolkits/axes_grid/figures/inset_locator_demo.py +.. plot:: mpl_toolkits/axes_grid/examples/inset_locator_demo.py For example, :func:`zoomed_inset_axes` can be used when you want the inset represents the zoom-up of the small portion in the parent axes. @@ -385,7 +385,7 @@ function :func:`mark_inset` to mark the location of the area represented by the inset axes. -.. plot:: mpl_toolkits/axes_grid/figures/inset_locator_demo2.py +.. plot:: mpl_toolkits/axes_grid/examples/inset_locator_demo2.py :include-source: @@ -395,6 +395,6 @@ You can draw a cuvelinear grid and ticks. Also a floating axis can be created. See :ref:`axislines-manual` for more details. -.. plot:: mpl_toolkits/axes_grid/figures/demo_floating_axis.py +.. plot:: mpl_toolkits/axes_grid/examples/demo_floating_axis.py Modified: trunk/matplotlib/examples/axes_grid/demo_axes_grid.py =================================================================== --- trunk/matplotlib/examples/axes_grid/demo_axes_grid.py 2009年09月13日 05:42:01 UTC (rev 7752) +++ trunk/matplotlib/examples/axes_grid/demo_axes_grid.py 2009年09月13日 05:44:21 UTC (rev 7753) @@ -44,7 +44,7 @@ Z, extent = get_demo_image() for i in range(4): im = grid[i].imshow(Z, extent=extent, interpolation="nearest") - plt.colorbar(im, cax = grid.cbar_axes[0]) + #plt.colorbar(im, cax = grid.cbar_axes[0]) grid.cbar_axes[0].colorbar(im) # This affects all axes as share_all = True. Added: trunk/matplotlib/examples/axes_grid/demo_axes_grid2.py =================================================================== --- trunk/matplotlib/examples/axes_grid/demo_axes_grid2.py (rev 0) +++ trunk/matplotlib/examples/axes_grid/demo_axes_grid2.py 2009年09月13日 05:44:21 UTC (rev 7753) @@ -0,0 +1,124 @@ +import matplotlib.pyplot as plt +from mpl_toolkits.axes_grid import ImageGrid +import numpy as np + +def get_demo_image(): + from matplotlib.cbook import get_sample_data + f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False) + z = np.load(f) + # z is a numpy array of 15x15 + return z, (-3,4,-4,3) + + +def add_inner_title(ax, title, loc, size=None, **kwargs): + from matplotlib.offsetbox import AuxTransformBox, AnchoredOffsetbox + from matplotlib.font_manager import FontProperties + from matplotlib.patches import PathPatch + from matplotlib.textpath import TextPath + from matplotlib.transforms import IdentityTransform + if size is None: + size = FontProperties(size=plt.rcParams['legend.fontsize']) + text_path = TextPath((0, 0), title, size=10) + p1 = PathPatch(text_path, ec="w", lw=3, transform=IdentityTransform()) + p2 = PathPatch(text_path, ec="none", fc="k", transform=IdentityTransform()) + + offsetbox = AuxTransformBox(IdentityTransform()) + offsetbox.add_artist(p1) + offsetbox.add_artist(p2) + + ao = AnchoredOffsetbox(loc=loc, child=offsetbox, + pad=0., borderpad=0.5, + frameon=False, **kwargs) + ax.add_artist(ao) + + return ao + +if __name__ == "__main__": + F = plt.figure(1, (6, 6)) + F.clf() + + # prepare images + Z, extent = get_demo_image() + ZS = [Z[i::3,:] for i in range(3)] + extent = extent[0], extent[1]/3., extent[2], extent[3] + + # demo 1 : colorbar at each axes + + grid = ImageGrid(F, 211, # similar to subplot(111) + nrows_ncols = (1, 3), + direction="row", + axes_pad = 0.05, + add_all=True, + label_mode = "1", + share_all = True, + cbar_location="top", + cbar_mode="each", + cbar_size="7%", + cbar_pad="1%", + ) + + + for ax, z in zip(grid, ZS): + im = ax.imshow(z, origin="lower", extent=extent, interpolation="nearest") + ax.cax.colorbar(im) + + for ax, im_title in zip(grid, ["Image 1", "Image 2", "Image 3"]): + t = add_inner_title(ax, im_title, loc=3) + t.patch.set_alpha(0.5) + + for ax, z in zip(grid, ZS): + ax.cax.toggle_label(True) + axis = ax.cax.axis[ax.cax.orientation] + axis.label.set_text("counts s$^{-1}$") + axis.label.set_size(10) + axis.major_ticklabels.set_size(6) + + # changing the colorbar ticks + grid[1].cax.set_xticks([-1, 0, 1]) + grid[2].cax.set_xticks([-1, 0, 1]) + + grid[0].set_xticks([-2, 0]) + grid[0].set_yticks([-2, 0, 2]) + + + # demo 2 : shared colorbar + + grid2 = ImageGrid(F, 212, + nrows_ncols = (1, 3), + direction="row", + axes_pad = 0.05, + add_all=True, + label_mode = "1", + share_all = True, + cbar_location="right", + cbar_mode="single", + cbar_size="10%", + cbar_pad=0.05, + ) + + grid2[0].set_xlabel("X") + grid2[0].set_ylabel("Y") + + vmax, vmin = np.max(ZS), np.min(ZS) + import matplotlib.colors + norm = matplotlib.colors.normalize(vmax=vmax, vmin=vmin) + + for ax, z in zip(grid2, ZS): + im = ax.imshow(z, norm=norm, + origin="lower", extent=extent, + interpolation="nearest") + + # With cbar_mode="single", cax attribute of all axes are identical. + ax.cax.colorbar(im) + ax.cax.toggle_label(True) + + for ax, im_title in zip(grid2, ["(a)", "(b)", "(c)"]): + t = add_inner_title(ax, im_title, loc=2) + t.patch.set_ec("none") + t.patch.set_alpha(0.5) + + grid2[0].set_xticks([-2, 0]) + grid2[0].set_yticks([-2, 0, 2]) + + plt.draw() + plt.show() Added: trunk/matplotlib/examples/axes_grid/demo_colorbar_with_inset_locator.py =================================================================== --- trunk/matplotlib/examples/axes_grid/demo_colorbar_with_inset_locator.py (rev 0) +++ trunk/matplotlib/examples/axes_grid/demo_colorbar_with_inset_locator.py 2009年09月13日 05:44:21 UTC (rev 7753) @@ -0,0 +1,44 @@ +import matplotlib.pyplot as plt + +from mpl_toolkits.axes_grid.inset_locator import inset_axes +#from mpl_toolkits.axes_grid.colorbar import colorbar + +fig = plt.figure(1, [6, 3]) + +# first subplot +ax1 = fig.add_subplot(121) + +axins1 = inset_axes(ax1, + width="50%", # width = 10% of parent_bbox width + height="5%", # height : 50% + loc=1) + +locator1=axins1.get_axes_locator() + +im1=ax1.imshow([[1,2],[2, 3]]) +colorbar(im1, cax=axins1, orientation="horizontal", ticks=[1,2,3]) +axins1.xaxis.set_ticks_position("bottom") + +# first subplot +ax = fig.add_subplot(122) + +axins = inset_axes(ax, + width="5%", # width = 10% of parent_bbox width + height="50%", # height : 50% + loc=3, + bbox_to_anchor=(1.05, 0., 1, 1), + bbox_transform=ax.transAxes, + borderpad=0, + ) + + +locator=axins.get_axes_locator() +# Controlling the placement of the inset axes is basically same as that +# of the legend. you may want to play with the borderpad value and +# the bbox_to_anchor coordinate. + +im=ax.imshow([[1,2],[2, 3]]) +colorbar(im, cax=axins) + +plt.draw() +plt.show() Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py =================================================================== --- trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py 2009年09月13日 05:42:01 UTC (rev 7752) +++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py 2009年09月13日 05:44:21 UTC (rev 7753) @@ -502,6 +502,31 @@ return ax + def append_axes(self, position, size, pad=None, **kwargs): + """ + create an axes at the given *position* with the same height + (or width) of the main axes. + + *position* + ["left"|"right"|"bottom"|"top"] + + *size* and *pad* should be axes_grid.axes_size compatible. + """ + + if position == "left": + ax = self.new_horizontal(size, pad, pack_start=True, **kwargs) + elif position == "right": + ax = self.new_horizontal(size, pad, pack_start=False, **kwargs) + elif position == "bottom": + ax = self.new_vertical(size, pad, pack_start=True, **kwargs) + elif position == "top": + ax = self.new_vertical(size, pad, pack_start=False, **kwargs) + else: + raise ValueError("the position must be one of left, right, bottom, or top") + + self._fig.add_axes(ax) + return ax + def get_aspect(self): if self._aspect is None: aspect = self._axes.get_aspect() Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_grid.py =================================================================== --- trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_grid.py 2009年09月13日 05:42:01 UTC (rev 7752) +++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_grid.py 2009年09月13日 05:44:21 UTC (rev 7753) @@ -2,7 +2,8 @@ import matplotlib.pyplot as plt import matplotlib.axes as maxes -import matplotlib.colorbar as mcolorbar +#import matplotlib.colorbar as mcolorbar +import colorbar as mcolorbar import matplotlib as mpl import matplotlib.patches as mpatches import matplotlib.lines as mlines @@ -10,8 +11,8 @@ from axes_divider import Size, SubplotDivider, LocatableAxes, Divider +import numpy as np - def _tick_only(ax, bottom_on, left_on): bottom_off = not bottom_on left_off = not left_on @@ -28,7 +29,7 @@ ax.axis["left"].label.set_visible(left_off) class Colorbar(mcolorbar.Colorbar): - def _config_axes(self, X, Y): + def _config_axes_deprecated(self, X, Y): ''' Make an axes patch and outline. ''' @@ -431,6 +432,7 @@ cbar_location="right", cbar_pad=None, cbar_size="5%", + cbar_set_cax=True, axes_class=None, ): """ @@ -456,9 +458,13 @@ cbar_location "right" [ "right" | "top" ] cbar_pad None cbar_size "5%" + cbar_set_cax True [ True | False ] axes_class None a type object which must be a subclass of :class:`~matplotlib.axes.Axes` ================ ======== ========================================= + + *cbar_set_cax* : if True, each axes in the grid has a cax + attribute that is bind to associated cbar_axes. """ self._nrows, self._ncols = nrows_ncols @@ -568,6 +574,14 @@ for ax in self.axes_all+self.cbar_axes: fig.add_axes(ax) + if cbar_set_cax: + if self._colorbar_mode == "single": + for ax in self.axes_all: + ax.cax = self.cbar_axes[0] + else: + for ax, cax in zip(self.axes_all, self.cbar_axes): + ax.cax = cax + self.set_label_mode(label_mode) @@ -683,8 +697,8 @@ -if __name__ == "__main__": -#if 0: +#if __name__ == "__main__": +if 0: from axes_divider import get_demo_image F = plt.figure(1, (9, 3.5)) F.clf() @@ -761,3 +775,5 @@ plt.ion() plt.draw() + + Added: trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py =================================================================== --- trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py (rev 0) +++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py 2009年09月13日 05:44:21 UTC (rev 7753) @@ -0,0 +1,816 @@ +''' +Colorbar toolkit with two classes and a function: + + :class:`ColorbarBase` + the base class with full colorbar drawing functionality. + It can be used as-is to make a colorbar for a given colormap; + a mappable object (e.g., image) is not needed. + + :class:`Colorbar` + the derived class for use with images or contour plots. + + :func:`make_axes` + a function for resizing an axes and adding a second axes + suitable for a colorbar + +The :meth:`~matplotlib.figure.Figure.colorbar` method uses :func:`make_axes` +and :class:`Colorbar`; the :func:`~matplotlib.pyplot.colorbar` function +is a thin wrapper over :meth:`~matplotlib.figure.Figure.colorbar`. + +''' + +import numpy as np +import matplotlib as mpl +import matplotlib.colors as colors +import matplotlib.cm as cm +from matplotlib import docstring +import matplotlib.ticker as ticker +import matplotlib.cbook as cbook +import matplotlib.collections as collections +import matplotlib.contour as contour +from matplotlib.path import Path +from matplotlib.patches import PathPatch +from matplotlib.transforms import Bbox + + +make_axes_kw_doc = ''' + + ============= ==================================================== + Property Description + ============= ==================================================== + *orientation* vertical or horizontal + *fraction* 0.15; fraction of original axes to use for colorbar + *pad* 0.05 if vertical, 0.15 if horizontal; fraction + of original axes between colorbar and new image axes + *shrink* 1.0; fraction by which to shrink the colorbar + *aspect* 20; ratio of long to short dimensions + ============= ==================================================== + +''' + +colormap_kw_doc = ''' + + =========== ==================================================== + Property Description + =========== ==================================================== + *extend* [ 'neither' | 'both' | 'min' | 'max' ] + If not 'neither', make pointed end(s) for out-of- + range values. These are set for a given colormap + using the colormap set_under and set_over methods. + *spacing* [ 'uniform' | 'proportional' ] + Uniform spacing gives each discrete color the same + space; proportional makes the space proportional to + the data interval. + *ticks* [ None | list of ticks | Locator object ] + If None, ticks are determined automatically from the + input. + *format* [ None | format string | Formatter object ] + If None, the + :class:`~matplotlib.ticker.ScalarFormatter` is used. + If a format string is given, e.g. '%.3f', that is + used. An alternative + :class:`~matplotlib.ticker.Formatter` object may be + given instead. + *drawedges* [ False | True ] If true, draw lines at color + boundaries. + =========== ==================================================== + + The following will probably be useful only in the context of + indexed colors (that is, when the mappable has norm=NoNorm()), + or other unusual circumstances. + + ============ =================================================== + Property Description + ============ =================================================== + *boundaries* None or a sequence + *values* None or a sequence which must be of length 1 less + than the sequence of *boundaries*. For each region + delimited by adjacent entries in *boundaries*, the + color mapped to the corresponding value in values + will be used. + ============ =================================================== + +''' + +colorbar_doc = ''' + +Add a colorbar to a plot. + +Function signatures for the :mod:`~matplotlib.pyplot` interface; all +but the first are also method signatures for the +:meth:`~matplotlib.figure.Figure.colorbar` method:: + + colorbar(**kwargs) + colorbar(mappable, **kwargs) + colorbar(mappable, cax=cax, **kwargs) + colorbar(mappable, ax=ax, **kwargs) + +arguments: + + *mappable* + the :class:`~matplotlib.image.Image`, + :class:`~matplotlib.contour.ContourSet`, etc. to + which the colorbar applies; this argument is mandatory for the + :meth:`~matplotlib.figure.Figure.colorbar` method but optional for the + :func:`~matplotlib.pyplot.colorbar` function, which sets the + default to the current image. + +keyword arguments: + + *cax* + None | axes object into which the colorbar will be drawn + *ax* + None | parent axes object from which space for a new + colorbar axes will be stolen + + +Additional keyword arguments are of two kinds: + + axes properties: +%s + colorbar properties: +%s + +If *mappable* is a :class:`~matplotlib.contours.ContourSet`, its *extend* +kwarg is included automatically. + +Note that the *shrink* kwarg provides a simple way to keep a vertical +colorbar, for example, from being taller than the axes of the mappable +to which the colorbar is attached; but it is a manual method requiring +some trial and error. If the colorbar is too tall (or a horizontal +colorbar is too wide) use a smaller value of *shrink*. + +For more precise control, you can manually specify the positions of +the axes objects in which the mappable and the colorbar are drawn. In +this case, do not use any of the axes properties kwargs. + +returns: + :class:`~matplotlib.colorbar.Colorbar` instance; see also its base class, + :class:`~matplotlib.colorbar.ColorbarBase`. Call the + :meth:`~matplotlib.colorbar.ColorbarBase.set_label` method + to label the colorbar. + + +The transData of the *cax* is adjusted so that the limits in the +longest axis actually corresponds to the limits in colorbar range. On +the other hand, the shortest axis has a data limits of [1,2], whose +unconventional value is to prevent underflow when log scale is used. +''' % (make_axes_kw_doc, colormap_kw_doc) + +docstring.interpd.update(colorbar_doc=colorbar_doc) + + +class CbarAxesLocator(object): + """ + CbarAxesLocator is a axes_locator for colobar axes. It adjust the + position of the axes to make a room for extended ends, i.e., the + extended ends are located outside the axes area. + """ + + def __init__(self, locator=None, extend="neither", orientation="vertical"): + """ + *locator* : the bbox returned from the locator is used as a + initial axes location. If None, axes.bbox is used. + + *extend* : same as in ColorbarBase + *orientation* : same as in ColorbarBase + + """ + self._locator = locator + self.extesion_fraction = 0.05 + self.extend = extend + self.orientation = orientation + + def get_original_position(self, axes, renderer): + """ + get the original position of the axes. + """ + if self._locator is None: + bbox = axes.get_position(original=True) + else: + bbox = self._locator(axes, renderer) + return bbox + + def get_end_vertices(self): + """ + return a tuple of two vertices for the colorbar extended ends. + The first vertives is for min. end, and the second is for + max. end. + """ + # Note that concatenating two vertices needs to make a + # vertices for the frame. + extesion_fraction = self.extesion_fraction + + corx = extesion_fraction*2. + cory = 1./(1. - corx) + x1, y1, w, h = 0, 0, 1, 1 + x2, y2 = x1 + w, y1 + h + dw, dh = w*extesion_fraction, h*extesion_fraction*cory + + if self.extend in ["min", "both"]: + bottom = [(x1, y1), + (x1+w/2., y1-dh), + (x2, y1)] + else: + bottom = [(x1, y1), + (x2, y1)] + + if self.extend in ["max", "both"]: + top = [(x2, y2), + (x1+w/2., y2+dh), + (x1, y2)] + else: + top = [(x2, y2), + (x1, y2)] + + if self.orientation == "horizontal": + bottom = [(y,x) for (x,y) in bottom] + top = [(y,x) for (x,y) in top] + + return bottom, top + + + def get_path_patch(self): + """ + get the path for axes patch + """ + end1, end2 = self.get_end_vertices() + + verts = [] + end1 + end2 + end1[:1] + + return Path(verts) + + + def get_path_ends(self): + """ + get the paths for extended ends + """ + + end1, end2 = self.get_end_vertices() + + return Path(end1), Path(end2) + + + def __call__(self, axes, renderer): + """ + Return the adjusted position of the axes + """ + bbox0 = self.get_original_position(axes, renderer) + bbox = bbox0 + + x1, y1, w, h = bbox.bounds + extesion_fraction = self.extesion_fraction + dw, dh = w*extesion_fraction, h*extesion_fraction + + if self.extend in ["min", "both"]: + if self.orientation == "horizontal": + x1 = x1 + dw + else: + y1 = y1+dh + + if self.extend in ["max", "both"]: + if self.orientation == "horizontal": + w = w-2*dw + else: + h = h-2*dh + + return Bbox.from_bounds(x1, y1, w, h) + + + +class ColorbarBase(cm.ScalarMappable): + ''' + Draw a colorbar in an existing axes. + + This is a base class for the :class:`Colorbar` class, which is the + basis for the :func:`~matplotlib.pyplot.colorbar` method and pylab + function. + + It is also useful by itself for showing a colormap. If the *cmap* + kwarg is given but *boundaries* and *values* are left as None, + then the colormap will be displayed on a 0-1 scale. To show the + under- and over-value colors, specify the *norm* as:: + + colors.Normalize(clip=False) + + To show the colors versus index instead of on the 0-1 scale, + use:: + + norm=colors.NoNorm. + + Useful attributes: + + :attr:`ax` + the Axes instance in which the colorbar is drawn + + :attr:`lines` + a LineCollection if lines were drawn, otherwise None + + :attr:`dividers` + a LineCollection if *drawedges* is True, otherwise None + + Useful public methods are :meth:`set_label` and :meth:`add_lines`. + + ''' + + def __init__(self, ax, cmap=None, + norm=None, + alpha=1.0, + values=None, + boundaries=None, + orientation='vertical', + extend='neither', + spacing='uniform', # uniform or proportional + ticks=None, + format=None, + drawedges=False, + filled=True, + ): + self.ax = ax + + if cmap is None: cmap = cm.get_cmap() + if norm is None: norm = colors.Normalize() + self.alpha = alpha + cm.ScalarMappable.__init__(self, cmap=cmap, norm=norm) + self.values = values + self.boundaries = boundaries + self.extend = extend + self.spacing = spacing + self.orientation = orientation + self.drawedges = drawedges + self.filled = filled + + # artists + self.solids = None + self.lines = None + self.dividers = None + self.extension_patch1 = None + self.extension_patch2 = None + + if orientation == "vertical": + self.cbar_axis = self.ax.yaxis + else: + self.cbar_axis = self.ax.xaxis + + + if format is None: + if isinstance(self.norm, colors.LogNorm): + # change both axis for proper aspect + self.ax.xaxis.set_scale("log") + self.ax.yaxis.set_scale("log") + self.ax._update_transScale() + self.cbar_axis.set_minor_locator(ticker.NullLocator()) + formatter = ticker.LogFormatter() + else: + formatter = None + elif cbook.is_string_like(format): + formatter = ticker.FormatStrFormatter(format) + else: + formatter = format # Assume it is a Formatter + + if formatter is None: + formatter = self.cbar_axis.get_major_formatter() + else: + self.cbar_axis.set_major_formatter(formatter) + + if cbook.iterable(ticks): + self.cbar_axis.set_ticks(ticks) + elif ticks is not None: + self.cbar_axis.set_major_locator(ticks) + else: + self._select_locator(formatter) + + + self._config_axes() + + self.update_artists() + + self.set_label_text('') + + + def _get_colorbar_limits(self): + """ + initial limits for colorbar range. The returne min, max values + will be used to create colorbar solid(?) and etc. + """ + if self.boundaries is not None: + C = self.boundaries + if self.extend in ["min", "both"]: + C = C[1:] + + if self.extend in ["max", "both"]: + C = C[:-1] + return min(C), max(C) + else: + return self.get_clim() + + + def _config_axes(self): + ''' + Adjust the properties of the axes to be adquate for colorbar display. + ''' + ax = self.ax + + axes_locator = CbarAxesLocator(ax.get_axes_locator(), + extend=self.extend, + orientation=self.orientation) + ax.set_axes_locator(axes_locator) + + # overide the get_data_ratio for the aspect works. + def _f(): + return 1. + ax.get_data_ratio = _f + ax.get_data_ratio_log = _f + + ax.set_frame_on(True) + ax.set_navigate(False) + + self.ax.set_autoscalex_on(False) + self.ax.set_autoscaley_on(False) + + if self.orientation == 'horizontal': + ax.xaxis.set_label_position('bottom') + ax.set_yticks([]) + else: + ax.set_xticks([]) + ax.yaxis.set_label_position('right') + ax.yaxis.set_ticks_position('right') + + + + def update_artists(self): + """ + Update the colorbar associated artists, *filled* and + *ends*. Note that *lines* are not updated. This needs to be + called whenever clim of associated image changes. + """ + self._process_values() + self._add_ends() + + X, Y = self._mesh() + if self.filled: + C = self._values[:,np.newaxis] + self._add_solids(X, Y, C) + + ax = self.ax + vmin, vmax = self._get_colorbar_limits() + if self.orientation == 'horizontal': + ax.set_ylim(1, 2) + ax.set_xlim(vmin, vmax) + else: + ax.set_xlim(1, 2) + ax.set_ylim(vmin, vmax) + + + def _add_ends(self): + """ + Create patches from extended ends and add them to the axes. + """ + + del self.extension_patch1 + del self.extension_patch2 + + path1, path2 = self.ax.get_axes_locator().get_path_ends() + fc=mpl.rcParams['axes.facecolor'] + ec=mpl.rcParams['axes.edgecolor'] + linewidths=0.5*mpl.rcParams['axes.linewidth'] + self.extension_patch1 = PathPatch(path1, + fc=fc, ec=ec, lw=linewidths, + zorder=2., + transform=self.ax.transAxes, + clip_on=False) + self.extension_patch2 = PathPatch(path2, + fc=fc, ec=ec, lw=linewidths, + zorder=2., + transform=self.ax.transAxes, + clip_on=False) + self.ax.add_artist(self.extension_patch1) + self.ax.add_artist(self.extension_patch2) + + + + def _set_label_text(self): + """ + set label. + """ + self.cbar_axis.set_label_text(self._label, **self._labelkw) + + def set_label_text(self, label, **kw): + ''' + Label the long axis of the colorbar + ''' + self._label = label + self._labelkw = kw + self._set_label_text() + + + def _edges(self, X, Y): + ''' + Return the separator line segments; helper for _add_solids. + ''' + N = X.shape[0] + # Using the non-array form of these line segments is much + # simpler than making them into arrays. + if self.orientation == 'vertical': + return [zip(X[i], Y[i]) for i in range(1, N-1)] + else: + return [zip(Y[i], X[i]) for i in range(1, N-1)] + + def _add_solids(self, X, Y, C): + ''' + Draw the colors using :meth:`~matplotlib.axes.Axes.pcolor`; + optionally add separators. + ''' + ## Change to pcolorfast after fixing bugs in some backends... + + if self.extend in ["min", "both"]: + cc = self.to_rgba([C[0][0]]) + self.extension_patch1.set_fc(cc[0]) + X, Y, C = X[1:], Y[1:], C[1:] + + if self.extend in ["max", "both"]: + cc = self.to_rgba([C[-1][0]]) + self.extension_patch2.set_fc(cc[0]) + X, Y, C = X[:-1], Y[:-1], C[:-1] + + if self.orientation == 'vertical': + args = (X, Y, C) + else: + args = (np.transpose(Y), np.transpose(X), np.transpose(C)) + kw = {'cmap':self.cmap, 'norm':self.norm, + 'shading':'flat', 'alpha':self.alpha, + } + + del self.solids + del self.dividers + + col = self.ax.pcolor(*args, **kw) + self.solids = col + if self.drawedges: + self.dividers = collections.LineCollection(self._edges(X,Y), + colors=(mpl.rcParams['axes.edgecolor'],), + linewidths=(0.5*mpl.rcParams['axes.linewidth'],), + ) + self.ax.add_collection(self.dividers) + else: + self.dividers = None + + def add_lines(self, levels, colors, linewidths): + ''' + Draw lines on the colorbar. It deletes preexting lines. + ''' + del self.lines + + N = len(levels) + x = np.array([1.0, 2.0]) + X, Y = np.meshgrid(x,levels) + if self.orientation == 'vertical': + xy = [zip(X[i], Y[i]) for i in range(N)] + else: + xy = [zip(Y[i], X[i]) for i in range(N)] + col = collections.LineCollection(xy, linewidths=linewidths, + ) + self.lines = col + col.set_color(colors) + self.ax.add_collection(col) + + + def _select_locator(self, formatter): + ''' + select a suitable locator + ''' + if self.boundaries is None: + if isinstance(self.norm, colors.NoNorm): + nv = len(self._values) + base = 1 + int(nv/10) + locator = ticker.IndexLocator(base=base, offset=0) + elif isinstance(self.norm, colors.BoundaryNorm): + b = self.norm.boundaries + locator = ticker.FixedLocator(b, nbins=10) + elif isinstance(self.norm, colors.LogNorm): + locator = ticker.LogLocator() + else: + locator = ticker.MaxNLocator(nbins=5) + else: + b = self._boundaries[self._inside] + locator = ticker.FixedLocator(b) #, nbins=10) + + self.cbar_axis.set_major_locator(locator) + + + def _process_values(self, b=None): + ''' + Set the :attr:`_boundaries` and :attr:`_values` attributes + based on the input boundaries and values. Input boundaries + can be *self.boundaries* or the argument *b*. + ''' + if b is None: + b = self.boundaries + if b is not None: + self._boundaries = np.asarray(b, dtype=float) + if self.values is None: + self._values = 0.5*(self._boundaries[:-1] + + self._boundaries[1:]) + if isinstance(self.norm, colors.NoNorm): + self._values = (self._values + 0.00001).astype(np.int16) + return + self._values = np.array(self.values) + return + if self.values is not None: + self._values = np.array(self.values) + if self.boundaries is None: + b = np.zeros(len(self.values)+1, 'd') + b[1:-1] = 0.5*(self._values[:-1] - self._values[1:]) + b[0] = 2.0*b[1] - b[2] + b[-1] = 2.0*b[-2] - b[-3] + self._boundaries = b + return + self._boundaries = np.array(self.boundaries) + return + # Neither boundaries nor values are specified; + # make reasonable ones based on cmap and norm. + if isinstance(self.norm, colors.NoNorm): + b = self._uniform_y(self.cmap.N+1) * self.cmap.N - 0.5 + v = np.zeros((len(b)-1,), dtype=np.int16) + v = np.arange(self.cmap.N, dtype=np.int16) + self._boundaries = b + self._values = v + return + elif isinstance(self.norm, colors.BoundaryNorm): + b = np.array(self.norm.boundaries) + v = np.zeros((len(b)-1,), dtype=float) + bi = self.norm.boundaries + v = 0.5*(bi[:-1] + bi[1:]) + self._boundaries = b + self._values = v + return + else: + b = self._uniform_y(self.cmap.N+1) + + self._process_values(b) + + + def _uniform_y(self, N): + ''' + Return colorbar data coordinates for *N* uniformly + spaced boundaries. + ''' + vmin, vmax = self._get_colorbar_limits() + if isinstance(self.norm, colors.LogNorm): + y = np.logspace(np.log10(vmin), np.log10(vmax), N) + else: + y = np.linspace(vmin, vmax, N) + return y + + def _mesh(self): + ''' + Return X,Y, the coordinate arrays for the colorbar pcolormesh. + These are suitable for a vertical colorbar; swapping and + transposition for a horizontal colorbar are done outside + this function. + ''' + x = np.array([1.0, 2.0]) + if self.spacing == 'uniform': + y = self._uniform_y(len(self._boundaries)) + else: + y = self._boundaries + self._y = y + + X, Y = np.meshgrid(x,y) + return X, Y + + + def set_alpha(self, alpha): + """ + set alpha value. + """ + self.alpha = alpha + + +class Colorbar(ColorbarBase): + def __init__(self, ax, mappable, **kw): + mappable.autoscale_None() # Ensure mappable.norm.vmin, vmax + # are set when colorbar is called, + # even if mappable.draw has not yet + # been called. This will not change + # vmin, vmax if they are already set. + self.mappable = mappable + kw['cmap'] = mappable.cmap + kw['norm'] = mappable.norm + kw['alpha'] = mappable.get_alpha() + if isinstance(mappable, contour.ContourSet): + CS = mappable + kw['boundaries'] = CS._levels + kw['values'] = CS.cvalues + kw['extend'] = CS.extend + #kw['ticks'] = CS._levels + kw.setdefault('ticks', ticker.FixedLocator(CS.levels, nbins=10)) + kw['filled'] = CS.filled + ColorbarBase.__init__(self, ax, **kw) + if not CS.filled: + self.add_lines(CS) + else: + ColorbarBase.__init__(self, ax, **kw) + + + def add_lines(self, CS): + ''' + Add the lines from a non-filled + :class:`~matplotlib.contour.ContourSet` to the colorbar. + ''' + if not isinstance(CS, contour.ContourSet) or CS.filled: + raise ValueError('add_lines is only for a ContourSet of lines') + tcolors = [c[0] for c in CS.tcolors] + tlinewidths = [t[0] for t in CS.tlinewidths] + # The following was an attempt to get the colorbar lines + # to follow subsequent changes in the contour lines, + # but more work is needed: specifically, a careful + # look at event sequences, and at how + # to make one object track another automatically. + #tcolors = [col.get_colors()[0] for col in CS.collections] + #tlinewidths = [col.get_linewidth()[0] for lw in CS.collections] + #print 'tlinewidths:', tlinewidths + ColorbarBase.add_lines(self, CS.levels, tcolors, tlinewidths) + + def update_bruteforce(self, mappable): + """ + Update the colorbar artists to reflect the change of the + assocaited mappable. + """ + self.update_artists() + + if isinstance(mappable, contour.ContourSet): + if not mappable.filled: + self.add_lines(mappable) + +...@do...bstitution(make_axes_kw_doc) +def make_axes(parent, **kw): + ''' + Resize and reposition a parent axes, and return a child + axes suitable for a colorbar:: + + cax, kw = make_axes(parent, **kw) + + Keyword arguments may include the following (with defaults): + + *orientation* + 'vertical' or 'horizontal' + + %s + + All but the first of these are stripped from the input kw set. + + Returns (cax, kw), the child axes and the reduced kw dictionary. + ''' + orientation = kw.setdefault('orientation', 'vertical') + fraction = kw.pop('fraction', 0.15) + shrink = kw.pop('shrink', 1.0) + aspect = kw.pop('aspect', 20) + #pb = transforms.PBox(parent.get_position()) + pb = parent.get_position(original=True).frozen() + if orientation == 'vertical': + pad = kw.pop('pad', 0.05) + x1 = 1.0-fraction + pb1, pbx, pbcb = pb.splitx(x1-pad, x1) + pbcb = pbcb.shrunk(1.0, shrink).anchored('C', pbcb) + anchor = (0.0, 0.5) + panchor = (1.0, 0.5) + else: + pad = kw.pop('pad', 0.15) + pbcb, pbx, pb1 = pb.splity(fraction, fraction+pad) + pbcb = pbcb.shrunk(shrink, 1.0).anchored('C', pbcb) + aspect = 1.0/aspect + anchor = (0.5, 1.0) + panchor = (0.5, 0.0) + parent.set_position(pb1) + parent.set_anchor(panchor) + fig = parent.get_figure() + cax = fig.add_axes(pbcb) + cax.set_aspect(aspect, anchor=anchor, adjustable='box') + return cax, kw + + +def colorbar(mappable, cax=None, ax=None, **kw): + """ + Create a colorbar for a ScalarMappable instance. + + Documentation for the pylab thin wrapper: + %(colorbar_doc)s + """ + import matplotlib.pyplot as plt + if ax is None: + ax = plt.gca() + if cax is None: + cax, kw = make_axes(ax, **kw) + cax.hold(True) + cb = Colorbar(cax, mappable, **kw) + + def on_changed(m): + cb.set_cmap(m.get_cmap()) + cb.set_clim(m.get_clim()) + cb.update_bruteforce(m) + + cbid = mappable.callbacksSM.connect('changed', on_changed) + mappable.set_colorbar(cb, cax) + ax.figure.sca(ax) + return cb This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7752 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7752&view=rev Author: leejjoon Date: 2009年09月13日 05:42:01 +0000 (2009年9月13日) Log Message: ----------- delete doc/mpl_toolkits/axes_grid/figures Removed Paths: ------------- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures Deleted: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures =================================================================== --- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures 2009年09月12日 21:11:42 UTC (rev 7751) +++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures 2009年09月13日 05:42:01 UTC (rev 7752) @@ -1 +0,0 @@ -link ../../../examples/axes_grid/ \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7751 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7751&view=rev Author: jdh2358 Date: 2009年09月12日 21:11:42 +0000 (2009年9月12日) Log Message: ----------- tagging for 99.1 release candiate Modified Paths: -------------- branches/v0_99_maint/README.txt branches/v0_99_maint/lib/matplotlib/__init__.py branches/v0_99_maint/make.osx Modified: branches/v0_99_maint/README.txt =================================================================== --- branches/v0_99_maint/README.txt 2009年09月11日 21:22:52 UTC (rev 7750) +++ branches/v0_99_maint/README.txt 2009年09月12日 21:11:42 UTC (rev 7751) @@ -1,61 +1,45 @@ -Overview of the matplotlib src tree -=================================== +matplotlib for MacOS X 10.3.9 or later and Python 2.5 and Python 2.6 -This is the source directory for matplotlib, which contains the -following files and directories. +matplotlib is a python 2D plotting library which produces publication +quality figures in a variety of hardcopy formats and interactive +environments across platforms. matplotlib can be used in python +scripts, the python and ipython shell (ala matlab or mathematica), web +application servers, and various graphical user interface toolkits. -* doc - the matplotlib documentation. See doc/users for the user's - documentation and doc/devel for the developers documentation +Home page: <http://matplotlib.sourceforge.net/> -* examples - a bunch of examples using matplotib. See - examples/README.txt for information +Before running matplotlib, you must install numpy. Binary installers +for all these packages are available here: -* setup.cfg.template - used to configure the matplotlib build process. - Copy this file to setup.cfg if you want to override the default - build behavior + <http://pythonmac.org/packages/py25-fat/index.html>. -* matplotlibrc.template - a template file used to generate the - matplotlibrc config file at build time. The matplotlibrc file will - be installed in matplotlib/mpl-data/matplotlibrc +*** Back Ends *** -* lib - the python src code. matplotlib ships several third party - packages here. The subdirectory lib/matplotlib contains the python - src code for matplotlib +You may use TkAgg or WXAgg back ends; Qt and GTK support is not +provided in this package. By default this matplotlib uses TkAgg +because Tcl/Tk is included with MacOS X. -* src - the matplotlib extension code, mostly C++ +If you wish to use WXAgg then: +* Install wxPython from: + <http://pythonmac.org/packages/py25-fat/index.html>. +* Configure a matplotlibrc file, as described below. -* ttconv - some truetype font utilities +For TkAgg you may use Apple's built-in Tcl/Tk or install your own 8.4.x -* license - all the licenses for code included with matplotlib. - matplotlib uses only BSD compatible code +*** Configuring a matplotlibrc file *** -* unit - some unit tests +If you wish to change any matplotlib settings, create a file: + ~/.matplotlib/matplotlibrc -* CHANGELOG - all the significant changes to matplotlib, organized by - release. The top of this file will show you the most recent changes -* API_CHANGES - any change that alters the API is listed here. The - entries are organized by release, with most recent entries first +that contains at least the following information. The values shown are +the defaults in the internal matplotlibrc file; change them as you see +fit: -* MIGRATION.txt - instructions on moving from the 0.91 code to the - 0.98 trunk. +# the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg WXAgg +# Agg Cairo GD GDK Paint PS PDF SVG Template +backend : TkAgg +interactive : False # see http://matplotlib.sourceforge.net/interactive.html -* SEGFAULTS - some tips for how to diagnose and debug segfaults - -* setup.py - the matplotlib build script - -* setupext.py - some helper code for setup.py to build the matplotlib - extensions - -* boilerplate.py - some code to automatically generate the pyplot - wrappers - -* DEVNOTES - deprecated developer notes. TODO: update and move to the - doc/devel framework - -* FILETYPES - This is a table of the output formats supported by each - backend. TODO: move to doc/users - -* INTERACTIVE - instructions on using matplotlib interactively, eg - from the python shell. TODO: update and move to doc/users. - +See also +<http://matplotlib.sourceforge.net/users/customizing.html> Modified: branches/v0_99_maint/lib/matplotlib/__init__.py =================================================================== --- branches/v0_99_maint/lib/matplotlib/__init__.py 2009年09月11日 21:22:52 UTC (rev 7750) +++ branches/v0_99_maint/lib/matplotlib/__init__.py 2009年09月12日 21:11:42 UTC (rev 7751) @@ -89,7 +89,7 @@ """ from __future__ import generators -__version__ = '0.99.0' +__version__ = '0.99.1rc1' __revision__ = '$Revision$' __date__ = '$Date$' Modified: branches/v0_99_maint/make.osx =================================================================== --- branches/v0_99_maint/make.osx 2009年09月11日 21:22:52 UTC (rev 7750) +++ branches/v0_99_maint/make.osx 2009年09月12日 21:11:42 UTC (rev 7751) @@ -1,6 +1,7 @@ # build mpl into a local install dir with # PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install +MPLVERSION=0.99.1rc1 PYVERSION=2.6 PYTHON=python${PYVERSION} ZLIBVERSION=1.2.3 @@ -10,13 +11,10 @@ ## You shouldn't need to configure past this point -CFLAGS="-Os -arch ppc -arch i386 -I{$PREFIX}/include" -LDFLAGS="-arch ppc -arch i386 -L${PREFIX}/lib" +CFLAGS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk" +LDFLAGS="-arch i386 -arch ppc -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" -CFLAGS_DEPS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk" -LDFLAGS_DEPS="-arch i386 -arch ppc -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" - clean: rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \ freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \ @@ -37,10 +35,10 @@ tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\ cd zlib-${ZLIBVERSION} &&\ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ - export CFLAGS=${CFLAGS_DEPS} &&\ - export LDFLAGS=${LDFLAGS_DEPS} &&\ + export CFLAGS=${CFLAGS} &&\ + export LDFLAGS=${LDFLAGS} &&\ ./configure --prefix=${PREFIX}&&\ - MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 install&& \ + MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} make -j3 install&& \ unset MACOSX_DEPLOYMENT_TARGET png: zlib @@ -49,8 +47,8 @@ tar xvfj libpng-${PNGVERSION}.tar.bz2 cd libpng-${PNGVERSION} &&\ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ - export CFLAGS=${CFLAGS_DEPS} &&\ - export LDFLAGS=${LDFLAGS_DEPS} &&\ + export CFLAGS=${CFLAGS} &&\ + export LDFLAGS=${LDFLAGS} &&\ ./configure --disable-dependency-tracking --prefix=${PREFIX} &&\ make -j3 install&&\ cp .libs/libpng.a . &&\ @@ -63,8 +61,8 @@ tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\ cd freetype-${FREETYPEVERSION} &&\ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ - export CFLAGS=${CFLAGS_DEPS} &&\ - export LDFLAGS=${LDFLAGS_DEPS} &&\ + export CFLAGS=${CFLAGS} &&\ + export LDFLAGS=${LDFLAGS} &&\ ./configure --prefix=${PREFIX} &&\ make -j3 install &&\ cp objs/.libs/libfreetype.a . &&\ @@ -76,12 +74,22 @@ mpl_build: export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ - export CFLAGS=${CFLAGS_DEPS} &&\ - export LDFLAGS=${LDFLAGS_DEPS} &&\ - python setup.py build + export CFLAGS=${CFLAGS} &&\ + export LDFLAGS=${LDFLAGS} &&\ + ${PYTHON} setup.py build mpl_install: export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ - export CFLAGS=${CFLAGS_DEPS} &&\ - export LDFLAGS=${LDFLAGS_DEPS} &&\ - python setup.py install --prefix=${PREFIX} + export CFLAGS=${CFLAGS} &&\ + export LDFLAGS=${LDFLAGS} &&\ + ${PYTHON} setup.py install --prefix=${PREFIX} + + +binaries: + unset PKG_CONFIG_PATH &&\ + cp release/osx/data/setup.cfg release/osx/data/ReadMe.txt . &&\ + export CFLAGS=${CFLAGS} &&\ + export LDFLAGS=${LDFLAGS} &&\ + /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg --readme=ReadMe.txt &&\ + hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.dmg &&\ + ${PYTHON} setupegg.py bdist_egg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7750 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7750&view=rev Author: efiring Date: 2009年09月11日 21:22:52 +0000 (2009年9月11日) Log Message: ----------- Recorded merge of revisions 7749 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7749 | efiring | 2009年09月11日 11:14:15 -1000 (2009年9月11日) | 2 lines Backported quiver bug fix from trunk ........ Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7745 + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7745,7749 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7749 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7749&view=rev Author: efiring Date: 2009年09月11日 21:14:15 +0000 (2009年9月11日) Log Message: ----------- Backported quiver bug fix from trunk Modified Paths: -------------- branches/v0_99_maint/lib/matplotlib/quiver.py Modified: branches/v0_99_maint/lib/matplotlib/quiver.py =================================================================== --- branches/v0_99_maint/lib/matplotlib/quiver.py 2009年09月11日 21:04:33 UTC (rev 7748) +++ branches/v0_99_maint/lib/matplotlib/quiver.py 2009年09月11日 21:14:15 UTC (rev 7749) @@ -496,7 +496,11 @@ a = np.absolute(uv) if self.scale is None: sn = max(10, math.sqrt(self.N)) - scale = 1.8 * a[~self.Umask].mean() * sn / self.span # crude auto-scaling + if self.Umask is not ma.nomask: + amean = a[~self.Umask].mean() + else: + amean = a.mean() + scale = 1.8 * amean * sn / self.span # crude auto-scaling self.scale = scale length = a/(self.scale*self.width) X, Y = self._h_arrows(length) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7748 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7748&view=rev Author: efiring Date: 2009年09月11日 21:04:33 +0000 (2009年9月11日) Log Message: ----------- Merged revisions 7745 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7745 | efiring | 2009年09月11日 10:48:10 -1000 (2009年9月11日) | 2 lines Fix bug in quiver angle kwarg, found when input angle array is not 1-D ........ Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/quiver.py Property Changed: ---------------- trunk/matplotlib/ trunk/matplotlib/doc/pyplots/README trunk/matplotlib/doc/sphinxext/gen_gallery.py trunk/matplotlib/doc/sphinxext/gen_rst.py trunk/matplotlib/examples/misc/multiprocess.py trunk/matplotlib/examples/mplot3d/contour3d_demo.py trunk/matplotlib/examples/mplot3d/contourf3d_demo.py trunk/matplotlib/examples/mplot3d/polys3d_demo.py trunk/matplotlib/examples/mplot3d/scatter3d_demo.py trunk/matplotlib/examples/mplot3d/surface3d_demo.py trunk/matplotlib/examples/mplot3d/wire3d_demo.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7741 + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7745 Modified: svn:mergeinfo - /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/doc/pyplots/README ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/examples/misc/multiprocess.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/misc/log.py:5753-5771 /branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint/examples/misc/log.py:5753-5771 /branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Modified: trunk/matplotlib/lib/matplotlib/quiver.py =================================================================== --- trunk/matplotlib/lib/matplotlib/quiver.py 2009年09月11日 21:02:27 UTC (rev 7747) +++ trunk/matplotlib/lib/matplotlib/quiver.py 2009年09月11日 21:04:33 UTC (rev 7748) @@ -512,6 +512,7 @@ theta = np.angle(uv) else: theta = ma.masked_invalid(self.angles, copy=False).filled(0) + theta = theta.ravel() theta *= (np.pi/180.0) theta.shape = (theta.shape[0], 1) # for broadcasting xy = (X+Y*1j) * np.exp(1j*theta)*self.width Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745 Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741,7745 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7747 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7747&view=rev Author: jdh2358 Date: 2009年09月11日 21:02:27 +0000 (2009年9月11日) Log Message: ----------- some docstring cleanup on recs_join and align_iterators Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/cbook.py trunk/matplotlib/lib/matplotlib/mlab.py trunk/matplotlib/make.osx Modified: trunk/matplotlib/lib/matplotlib/cbook.py =================================================================== --- trunk/matplotlib/lib/matplotlib/cbook.py 2009年09月11日 20:58:27 UTC (rev 7746) +++ trunk/matplotlib/lib/matplotlib/cbook.py 2009年09月11日 21:02:27 UTC (rev 7747) @@ -390,7 +390,7 @@ for url, (fn, x, y) in cache.items(): if not os.path.isabs(fn): cache[url] = (self.in_cache_dir(fn), x, y) - + # If any files are deleted, drop them from the cache for url, (fn, _, _) in cache.items(): if not os.path.exists(fn): @@ -525,7 +525,7 @@ msg = 'file %s not in cache; received %s when trying to retrieve' \ % (fname, error) raise KeyError(msg) - + fname = cached[0] if asfileobj: @@ -1627,12 +1627,14 @@ return mlab.quad2cubic(q0x, q0y, q1x, q1y, q2x, q2y) def align_iterators(func, *iterables): - """ - This generator takes a bunch of iterables that are ordered by func - It sends out ordered tuples (func(row), [rows from all iterators matching func(row)]) - - It is used by mlab.recs_join to join record arrays """ + This generator takes a bunch of iterables that are ordered by func + It sends out ordered tuples: + + (func(row), [rows from all iterators matching func(row)]) + + It is used by :func:`matplotlib.mlab.recs_join` to join record arrays + """ class myiter: def __init__(self, it): self.it = it Modified: trunk/matplotlib/lib/matplotlib/mlab.py =================================================================== --- trunk/matplotlib/lib/matplotlib/mlab.py 2009年09月11日 20:58:27 UTC (rev 7746) +++ trunk/matplotlib/lib/matplotlib/mlab.py 2009年09月11日 21:02:27 UTC (rev 7747) @@ -1884,16 +1884,27 @@ return newrec def recs_join(key, name, recs,missing=0.): - """ - *key* is the column name that acts as a key - *name* is the name that we want to join - *missing" is what the missing fields are replaced by - *recarrays* is a list of record arrays to join + """ + Join a sequence of record arrays on key + *key* + is the column name that acts as a key + + *name* + is the name that we want to join + + *missing" + is what the missing fields are replaced by + + *recarrays* + is a list of record arrays to join + returns a record array with columns [rowkey, name1, name2, ... namen] - >>> r = recs_join("date", "close", recs=[r0, r1], missing=0.) + Example:: + r = recs_join("date", "close", recs=[r0, r1], missing=0.) + """ results = [] def extract(r): Modified: trunk/matplotlib/make.osx =================================================================== --- trunk/matplotlib/make.osx 2009年09月11日 20:58:27 UTC (rev 7746) +++ trunk/matplotlib/make.osx 2009年09月11日 21:02:27 UTC (rev 7747) @@ -61,7 +61,7 @@ cd freetype-${FREETYPEVERSION} &&\ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ export CFLAGS=${CFLAGS_DEPS} &&\ - export LDFLAGS=${LDFLAGS_DEPS} &&\ + export LDFLAGS=${LDFLAGS_DEPS} &&\python/svn/bison/scripts/ ./configure --prefix=${PREFIX} &&\ make -j3 install &&\ cp objs/.libs/libfreetype.a . &&\ @@ -76,8 +76,6 @@ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ export CFLAGS=${CFLAGS_DEPS} &&\ export LDFLAGS=${LDFLAGS_DEPS} &&\ - export LD_LIBRARY_PATH=${PREFIX}/lib &&\ - export DYLD_LIBRARY_PATH=${PREFIX}/lib &&\ python setup.py build mpl_install: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7746 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7746&view=rev Author: sameerd Date: 2009年09月11日 20:58:27 +0000 (2009年9月11日) Log Message: ----------- Added a recs_join function to join a single column of multiple record arrays Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/cbook.py trunk/matplotlib/lib/matplotlib/mlab.py Modified: trunk/matplotlib/lib/matplotlib/cbook.py =================================================================== --- trunk/matplotlib/lib/matplotlib/cbook.py 2009年09月11日 20:48:10 UTC (rev 7745) +++ trunk/matplotlib/lib/matplotlib/cbook.py 2009年09月11日 20:58:27 UTC (rev 7746) @@ -1626,7 +1626,48 @@ import matplotlib.mlab as mlab return mlab.quad2cubic(q0x, q0y, q1x, q1y, q2x, q2y) +def align_iterators(func, *iterables): + """ + This generator takes a bunch of iterables that are ordered by func + It sends out ordered tuples (func(row), [rows from all iterators matching func(row)]) + + It is used by mlab.recs_join to join record arrays + """ + class myiter: + def __init__(self, it): + self.it = it + self.key = self.value = None + self.iternext() + def iternext(self): + try: + self.value = self.it.next() + self.key = func(self.value) + except StopIteration: + self.value = self.key = None + + def __call__(self, key): + retval = None + if key == self.key: + retval = self.value + self.iternext() + elif self.key and key > self.key: + raise ValueError, "Iterator has been left behind" + return retval + + # This can be made more efficient by not computing the minimum key for each iteration + iters = [myiter(it) for it in iterables] + minvals = minkey = True + while 1: + minvals = (filter(None, [it.key for it in iters])) + if minvals: + minkey = min(minvals) + yield (minkey, [it(minkey) for it in iters]) + else: + break + + + if __name__=='__main__': assert( allequal([1,1,1]) ) assert(not allequal([1,1,0]) ) Modified: trunk/matplotlib/lib/matplotlib/mlab.py =================================================================== --- trunk/matplotlib/lib/matplotlib/mlab.py 2009年09月11日 20:48:10 UTC (rev 7745) +++ trunk/matplotlib/lib/matplotlib/mlab.py 2009年09月11日 20:58:27 UTC (rev 7746) @@ -91,6 +91,9 @@ :meth:`rec_join` join two record arrays on sequence of fields +:meth:`recs_join` + a simple join of multiple recarrays using a single column as a key + :meth:`rec_groupby` summarize data by groups (similar to SQL GROUP BY) @@ -139,7 +142,7 @@ """ from __future__ import division -import csv, warnings, copy, os +import csv, warnings, copy, os, operator import numpy as np ma = np.ma @@ -1880,7 +1883,29 @@ return newrec +def recs_join(key, name, recs,missing=0.): + """ + *key* is the column name that acts as a key + *name* is the name that we want to join + *missing" is what the missing fields are replaced by + *recarrays* is a list of record arrays to join + returns a record array with columns [rowkey, name1, name2, ... namen] + + >>> r = recs_join("date", "close", recs=[r0, r1], missing=0.) + + """ + results = [] + def extract(r): + if r is None: return missing + else: return r[name] + + for rowkey, row in cbook.align_iterators(operator.attrgetter(key), *[iter(r) for r in recs]): + results.append([rowkey] + map(extract, row)) + names = ",".join([key] + ["%s%d" % (name, d) for d in range(len(recs))]) + return np.rec.fromrecords(results, names=names) + + def csv2rec(fname, comments='#', skiprows=0, checkrows=0, delimiter=',', converterd=None, names=None, missing='', missingd=None, use_mrecords=False): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7745 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7745&view=rev Author: efiring Date: 2009年09月11日 20:48:10 +0000 (2009年9月11日) Log Message: ----------- Fix bug in quiver angle kwarg, found when input angle array is not 1-D Modified Paths: -------------- branches/v0_99_maint/lib/matplotlib/quiver.py Modified: branches/v0_99_maint/lib/matplotlib/quiver.py =================================================================== --- branches/v0_99_maint/lib/matplotlib/quiver.py 2009年09月11日 15:07:22 UTC (rev 7744) +++ branches/v0_99_maint/lib/matplotlib/quiver.py 2009年09月11日 20:48:10 UTC (rev 7745) @@ -506,6 +506,7 @@ theta = np.angle(uv) else: theta = ma.masked_invalid(self.angles, copy=False).filled(0) + theta = theta.ravel() theta *= (np.pi/180.0) theta.shape = (theta.shape[0], 1) # for broadcasting xy = (X+Y*1j) * np.exp(1j*theta)*self.width This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7744 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7744&view=rev Author: jswhit Date: 2009年09月11日 15:07:22 +0000 (2009年9月11日) Log Message: ----------- fix date2index bugs. Modified Paths: -------------- trunk/toolkits/basemap/Changelog Modified: trunk/toolkits/basemap/Changelog =================================================================== --- trunk/toolkits/basemap/Changelog 2009年09月11日 02:30:40 UTC (rev 7743) +++ trunk/toolkits/basemap/Changelog 2009年09月11日 15:07:22 UTC (rev 7744) @@ -1,4 +1,5 @@ version 0.99.5 (not yet released) + * fix date2index bugs. * update date2index function with a bug-fix from netcdf4-python. * in contourf method, mask data outside map projection region (this prevents contourf from erroneously filling entire map). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7743 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7743&view=rev Author: astraw Date: 2009年09月11日 02:30:40 +0000 (2009年9月11日) Log Message: ----------- testing: add test image for hexbin_extent test, disable known failure Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/tests/test_axes.py Added Paths: ----------- trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.png Added: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.png =================================================================== --- trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.png (rev 0) +++ trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.png 2009年09月11日 02:30:40 UTC (rev 7743) @@ -0,0 +1,199 @@ +\x89PNG + +
Revision: 7742 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7742&view=rev Author: jdh2358 Date: 2009年09月11日 02:11:11 +0000 (2009年9月11日) Log Message: ----------- Merged revisions 7740-7741 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7740 | astraw | 2009年09月10日 18:54:27 -0700 (2009年9月10日) | 2 lines bugfix: bounds checking in hexbin with extent specified (SF#2856228) ........ r7741 | jdh2358 | 2009年09月10日 19:06:30 -0700 (2009年9月10日) | 1 line minor tweaks to licensing devel doc ........ Modified Paths: -------------- trunk/matplotlib/doc/devel/coding_guide.rst trunk/matplotlib/doc/users/credits.rst trunk/matplotlib/lib/matplotlib/axes.py Property Changed: ---------------- trunk/matplotlib/ trunk/matplotlib/doc/pyplots/README trunk/matplotlib/doc/sphinxext/gen_gallery.py trunk/matplotlib/doc/sphinxext/gen_rst.py trunk/matplotlib/examples/misc/multiprocess.py trunk/matplotlib/examples/mplot3d/contour3d_demo.py trunk/matplotlib/examples/mplot3d/contourf3d_demo.py trunk/matplotlib/examples/mplot3d/polys3d_demo.py trunk/matplotlib/examples/mplot3d/scatter3d_demo.py trunk/matplotlib/examples/mplot3d/surface3d_demo.py trunk/matplotlib/examples/mplot3d/wire3d_demo.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7734 + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7741 Modified: svn:mergeinfo - /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Modified: trunk/matplotlib/doc/devel/coding_guide.rst =================================================================== --- trunk/matplotlib/doc/devel/coding_guide.rst 2009年09月11日 02:06:30 UTC (rev 7741) +++ trunk/matplotlib/doc/devel/coding_guide.rst 2009年09月11日 02:11:11 UTC (rev 7742) @@ -604,74 +604,7 @@ .. _license-discussion: -Licenses -======== -Matplotlib only uses BSD compatible code. If you bring in code from -another project make sure it has a PSF, BSD, MIT or compatible license -(see the Open Source Initiative `licenses page -<http://www.opensource.org/licenses>`_ for details on individual -licenses). If it doesn't, you may consider contacting the author and -asking them to relicense it. GPL and LGPL code are not acceptable in -the main code base, though we are considering an alternative way of -distributing L/GPL code through an separate channel, possibly a -toolkit. If you include code, make sure you include a copy of that -code's license in the license directory if the code's license requires -you to distribute the license with it. Non-BSD compatible licenses -are acceptable in matplotlib toolkits (eg basemap), but make sure you -clearly state the licenses you are using. - -Why BSD compatible? -------------------- - -The two dominant license variants in the wild are GPL-style and -BSD-style. There are countless other licenses that place specific -restrictions on code reuse, but there is an important different to be -considered in the GPL and BSD variants. The best known and perhaps -most widely used license is the GPL, which in addition to granting you -full rights to the source code including redistribution, carries with -it an extra obligation. If you use GPL code in your own code, or link -with it, your product must be released under a GPL compatible -license. I.e., you are required to give the source code to other -people and give them the right to redistribute it as well. Many of the -most famous and widely used open source projects are released under -the GPL, including sagemath, linux, gcc and emacs. - -The second major class are the BSD-style licenses (which includes MIT -and the python PSF license). These basically allow you to do whatever -you want with the code: ignore it, include it in your own open source -project, include it in your proprietary product, sell it, -whatever. python itself is released under a BSD compatible license, in -the sense that, quoting from the PSF license page:: - - There is no GPL-like "copyleft" restriction. Distributing - binary-only versions of Python, modified or not, is allowed. There - is no requirement to release any of your source code. You can also - write extension modules for Python and provide them only in binary - form. - -Famous projects released under a BSD-style license in the permissive -sense of the last paragraph are the BSD operating system, python and -TeX. - -There are two primary reasons why early matplotlib developers selected -a BSD compatible license. We wanted to attract as many users and -developers as possible, and many software companies will not use GPL code -in software they plan to distribute, even those that are highly -committed to open source development, such as `enthought -<http://enthought.com>`_, out of legitimate concern that use of the -GPL will "infect" their code base by its viral nature. In effect, they -want to retain the right to release some proprietary code. Companies, -and institutions in general, who use matplotlib often make significant -contributions, since they have the resources to get a job done, even a -boring one, if they need it in their code. Two of the matplotlib -backends (FLTK and WX) were contributed by private companies. - -The other reason is licensing compatibility with the other python -extensions for scientific computing: ipython, numpy, scipy, the -enthought tool suite and python itself are all distributed under BSD -compatible licenses. - Testing ======= @@ -784,3 +717,75 @@ ``matplotlib.tests.test_whizbang_features``. To add this module to the list of default tests, append its name to ``default_test_modules`` in :file:`lib/matplotlib/__init__.py`. + +Licenses +======== + +Matplotlib only uses BSD compatible code. If you bring in code from +another project make sure it has a PSF, BSD, MIT or compatible license +(see the Open Source Initiative `licenses page +<http://www.opensource.org/licenses>`_ for details on individual +licenses). If it doesn't, you may consider contacting the author and +asking them to relicense it. GPL and LGPL code are not acceptable in +the main code base, though we are considering an alternative way of +distributing L/GPL code through an separate channel, possibly a +toolkit. If you include code, make sure you include a copy of that +code's license in the license directory if the code's license requires +you to distribute the license with it. Non-BSD compatible licenses +are acceptable in matplotlib toolkits (eg basemap), but make sure you +clearly state the licenses you are using. + +Why BSD compatible? +------------------- + +The two dominant license variants in the wild are GPL-style and +BSD-style. There are countless other licenses that place specific +restrictions on code reuse, but there is an important difference to be +considered in the GPL and BSD variants. The best known and perhaps +most widely used license is the GPL, which in addition to granting you +full rights to the source code including redistribution, carries with +it an extra obligation. If you use GPL code in your own code, or link +with it, your product must be released under a GPL compatible +license. I.e., you are required to give the source code to other +people and give them the right to redistribute it as well. Many of the +most famous and widely used open source projects are released under +the GPL, including linux, gcc, emacs and sage. + +The second major class are the BSD-style licenses (which includes MIT +and the python PSF license). These basically allow you to do whatever +you want with the code: ignore it, include it in your own open source +project, include it in your proprietary product, sell it, +whatever. python itself is released under a BSD compatible license, in +the sense that, quoting from the PSF license page:: + + There is no GPL-like "copyleft" restriction. Distributing + binary-only versions of Python, modified or not, is allowed. There + is no requirement to release any of your source code. You can also + write extension modules for Python and provide them only in binary + form. + +Famous projects released under a BSD-style license in the permissive +sense of the last paragraph are the BSD operating system, python and +TeX. + +There are several reasons why early matplotlib developers selected a +BSD compatible license. matplotlib is a python extension, and we +choose a license that was based on the python license (BSD +compatible). Also, we wanted to attract as many users and developers +as possible, and many software companies will not use GPL code in +software they plan to distribute, even those that are highly committed +to open source development, such as `enthought +<http://enthought.com>`_, out of legitimate concern that use of the +GPL will "infect" their code base by its viral nature. In effect, they +want to retain the right to release some proprietary code. Companies +and institutions who use matplotlib often make significant +contributions, because they have the resources to get a job done, even +a boring one. Two of the matplotlib backends (FLTK and WX) were +contributed by private companies. The final reason behind the +licensing choice is compatibility with the other python extensions for +scientific computing: ipython, numpy, scipy, the enthought tool suite +and python itself are all distributed under BSD compatible licenses. +The other reason is licensing compatibility with the other python +extensions for scientific computing: ipython, numpy, scipy, the +enthought tool suite and python itself are all distributed under BSD +compatible licenses. Property changes on: trunk/matplotlib/doc/pyplots/README ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Modified: trunk/matplotlib/doc/users/credits.rst =================================================================== --- trunk/matplotlib/doc/users/credits.rst 2009年09月11日 02:06:30 UTC (rev 7741) +++ trunk/matplotlib/doc/users/credits.rst 2009年09月11日 02:11:11 UTC (rev 7742) @@ -18,7 +18,11 @@ Andrew Straw provided much of the log scaling architecture, the fill command, PIL support for imshow, and provided many examples. He - also wrote the support for dropped axis spines. + also wrote the support for dropped axis spines and the `buildbot + <http://mpl-buildbot.code.astraw.com/>`_ unit testing infrastructure + which triggers the JPL/James Evans platform specific builds and + regression test image comparisons from svn matplotlib across + platforms on svn commits. Charles Twardy provided the impetus code for the legend class and has made @@ -116,11 +120,14 @@ at `NOAA <http://www.boulder.noaa.gov>`_ wrote the :ref:`toolkit_basemap` tookit -Sigve Tjoraand, Ted Drain +Sigve Tjoraand, Ted Drain, James Evans and colleagues at the `JPL <http://www.jpl.nasa.gov>`_ collaborated on the QtAgg backend and sponsored development of a number of features including custom unit types, datetime support, scale free - ellipses, broken bar plots and more. + ellipses, broken bar plots and more. The JPL team wrote the unit + testing image comparison `infrastructure + <http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/matplotlib/test>`_ + for regression test image comparisons. James Amundson did the initial work porting the qt backend to qt4 Property changes on: trunk/matplotlib/examples/misc/multiprocess.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/misc/log.py:5753-5771 /branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint/examples/misc/log.py:5753-5771 /branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Modified: trunk/matplotlib/lib/matplotlib/axes.py =================================================================== --- trunk/matplotlib/lib/matplotlib/axes.py 2009年09月11日 02:06:30 UTC (rev 7741) +++ trunk/matplotlib/lib/matplotlib/axes.py 2009年09月11日 02:11:11 UTC (rev 7742) @@ -5587,9 +5587,13 @@ for i in xrange(len(x)): if bdist[i]: - lattice1[ix1[i], iy1[i]]+=1 + if ((ix1[i] >= 0) and (ix1[i] < nx1) and + (iy1[i] >= 0) and (iy1[i] < ny1)): + lattice1[ix1[i], iy1[i]]+=1 else: - lattice2[ix2[i], iy2[i]]+=1 + if ((ix2[i] >= 0) and (ix2[i] < nx2) and + (iy2[i] >= 0) and (iy2[i] < ny2)): + lattice2[ix2[i], iy2[i]]+=1 # threshold if mincnt is not None: @@ -5621,9 +5625,13 @@ for i in xrange(len(x)): if bdist[i]: - lattice1[ix1[i], iy1[i]].append( C[i] ) + if ((ix1[i] >= 0) and (ix1[i] < nx1) and + (iy1[i] >= 0) and (iy1[i] < ny1)): + lattice1[ix1[i], iy1[i]].append( C[i] ) else: - lattice2[ix2[i], iy2[i]].append( C[i] ) + if ((ix2[i] >= 0) and (ix2[i] < nx2) and + (iy2[i] >= 0) and (iy2[i] < ny2)): + lattice2[ix2[i], iy2[i]].append( C[i] ) for i in xrange(nx1): Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741 Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7741 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7741&view=rev Author: jdh2358 Date: 2009年09月11日 02:06:30 +0000 (2009年9月11日) Log Message: ----------- minor tweaks to licensing devel doc Modified Paths: -------------- branches/v0_99_maint/doc/devel/coding_guide.rst branches/v0_99_maint/doc/users/credits.rst Modified: branches/v0_99_maint/doc/devel/coding_guide.rst =================================================================== --- branches/v0_99_maint/doc/devel/coding_guide.rst 2009年09月11日 01:54:27 UTC (rev 7740) +++ branches/v0_99_maint/doc/devel/coding_guide.rst 2009年09月11日 02:06:30 UTC (rev 7741) @@ -578,7 +578,7 @@ The two dominant license variants in the wild are GPL-style and BSD-style. There are countless other licenses that place specific -restrictions on code reuse, but there is an important different to be +restrictions on code reuse, but there is an important difference to be considered in the GPL and BSD variants. The best known and perhaps most widely used license is the GPL, which in addition to granting you full rights to the source code including redistribution, carries with @@ -587,7 +587,7 @@ license. I.e., you are required to give the source code to other people and give them the right to redistribute it as well. Many of the most famous and widely used open source projects are released under -the GPL, including sagemath, linux, gcc and emacs. +the GPL, including linux, gcc, emacs and sage. The second major class are the BSD-style licenses (which includes MIT and the python PSF license). These basically allow you to do whatever @@ -606,20 +606,20 @@ sense of the last paragraph are the BSD operating system, python and TeX. -There are two primary reasons why early matplotlib developers selected -a BSD compatible license. We wanted to attract as many users and -developers as possible, and many software companies will not use GPL code -in software they plan to distribute, even those that are highly -committed to open source development, such as `enthought +There are several reasons why early matplotlib developers selected a +BSD compatible license. matplotlib is a python extension, and we +choose a license that was based on the python license (BSD +compatible). Also, we wanted to attract as many users and developers +as possible, and many software companies will not use GPL code in +software they plan to distribute, even those that are highly committed +to open source development, such as `enthought <http://enthought.com>`_, out of legitimate concern that use of the GPL will "infect" their code base by its viral nature. In effect, they -want to retain the right to release some proprietary code. Companies, -and institutions in general, who use matplotlib often make significant -contributions, since they have the resources to get a job done, even a -boring one, if they need it in their code. Two of the matplotlib -backends (FLTK and WX) were contributed by private companies. - -The other reason is licensing compatibility with the other python -extensions for scientific computing: ipython, numpy, scipy, the -enthought tool suite and python itself are all distributed under BSD -compatible licenses. +want to retain the right to release some proprietary code. Companies +and institutions who use matplotlib often make significant +contributions, because they have the resources to get a job done, even +a boring one. Two of the matplotlib backends (FLTK and WX) were +contributed by private companies. The final reason behind the +licensing choice is compatibility with the other python extensions for +scientific computing: ipython, numpy, scipy, the enthought tool suite +and python itself are all distributed under BSD compatible licenses. Modified: branches/v0_99_maint/doc/users/credits.rst =================================================================== --- branches/v0_99_maint/doc/users/credits.rst 2009年09月11日 01:54:27 UTC (rev 7740) +++ branches/v0_99_maint/doc/users/credits.rst 2009年09月11日 02:06:30 UTC (rev 7741) @@ -18,7 +18,11 @@ Andrew Straw provided much of the log scaling architecture, the fill command, PIL support for imshow, and provided many examples. He - also wrote the support for dropped axis spines. + also wrote the support for dropped axis spines and the `buildbot + <http://mpl-buildbot.code.astraw.com/>`_ unit testing infrastructure + which triggers the JPL/James Evans platform specific builds and + regression test image comparisons from svn matplotlib across + platforms on svn commits. Charles Twardy provided the impetus code for the legend class and has made @@ -116,11 +120,14 @@ at `NOAA <http://www.boulder.noaa.gov>`_ wrote the :ref:`toolkit_basemap` tookit -Sigve Tjoraand, Ted Drain +Sigve Tjoraand, Ted Drain, James Evans and colleagues at the `JPL <http://www.jpl.nasa.gov>`_ collaborated on the QtAgg backend and sponsored development of a number of features including custom unit types, datetime support, scale free - ellipses, broken bar plots and more. + ellipses, broken bar plots and more. The JPL team wrote the unit + testing image comparison `infrastructure + <http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/matplotlib/test>`_ + for regression test image comparisons. James Amundson did the initial work porting the qt backend to qt4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7740 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7740&view=rev Author: astraw Date: 2009年09月11日 01:54:27 +0000 (2009年9月11日) Log Message: ----------- bugfix: bounds checking in hexbin with extent specified (SF#2856228) Modified Paths: -------------- branches/v0_99_maint/lib/matplotlib/axes.py Modified: branches/v0_99_maint/lib/matplotlib/axes.py =================================================================== --- branches/v0_99_maint/lib/matplotlib/axes.py 2009年09月11日 01:52:47 UTC (rev 7739) +++ branches/v0_99_maint/lib/matplotlib/axes.py 2009年09月11日 01:54:27 UTC (rev 7740) @@ -5624,9 +5624,13 @@ for i in xrange(len(x)): if bdist[i]: - lattice1[ix1[i], iy1[i]]+=1 + if ((ix1[i] >= 0) and (ix1[i] < nx1) and + (iy1[i] >= 0) and (iy1[i] < ny1)): + lattice1[ix1[i], iy1[i]]+=1 else: - lattice2[ix2[i], iy2[i]]+=1 + if ((ix2[i] >= 0) and (ix2[i] < nx2) and + (iy2[i] >= 0) and (iy2[i] < ny2)): + lattice2[ix2[i], iy2[i]]+=1 # threshold if mincnt is not None: @@ -5658,9 +5662,13 @@ for i in xrange(len(x)): if bdist[i]: - lattice1[ix1[i], iy1[i]].append( C[i] ) + if ((ix1[i] >= 0) and (ix1[i] < nx1) and + (iy1[i] >= 0) and (iy1[i] < ny1)): + lattice1[ix1[i], iy1[i]].append( C[i] ) else: - lattice2[ix2[i], iy2[i]].append( C[i] ) + if ((ix2[i] >= 0) and (ix2[i] < nx2) and + (iy2[i] >= 0) and (iy2[i] < ny2)): + lattice2[ix2[i], iy2[i]].append( C[i] ) for i in xrange(nx1): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7739 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7739&view=rev Author: jdh2358 Date: 2009年09月11日 01:52:47 +0000 (2009年9月11日) Log Message: ----------- make test for sf bug 2856228 a knownfailure Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/tests/test_axes.py Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py =================================================================== --- trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009年09月11日 01:33:40 UTC (rev 7738) +++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009年09月11日 01:52:47 UTC (rev 7739) @@ -341,7 +341,8 @@ fig.savefig( 'axhspan_epoch' ) -@image_comparison(baseline_images=['hexbin_extent']) +#@image_comparison(baseline_images=['hexbin_extent']) +@knownfailureif(True) def test_hexbin_extent(): # this test exposes sf bug 2856228 fig = plt.figure() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7738 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7738&view=rev Author: jdh2358 Date: 2009年09月11日 01:33:40 +0000 (2009年9月11日) Log Message: ----------- choose different scaling and extent for hexbin test Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/tests/test_axes.py Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py =================================================================== --- trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009年09月11日 01:26:41 UTC (rev 7737) +++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009年09月11日 01:33:40 UTC (rev 7738) @@ -347,11 +347,11 @@ fig = plt.figure() ax = fig.add_subplot(111) - data = np.arange(2000.) + data = np.arange(2000.)/2000. data.shape = 2, 1000 x, y = data - ax.hexbin(x, y, extent=[-.4, .4, -.4, .4]) + ax.hexbin(x, y, extent=[.1, .3, .6, .7]) fig.savefig('hexbin_extent') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7737 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7737&view=rev Author: jdh2358 Date: 2009年09月11日 01:26:41 +0000 (2009年9月11日) Log Message: ----------- add test to expose hexbin extent bug #2856228 Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/tests/test_axes.py Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py =================================================================== --- trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009年09月10日 23:52:54 UTC (rev 7736) +++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009年09月11日 01:26:41 UTC (rev 7737) @@ -2,8 +2,8 @@ import matplotlib from matplotlib.testing.decorators import image_comparison, knownfailureif import matplotlib.pyplot as plt -import pylab + @image_comparison(baseline_images=['formatter_ticker_001', 'formatter_ticker_002', 'formatter_ticker_003', @@ -20,8 +20,8 @@ ydata1 = [ (1.5*y - 0.5)*units.km for y in range(10) ] ydata2 = [ (1.75*y - 1.0)*units.km for y in range(10) ] - fig = pylab.figure() - ax = pylab.subplot( 111 ) + fig = plt.figure() + ax = plt.subplot( 111 ) ax.set_xlabel( "x-label 001" ) fig.savefig( 'formatter_ticker_001' ) @@ -49,7 +49,7 @@ # Offset Points - fig = pylab.figure() + fig = plt.figure() ax = fig.add_subplot( 111, autoscale_on=False, xlim=(-1,5), ylim=(-3,5) ) line, = ax.plot( t, s, lw=3, color='purple' ) @@ -74,7 +74,7 @@ r = np.arange(0.0, 1.0, 0.001 ) theta = 2.0 * 2.0 * np.pi * r - fig = pylab.figure() + fig = plt.figure() ax = fig.add_subplot( 111, polar=True ) line, = ax.plot( theta, r, color='#ee8d18', lw=3 ) @@ -102,7 +102,7 @@ from matplotlib.patches import Ellipse el = Ellipse((0,0), 10, 20, facecolor='r', alpha=0.5) - fig = pylab.figure() + fig = plt.figure() ax = fig.add_subplot( 111, aspect='equal' ) ax.add_artist( el ) @@ -134,7 +134,7 @@ value = 10.0 * units.deg day = units.Duration( "ET", 24.0 * 60.0 * 60.0 ) - fig = pylab.figure() + fig = plt.figure() # Top-Left ax1 = fig.add_subplot( 221 ) @@ -166,12 +166,12 @@ @image_comparison(baseline_images=['single_point']) def test_single_point(): - fig = pylab.figure() - pylab.subplot( 211 ) - pylab.plot( [0], [0], 'o' ) + fig = plt.figure() + plt.subplot( 211 ) + plt.plot( [0], [0], 'o' ) - pylab.subplot( 212 ) - pylab.plot( [1], [1], 'o' ) + plt.subplot( 212 ) + plt.plot( [1], [1], 'o' ) fig.savefig( 'single_point' ) @@ -180,12 +180,12 @@ time1=[ 721964.0 ] data1=[ -65.54 ] - fig = pylab.figure() - pylab.subplot( 211 ) - pylab.plot_date( time1, data1, 'o', color='r' ) + fig = plt.figure() + plt.subplot( 211 ) + plt.plot_date( time1, data1, 'o', color='r' ) - pylab.subplot( 212 ) - pylab.plot( time1, data1, 'o', color='r' ) + plt.subplot( 212 ) + plt.plot( time1, data1, 'o', color='r' ) fig.savefig( 'single_date' ) @@ -218,33 +218,33 @@ y2 = np.arange( 10 ) y2.shape = 10, 1 - fig = pylab.figure() - pylab.subplot( 411 ) - pylab.plot( y1 ) - pylab.subplot( 412 ) - pylab.plot( y2 ) + fig = plt.figure() + plt.subplot( 411 ) + plt.plot( y1 ) + plt.subplot( 412 ) + plt.plot( y2 ) - pylab.subplot( 413 ) + plt.subplot( 413 ) from nose.tools import assert_raises - assert_raises(ValueError,pylab.plot, (y1,y2)) + assert_raises(ValueError,plt.plot, (y1,y2)) - pylab.subplot( 414 ) - pylab.plot( xdata[:,1], xdata[1,:], 'o' ) + plt.subplot( 414 ) + plt.plot( xdata[:,1], xdata[1,:], 'o' ) fig.savefig( 'shaped data' ) @image_comparison(baseline_images=['const_xy']) def test_const_xy(): - fig = pylab.figure() + fig = plt.figure() - pylab.subplot( 311 ) - pylab.plot( np.arange(10), np.ones( (10,) ) ) + plt.subplot( 311 ) + plt.plot( np.arange(10), np.ones( (10,) ) ) - pylab.subplot( 312 ) - pylab.plot( np.ones( (10,) ), np.arange(10) ) + plt.subplot( 312 ) + plt.plot( np.ones( (10,) ), np.arange(10) ) - pylab.subplot( 313 ) - pylab.plot( np.ones( (10,) ), np.ones( (10,) ), 'o' ) + plt.subplot( 313 ) + plt.plot( np.ones( (10,) ), np.ones( (10,) ), 'o' ) fig.savefig( 'const_xy' ) @@ -254,24 +254,24 @@ def test_polar_wrap(): D2R = np.pi / 180.0 - fig = pylab.figure() + fig = plt.figure() #NOTE: resolution=1 really should be the default - pylab.subplot( 111, polar=True, resolution=1 ) - pylab.polar( [179*D2R, -179*D2R], [0.2, 0.1], "b.-" ) - pylab.polar( [179*D2R, 181*D2R], [0.2, 0.1], "g.-" ) - pylab.rgrids( [0.05, 0.1, 0.15, 0.2, 0.25, 0.3] ) + plt.subplot( 111, polar=True, resolution=1 ) + plt.polar( [179*D2R, -179*D2R], [0.2, 0.1], "b.-" ) + plt.polar( [179*D2R, 181*D2R], [0.2, 0.1], "g.-" ) + plt.rgrids( [0.05, 0.1, 0.15, 0.2, 0.25, 0.3] ) fig.savefig( 'polar_wrap_180' ) - fig = pylab.figure() + fig = plt.figure() #NOTE: resolution=1 really should be the default - pylab.subplot( 111, polar=True, resolution=1 ) - pylab.polar( [2*D2R, -2*D2R], [0.2, 0.1], "b.-" ) - pylab.polar( [2*D2R, 358*D2R], [0.2, 0.1], "g.-" ) - pylab.polar( [358*D2R, 2*D2R], [0.2, 0.1], "r.-" ) - pylab.rgrids( [0.05, 0.1, 0.15, 0.2, 0.25, 0.3] ) + plt.subplot( 111, polar=True, resolution=1 ) + plt.polar( [2*D2R, -2*D2R], [0.2, 0.1], "b.-" ) + plt.polar( [2*D2R, 358*D2R], [0.2, 0.1], "g.-" ) + plt.polar( [358*D2R, 2*D2R], [0.2, 0.1], "r.-" ) + plt.rgrids( [0.05, 0.1, 0.15, 0.2, 0.25, 0.3] ) fig.savefig( 'polar_wrap_360' ) @@ -289,9 +289,9 @@ y1 = [ 1.0, 2.0, 3.0, 4.0] y2 = [ 4.0, 3.0, 2.0, 1.0 ] - fig = pylab.figure() + fig = plt.figure() - pylab.polar( x2, y1, color = "blue" ) + plt.polar( x2, y1, color = "blue" ) # polar( x2, y1, color = "red", xunits="rad" ) # polar( x2, y2, color = "green" ) @@ -310,11 +310,11 @@ dt = units.Duration( "ET", units.day.convert( "sec" ) ) - fig = pylab.figure() + fig = plt.figure() - pylab.axvspan( t0, tf, facecolor="blue", alpha=0.25 ) + plt.axvspan( t0, tf, facecolor="blue", alpha=0.25 ) - ax = pylab.gca() + ax = plt.gca() ax.set_xlim( t0 - 5.0*dt, tf + 5.0*dt ) fig.savefig( 'axvspan_epoch' ) @@ -331,11 +331,31 @@ dt = units.Duration( "ET", units.day.convert( "sec" ) ) - fig = pylab.figure() + fig = plt.figure() - pylab.axhspan( t0, tf, facecolor="blue", alpha=0.25 ) + plt.axhspan( t0, tf, facecolor="blue", alpha=0.25 ) - ax = pylab.gca() + ax = plt.gca() ax.set_ylim( t0 - 5.0*dt, tf + 5.0*dt ) fig.savefig( 'axhspan_epoch' ) + + +@image_comparison(baseline_images=['hexbin_extent']) +def test_hexbin_extent(): + # this test exposes sf bug 2856228 + fig = plt.figure() + + ax = fig.add_subplot(111) + data = np.arange(2000.) + data.shape = 2, 1000 + x, y = data + + ax.hexbin(x, y, extent=[-.4, .4, -.4, .4]) + fig.savefig('hexbin_extent') + + + +if __name__=='__main__': + import nose + nose.runmodule(argv=['-s','--with-doctest'], exit=False) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7736 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7736&view=rev Author: astraw Date: 2009年09月10日 23:52:54 +0000 (2009年9月10日) Log Message: ----------- testing: remove known failure now that bug is fixed Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/tests/test_backend_svg.py Modified: trunk/matplotlib/lib/matplotlib/tests/test_backend_svg.py =================================================================== --- trunk/matplotlib/lib/matplotlib/tests/test_backend_svg.py 2009年09月10日 23:22:40 UTC (rev 7735) +++ trunk/matplotlib/lib/matplotlib/tests/test_backend_svg.py 2009年09月10日 23:52:54 UTC (rev 7736) @@ -4,7 +4,6 @@ import xml.parsers.expat from matplotlib.testing.decorators import knownfailureif -@knownfailureif(True) def test_visibility(): # This is SF 2856495. See # https://sourceforge.net/tracker/?func=detail&aid=2856495&group_id=80706&atid=560720 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.