SF.net SVN: matplotlib:[7782] trunk/matplotlib/lib/matplotlib/tests/ test_dates.py

2009-09-18 Thread jdh2358
Revision: 7782
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7782&view=rev
Author:   jdh2358
Date: 2009-09-18 14:05:51 + (Fri, 18 Sep 2009)

Log Message:
---
add unit test for sf bug 2861426; empty date plot with year formatter

Modified Paths:
--
trunk/matplotlib/lib/matplotlib/tests/test_dates.py

Modified: trunk/matplotlib/lib/matplotlib/tests/test_dates.py
===
--- trunk/matplotlib/lib/matplotlib/tests/test_dates.py 2009-09-18 02:50:37 UTC 
(rev 7781)
+++ trunk/matplotlib/lib/matplotlib/tests/test_dates.py 2009-09-18 14:05:51 UTC 
(rev 7782)
@@ -141,6 +141,20 @@
 
 fig.savefig( 'DateFormatter_fractionalSeconds' )
 
+...@image_comparison(baseline_images=['empty_date_bug'])
+...@knownfailureif(True)
+def empty_date_with_year_formatter():
+# exposes sf bug 2861426: 
https://sourceforge.net/tracker/?func=detail&aid=2861426&group_id=80706&atid=560720
+import matplotlib.dates as dates
+
+fig = plt.figure()
+ax = fig.add_subplot(111)
+
+yearFmt = dates.DateFormatter('%Y')
+ax.xaxis.set_major_formatter(yearFmt)
+
+fig.savefig('empty_date_bug')
+
 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.

--
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib:[7783] trunk/matplotlib/lib/matplotlib/tests/ test_dates.py

2009-09-18 Thread jdh2358
Revision: 7783
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7783&view=rev
Author:   jdh2358
Date: 2009-09-18 14:28:39 + (Fri, 18 Sep 2009)

Log Message:
---
add unit test for sf bug 2861426; empty date plot with year formatter; need 
test in the name

Modified Paths:
--
trunk/matplotlib/lib/matplotlib/tests/test_dates.py

Modified: trunk/matplotlib/lib/matplotlib/tests/test_dates.py
===
--- trunk/matplotlib/lib/matplotlib/tests/test_dates.py 2009-09-18 14:05:51 UTC 
(rev 7782)
+++ trunk/matplotlib/lib/matplotlib/tests/test_dates.py 2009-09-18 14:28:39 UTC 
(rev 7783)
@@ -143,7 +143,7 @@
 
 #...@image_comparison(baseline_images=['empty_date_bug'])
 @knownfailureif(True)
-def empty_date_with_year_formatter():
+def test_empty_date_with_year_formatter():
 # exposes sf bug 2861426: 
https://sourceforge.net/tracker/?func=detail&aid=2861426&group_id=80706&atid=560720
 import matplotlib.dates as dates
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib:[7784] branches/v0_99_maint/lib/matplotlib/lines.py

2009-09-18 Thread mdboom
Revision: 7784
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7784&view=rev
Author:   mdboom
Date: 2009-09-18 15:16:20 + (Fri, 18 Sep 2009)

Log Message:
---
Fix bug where subslicing was cutting polar lines off (because it was treating 
them as if they were rectilinearly plotted).

Modified Paths:
--
branches/v0_99_maint/lib/matplotlib/lines.py

Modified: branches/v0_99_maint/lib/matplotlib/lines.py
===
--- branches/v0_99_maint/lib/matplotlib/lines.py2009-09-18 14:28:39 UTC 
(rev 7783)
+++ branches/v0_99_maint/lib/matplotlib/lines.py2009-09-18 15:16:20 UTC 
(rev 7784)
@@ -459,7 +459,10 @@
 self._y = self._xy[:, 1] # just a view
 
 self._subslice = False
-if self.axes and len(x) > 100 and self._is_sorted(x):
+if (self.axes and len(x) > 100 and self._is_sorted(x) and
+self.axes.name == 'rectilinear' and
+self.axes.get_xscale() == 'linear' and
+self.axes.get_yscale() == 'linear'):
 self._subslice = True
 if hasattr(self, '_path'):
 interpolation_steps = self._path._interpolation_steps


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib:[7785] trunk/matplotlib

2009-09-18 Thread mdboom
Revision: 7785
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7785&view=rev
Author:   mdboom
Date: 2009-09-18 15:18:21 + (Fri, 18 Sep 2009)

Log Message:
---
Merged revisions 7784 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint


  r7784 | mdboom | 2009-09-18 11:16:20 -0400 (Fri, 18 Sep 2009) | 2 lines
  
  Fix bug where subslicing was cutting polar lines off (because it was treating 
them as if they were rectilinearly plotted).


Modified Paths:
--
trunk/matplotlib/lib/matplotlib/lines.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-7780
   + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 
/branches/v0_99_maint:1-7784
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,7756,7762,7770,7772,7774,7776-7778,7780
   + /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,7762,7770,7772,7774,7776-7778,7780,7784


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,7756,7762,7770,7772,7774,7776-7778,7780
   + 
/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,7762,7770,7772,7774,7776-7778,7780,7784


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-6

SF.net SVN: matplotlib:[7786] trunk/matplotlib/lib/matplotlib/tests/ baseline_images/test_axes/polar_axes.png

2009-09-18 Thread mdboom
Revision: 7786
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7786&view=rev
Author:   mdboom
Date: 2009-09-18 15:42:37 + (Fri, 18 Sep 2009)

Log Message:
---
Update this baseline image to reflect correct, not buggy, behavior :)

Modified Paths:
--

trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_axes.png

Modified: 
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_axes.png
===
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib:[7787] trunk/matplotlib

2009-09-18 Thread mdboom
Revision: 7787
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7787&view=rev
Author:   mdboom
Date: 2009-09-18 16:18:51 + (Fri, 18 Sep 2009)

Log Message:
---
Add tests for the simplification/clipping infrastructure.

Modified Paths:
--
trunk/matplotlib/examples/tests/backend_driver.py
trunk/matplotlib/lib/matplotlib/__init__.py
trunk/matplotlib/lib/matplotlib/testing/compare.py

Added Paths:
---
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_simplification/

trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_simplification/clipping.png

trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.png

trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_simplification/overflow.png

trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_simplification/simplify_curve.png
trunk/matplotlib/lib/matplotlib/tests/test_simplification.py

Removed Paths:
-
trunk/matplotlib/examples/pylab_examples/simplification_clipping_test.py

Deleted: 
trunk/matplotlib/examples/pylab_examples/simplification_clipping_test.py
===
--- trunk/matplotlib/examples/pylab_examples/simplification_clipping_test.py
2009-09-18 15:42:37 UTC (rev 7786)
+++ trunk/matplotlib/examples/pylab_examples/simplification_clipping_test.py
2009-09-18 16:18:51 UTC (rev 7787)
@@ -1,72 +0,0 @@
-from pylab import *
-import numpy as np
-from matplotlib import patches, path
-nan = np.nan
-Path = path.Path
-
-t = arange(0.0, 2.0, 0.01)
-s = sin(2*pi*t)
-plot(t, s, linewidth=1.0)
-
-ylim((-0.20, -0.28))
-
-title('Should see four lines extending from bottom to top')
-
-figure()
-
-x = np.array([1.0,2.0,3.0,2.0e5])
-y = np.arange(len(x))
-plot(x,y)
-xlim(xmin=2,xmax=6)
-title("Should be monotonically increasing")
-
-figure()
-
-x = np.array([0.0, 1.0, 0.0, -1.0, 0.0])
-y = np.array([1.0, 0.0, -1.0, 0.0, 1.0])
-plot(x, y)
-xlim(xmin=-0.6, xmax=0.6)
-ylim(ymin=-0.6, ymax=0.6)
-title("Diamond shape, with segments visible in all four corners")
-
-figure()
-
-np.random.seed(0)
-x = np.random.uniform(size=(5000,)) * 50
-
-rcParams['path.simplify'] = True
-p1 = plot(x,solid_joinstyle='round',linewidth=2.0)
-
-path = p1[0].get_path()
-transform = p1[0].get_transform()
-path = transform.transform_path(path)
-simplified = list(path.iter_segments(simplify=(800, 600)))
-
-title("Original length: %d, simplified length: %d" % (len(path.vertices), 
len(simplified)))
-
-figure()
-
-x = np.sin(np.linspace(0, np.pi * 2.0, 1000)) + 
np.random.uniform(size=(1000,)) * 0.01
-
-rcParams['path.simplify'] = True
-p1 = plot(x,solid_joinstyle='round',linewidth=2.0)
-
-path = p1[0].get_path()
-transform = p1[0].get_transform()
-path = transform.transform_path(path)
-simplified = list(path.iter_segments(simplify=(800, 600)))
-
-title("Original length: %d, simplified length: %d" % (len(path.vertices), 
len(simplified)))
-
-figure()
-pp1 = patches.PathPatch(
-Path([(0, 0), (1, 0), (1, 1), (nan, 1), (0, 0), (2, 0), (2, 2), (0, 0)],
- [Path.MOVETO, Path.CURVE3, Path.CURVE3, Path.CURVE3, Path.CURVE3, 
Path.CURVE3, Path.CURVE3, Path.CLOSEPOLY]),
-fc="none")
-
-gca().add_patch(pp1)
-gca().set_xlim((0, 2))
-gca().set_ylim((0, 2))
-title("Should be one line with two curves below it")
-
-show()

Modified: trunk/matplotlib/examples/tests/backend_driver.py
===
--- trunk/matplotlib/examples/tests/backend_driver.py   2009-09-18 15:42:37 UTC 
(rev 7786)
+++ trunk/matplotlib/examples/tests/backend_driver.py   2009-09-18 16:18:51 UTC 
(rev 7787)
@@ -181,7 +181,6 @@
 'shared_axis_across_figures.py',
 'shared_axis_demo.py',
 'simple_plot.py',
-'simplification_clipping_test.py',
 'specgram_demo.py',
 'spine_placement_demo.py',
 'spy_demos.py',

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===
--- trunk/matplotlib/lib/matplotlib/__init__.py 2009-09-18 15:42:37 UTC (rev 
7786)
+++ trunk/matplotlib/lib/matplotlib/__init__.py 2009-09-18 16:18:51 UTC (rev 
7787)
@@ -886,6 +886,7 @@
 'matplotlib.tests.test_dates',
 'matplotlib.tests.test_spines',
 'matplotlib.tests.test_image',
+'matplotlib.tests.test_simplification',
 ]
 
 def test(verbosity=0):

Modified: trunk/matplotlib/lib/matplotlib/testing/compare.py
===
--- trunk/matplotlib/lib/matplotlib/testing/compare.py  2009-09-18 15:42:37 UTC 
(rev 7786)
+++ trunk/matplotlib/lib/matplotlib/testing/compare.py  2009-09-18 16:18:51 UTC 
(rev 7787)
@@ -80,7 +80,7 @@
 
# img1 = "./baseline/plot.png"
# img2 = "./output/plot.png"
-   #
+   #
# compare_images( img1, img2, 0.001 ):
 
= INPUT VARIABLES

Added: 
trunk/matplotlib/lib/matplotlib/tests/baseline_image

SF.net SVN: matplotlib:[7788] branches/v0_99_maint/lib/matplotlib/cbook.py

2009-09-18 Thread efiring
Revision: 7788
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7788&view=rev
Author:   efiring
Date: 2009-09-19 02:53:06 + (Sat, 19 Sep 2009)

Log Message:
---
Fix bug in maxdict when replacing an existing item

Modified Paths:
--
branches/v0_99_maint/lib/matplotlib/cbook.py

Modified: branches/v0_99_maint/lib/matplotlib/cbook.py
===
--- branches/v0_99_maint/lib/matplotlib/cbook.py2009-09-18 16:18:51 UTC 
(rev 7787)
+++ branches/v0_99_maint/lib/matplotlib/cbook.py2009-09-19 02:53:06 UTC 
(rev 7788)
@@ -780,11 +780,12 @@
 self.maxsize = maxsize
 self._killkeys = []
 def __setitem__(self, k, v):
-if len(self)>=self.maxsize:
-del self[self._killkeys[0]]
-del self._killkeys[0]
+if k not in self:
+if len(self)>=self.maxsize:
+del self[self._killkeys[0]]
+del self._killkeys[0]
+self._killkeys.append(k)
 dict.__setitem__(self, k, v)
-self._killkeys.append(k)
 
 
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib:[7789] trunk/matplotlib

2009-09-18 Thread efiring
Revision: 7789
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7789&view=rev
Author:   efiring
Date: 2009-09-19 03:05:24 + (Sat, 19 Sep 2009)

Log Message:
---
Merged revisions 7788 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint


  r7788 | efiring | 2009-09-18 16:53:06 -1000 (Fri, 18 Sep 2009) | 2 lines
  
  Fix bug in maxdict when replacing an existing item


Modified Paths:
--
trunk/matplotlib/lib/matplotlib/cbook.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-7784
   + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 
/branches/v0_99_maint:1-7788
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,7756,7762,7770,7772,7774,7776-7778,7780,7784
   + /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,7762,7770,7772,7774,7776-7778,7780,7784,7788


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,7756,7762,7770,7772,7774,7776-7778,7780,7784
   + 
/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,7762,7770,7772,7774,7776-7778,7780,7784,7788


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,679

SF.net SVN: matplotlib:[7790] branches/v0_99_maint/lib/matplotlib/mlab.py

2009-09-18 Thread efiring
Revision: 7790
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7790&view=rev
Author:   efiring
Date: 2009-09-19 06:28:43 + (Sat, 19 Sep 2009)

Log Message:
---
Fix bug in mlab.demean, with axis = -1

Modified Paths:
--
branches/v0_99_maint/lib/matplotlib/mlab.py

Modified: branches/v0_99_maint/lib/matplotlib/mlab.py
===
--- branches/v0_99_maint/lib/matplotlib/mlab.py 2009-09-19 03:05:24 UTC (rev 
7789)
+++ branches/v0_99_maint/lib/matplotlib/mlab.py 2009-09-19 06:28:43 UTC (rev 
7790)
@@ -173,11 +173,11 @@
 def demean(x, axis=0):
 "Return x minus its mean along the specified axis"
 x = np.asarray(x)
-if axis:
-ind = [slice(None)] * axis
-ind.append(np.newaxis)
-return x - x.mean(axis)[ind]
-return x - x.mean(axis)
+if axis == 0 or axis is None or x.ndim <= 1:
+return x - x.mean(axis)
+ind = [slice(None)] * x.ndim
+ind[axis] = np.newaxis
+return x - x.mean(axis)[ind]
 
 def detrend_mean(x):
 "Return x minus the mean(x)"


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib:[7791] trunk/matplotlib

2009-09-18 Thread efiring
Revision: 7791
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7791&view=rev
Author:   efiring
Date: 2009-09-19 06:32:38 + (Sat, 19 Sep 2009)

Log Message:
---
Merged revisions 7790 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint


  r7790 | efiring | 2009-09-18 20:28:43 -1000 (Fri, 18 Sep 2009) | 2 lines
  
  Fix bug in mlab.demean, with axis = -1


Modified Paths:
--
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-7788
   + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 
/branches/v0_99_maint:1-7790
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,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788
   + /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,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790


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,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788
   + 
/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,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790


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,6