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: 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.