matplotlib-checkins Mailing List for matplotlib (Page 2)

Revision: 8583
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8583&view=rev
Author: mdboom
Date: 2010年07月27日 17:26:50 +0000 (2010年7月27日)
Log Message:
-----------
[3034778] line width arguments don't work in pcolormesh
Also, support clipping paths on images in SVG backend.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/backend_bases.py
 branches/v1_0_maint/lib/matplotlib/backends/backend_svg.py
 branches/v1_0_maint/lib/matplotlib/collections.py
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/imshow.svg
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_interps.svg
 branches/v1_0_maint/lib/matplotlib/tests/test_axes.py
 branches/v1_0_maint/lib/matplotlib/tests/test_image.py
 branches/v1_0_maint/lib/matplotlib/tests/test_simplification.py
 branches/v1_0_maint/src/_backend_agg.cpp
Added Paths:
-----------
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh.pdf
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh.png
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh.svg
Modified: branches/v1_0_maint/lib/matplotlib/backend_bases.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backend_bases.py	2010年07月27日 16:01:47 UTC (rev 8582)
+++ branches/v1_0_maint/lib/matplotlib/backend_bases.py	2010年07月27日 17:26:50 UTC (rev 8583)
@@ -208,10 +208,10 @@
 
 if showedges:
 edgecolors = np.array([[0.0, 0.0, 0.0, 1.0]], np.float_)
- linewidths = np.array([1.0], np.float_)
+ linewidths = np.array([gc.get_linewidth()], np.float_)
 else:
 edgecolors = facecolors
- linewidths = np.array([0.0], np.float_)
+ linewidths = np.array([gc.get_linewidth()], np.float_)
 
 return self.draw_path_collection(
 gc, master_transform, paths, [], offsets, offsetTrans, facecolors,
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_svg.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_svg.py	2010年07月27日 16:01:47 UTC (rev 8582)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_svg.py	2010年07月27日 17:26:50 UTC (rev 8583)
@@ -389,7 +389,12 @@
 write('</g>\n')
 
 def draw_image(self, gc, x, y, im):
- # MGDTODO: Support clippath here
+ clipid = self._get_gc_clip_svg(gc)
+ if clipid is None:
+ clippath = ''
+ else:
+ clippath = 'clip-path="url(#%s)"' % clipid
+
 trans = [1,0,0,1,0,0]
 transstr = ''
 if rcParams['svg.image_noscale']:
@@ -410,7 +415,9 @@
 self._svgwriter.write('<a xlink:href="%s">' % url)
 self._svgwriter.write (
 '<image x="%f" y="%f" width="%f" height="%f" '
- '%s xlink:href="'%(x/trans[0], (self.height-y)/trans[3]-h, w, h, transstr)
+ '%s %s xlink:href="' % (
+ x/trans[0], (self.height-y)/trans[3]-h, w, h,
+ transstr, clippath)
 )
 
 if rcParams['svg.image_inline']:
Modified: branches/v1_0_maint/lib/matplotlib/collections.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/collections.py	2010年07月27日 16:01:47 UTC (rev 8582)
+++ branches/v1_0_maint/lib/matplotlib/collections.py	2010年07月27日 17:26:50 UTC (rev 8583)
@@ -1228,6 +1228,7 @@
 
 gc = renderer.new_gc()
 self._set_gc_clip(gc)
+ gc.set_linewidth(self.get_linewidth()[0])
 
 if self._shading == 'gouraud':
 triangles, colors = self.convert_mesh_to_triangles(
Modified: branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/imshow.svg
===================================================================
--- branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/imshow.svg	2010年07月27日 16:01:47 UTC (rev 8582)
+++ branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/imshow.svg	2010年07月27日 17:26:50 UTC (rev 8583)
@@ -18,994 +18,1000 @@
 <path style="fill: #ffffff; opacity: 1.000000" d="M122.400000 388.800000L468.000000 388.800000L468.000000 43.200000
 L122.400000 43.200000L122.400000 388.800000"/>
 </g>
-<image x="122.400000" y="41.800000" width="347.000000" height="347.000000" xlink:href="data:image/png;base64,
+<defs>
+ <clipPath id="p3268b4c49a7b373f0e4e01e239475b1d">
+<rect x="122.400000" y="43.200000" width="345.600000" height="345.600000"/>
+ </clipPath>
+</defs><image x="122.400000" y="41.800000" width="347.000000" height="347.000000" clip-path="url(#p3268b4c49a7b373f0e4e01e239475b1d)" xlink:href="data:image/png;base64,
 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
-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...
 
[truncated message content]

Revision: 8582
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8582&view=rev
Author: leejjoon
Date: 2010年07月27日 16:01:47 +0000 (2010年7月27日)
Log Message:
-----------
Merged revisions 8581 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8581 | leejjoon | 2010年07月27日 11:52:47 -0400 (2010年7月27日) | 1 line
 
 fix pyplot.subplot2grid to support the projection keyword
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/pyplot.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_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8579 /trunk/matplotlib:1-7315
 + /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_91_maint:1-6428 /branches/v1_0_maint:1-8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
Modified: trunk/matplotlib/lib/matplotlib/pyplot.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pyplot.py	2010年07月27日 15:52:47 UTC (rev 8581)
+++ trunk/matplotlib/lib/matplotlib/pyplot.py	2010年07月27日 16:01:47 UTC (rev 8582)
@@ -797,8 +797,7 @@
 subplotspec = GridSpec(s1, s2).new_subplotspec(loc,
 rowspan=rowspan,
 colspan=colspan)
- a = Subplot(fig, subplotspec, **kwargs)
- fig.add_subplot(a)
+ a = fig.add_subplot(subplotspec, **kwargs)
 bbox = a.bbox
 byebye = []
 for other in fig.axes:
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
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:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8581
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8581&view=rev
Author: leejjoon
Date: 2010年07月27日 15:52:47 +0000 (2010年7月27日)
Log Message:
-----------
fix pyplot.subplot2grid to support the projection keyword
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/pyplot.py
Modified: branches/v1_0_maint/lib/matplotlib/pyplot.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/pyplot.py	2010年07月26日 19:17:37 UTC (rev 8580)
+++ branches/v1_0_maint/lib/matplotlib/pyplot.py	2010年07月27日 15:52:47 UTC (rev 8581)
@@ -797,8 +797,7 @@
 subplotspec = GridSpec(s1, s2).new_subplotspec(loc,
 rowspan=rowspan,
 colspan=colspan)
- a = Subplot(fig, subplotspec, **kwargs)
- fig.add_subplot(a)
+ a = fig.add_subplot(subplotspec, **kwargs)
 bbox = a.bbox
 byebye = []
 for other in fig.axes:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8580
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8580&view=rev
Author: efiring
Date: 2010年07月26日 19:17:37 +0000 (2010年7月26日)
Log Message:
-----------
Merged revisions 8579 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8579 | efiring | 2010年07月26日 09:14:16 -1000 (2010年7月26日) | 2 lines
 
 [3032390] subplot: more robust argument handling, consistent with 0.99.3
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/axes.py
 trunk/matplotlib/lib/matplotlib/gridspec.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_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8577 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8579 /trunk/matplotlib:1-7315
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2010年07月26日 19:14:16 UTC (rev 8579)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2010年07月26日 19:17:37 UTC (rev 8580)
@@ -8295,6 +8295,7 @@
 being created. *plotNum* starts at 1 in the upper left
 corner and increases to the right.
 
+
 If *numRows* <= *numCols* <= *plotNum* < 10, *args* can be the
 decimal integer *numRows* * 100 + *numCols* * 10 + *plotNum*.
 """
@@ -8304,25 +8305,28 @@
 if len(args) == 1:
 if isinstance(args[0], SubplotSpec):
 self._subplotspec = args[0]
-
 else:
- s = str(args[0])
- if len(s) != 3:
- raise ValueError('Argument to subplot must be a 3 digits long')
- rows, cols, num = map(int, s)
+ try:
+ s = str(int(args[0]))
+ rows, cols, num = map(int, s)
+ except ValueError:
+ raise ValueError(
+ 'Single argument to subplot must be a 3-digit integer')
 self._subplotspec = GridSpec(rows, cols)[num-1]
 # num - 1 for converting from MATLAB to python indexing
 elif len(args)==3:
 rows, cols, num = args
+ rows = int(rows)
+ cols = int(cols)
 if isinstance(num, tuple) and len(num) == 2:
+ num = [int(n) for n in num]
 self._subplotspec = GridSpec(rows, cols)[num[0]-1:num[1]]
 else:
- self._subplotspec = GridSpec(rows, cols)[num-1]
+ self._subplotspec = GridSpec(rows, cols)[int(num)-1]
 # num - 1 for converting from MATLAB to python indexing
 else:
- raise ValueError( 'Illegal argument to subplot')
+ raise ValueError('Illegal argument(s) to subplot: %s' % (args,))
 
-
 self.update_params()
 
 # _axes_class is set in the subplot_class_factory
Modified: trunk/matplotlib/lib/matplotlib/gridspec.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/gridspec.py	2010年07月26日 19:14:16 UTC (rev 8579)
+++ trunk/matplotlib/lib/matplotlib/gridspec.py	2010年07月26日 19:17:37 UTC (rev 8580)
@@ -70,7 +70,7 @@
 def get_height_ratios(self):
 return self._row_height_ratios
 
- 
+
 def get_grid_positions(self, fig):
 """
 return lists of bottom and top position of rows, left and
@@ -116,9 +116,9 @@
 
 sepWidths = [0] + ([sepW] * (ncols-1))
 cellWs = np.add.accumulate(np.ravel(zip(sepWidths, cellWidths)))
- 
 
 
+
 figTops = [top - cellHs[2*rowNum] for rowNum in range(nrows)]
 figBottoms = [top - cellHs[2*rowNum+1] for rowNum in range(nrows)]
 figLefts = [left + cellWs[2*colNum] for colNum in range(ncols)]
@@ -126,8 +126,8 @@
 
 
 return figBottoms, figTops, figLefts, figRights
- 
 
+
 def __getitem__(self, key):
 """
 create and return a SuplotSpec instance.
@@ -287,7 +287,7 @@
 
 def get_subplot_params(self, fig=None):
 """
- return a dictionary of subplot layout parameters. 
+ return a dictionary of subplot layout parameters.
 """
 
 if fig is None:
@@ -324,7 +324,7 @@
 """
 specifies the location of the subplot in the given *GridSpec*.
 """
- 
+
 def __init__(self, gridspec, num1, num2=None):
 """
 The subplot will occupy the num1-th cell of the given
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
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:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8579
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8579&view=rev
Author: efiring
Date: 2010年07月26日 19:14:16 +0000 (2010年7月26日)
Log Message:
-----------
[3032390] subplot: more robust argument handling, consistent with 0.99.3
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/axes.py
 branches/v1_0_maint/lib/matplotlib/gridspec.py
Modified: branches/v1_0_maint/lib/matplotlib/axes.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/axes.py	2010年07月26日 18:20:35 UTC (rev 8578)
+++ branches/v1_0_maint/lib/matplotlib/axes.py	2010年07月26日 19:14:16 UTC (rev 8579)
@@ -8295,6 +8295,7 @@
 being created. *plotNum* starts at 1 in the upper left
 corner and increases to the right.
 
+
 If *numRows* <= *numCols* <= *plotNum* < 10, *args* can be the
 decimal integer *numRows* * 100 + *numCols* * 10 + *plotNum*.
 """
@@ -8304,25 +8305,28 @@
 if len(args) == 1:
 if isinstance(args[0], SubplotSpec):
 self._subplotspec = args[0]
-
 else:
- s = str(args[0])
- if len(s) != 3:
- raise ValueError('Argument to subplot must be a 3 digits long')
- rows, cols, num = map(int, s)
+ try:
+ s = str(int(args[0]))
+ rows, cols, num = map(int, s)
+ except ValueError:
+ raise ValueError(
+ 'Single argument to subplot must be a 3-digit integer')
 self._subplotspec = GridSpec(rows, cols)[num-1]
 # num - 1 for converting from MATLAB to python indexing
 elif len(args)==3:
 rows, cols, num = args
+ rows = int(rows)
+ cols = int(cols)
 if isinstance(num, tuple) and len(num) == 2:
+ num = [int(n) for n in num]
 self._subplotspec = GridSpec(rows, cols)[num[0]-1:num[1]]
 else:
- self._subplotspec = GridSpec(rows, cols)[num-1]
+ self._subplotspec = GridSpec(rows, cols)[int(num)-1]
 # num - 1 for converting from MATLAB to python indexing
 else:
- raise ValueError( 'Illegal argument to subplot')
+ raise ValueError('Illegal argument(s) to subplot: %s' % (args,))
 
-
 self.update_params()
 
 # _axes_class is set in the subplot_class_factory
Modified: branches/v1_0_maint/lib/matplotlib/gridspec.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/gridspec.py	2010年07月26日 18:20:35 UTC (rev 8578)
+++ branches/v1_0_maint/lib/matplotlib/gridspec.py	2010年07月26日 19:14:16 UTC (rev 8579)
@@ -70,7 +70,7 @@
 def get_height_ratios(self):
 return self._row_height_ratios
 
- 
+
 def get_grid_positions(self, fig):
 """
 return lists of bottom and top position of rows, left and
@@ -116,9 +116,9 @@
 
 sepWidths = [0] + ([sepW] * (ncols-1))
 cellWs = np.add.accumulate(np.ravel(zip(sepWidths, cellWidths)))
- 
 
 
+
 figTops = [top - cellHs[2*rowNum] for rowNum in range(nrows)]
 figBottoms = [top - cellHs[2*rowNum+1] for rowNum in range(nrows)]
 figLefts = [left + cellWs[2*colNum] for colNum in range(ncols)]
@@ -126,8 +126,8 @@
 
 
 return figBottoms, figTops, figLefts, figRights
- 
 
+
 def __getitem__(self, key):
 """
 create and return a SuplotSpec instance.
@@ -287,7 +287,7 @@
 
 def get_subplot_params(self, fig=None):
 """
- return a dictionary of subplot layout parameters. 
+ return a dictionary of subplot layout parameters.
 """
 
 if fig is None:
@@ -324,7 +324,7 @@
 """
 specifies the location of the subplot in the given *GridSpec*.
 """
- 
+
 def __init__(self, gridspec, num1, num2=None):
 """
 The subplot will occupy the num1-th cell of the given
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8578
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8578&view=rev
Author: efiring
Date: 2010年07月26日 18:20:35 +0000 (2010年7月26日)
Log Message:
-----------
Merged revisions 8577 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8577 | efiring | 2010年07月26日 08:17:18 -1000 (2010年7月26日) | 2 lines
 
 [3026430] delete duplicate test file with space in name
........
Removed Paths:
-------------
 trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/shaped data.svg
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
 - /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_91_maint:1-6428 /branches/v1_0_maint:1-8575
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8577 /trunk/matplotlib:1-7315
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577
Deleted: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/shaped data.svg
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/shaped data.svg	2010年07月26日 18:17:18 UTC (rev 8577)
+++ trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/shaped data.svg	2010年07月26日 18:20:35 UTC (rev 8578)
@@ -1,1072 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.sourceforge.net/) -->
-<svg width="576pt" height="432pt" viewBox="0 0 576 432"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- version="1.1"
- id="svg1">
-<filter id="colorAdd"><feComposite in="SourceGraphic" in2="BackgroundImage" operator="arithmetic" k2="1" k3="1"/></filter>
-<g id="figure1">
-<g id="patch1">
-<path style="fill: #ffffff; stroke: #ffffff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M0.000000 432.000000L576.000000 432.000000L576.000000 0.000000
-L0.000000 0.000000L0.000000 432.000000"/>
-</g>
-<g id="axes1">
-<g id="patch2">
-<path style="fill: #ffffff; opacity: 1.000000" d="M72.000000 118.330435L518.400000 118.330435L518.400000 43.200000
-L72.000000 43.200000L72.000000 118.330435"/>
-</g>
-<g id="line2d1">
-<defs>
- <clipPath id="p61af403617d959841c525b403ce2fe0f">
-<rect x="72.000000" y="43.200000" width="446.400000" height="75.130435"/>
- </clipPath>
-</defs><path style="fill: none; stroke: #0000ff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 118.330435"/>
-</g>
-<g id="line2d2">
-<path style="fill: none; stroke: #008000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 109.982609"/>
-</g>
-<g id="line2d3">
-<path style="fill: none; stroke: #ff0000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 101.634783"/>
-</g>
-<g id="line2d4">
-<path style="fill: none; stroke: #00bfbf; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 93.286957"/>
-</g>
-<g id="line2d5">
-<path style="fill: none; stroke: #bf00bf; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 84.939130"/>
-</g>
-<g id="line2d6">
-<path style="fill: none; stroke: #bfbf00; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 76.591304"/>
-</g>
-<g id="line2d7">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 68.243478"/>
-</g>
-<g id="line2d8">
-<path style="fill: none; stroke: #0000ff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 59.895652"/>
-</g>
-<g id="line2d9">
-<path style="fill: none; stroke: #008000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 51.547826"/>
-</g>
-<g id="line2d10">
-<path style="fill: none; stroke: #ff0000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 43.200000"/>
-</g>
-<g id="matplotlib.axis1">
-<g id="xtick1">
-<g id="line2d11">
-<defs><path id="m30e32995789d870ad79a2e54c91cf9c6" d="M0.000000 0.000000L0.000000 -4.000000"/></defs>
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="72.000000" y="118.330435"/>
-</g></g>
-<g id="line2d12">
-<defs><path id="m9281cae24120827b11d5ea8a7ad3e96b" d="M0.000000 0.000000L0.000000 4.000000"/></defs>
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="72.000000" y="43.200000"/>
-</g></g>
-<g id="text1">
-<defs>
-<path id="c_6a8d56c819c37117ab4cf023bec22a5a" d="M10.593750 -35.500000l62.593750 0.000000l0.000000 8.296875l-62.593750 0.000000z"/>
-<path id="c_7a2040fe3b94fcd41d0a72c84e93b115" d="M31.781250 -66.406250q-7.609375 0.000000 -11.453125 7.500000q-3.828125 7.484375 -3.828125 22.531250q0.000000 14.984375 3.828125 22.484375q3.843750 7.500000 11.453125 7.500000q7.671875 0.000000 11.500000 -7.500000q3.843750 -7.500000 3.843750 -22.484375q0.000000 -15.046875 -3.843750 -22.531250q-3.828125 -7.500000 -11.500000 -7.500000M31.781250 -74.218750q12.265625 0.000000 18.734375 9.703125q6.468750 9.687500 6.468750 28.140625q0.000000 18.406250 -6.468750 28.109375q-6.468750 9.687500 -18.734375 9.687500q-12.250000 0.000000 -18.718750 -9.687500q-6.468750 -9.703125 -6.468750 -28.109375q0.000000 -18.453125 6.468750 -28.140625q6.468750 -9.703125 18.718750 -9.703125"/>
-<path id="c_ed3e21196fb739f392806f09ca0594ef" d="M10.687500 -12.406250l10.312500 0.000000l0.000000 12.406250l-10.312500 0.000000z"/>
-<path id="c_cc8d6d580d1b10c8632f7a42cd53db8a" d="M33.015625 -40.375000q-6.640625 0.000000 -10.531250 4.546875q-3.875000 4.531250 -3.875000 12.437500q0.000000 7.859375 3.875000 12.437500q3.890625 4.562500 10.531250 4.562500q6.640625 0.000000 10.515625 -4.562500q3.875000 -4.578125 3.875000 -12.437500q0.000000 -7.906250 -3.875000 -12.437500q-3.875000 -4.546875 -10.515625 -4.546875M52.593750 -71.296875l0.000000 8.984375q-3.718750 -1.750000 -7.500000 -2.671875q-3.781250 -0.937500 -7.500000 -0.937500q-9.765625 0.000000 -14.921875 6.593750q-5.140625 6.593750 -5.875000 19.921875q2.875000 -4.250000 7.218750 -6.515625q4.359375 -2.265625 9.578125 -2.265625q10.984375 0.000000 17.359375 6.671875q6.375000 6.656250 6.375000 18.125000q0.000000 11.234375 -6.640625 18.031250q-6.640625 6.781250 -17.671875 6.781250q-12.656250 0.000000 -19.343750 -9.687500q-6.687500 -9.703125 -6.687500 -28.109375q0.000000 -17.281250 8.203125 -27.562500q8.203125 -10.281250 22.015625 -10.281250q3.718750 0.000000 7.500000 0.734375q3.781250 0.734375 7.890625 2.187500"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(54.617188,131.236685)scale(0.120000)">
-<use xlink:href="#c_6a8d56c819c37117ab4cf023bec22a5a"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="83.789062"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="147.412109"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="179.199219"/>
-<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a" x="242.822266"/>
-</g>
-</g>
-</g>
-<g id="xtick2">
-<g id="line2d13">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="146.400000" y="118.330435"/>
-</g></g>
-<g id="line2d14">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="146.400000" y="43.200000"/>
-</g></g>
-<g id="text2">
-<defs>
-<path id="c_a0416418d96557a09b8c1332d34883ba" d="M37.796875 -64.312500l-24.906250 38.921875l24.906250 0.000000zM35.203125 -72.906250l12.406250 0.000000l0.000000 47.515625l10.406250 0.000000l0.000000 8.203125l-10.406250 0.000000l0.000000 17.187500l-9.812500 0.000000l0.000000 -17.187500l-32.906250 0.000000l0.000000 -9.515625z"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(128.970313,131.236685)scale(0.120000)">
-<use xlink:href="#c_6a8d56c819c37117ab4cf023bec22a5a"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="83.789062"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="147.412109"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="179.199219"/>
-<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba" x="242.822266"/>
-</g>
-</g>
-</g>
-<g id="xtick3">
-<g id="line2d15">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="220.800000" y="118.330435"/>
-</g></g>
-<g id="line2d16">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="220.800000" y="43.200000"/>
-</g></g>
-<g id="text3">
-<defs>
-<path id="c_ed3f3ed3ebfbd18bcb9c012009a68ad1" d="M19.187500 -8.296875l34.421875 0.000000l0.000000 8.296875l-46.281250 0.000000l0.000000 -8.296875q5.609375 -5.812500 15.296875 -15.593750q9.703125 -9.796875 12.187500 -12.640625q4.734375 -5.312500 6.609375 -9.000000q1.890625 -3.687500 1.890625 -7.250000q0.000000 -5.812500 -4.078125 -9.468750q-4.078125 -3.671875 -10.625000 -3.671875q-4.640625 0.000000 -9.796875 1.609375q-5.140625 1.609375 -11.000000 4.890625l0.000000 -9.968750q5.953125 -2.390625 11.125000 -3.609375q5.187500 -1.218750 9.484375 -1.218750q11.328125 0.000000 18.062500 5.671875q6.734375 5.656250 6.734375 15.125000q0.000000 4.500000 -1.687500 8.531250q-1.671875 4.015625 -6.125000 9.484375q-1.218750 1.421875 -7.765625 8.187500q-6.531250 6.765625 -18.453125 18.921875"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(203.635938,131.236685)scale(0.120000)">
-<use xlink:href="#c_6a8d56c819c37117ab4cf023bec22a5a"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="83.789062"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="147.412109"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="179.199219"/>
-<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1" x="242.822266"/>
-</g>
-</g>
-</g>
-<g id="xtick4">
-<g id="line2d17">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="295.200000" y="118.330435"/>
-</g></g>
-<g id="line2d18">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="295.200000" y="43.200000"/>
-</g></g>
-<g id="text4">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(282.629687,131.236685)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="159.033203"/>
-</g>
-</g>
-</g>
-<g id="xtick5">
-<g id="line2d19">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="369.600000" y="118.330435"/>
-</g></g>
-<g id="line2d20">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="369.600000" y="43.200000"/>
-</g></g>
-<g id="text5">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(357.232813,131.236685)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1" x="159.033203"/>
-</g>
-</g>
-</g>
-<g id="xtick6">
-<g id="line2d21">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="444.000000" y="118.330435"/>
-</g></g>
-<g id="line2d22">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="444.000000" y="43.200000"/>
-</g></g>
-<g id="text6">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(431.367188,131.236685)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba" x="159.033203"/>
-</g>
-</g>
-</g>
-<g id="xtick7">
-<g id="line2d23">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="518.400000" y="118.330435"/>
-</g></g>
-<g id="line2d24">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="518.400000" y="43.200000"/>
-</g></g>
-<g id="text7">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(505.814062,131.236685)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a" x="159.033203"/>
-</g>
-</g>
-</g>
-</g>
-<g id="matplotlib.axis2">
-<g id="ytick1">
-<g id="line2d25">
-<defs><path id="m3400efa6b1638b3fea9e19e898273957" d="M0.000000 0.000000L4.000000 0.000000"/></defs>
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="118.330435"/>
-</g></g>
-<g id="line2d26">
-<defs><path id="m20b58b2501143cb5e0a5e8f1ef6f1643" d="M0.000000 0.000000L-4.000000 0.000000"/></defs>
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="118.330435"/>
-</g></g>
-<g id="text8">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(61.953125,122.697622)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-</g>
-</g>
-</g>
-<g id="ytick2">
-<g id="line2d27">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="109.982609"/>
-</g></g>
-<g id="line2d28">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="109.982609"/>
-</g></g>
-<g id="text9">
-<defs>
-<path id="c_42baa63129a918535c52adb20d687ea7" d="M12.406250 -8.296875l16.109375 0.000000l0.000000 -55.625000l-17.531250 3.515625l0.000000 -8.984375l17.437500 -3.515625l9.859375 0.000000l0.000000 64.609375l16.109375 0.000000l0.000000 8.296875l-41.984375 0.000000z"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.781250,114.357609)scale(0.120000)">
-<use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
-</g>
-</g>
-</g>
-<g id="ytick3">
-<g id="line2d29">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="101.634783"/>
-</g></g>
-<g id="line2d30">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="101.634783"/>
-</g></g>
-<g id="text10">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.437500,106.087908)scale(0.120000)">
-<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1"/>
-</g>
-</g>
-</g>
-<g id="ytick4">
-<g id="line2d31">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="93.286957"/>
-</g></g>
-<g id="line2d32">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="93.286957"/>
-</g></g>
-<g id="text11">
-<defs>
-<path id="c_3dcfa38a02242cb63ec6726c6e70be7a" d="M40.578125 -39.312500q7.078125 1.515625 11.046875 6.312500q3.984375 4.781250 3.984375 11.812500q0.000000 10.781250 -7.421875 16.703125q-7.421875 5.906250 -21.093750 5.906250q-4.578125 0.000000 -9.437500 -0.906250q-4.859375 -0.906250 -10.031250 -2.718750l0.000000 -9.515625q4.093750 2.390625 8.968750 3.609375q4.890625 1.218750 10.218750 1.218750q9.265625 0.000000 14.125000 -3.656250q4.859375 -3.656250 4.859375 -10.640625q0.000000 -6.453125 -4.515625 -10.078125q-4.515625 -3.640625 -12.562500 -3.640625l-8.500000 0.000000l0.000000 -8.109375l8.890625 0.000000q7.265625 0.000000 11.125000 -2.906250q3.859375 -2.906250 3.859375 -8.375000q0.000000 -5.609375 -3.984375 -8.609375q-3.968750 -3.015625 -11.390625 -3.015625q-4.062500 0.000000 -8.703125 0.890625q-4.640625 0.875000 -10.203125 2.718750l0.000000 -8.781250q5.625000 -1.562500 10.531250 -2.343750q4.906250 -0.781250 9.250000 -0.781250q11.234375 0.000000 17.765625 5.109375q6.546875 5.093750 6.546875 13.781250q0.000000 6.062500 -3.468750 10.234375q-3.468750 4.171875 -9.859375 5.781250"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.250000,97.654144)scale(0.120000)">
-<use xlink:href="#c_3dcfa38a02242cb63ec6726c6e70be7a"/>
-</g>
-</g>
-</g>
-<g id="ytick5">
-<g id="line2d33">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="84.939130"/>
-</g></g>
-<g id="line2d34">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="84.939130"/>
-</g></g>
-<g id="text12">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(61.625000,89.314130)scale(0.120000)">
-<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba"/>
-</g>
-</g>
-</g>
-<g id="ytick6">
-<g id="line2d35">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="76.591304"/>
-</g></g>
-<g id="line2d36">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="76.591304"/>
-</g></g>
-<g id="text13">
-<defs>
-<path id="c_1260a2df50f305f3db244e29828f968e" d="M10.796875 -72.906250l38.718750 0.000000l0.000000 8.312500l-29.687500 0.000000l0.000000 17.859375q2.140625 -0.734375 4.281250 -1.093750q2.156250 -0.359375 4.312500 -0.359375q12.203125 0.000000 19.328125 6.687500q7.140625 6.687500 7.140625 18.109375q0.000000 11.765625 -7.328125 18.296875q-7.328125 6.515625 -20.656250 6.515625q-4.593750 0.000000 -9.359375 -0.781250q-4.750000 -0.781250 -9.828125 -2.343750l0.000000 -9.921875q4.390625 2.390625 9.078125 3.562500q4.687500 1.171875 9.906250 1.171875q8.453125 0.000000 13.375000 -4.437500q4.937500 -4.437500 4.937500 -12.062500q0.000000 -7.609375 -4.937500 -12.046875q-4.921875 -4.453125 -13.375000 -4.453125q-3.953125 0.000000 -7.890625 0.875000q-3.921875 0.875000 -8.015625 2.734375z"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.328125,80.880367)scale(0.120000)">
-<use xlink:href="#c_1260a2df50f305f3db244e29828f968e"/>
-</g>
-</g>
-</g>
-<g id="ytick7">
-<g id="line2d37">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="68.243478"/>
-</g></g>
-<g id="line2d38">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="68.243478"/>
-</g></g>
-<g id="text14">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(61.968750,72.610666)scale(0.120000)">
-<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a"/>
-</g>
-</g>
-</g>
-<g id="ytick8">
-<g id="line2d39">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="59.895652"/>
-</g></g>
-<g id="line2d40">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="59.895652"/>
-</g></g>
-<g id="text15">
-<defs>
-<path id="c_956f18cfdaf972f35a6c2b4aaac2532b" d="M8.203125 -72.906250l46.875000 0.000000l0.000000 4.203125l-26.468750 68.703125l-10.296875 0.000000l24.906250 -64.593750l-35.015625 0.000000z"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.375000,64.270652)scale(0.120000)">
-<use xlink:href="#c_956f18cfdaf972f35a6c2b4aaac2532b"/>
-</g>
-</g>
-</g>
-<g id="ytick9">
-<g id="line2d41">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="51.547826"/>
-</g></g>
-<g id="line2d42">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="51.547826"/>
-</g></g>
-<g id="text16">
-<defs>
-<path id="c_bef35738d52871942e50b9de9b122bab" d="M31.781250 -34.625000q-7.031250 0.000000 -11.062500 3.765625q-4.015625 3.765625 -4.015625 10.343750q0.000000 6.593750 4.015625 10.359375q4.031250 3.765625 11.062500 3.765625q7.031250 0.000000 11.078125 -3.781250q4.062500 -3.796875 4.062500 -10.343750q0.000000 -6.578125 -4.031250 -10.343750q-4.015625 -3.765625 -11.109375 -3.765625M21.921875 -38.812500q-6.343750 -1.562500 -9.890625 -5.906250q-3.531250 -4.359375 -3.531250 -10.609375q0.000000 -8.734375 6.218750 -13.812500q6.234375 -5.078125 17.062500 -5.078125q10.890625 0.000000 17.093750 5.078125q6.203125 5.078125 6.203125 13.812500q0.000000 6.250000 -3.546875 10.609375q-3.531250 4.343750 -9.828125 5.906250q7.125000 1.656250 11.093750 6.500000q3.984375 4.828125 3.984375 11.796875q0.000000 10.609375 -6.468750 16.281250q-6.468750 5.656250 -18.531250 5.656250q-12.046875 0.000000 -18.531250 -5.656250q-6.468750 -5.671875 -6.468750 -16.281250q0.000000 -6.968750 4.000000 -11.796875q4.015625 -4.843750 11.140625 -6.500000M18.312500 -54.390625q0.000000 5.656250 3.531250 8.828125q3.546875 3.171875 9.937500 3.171875q6.359375 0.000000 9.937500 -3.171875q3.593750 -3.171875 3.593750 -8.828125q0.000000 -5.671875 -3.593750 -8.843750q-3.578125 -3.171875 -9.937500 -3.171875q-6.390625 0.000000 -9.937500 3.171875q-3.531250 3.171875 -3.531250 8.843750"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.000000,55.915014)scale(0.120000)">
-<use xlink:href="#c_bef35738d52871942e50b9de9b122bab"/>
-</g>
-</g>
-</g>
-<g id="ytick10">
-<g id="line2d43">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="43.200000"/>
-</g></g>
-<g id="line2d44">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="43.200000"/>
-</g></g>
-<g id="text17">
-<defs>
-<path id="c_cd96f817f3cab988d24a2b49a5577fe6" d="M10.984375 -1.515625l0.000000 -8.984375q3.718750 1.765625 7.515625 2.687500q3.812500 0.921875 7.484375 0.921875q9.765625 0.000000 14.906250 -6.562500q5.156250 -6.562500 5.890625 -19.953125q-2.828125 4.203125 -7.187500 6.453125q-4.343750 2.250000 -9.609375 2.250000q-10.937500 0.000000 -17.312500 -6.609375q-6.375000 -6.625000 -6.375000 -18.109375q0.000000 -11.218750 6.640625 -18.000000q6.640625 -6.796875 17.671875 -6.796875q12.656250 0.000000 19.312500 9.703125q6.671875 9.687500 6.671875 28.140625q0.000000 17.234375 -8.187500 27.515625q-8.171875 10.281250 -21.984375 10.281250q-3.718750 0.000000 -7.531250 -0.734375q-3.796875 -0.734375 -7.906250 -2.203125M30.609375 -32.421875q6.640625 0.000000 10.515625 -4.531250q3.890625 -4.546875 3.890625 -12.468750q0.000000 -7.859375 -3.890625 -12.421875q-3.875000 -4.562500 -10.515625 -4.562500q-6.640625 0.000000 -10.515625 4.562500q-3.875000 4.562500 -3.875000 12.421875q0.000000 7.921875 3.875000 12.468750q3.875000 4.531250 10.515625 4.531250"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(61.953125,47.567187)scale(0.120000)">
-<use xlink:href="#c_cd96f817f3cab988d24a2b49a5577fe6"/>
-</g>
-</g>
-</g>
-</g>
-<g id="patch3">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 43.200000L518.400000 43.200000"/>
-</g>
-<g id="patch4">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M518.400000 118.330435L518.400000 43.200000"/>
-</g>
-<g id="patch5">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 118.330435L518.400000 118.330435"/>
-</g>
-<g id="patch6">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 118.330435L72.000000 43.200000"/>
-</g>
-</g>
-<g id="axes2">
-<g id="patch7">
-<path style="fill: #ffffff; opacity: 1.000000" d="M72.000000 208.486957L518.400000 208.486957L518.400000 133.356522
-L72.000000 133.356522L72.000000 208.486957"/>
-</g>
-<g id="line2d45">
-<defs>
- <clipPath id="pda3a145229a27f96d397cd13eca21335">
-<rect x="72.00000...
 
[truncated message content]

Revision: 8577
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8577&view=rev
Author: efiring
Date: 2010年07月26日 18:17:18 +0000 (2010年7月26日)
Log Message:
-----------
[3026430] delete duplicate test file with space in name
Removed Paths:
-------------
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/shaped data.svg
Deleted: branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/shaped data.svg
===================================================================
--- branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/shaped data.svg	2010年07月25日 22:47:54 UTC (rev 8576)
+++ branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/shaped data.svg	2010年07月26日 18:17:18 UTC (rev 8577)
@@ -1,1072 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.sourceforge.net/) -->
-<svg width="576pt" height="432pt" viewBox="0 0 576 432"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- version="1.1"
- id="svg1">
-<filter id="colorAdd"><feComposite in="SourceGraphic" in2="BackgroundImage" operator="arithmetic" k2="1" k3="1"/></filter>
-<g id="figure1">
-<g id="patch1">
-<path style="fill: #ffffff; stroke: #ffffff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M0.000000 432.000000L576.000000 432.000000L576.000000 0.000000
-L0.000000 0.000000L0.000000 432.000000"/>
-</g>
-<g id="axes1">
-<g id="patch2">
-<path style="fill: #ffffff; opacity: 1.000000" d="M72.000000 118.330435L518.400000 118.330435L518.400000 43.200000
-L72.000000 43.200000L72.000000 118.330435"/>
-</g>
-<g id="line2d1">
-<defs>
- <clipPath id="p61af403617d959841c525b403ce2fe0f">
-<rect x="72.000000" y="43.200000" width="446.400000" height="75.130435"/>
- </clipPath>
-</defs><path style="fill: none; stroke: #0000ff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 118.330435"/>
-</g>
-<g id="line2d2">
-<path style="fill: none; stroke: #008000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 109.982609"/>
-</g>
-<g id="line2d3">
-<path style="fill: none; stroke: #ff0000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 101.634783"/>
-</g>
-<g id="line2d4">
-<path style="fill: none; stroke: #00bfbf; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 93.286957"/>
-</g>
-<g id="line2d5">
-<path style="fill: none; stroke: #bf00bf; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 84.939130"/>
-</g>
-<g id="line2d6">
-<path style="fill: none; stroke: #bfbf00; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 76.591304"/>
-</g>
-<g id="line2d7">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 68.243478"/>
-</g>
-<g id="line2d8">
-<path style="fill: none; stroke: #0000ff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 59.895652"/>
-</g>
-<g id="line2d9">
-<path style="fill: none; stroke: #008000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 51.547826"/>
-</g>
-<g id="line2d10">
-<path style="fill: none; stroke: #ff0000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p61af403617d959841c525b403ce2fe0f)" d="M295.200000 43.200000"/>
-</g>
-<g id="matplotlib.axis1">
-<g id="xtick1">
-<g id="line2d11">
-<defs><path id="m30e32995789d870ad79a2e54c91cf9c6" d="M0.000000 0.000000L0.000000 -4.000000"/></defs>
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="72.000000" y="118.330435"/>
-</g></g>
-<g id="line2d12">
-<defs><path id="m9281cae24120827b11d5ea8a7ad3e96b" d="M0.000000 0.000000L0.000000 4.000000"/></defs>
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="72.000000" y="43.200000"/>
-</g></g>
-<g id="text1">
-<defs>
-<path id="c_6a8d56c819c37117ab4cf023bec22a5a" d="M10.593750 -35.500000l62.593750 0.000000l0.000000 8.296875l-62.593750 0.000000z"/>
-<path id="c_7a2040fe3b94fcd41d0a72c84e93b115" d="M31.781250 -66.406250q-7.609375 0.000000 -11.453125 7.500000q-3.828125 7.484375 -3.828125 22.531250q0.000000 14.984375 3.828125 22.484375q3.843750 7.500000 11.453125 7.500000q7.671875 0.000000 11.500000 -7.500000q3.843750 -7.500000 3.843750 -22.484375q0.000000 -15.046875 -3.843750 -22.531250q-3.828125 -7.500000 -11.500000 -7.500000M31.781250 -74.218750q12.265625 0.000000 18.734375 9.703125q6.468750 9.687500 6.468750 28.140625q0.000000 18.406250 -6.468750 28.109375q-6.468750 9.687500 -18.734375 9.687500q-12.250000 0.000000 -18.718750 -9.687500q-6.468750 -9.703125 -6.468750 -28.109375q0.000000 -18.453125 6.468750 -28.140625q6.468750 -9.703125 18.718750 -9.703125"/>
-<path id="c_ed3e21196fb739f392806f09ca0594ef" d="M10.687500 -12.406250l10.312500 0.000000l0.000000 12.406250l-10.312500 0.000000z"/>
-<path id="c_cc8d6d580d1b10c8632f7a42cd53db8a" d="M33.015625 -40.375000q-6.640625 0.000000 -10.531250 4.546875q-3.875000 4.531250 -3.875000 12.437500q0.000000 7.859375 3.875000 12.437500q3.890625 4.562500 10.531250 4.562500q6.640625 0.000000 10.515625 -4.562500q3.875000 -4.578125 3.875000 -12.437500q0.000000 -7.906250 -3.875000 -12.437500q-3.875000 -4.546875 -10.515625 -4.546875M52.593750 -71.296875l0.000000 8.984375q-3.718750 -1.750000 -7.500000 -2.671875q-3.781250 -0.937500 -7.500000 -0.937500q-9.765625 0.000000 -14.921875 6.593750q-5.140625 6.593750 -5.875000 19.921875q2.875000 -4.250000 7.218750 -6.515625q4.359375 -2.265625 9.578125 -2.265625q10.984375 0.000000 17.359375 6.671875q6.375000 6.656250 6.375000 18.125000q0.000000 11.234375 -6.640625 18.031250q-6.640625 6.781250 -17.671875 6.781250q-12.656250 0.000000 -19.343750 -9.687500q-6.687500 -9.703125 -6.687500 -28.109375q0.000000 -17.281250 8.203125 -27.562500q8.203125 -10.281250 22.015625 -10.281250q3.718750 0.000000 7.500000 0.734375q3.781250 0.734375 7.890625 2.187500"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(54.617188,131.236685)scale(0.120000)">
-<use xlink:href="#c_6a8d56c819c37117ab4cf023bec22a5a"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="83.789062"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="147.412109"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="179.199219"/>
-<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a" x="242.822266"/>
-</g>
-</g>
-</g>
-<g id="xtick2">
-<g id="line2d13">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="146.400000" y="118.330435"/>
-</g></g>
-<g id="line2d14">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="146.400000" y="43.200000"/>
-</g></g>
-<g id="text2">
-<defs>
-<path id="c_a0416418d96557a09b8c1332d34883ba" d="M37.796875 -64.312500l-24.906250 38.921875l24.906250 0.000000zM35.203125 -72.906250l12.406250 0.000000l0.000000 47.515625l10.406250 0.000000l0.000000 8.203125l-10.406250 0.000000l0.000000 17.187500l-9.812500 0.000000l0.000000 -17.187500l-32.906250 0.000000l0.000000 -9.515625z"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(128.970313,131.236685)scale(0.120000)">
-<use xlink:href="#c_6a8d56c819c37117ab4cf023bec22a5a"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="83.789062"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="147.412109"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="179.199219"/>
-<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba" x="242.822266"/>
-</g>
-</g>
-</g>
-<g id="xtick3">
-<g id="line2d15">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="220.800000" y="118.330435"/>
-</g></g>
-<g id="line2d16">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="220.800000" y="43.200000"/>
-</g></g>
-<g id="text3">
-<defs>
-<path id="c_ed3f3ed3ebfbd18bcb9c012009a68ad1" d="M19.187500 -8.296875l34.421875 0.000000l0.000000 8.296875l-46.281250 0.000000l0.000000 -8.296875q5.609375 -5.812500 15.296875 -15.593750q9.703125 -9.796875 12.187500 -12.640625q4.734375 -5.312500 6.609375 -9.000000q1.890625 -3.687500 1.890625 -7.250000q0.000000 -5.812500 -4.078125 -9.468750q-4.078125 -3.671875 -10.625000 -3.671875q-4.640625 0.000000 -9.796875 1.609375q-5.140625 1.609375 -11.000000 4.890625l0.000000 -9.968750q5.953125 -2.390625 11.125000 -3.609375q5.187500 -1.218750 9.484375 -1.218750q11.328125 0.000000 18.062500 5.671875q6.734375 5.656250 6.734375 15.125000q0.000000 4.500000 -1.687500 8.531250q-1.671875 4.015625 -6.125000 9.484375q-1.218750 1.421875 -7.765625 8.187500q-6.531250 6.765625 -18.453125 18.921875"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(203.635938,131.236685)scale(0.120000)">
-<use xlink:href="#c_6a8d56c819c37117ab4cf023bec22a5a"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="83.789062"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="147.412109"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="179.199219"/>
-<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1" x="242.822266"/>
-</g>
-</g>
-</g>
-<g id="xtick4">
-<g id="line2d17">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="295.200000" y="118.330435"/>
-</g></g>
-<g id="line2d18">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="295.200000" y="43.200000"/>
-</g></g>
-<g id="text4">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(282.629687,131.236685)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="159.033203"/>
-</g>
-</g>
-</g>
-<g id="xtick5">
-<g id="line2d19">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="369.600000" y="118.330435"/>
-</g></g>
-<g id="line2d20">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="369.600000" y="43.200000"/>
-</g></g>
-<g id="text5">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(357.232813,131.236685)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1" x="159.033203"/>
-</g>
-</g>
-</g>
-<g id="xtick6">
-<g id="line2d21">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="444.000000" y="118.330435"/>
-</g></g>
-<g id="line2d22">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="444.000000" y="43.200000"/>
-</g></g>
-<g id="text6">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(431.367188,131.236685)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba" x="159.033203"/>
-</g>
-</g>
-</g>
-<g id="xtick7">
-<g id="line2d23">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="518.400000" y="118.330435"/>
-</g></g>
-<g id="line2d24">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="518.400000" y="43.200000"/>
-</g></g>
-<g id="text7">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(505.814062,131.236685)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a" x="159.033203"/>
-</g>
-</g>
-</g>
-</g>
-<g id="matplotlib.axis2">
-<g id="ytick1">
-<g id="line2d25">
-<defs><path id="m3400efa6b1638b3fea9e19e898273957" d="M0.000000 0.000000L4.000000 0.000000"/></defs>
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="118.330435"/>
-</g></g>
-<g id="line2d26">
-<defs><path id="m20b58b2501143cb5e0a5e8f1ef6f1643" d="M0.000000 0.000000L-4.000000 0.000000"/></defs>
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="118.330435"/>
-</g></g>
-<g id="text8">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(61.953125,122.697622)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-</g>
-</g>
-</g>
-<g id="ytick2">
-<g id="line2d27">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="109.982609"/>
-</g></g>
-<g id="line2d28">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="109.982609"/>
-</g></g>
-<g id="text9">
-<defs>
-<path id="c_42baa63129a918535c52adb20d687ea7" d="M12.406250 -8.296875l16.109375 0.000000l0.000000 -55.625000l-17.531250 3.515625l0.000000 -8.984375l17.437500 -3.515625l9.859375 0.000000l0.000000 64.609375l16.109375 0.000000l0.000000 8.296875l-41.984375 0.000000z"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.781250,114.357609)scale(0.120000)">
-<use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
-</g>
-</g>
-</g>
-<g id="ytick3">
-<g id="line2d29">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="101.634783"/>
-</g></g>
-<g id="line2d30">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="101.634783"/>
-</g></g>
-<g id="text10">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.437500,106.087908)scale(0.120000)">
-<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1"/>
-</g>
-</g>
-</g>
-<g id="ytick4">
-<g id="line2d31">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="93.286957"/>
-</g></g>
-<g id="line2d32">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="93.286957"/>
-</g></g>
-<g id="text11">
-<defs>
-<path id="c_3dcfa38a02242cb63ec6726c6e70be7a" d="M40.578125 -39.312500q7.078125 1.515625 11.046875 6.312500q3.984375 4.781250 3.984375 11.812500q0.000000 10.781250 -7.421875 16.703125q-7.421875 5.906250 -21.093750 5.906250q-4.578125 0.000000 -9.437500 -0.906250q-4.859375 -0.906250 -10.031250 -2.718750l0.000000 -9.515625q4.093750 2.390625 8.968750 3.609375q4.890625 1.218750 10.218750 1.218750q9.265625 0.000000 14.125000 -3.656250q4.859375 -3.656250 4.859375 -10.640625q0.000000 -6.453125 -4.515625 -10.078125q-4.515625 -3.640625 -12.562500 -3.640625l-8.500000 0.000000l0.000000 -8.109375l8.890625 0.000000q7.265625 0.000000 11.125000 -2.906250q3.859375 -2.906250 3.859375 -8.375000q0.000000 -5.609375 -3.984375 -8.609375q-3.968750 -3.015625 -11.390625 -3.015625q-4.062500 0.000000 -8.703125 0.890625q-4.640625 0.875000 -10.203125 2.718750l0.000000 -8.781250q5.625000 -1.562500 10.531250 -2.343750q4.906250 -0.781250 9.250000 -0.781250q11.234375 0.000000 17.765625 5.109375q6.546875 5.093750 6.546875 13.781250q0.000000 6.062500 -3.468750 10.234375q-3.468750 4.171875 -9.859375 5.781250"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.250000,97.654144)scale(0.120000)">
-<use xlink:href="#c_3dcfa38a02242cb63ec6726c6e70be7a"/>
-</g>
-</g>
-</g>
-<g id="ytick5">
-<g id="line2d33">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="84.939130"/>
-</g></g>
-<g id="line2d34">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="84.939130"/>
-</g></g>
-<g id="text12">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(61.625000,89.314130)scale(0.120000)">
-<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba"/>
-</g>
-</g>
-</g>
-<g id="ytick6">
-<g id="line2d35">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="76.591304"/>
-</g></g>
-<g id="line2d36">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="76.591304"/>
-</g></g>
-<g id="text13">
-<defs>
-<path id="c_1260a2df50f305f3db244e29828f968e" d="M10.796875 -72.906250l38.718750 0.000000l0.000000 8.312500l-29.687500 0.000000l0.000000 17.859375q2.140625 -0.734375 4.281250 -1.093750q2.156250 -0.359375 4.312500 -0.359375q12.203125 0.000000 19.328125 6.687500q7.140625 6.687500 7.140625 18.109375q0.000000 11.765625 -7.328125 18.296875q-7.328125 6.515625 -20.656250 6.515625q-4.593750 0.000000 -9.359375 -0.781250q-4.750000 -0.781250 -9.828125 -2.343750l0.000000 -9.921875q4.390625 2.390625 9.078125 3.562500q4.687500 1.171875 9.906250 1.171875q8.453125 0.000000 13.375000 -4.437500q4.937500 -4.437500 4.937500 -12.062500q0.000000 -7.609375 -4.937500 -12.046875q-4.921875 -4.453125 -13.375000 -4.453125q-3.953125 0.000000 -7.890625 0.875000q-3.921875 0.875000 -8.015625 2.734375z"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.328125,80.880367)scale(0.120000)">
-<use xlink:href="#c_1260a2df50f305f3db244e29828f968e"/>
-</g>
-</g>
-</g>
-<g id="ytick7">
-<g id="line2d37">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="68.243478"/>
-</g></g>
-<g id="line2d38">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="68.243478"/>
-</g></g>
-<g id="text14">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(61.968750,72.610666)scale(0.120000)">
-<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a"/>
-</g>
-</g>
-</g>
-<g id="ytick8">
-<g id="line2d39">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="59.895652"/>
-</g></g>
-<g id="line2d40">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="59.895652"/>
-</g></g>
-<g id="text15">
-<defs>
-<path id="c_956f18cfdaf972f35a6c2b4aaac2532b" d="M8.203125 -72.906250l46.875000 0.000000l0.000000 4.203125l-26.468750 68.703125l-10.296875 0.000000l24.906250 -64.593750l-35.015625 0.000000z"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.375000,64.270652)scale(0.120000)">
-<use xlink:href="#c_956f18cfdaf972f35a6c2b4aaac2532b"/>
-</g>
-</g>
-</g>
-<g id="ytick9">
-<g id="line2d41">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="51.547826"/>
-</g></g>
-<g id="line2d42">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="51.547826"/>
-</g></g>
-<g id="text16">
-<defs>
-<path id="c_bef35738d52871942e50b9de9b122bab" d="M31.781250 -34.625000q-7.031250 0.000000 -11.062500 3.765625q-4.015625 3.765625 -4.015625 10.343750q0.000000 6.593750 4.015625 10.359375q4.031250 3.765625 11.062500 3.765625q7.031250 0.000000 11.078125 -3.781250q4.062500 -3.796875 4.062500 -10.343750q0.000000 -6.578125 -4.031250 -10.343750q-4.015625 -3.765625 -11.109375 -3.765625M21.921875 -38.812500q-6.343750 -1.562500 -9.890625 -5.906250q-3.531250 -4.359375 -3.531250 -10.609375q0.000000 -8.734375 6.218750 -13.812500q6.234375 -5.078125 17.062500 -5.078125q10.890625 0.000000 17.093750 5.078125q6.203125 5.078125 6.203125 13.812500q0.000000 6.250000 -3.546875 10.609375q-3.531250 4.343750 -9.828125 5.906250q7.125000 1.656250 11.093750 6.500000q3.984375 4.828125 3.984375 11.796875q0.000000 10.609375 -6.468750 16.281250q-6.468750 5.656250 -18.531250 5.656250q-12.046875 0.000000 -18.531250 -5.656250q-6.468750 -5.671875 -6.468750 -16.281250q0.000000 -6.968750 4.000000 -11.796875q4.015625 -4.843750 11.140625 -6.500000M18.312500 -54.390625q0.000000 5.656250 3.531250 8.828125q3.546875 3.171875 9.937500 3.171875q6.359375 0.000000 9.937500 -3.171875q3.593750 -3.171875 3.593750 -8.828125q0.000000 -5.671875 -3.593750 -8.843750q-3.578125 -3.171875 -9.937500 -3.171875q-6.390625 0.000000 -9.937500 3.171875q-3.531250 3.171875 -3.531250 8.843750"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.000000,55.915014)scale(0.120000)">
-<use xlink:href="#c_bef35738d52871942e50b9de9b122bab"/>
-</g>
-</g>
-</g>
-<g id="ytick10">
-<g id="line2d43">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="43.200000"/>
-</g></g>
-<g id="line2d44">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="43.200000"/>
-</g></g>
-<g id="text17">
-<defs>
-<path id="c_cd96f817f3cab988d24a2b49a5577fe6" d="M10.984375 -1.515625l0.000000 -8.984375q3.718750 1.765625 7.515625 2.687500q3.812500 0.921875 7.484375 0.921875q9.765625 0.000000 14.906250 -6.562500q5.156250 -6.562500 5.890625 -19.953125q-2.828125 4.203125 -7.187500 6.453125q-4.343750 2.250000 -9.609375 2.250000q-10.937500 0.000000 -17.312500 -6.609375q-6.375000 -6.625000 -6.375000 -18.109375q0.000000 -11.218750 6.640625 -18.000000q6.640625 -6.796875 17.671875 -6.796875q12.656250 0.000000 19.312500 9.703125q6.671875 9.687500 6.671875 28.140625q0.000000 17.234375 -8.187500 27.515625q-8.171875 10.281250 -21.984375 10.281250q-3.718750 0.000000 -7.531250 -0.734375q-3.796875 -0.734375 -7.906250 -2.203125M30.609375 -32.421875q6.640625 0.000000 10.515625 -4.531250q3.890625 -4.546875 3.890625 -12.468750q0.000000 -7.859375 -3.890625 -12.421875q-3.875000 -4.562500 -10.515625 -4.562500q-6.640625 0.000000 -10.515625 4.562500q-3.875000 4.562500 -3.875000 12.421875q0.000000 7.921875 3.875000 12.468750q3.875000 4.531250 10.515625 4.531250"/>
-</defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(61.953125,47.567187)scale(0.120000)">
-<use xlink:href="#c_cd96f817f3cab988d24a2b49a5577fe6"/>
-</g>
-</g>
-</g>
-</g>
-<g id="patch3">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 43.200000L518.400000 43.200000"/>
-</g>
-<g id="patch4">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M518.400000 118.330435L518.400000 43.200000"/>
-</g>
-<g id="patch5">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 118.330435L518.400000 118.330435"/>
-</g>
-<g id="patch6">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 118.330435L72.000000 43.200000"/>
-</g>
-</g>
-<g id="axes2">
-<g id="patch7">
-<path style="fill: #ffffff; opacity: 1.000000" d="M72.000000 208.486957L518.400000 208.486957L518.400000 133.356522
-L72.000000 133.356522L72.000000 208.486957"/>
-</g>
-<g id="line2d45">
-<defs>
- <clipPath id="pda3a145229a27f96d397cd13eca21335">
-<rect x="72.000000" y="133.356522" width="446.400000" height="75.130435"/>
- </clipPath>
-</defs><path style="fill: none; stroke: #0000ff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#pda3a145229a27f96d397cd13eca21335)" d="M72.000000 208.486957L121.600000 200.139130L171.200000 191.791304
-L220.800000 183.443478L270.400000 175.095652L320.000000 166.747826
-L369.600000 158.400000L419.200000 150.052174L468.800000 141.704348
-L518.400000 133.356522"/>
-</g>
-<g id="matplotlib.axis3">
-<g id="xtick8">
-<g id="line2d46">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="72.000000" y="208.486957"/>
-</g></g>
-<g id="line2d47">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="72.000000" y="133.356522"/>
-</g></g>
-<g id="text18">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(68.976562,221.393207)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-</g>
-</g>
-</g>
-<g id="xtick9">
-<g id="line2d48">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="121.600000" y="208.486957"/>
-</g></g>
-<g id="line2d49">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="121.600000" y="133.356522"/>
-</g></g>
-<g id="text19">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(118.990625,221.236957)scale(0.120000)">
-<use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
-</g>
-</g>
-</g>
-<g id="xtick10">
-<g id="line2d50">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="171.200000" y="208.486957"/>
-</g></g>
-<g id="line2d51">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="171.200000" y="133.356522"/>
-</g></g>
-<g id="text20">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(168.418750,221.393207)scale(0.120000)">
-<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1"/>
-</g>
-</g>
-</g>
-<g id="xtick11">
-<g id="line2d52">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="220.800000" y="208.486957"/>
-</g></g>
-<g id="line2d53">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="220.800000" y="133.356522"/>
-</g></g>
-<g id="text21">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(217.925000,221.393207)scale(0.120000)">
-<use xlink:href="#c_3dcfa38a02242cb63ec6726c6e70be7a"/>
-</g>
-</g>
-</g>
-<g id="xtick12">
-<g id="line2d54">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="270.400000" y="208.486957"/>
-</g></g>
-<g id="line2d55">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="270.400000" y="133.356522"/>
-</g></g>
-<g id="text22">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(267.212500,221.236957)scale(0.120000)">
-<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba"/>
-</g>
-</g>
-</g>
-<g id="xtick13">
-<g id="line2d56">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="320.000000" y="208.486957"/>
-</g></g>
-<g id="line2d57">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="320.000000" y="133.356522"/>
-</g></g>
-<g id="text23">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(317.164062,221.236957)scale(0.120000)">
-<use xlink:href="#c_1260a2df50f305f3db244e29828f968e"/>
-</g>
-</g>
-</g>
-<g id="xtick14">
-<g id="line2d58">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="369.600000" y="208.486957"/>
-</g></g>
-<g id="line2d59">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="369.600000" y="133.356522"/>
-</g></g>
-<g id="text24">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(366.584375,221.393207)scale(0.120000)">
-<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a"/>
-</g>
-</g>
-</g>
-<g id="xtick15">
-<g id="line2d60">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="419.200000" y="208.486957"/>
-</g></g>
-<g id="line2d61">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="419.200000" y="133.356522"/>
-</g></g>
-<g id="text25">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(416.387500,221.236957)scale(0.120000)">
-<use xlink:href="#c_956f18cfdaf972f35a6c2b4aaac2532b"/>
-</g>
-</g>
-</g>
-<g id="xtick16">
-<g id="line2d62">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="468.800000" y="208.486957"/>
-</g></g>
-<g id="line2d63">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="468.800000" y="133.356522"/>
-</g></g>
-<g id="text26">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(465.800000,221.393207)scale(0.120000)">
-<use xlink:href="#c_bef35738d52871942e50b9de9b122bab"/>
-</g>
-</g>
-</g>
-<g id="xtick17">
-<g id="line2d64">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="518.400000" y="208.486957"/>
-</g></g>
-<g id="line2d65">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="518.400000" y="133.356522"/>
-</g></g>
-<g id="text27">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(515.376562,221.393207)scale(0.120000)">
-<use xlink:href="#c_cd96f817f3cab988d24a2b49a5577fe6"/>
-</g>
-</g>
-</g>
-</g>
-<g id="matplotlib.axis4">
-<g id="ytick11">
-<g id="line2d66">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="208.486957"/>
-</g></g>
-<g id="line2d67">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="208.486957"/>
-</g></g>
-<g id="text28">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(61.953125,212.854144)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-</g>
-</g>
-</g>
-<g id="ytick12">
-<g id="line2d68">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="200.139130"/>
-</g></g>
-<g id="line2d69">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="200.139130"/>
-</g></g>
-<g id="text29">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.781250,204.514130)scale(0.120000)">
-<use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
-</g>
-</g>
-</g>
-<g id="ytick13">
-<g id="line2d70">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="191.791304"/>
-</g></g>
-<g id="line2d71">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="191.791304"/>
-</g></g>
-<g id="text30">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.437500,196.244429)scale(0.120000)">
-<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1"/>
-</g>
-</g>
-</g>
-<g id="ytick14">
-<g id="line2d72">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="183.443478"/>
-</g></g>
-<g id="line2d73">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="183.443478"/>
-</g></g>
-<g id="text31">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.250000,187.810666)scale(0.120000)">
-<use xlink:href="#c_3dcfa38a02242cb63ec6726c6e70be7a"/>
-</g>
-</g>
-</g>
-<g id="ytick15">
-<g id="line2d74">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="175.095652"/>
-</g></g>
-<g id="line2d75">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="175.095652"/>
-</g></g>
-<g id="text32">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(61.625000,179.470652)scale(0.120000)">
-<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba"/>
-</g>
-</g>
-</g>
-<g id="ytick16">
-<g id="line2d76">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="166.747826"/>
-</g></g>
-<g id="line2d77">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="166.747826"/>
-</g></g>
-<g id="text33">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.328125,171.036889)scale(0.120000)">
-<use xlink:href="#c_1260a2df50f305f3db244e29828f968e"/>
-</g>
-</g>
-</g>
-<g id="ytick17">
-<g id="line2d78">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="158.400000"/>
-</g></g>
-<g id="line2d79">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="158.400000"/>
-</g></g>
-<g id="text34">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(61.968750,162.767188)scale(0.120000)">
-<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a"/>
-</g>
-</g>
-</g>
-<g id="ytick18">
-<g id="line2d80">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="150.052174"/>
-</g></g>
-<g id="line2d81">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="150.052174"/>
-</g></g>
-<g id="text35">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.375000,154.427174)scale(0.120000)">
-<use xlink:href="#c_956f18cfdaf972f35a6c2b4aaac2532b"/>
-</g>
-</g>
-</g>
-<g id="ytick19">
-<g id="line2d82">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="141.704348"/>
-</g></g>
-<g id="line2d83">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="141.704348"/>
-</g></g>
-<g id="text36">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(62.000000,146.071535)scale(0.120000)">
-<use xlink:href="#c_bef35738d52871942e50b9de9b122bab"/>
-</g>
-</g>
-</g>
-<g id="ytick20">
-<g id="line2d84">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="133.356522"/>
-</g></g>
-<g id="line2d85">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="133.356522"/>
-</g></g>
-<g id="text37">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(61.953125,137.723709)scale(0.120000)">
-<use xlink:href="#c_cd96f817f3cab988d24a2b49a5577fe6"/>
-</g>
-</g>
-</g>
-</g>
-<g id="patch8">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 133.356522L518.400000 133.356522"/>
-</g>
-<g id="patch9">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M518.400000 208.486957L518.400000 133.356522"/>
-</g>
-<g id="patch10">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 208.486957L518.400000 208.486957"/>
-</g>
-<g id="patch11">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 208.486957L72.000000 133.356522"/>
-</g>
-</g>
-<g id="axes3">
-<g id="patch12">
-<path style="fill: #ffffff; opacity: 1.000000" d="M72.000000 298.643478L518.400000 298.643478L518.400000 223.513043
-L72.000000 223.513043L72.000000 298.643478"/>
-</g>
-<g id="matplotlib.axis5">
-<g id="xtick18">
-<g id="line2d86">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="72.000000" y="298.643478"/>
-</g></g>
-<g id="line2d87">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="72.000000" y="223.513043"/>
-</g></g>
-<g id="text38">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(63.250000,311.549728)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="xtick19">
-<g id="line2d88">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="161.280000" y="298.643478"/>
-</g></g>
-<g id="line2d89">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="161.280000" y="223.513043"/>
-</g></g>
-<g id="text39">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(152.733125,311.549728)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="xtick20">
-<g id="line2d90">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="250.560000" y="298.643478"/>
-</g></g>
-<g id="line2d91">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="250.560000" y="223.513043"/>
-</g></g>
-<g id="text40">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(241.747500,311.549728)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="xtick21">
-<g id="line2d92">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="339.840000" y="298.643478"/>
-</g></g>
-<g id="line2d93">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="339.840000" y="223.513043"/>
-</g></g>
-<g id="text41">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(331.074375,311.549728)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="xtick22">
-<g id="line2d94">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="429.120000" y="298.643478"/>
-</g></g>
-<g id="line2d95">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="429.120000" y="223.513043"/>
-</g></g>
-<g id="text42">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(420.385625,311.549728)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_bef35738d52871942e50b9de9b122bab" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="xtick23">
-<g id="line2d96">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="518.400000" y="298.643478"/>
-</g></g>
-<g id="line2d97">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="518.400000" y="223.513043"/>
-</g></g>
-<g id="text43">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(509.907812,311.549728)scale(0.120000)">
-<use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-</g>
-</g>
-</g>
-</g>
-<g id="matplotlib.axis6">
-<g id="ytick21">
-<g id="line2d98">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="298.643478"/>
-</g></g>
-<g id="line2d99">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="298.643478"/>
-</g></g>
-<g id="text44">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(50.500000,303.010666)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="ytick22">
-<g id="line2d100">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="283.617391"/>
-</g></g>
-<g id="line2d101">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="283.617391"/>
-</g></g>
-<g id="text45">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(50.906250,287.984579)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="ytick23">
-<g id="line2d102">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="268.591304"/>
-</g></g>
-<g id="line2d103">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="268.591304"/>
-</g></g>
-<g id="text46">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(50.375000,272.958492)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="ytick24">
-<g id="line2d104">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="253.565217"/>
-</g></g>
-<g id="line2d105">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="253.565217"/>
-</g></g>
-<g id="text47">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(50.468750,257.932405)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="ytick25">
-<g id="line2d106">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="238.539130"/>
-</g></g>
-<g id="line2d107">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="238.539130"/>
-</g></g>
-<g id="text48">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(50.531250,242.906318)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_bef35738d52871942e50b9de9b122bab" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="ytick26">
-<g id="line2d108">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m3400efa6b1638b3fea9e19e898273957" x="72.000000" y="223.513043"/>
-</g></g>
-<g id="line2d109">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="223.513043"/>
-</g></g>
-<g id="text49">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(51.015625,227.880231)scale(0.120000)">
-<use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-</g>
-</g>
-</g>
-</g>
-<g id="patch13">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 223.513043L518.400000 223.513043"/>
-</g>
-<g id="patch14">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M518.400000 298.643478L518.400000 223.513043"/>
-</g>
-<g id="patch15">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 298.643478L518.400000 298.643478"/>
-</g>
-<g id="patch16">
-<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 298.643478L72.000000 223.513043"/>
-</g>
-</g>
-<g id="axes4">
-<g id="patch17">
-<path style="fill: #ffffff; opacity: 1.000000" d="M72.000000 388.800000L518.400000 388.800000L518.400000 313.669565
-L72.000000 313.669565L72.000000 388.800000"/>
-</g>
-<g id="line2d110">
-<defs><path id="m87f81da4bcf58d853202912065521dc1" d="M0.000000 3.000000C0.795609 3.000000 1.558740 2.683901 2.121320 2.121320
-C2.683901 1.558740 3.000000 0.795609 3.000000 0.000000
-C3.000000 -0.795609 2.683901 -1.558740 2.121320 -2.121320
-C1.558740 -2.683901 0.795609 -3.000000 0.000000 -3.000000
-C-0.795609 -3.000000 -1.558740 -2.683901 -2.121320 -2.121320
-C-2.683901 -1.558740 -3.000000 -0.795609 -3.000000 0.000000
-C-3.000000 0.795609 -2.683901 1.558740 -2.121320 2.121320
-C-1.558740 2.683901 -0.795609 3.000000 0.000000 3.000000z"/></defs>
-<defs>
- <clipPath id="p872305ca5eeec7cb3601c9cf401ec5c6">
-<rect x="72.000000" y="313.669565" width="446.400000" height="75.130435"/>
- </clipPath>
-</defs><g clip-path="url(#p872305ca5eeec7cb3601c9cf401ec5c6)"><use style="fill: #0000ff; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m87f81da4bcf58d853202912065521dc1" x="174.908373" y="367.778414"/>
-<use style="fill: #0000ff; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m87f81da4bcf58d853202912065521dc1" x="187.234718" y="369.405658"/>
-<use style="fill: #0000ff; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m87f81da4bcf58d853202912065521dc1" x="431.193653" y="386.682679"/>
-<use style="fill: #0000ff; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m87f81da4bcf58d853202912065521dc1" x="435.725430" y="379.058245"/>
-<use style="fill: #0000ff; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m87f81da4bcf58d853202912065521dc1" x="491.188090" y="345.640362"/>
-<use style="fill: #0000ff; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m87f81da4bcf58d853202912065521dc1" x="219.881638" y="345.098424"/>
-<use style="fill: #0000ff; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m87f81da4bcf58d853202912065521dc1" x="516.416198" y="335.436171"/>
-<use style="fill: #0000ff; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m87f81da4bcf58d853202912065521dc1" x="95.729695" y="336.875300"/>
-<use style="fill: #0000ff; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m87f81da4bcf58d853202912065521dc1" x="443.568517" y="321.240405"/>
-<use style="fill: #0000ff; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m87f81da4bcf58d853202912065521dc1" x="224.047992" y="314.366418"/>
-</g></g>
-<g id="matplotlib.axis7">
-<g id="xtick24">
-<g id="line2d111">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="72.000000" y="388.800000"/>
-</g></g>
-<g id="line2d112">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="72.000000" y="313.669565"/>
-</g></g>
-<g id="text50">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(63.250000,401.706250)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="xtick25">
-<g id="line2d113">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="161.280000" y="388.800000"/>
-</g></g>
-<g id="line2d114">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="161.280000" y="313.669565"/>
-</g></g>
-<g id="text51">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(152.733125,401.706250)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="xtick26">
-<g id="line2d115">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="250.560000" y="388.800000"/>
-</g></g>
-<g id="line2d116">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="250.560000" y="313.669565"/>
-</g></g>
-<g id="text52">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(241.747500,401.706250)scale(0.120000)">
-<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
-<use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
-<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba" x="95.410156"/>
-</g>
-</g>
-</g>
-<g id="xtick27">
-<g id="line2d117">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m30e32995789d870ad79a2e54c91cf9c6" x="339.840000" y="388.800000"/>
-</g></g>
-<g id="line2d118">
-<g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="339.840000" y="313.669565"/>
-</g></g>
-<g id="text53">
-<g style="fill: #000000; o...
 
[truncated message content]

Revision: 8576
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8576&view=rev
Author: weathergod
Date: 2010年07月25日 22:47:54 +0000 (2010年7月25日)
Log Message:
-----------
Merged revisions 8575 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8575 | weathergod | 2010年07月25日 17:24:05 -0500 (2010年7月25日) | 2 lines
 
 Fix "graph jumping" issue when rubber-banding a selection in GTK backends.
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/backends/backend_gtk.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_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8573 /trunk/matplotlib:1-7315
 + /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_91_maint:1-6428 /branches/v1_0_maint:1-8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2010年07月25日 22:24:05 UTC (rev 8575)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2010年07月25日 22:47:54 UTC (rev 8576)
@@ -616,7 +616,7 @@
 self.canvas.window.set_cursor(cursord[cursor])
 
 def release(self, event):
- try: del self._imageBack
+ try: del self._pixmapBack
 except AttributeError: pass
 
 def dynamic_update(self):
@@ -640,7 +640,7 @@
 
 rect = [int(val)for val in min(x0,x1), min(y0, y1), w, h]
 try:
- lastrect, imageBack = self._imageBack
+ lastrect, pixmapBack = self._pixmapBack
 except AttributeError:
 #snap image back
 if event.inaxes is None:
@@ -650,9 +650,10 @@
 l,b,w,h = [int(val) for val in ax.bbox.bounds]
 b = int(height)-(b+h)
 axrect = l,b,w,h
- self._imageBack = axrect, drawable.get_image(*axrect)
+ self._pixmapBack = axrect, gtk.gdk.Pixmap(drawable, w, h)
+ self._pixmapBack[1].draw_drawable(gc, drawable, l, b, 0, 0, w, h)
 else:
- drawable.draw_image(gc, imageBack, 0, 0, *lastrect)
+ drawable.draw_drawable(gc, pixmapBack, 0, 0, *lastrect)
 drawable.draw_rectangle(gc, False, *rect)
 
 
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
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:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8575
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8575&view=rev
Author: weathergod
Date: 2010年07月25日 22:24:05 +0000 (2010年7月25日)
Log Message:
-----------
Fix "graph jumping" issue when rubber-banding a selection in GTK backends.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py	2010年07月24日 22:02:33 UTC (rev 8574)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py	2010年07月25日 22:24:05 UTC (rev 8575)
@@ -616,7 +616,7 @@
 self.canvas.window.set_cursor(cursord[cursor])
 
 def release(self, event):
- try: del self._imageBack
+ try: del self._pixmapBack
 except AttributeError: pass
 
 def dynamic_update(self):
@@ -640,7 +640,7 @@
 
 rect = [int(val)for val in min(x0,x1), min(y0, y1), w, h]
 try:
- lastrect, imageBack = self._imageBack
+ lastrect, pixmapBack = self._pixmapBack
 except AttributeError:
 #snap image back
 if event.inaxes is None:
@@ -650,9 +650,10 @@
 l,b,w,h = [int(val) for val in ax.bbox.bounds]
 b = int(height)-(b+h)
 axrect = l,b,w,h
- self._imageBack = axrect, drawable.get_image(*axrect)
+ self._pixmapBack = axrect, gtk.gdk.Pixmap(drawable, w, h)
+ self._pixmapBack[1].draw_drawable(gc, drawable, l, b, 0, 0, w, h)
 else:
- drawable.draw_image(gc, imageBack, 0, 0, *lastrect)
+ drawable.draw_drawable(gc, pixmapBack, 0, 0, *lastrect)
 drawable.draw_rectangle(gc, False, *rect)
 
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8574
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8574&view=rev
Author: efiring
Date: 2010年07月24日 22:02:33 +0000 (2010年7月24日)
Log Message:
-----------
Merged revisions 8573 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8573 | efiring | 2010年07月24日 11:59:55 -1000 (2010年7月24日) | 3 lines
 
 rcParams: don't include deprecated keys.
 Some other rc cleanups are included in this changeset.
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/__init__.py
 trunk/matplotlib/lib/matplotlib/rcsetup.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_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8571 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8573 /trunk/matplotlib:1-7315
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2010年07月24日 21:59:55 UTC (rev 8573)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2010年07月24日 22:02:33 UTC (rev 8574)
@@ -632,25 +632,50 @@
 
 validate = dict([ (key, converter) for key, (default, converter) in \
 defaultParams.iteritems() ])
+ msg_depr = "%s is deprecated and replaced with %s; please use the latter."
+ msg_depr_ignore = "%s is deprecated and ignored. Use %s"
 
 def __setitem__(self, key, val):
 try:
 if key in _deprecated_map.keys():
 alt = _deprecated_map[key]
- warnings.warn('%s is deprecated in matplotlibrc. Use %s \
-instead.'% (key, alt))
+ warnings.warn(self.msg_depr % (key, alt))
 key = alt
 elif key in _deprecated_ignore_map:
 alt = _deprecated_ignore_map[key]
- warnings.warn('%s is deprecated. Use %s instead.'% (key, alt))
+ warnings.warn(self.msg_depr_ignore % (key, alt))
 return
 cval = self.validate[key](val)
 dict.__setitem__(self, key, cval)
 except KeyError:
 raise KeyError('%s is not a valid rc parameter.\
-See rcParams.keys() for a list of valid parameters.'%key)
+See rcParams.keys() for a list of valid parameters.' % (key,))
 
+ def __getitem__(self, key):
+ if key in _deprecated_map.keys():
+ alt = _deprecated_map[key]
+ warnings.warn(self.msg_depr % (key, alt))
+ key = alt
+ elif key in _deprecated_ignore_map:
+ alt = _deprecated_ignore_map[key]
+ warnings.warn(self.msg_depr_ignore % (key, alt))
+ key = alt
+ return dict.__getitem__(self, key)
 
+ def keys(self):
+ """
+ Return sorted list of keys.
+ """
+ k = dict.keys(self)
+ k.sort()
+ return k
+
+ def values(self):
+ """
+ Return values in order of sorted keys.
+ """
+ return [self[k] for k in self.keys()]
+
 def rc_params(fail_on_error=False):
 'Return the default params updated from the values in the rc file'
 
@@ -810,12 +835,12 @@
 for k,v in kwargs.items():
 name = aliases.get(k) or k
 key = '%s.%s' % (g, name)
- if key not in rcParams:
+ try:
+ rcParams[key] = v
+ except KeyError:
 raise KeyError('Unrecognized key "%s" for group "%s" and name "%s"' %
 (key, g, name))
 
- rcParams[key] = v
-
 def rcdefaults():
 """
 Restore the default rc params - the ones that were created at
Modified: trunk/matplotlib/lib/matplotlib/rcsetup.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/rcsetup.py	2010年07月24日 21:59:55 UTC (rev 8573)
+++ trunk/matplotlib/lib/matplotlib/rcsetup.py	2010年07月24日 22:02:33 UTC (rev 8574)
@@ -347,8 +347,8 @@
 defaultParams = {
 'backend' : ['Agg', validate_backend], # agg is certainly present
 'backend_fallback' : [True, validate_bool], # agg is certainly present
- 'numerix' : ['obsolete', validate_numerix],
- 'maskedarray' : ['obsolete', validate_maskedarray], #to be removed
+ #'numerix' : ['obsolete', validate_numerix],
+ #'maskedarray' : ['obsolete', validate_maskedarray], #to be removed
 'toolbar' : ['toolbar2', validate_toolbar],
 'datapath' : [None, validate_path_exists], # handled by _get_data_path_cached
 'units' : [False, validate_bool],
@@ -385,7 +385,7 @@
 'font.variant' : ['normal', str], #
 'font.stretch' : ['normal', str], #
 'font.weight' : ['normal', str], #
- 'font.size' : [12.0, validate_float], #
+ 'font.size' : [12, validate_float], # Base font size in points
 'font.serif' : [['Bitstream Vera Serif', 'DejaVu Serif',
 'New Century Schoolbook', 'Century Schoolbook L',
 'Utopia', 'ITC Bookman', 'Bookman',
@@ -412,13 +412,16 @@
 'text.latex.preamble' : [[''], validate_stringlist],
 'text.latex.preview' : [False, validate_bool],
 'text.dvipnghack' : [None, validate_bool_maybe_none],
- 'text.fontstyle' : ['normal', str],
- 'text.fontangle' : ['normal', str],
- 'text.fontvariant' : ['normal', str],
- 'text.fontweight' : ['normal', str],
- 'text.fontsize' : ['medium', validate_fontsize],
 'text.hinting' : [True, validate_bool],
 
+ # The following are deprecated and replaced by, e.g., 'font.style'
+ #'text.fontstyle' : ['normal', str],
+ #'text.fontangle' : ['normal', str],
+ #'text.fontvariant' : ['normal', str],
+ #'text.fontweight' : ['normal', str],
+ #'text.fontsize' : ['medium', validate_fontsize],
+
+
 'mathtext.cal' : ['cursive', validate_font_properties],
 'mathtext.rm' : ['serif', validate_font_properties],
 'mathtext.tt' : ['monospace', validate_font_properties],
@@ -483,9 +486,6 @@
 
 'legend.shadow' : [False, validate_bool],
 
-
-
-
 # tick properties
 'xtick.major.size' : [4, validate_float], # major xtick size in points
 'xtick.minor.size' : [2, validate_float], # minor xtick size in points
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
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:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8573
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8573&view=rev
Author: efiring
Date: 2010年07月24日 21:59:55 +0000 (2010年7月24日)
Log Message:
-----------
rcParams: don't include deprecated keys.
Some other rc cleanups are included in this changeset.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/__init__.py
 branches/v1_0_maint/lib/matplotlib/rcsetup.py
Modified: branches/v1_0_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/__init__.py	2010年07月23日 16:47:30 UTC (rev 8572)
+++ branches/v1_0_maint/lib/matplotlib/__init__.py	2010年07月24日 21:59:55 UTC (rev 8573)
@@ -632,25 +632,50 @@
 
 validate = dict([ (key, converter) for key, (default, converter) in \
 defaultParams.iteritems() ])
+ msg_depr = "%s is deprecated and replaced with %s; please use the latter."
+ msg_depr_ignore = "%s is deprecated and ignored. Use %s"
 
 def __setitem__(self, key, val):
 try:
 if key in _deprecated_map.keys():
 alt = _deprecated_map[key]
- warnings.warn('%s is deprecated in matplotlibrc. Use %s \
-instead.'% (key, alt))
+ warnings.warn(self.msg_depr % (key, alt))
 key = alt
 elif key in _deprecated_ignore_map:
 alt = _deprecated_ignore_map[key]
- warnings.warn('%s is deprecated. Use %s instead.'% (key, alt))
+ warnings.warn(self.msg_depr_ignore % (key, alt))
 return
 cval = self.validate[key](val)
 dict.__setitem__(self, key, cval)
 except KeyError:
 raise KeyError('%s is not a valid rc parameter.\
-See rcParams.keys() for a list of valid parameters.'%key)
+See rcParams.keys() for a list of valid parameters.' % (key,))
 
+ def __getitem__(self, key):
+ if key in _deprecated_map.keys():
+ alt = _deprecated_map[key]
+ warnings.warn(self.msg_depr % (key, alt))
+ key = alt
+ elif key in _deprecated_ignore_map:
+ alt = _deprecated_ignore_map[key]
+ warnings.warn(self.msg_depr_ignore % (key, alt))
+ key = alt
+ return dict.__getitem__(self, key)
 
+ def keys(self):
+ """
+ Return sorted list of keys.
+ """
+ k = dict.keys(self)
+ k.sort()
+ return k
+
+ def values(self):
+ """
+ Return values in order of sorted keys.
+ """
+ return [self[k] for k in self.keys()]
+
 def rc_params(fail_on_error=False):
 'Return the default params updated from the values in the rc file'
 
@@ -810,12 +835,12 @@
 for k,v in kwargs.items():
 name = aliases.get(k) or k
 key = '%s.%s' % (g, name)
- if key not in rcParams:
+ try:
+ rcParams[key] = v
+ except KeyError:
 raise KeyError('Unrecognized key "%s" for group "%s" and name "%s"' %
 (key, g, name))
 
- rcParams[key] = v
-
 def rcdefaults():
 """
 Restore the default rc params - the ones that were created at
Modified: branches/v1_0_maint/lib/matplotlib/rcsetup.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/rcsetup.py	2010年07月23日 16:47:30 UTC (rev 8572)
+++ branches/v1_0_maint/lib/matplotlib/rcsetup.py	2010年07月24日 21:59:55 UTC (rev 8573)
@@ -347,8 +347,8 @@
 defaultParams = {
 'backend' : ['Agg', validate_backend], # agg is certainly present
 'backend_fallback' : [True, validate_bool], # agg is certainly present
- 'numerix' : ['obsolete', validate_numerix],
- 'maskedarray' : ['obsolete', validate_maskedarray], #to be removed
+ #'numerix' : ['obsolete', validate_numerix],
+ #'maskedarray' : ['obsolete', validate_maskedarray], #to be removed
 'toolbar' : ['toolbar2', validate_toolbar],
 'datapath' : [None, validate_path_exists], # handled by _get_data_path_cached
 'units' : [False, validate_bool],
@@ -385,7 +385,7 @@
 'font.variant' : ['normal', str], #
 'font.stretch' : ['normal', str], #
 'font.weight' : ['normal', str], #
- 'font.size' : [12.0, validate_float], #
+ 'font.size' : [12, validate_float], # Base font size in points
 'font.serif' : [['Bitstream Vera Serif', 'DejaVu Serif',
 'New Century Schoolbook', 'Century Schoolbook L',
 'Utopia', 'ITC Bookman', 'Bookman',
@@ -412,13 +412,16 @@
 'text.latex.preamble' : [[''], validate_stringlist],
 'text.latex.preview' : [False, validate_bool],
 'text.dvipnghack' : [None, validate_bool_maybe_none],
- 'text.fontstyle' : ['normal', str],
- 'text.fontangle' : ['normal', str],
- 'text.fontvariant' : ['normal', str],
- 'text.fontweight' : ['normal', str],
- 'text.fontsize' : ['medium', validate_fontsize],
 'text.hinting' : [True, validate_bool],
 
+ # The following are deprecated and replaced by, e.g., 'font.style'
+ #'text.fontstyle' : ['normal', str],
+ #'text.fontangle' : ['normal', str],
+ #'text.fontvariant' : ['normal', str],
+ #'text.fontweight' : ['normal', str],
+ #'text.fontsize' : ['medium', validate_fontsize],
+
+
 'mathtext.cal' : ['cursive', validate_font_properties],
 'mathtext.rm' : ['serif', validate_font_properties],
 'mathtext.tt' : ['monospace', validate_font_properties],
@@ -483,9 +486,6 @@
 
 'legend.shadow' : [False, validate_bool],
 
-
-
-
 # tick properties
 'xtick.major.size' : [4, validate_float], # major xtick size in points
 'xtick.minor.size' : [2, validate_float], # minor xtick size in points
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8572
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8572&view=rev
Author: mdboom
Date: 2010年07月23日 16:47:30 +0000 (2010年7月23日)
Log Message:
-----------
Merged revisions 8570-8571 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8570 | mdboom | 2010年07月23日 12:45:24 -0400 (2010年7月23日) | 2 lines
 
 Fix image clipping to a path and add a test.
........
 r8571 | mdboom | 2010年07月23日 12:46:40 -0400 (2010年7月23日) | 2 lines
 
 Oops in last commit.
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/axes.py
 trunk/matplotlib/lib/matplotlib/tests/test_image.py
Added Paths:
-----------
 trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_image/image_clip.pdf
 trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_image/image_clip.png
 trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_image/image_clip.svg
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8568 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8571 /trunk/matplotlib:1-7315
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2010年07月23日 16:46:40 UTC (rev 8571)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2010年07月23日 16:47:30 UTC (rev 8572)
@@ -6732,7 +6732,7 @@
 im.set_data(X)
 im.set_alpha(alpha)
 self._set_artist_props(im)
- if not im.get_clip_on():
+ if im.get_clip_path() is None:
 # image does not already have clipping set, clip to axes patch
 im.set_clip_path(self.patch)
 #if norm is None and shape is None:
Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_image/image_clip.pdf (from rev 8571, branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.pdf)
===================================================================
(Binary files differ)
Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_image/image_clip.png (from rev 8571, branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.png)
===================================================================
(Binary files differ)
Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_image/image_clip.svg (from rev 8571, branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.svg)
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_image/image_clip.svg	 (rev 0)
+++ trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_image/image_clip.svg	2010年07月23日 16:47:30 UTC (rev 8572)
@@ -0,0 +1,659 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Created with matplotlib (http://matplotlib.sourceforge.net/) -->
+<svg width="576pt" height="432pt" viewBox="0 0 576 432"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ version="1.1"
+ id="svg1">
+<filter id="colorAdd"><feComposite in="SourceGraphic" in2="BackgroundImage" operator="arithmetic" k2="1" k3="1"/></filter>
+<g id="figure1">
+<g id="patch1">
+<path style="fill: #ffffff; stroke: #ffffff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M0.000000 432.000000L576.000000 432.000000L576.000000 0.000000
+L0.000000 0.000000L0.000000 432.000000"/>
+</g>
+<g id="axes1">
+<g id="patch2">
+<path style="fill: #ffffff; opacity: 1.000000" d="M295.200000 388.800000
+C341.027096 388.800000 384.983402 370.592702 417.388052 338.188052
+C449.792702 305.783402 468.000000 261.827096 468.000000 216.000000
+C468.000000 170.172904 449.792702 126.216598 417.388052 93.811948
+C384.983402 61.407298 341.027096 43.200000 295.200000 43.200000
+C249.372904 43.200000 205.416598 61.407298 173.011948 93.811948
+C140.607298 126.216598 122.400000 170.172904 122.400000 216.000000
+C122.400000 261.827096 140.607298 305.783402 173.011948 338.188052
+C205.416598 370.592702 249.372904 388.800000 295.200000 388.800000z"/>
+</g>
+<image x="122.400000" y="41.800000" width="347.000000" height="347.000000" xlink:href="data:image/png;base64,
+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
+"/>
+<g id="matplotlib.axis1">
+<g id="xtick1">
+<g id="text1">
+<defs>
+<path id="c_7b26b13f539f13a4c64eef23b6952d29" d="M4.890625 -31.390625l26.312500 0.000000l0.000000 8.000000l-26.312500 0.000000z"/>
+<path id="c_42baa63129a918535c52adb20d687ea7" d="M12.406250 -8.296875l16.109375 0.000000l0.000000 -55.625000l-17.531250 3.515625l0.000000 -8.984375l17.437500 -3.515625l9.859375 0.000000l0.000000 64.609375l16.109375 0.000000l0.000000 8.296875l-41.984375 0.000000z"/>
+<path id="c_1260a2df50f305f3db244e29828f968e" d="M10.796875 -72.906250l38.718750 0.000000l0.000000 8.312500l-29.687500 0.000000l0.000000 17.859375q2.140625 -0.734375 4.281250 -1.093750q2.156250 -0.359375 4.312500 -0.359375q12.203125 0.000000 19.328125 6.687500q7.140625 6.687500 7.140625 18.109375q0.000000 11.765625 -7.328125 18.296875q-7.328125 6.515625 -20.656250 6.515625q-4.593750 0.000000 -9.359375 -0.781250q-4.750000 -0.781250 -9.828125 -2.343750l0.000000 -9.921875q4.390625 2.390625 9.078125 3.562500q4.687500 1.171875 9.906250 1.171875q8.453125 0.000000 13.375000 -4.437500q4.937500 -4.437500 4.937500 -12.062500q0.000000 -7.609375 -4.937500 -12.046875q-4.921875 -4.453125 -13.375000 -4.453125q-3.953125 0.000000 -7.890625 0.875000q-3.921875 0.875000 -8.015625 2.734375z"/>
+<path id="c_7a2040fe3b94fcd41d0a72c84e93b115" d="M31.781250 -66.406250q-7.609375 0.000000 -11.453125 7.500000q-3.828125 7.484375 -3.828125 22.531250q0.000000 14.984375 3.828125 22.484375q3.843750 7.500000 11.453125 7.500000q7.671875 0.000000 11.500000 -7.500000q3.843750 -7.500000 3.843750 -22.484375q0.000000 -15.046875 -3.843750 -22.531250q-3.828125 -7.500000 -11.500000 -7.500000M31.781250 -74.218750q12.265625 0.000000 18.734375 9.703125q6.468750 9.687500 6.468750 28.140625q0.000000 18.406250 -6.468750 28.109375q-6.468750 9.687500 -18.734375 9.687500q-12.250000 0.000000 -18.718750 -9.687500q-6.468750 -9.703125 -6.468750 -28.109375q0.000000 -18.453125 6.468750 -28.140625q6.468750 -9.703125 18.718750 -9.703125"/>
+<path id="c_40880da00a2fb346f185ce8104650367" d="M25.000000 -67.921875q-3.906250 0.000000 -6.593750 2.718750q-2.687500 2.703125 -2.687500 6.609375q0.000000 3.859375 2.687500 6.515625q2.687500 2.656250 6.593750 2.656250q3.906250 0.000000 6.593750 -2.656250q2.687500 -2.656250 2.687500 -6.515625q0.000000 -3.859375 -2.718750 -6.593750q-2.703125 -2.734375 -6.562500 -2.734375M25.000000 -74.218750q3.125000 0.000000 6.000000 1.203125q2.890625 1.187500 4.984375 3.437500q2.250000 2.187500 3.375000 4.984375q1.125000 2.781250 1.125000 6.000000q0.000000 6.437500 -4.515625 10.906250q-4.515625 4.468750 -11.062500 4.468750q-6.593750 0.000000 -11.000000 -4.390625q-4.390625 -4.390625 -4.390625 -10.984375q0.000000 -6.546875 4.484375 -11.078125q4.500000 -4.546875 11.000000 -4.546875"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(146.848084,211.828125)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_42baa63129a918535c52adb20d687ea7" x="36.083984"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="99.707031"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="163.330078"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="226.953125"/>
+</g>
+</g>
+</g>
+<g id="xtick2">
+<g id="text2">
+<defs>
+<path id="c_ed3f3ed3ebfbd18bcb9c012009a68ad1" d="M19.187500 -8.296875l34.421875 0.000000l0.000000 8.296875l-46.281250 0.000000l0.000000 -8.296875q5.609375 -5.812500 15.296875 -15.593750q9.703125 -9.796875 12.187500 -12.640625q4.734375 -5.312500 6.609375 -9.000000q1.890625 -3.687500 1.890625 -7.250000q0.000000 -5.812500 -4.078125 -9.468750q-4.078125 -3.671875 -10.625000 -3.671875q-4.640625 0.000000 -9.796875 1.609375q-5.140625 1.609375 -11.000000 4.890625l0.000000 -9.968750q5.953125 -2.390625 11.125000 -3.609375q5.187500 -1.218750 9.484375 -1.218750q11.328125 0.000000 18.062500 5.671875q6.734375 5.656250 6.734375 15.125000q0.000000 4.500000 -1.687500 8.531250q-1.671875 4.015625 -6.125000 9.484375q-1.218750 1.421875 -7.765625 8.187500q-6.531250 6.765625 -18.453125 18.921875"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(179.676061,211.828125)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_42baa63129a918535c52adb20d687ea7" x="36.083984"/>
+<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1" x="99.707031"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="163.330078"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="226.953125"/>
+</g>
+</g>
+</g>
+<g id="xtick3">
+<g id="text3">
+<defs>
+<path id="c_cd96f817f3cab988d24a2b49a5577fe6" d="M10.984375 -1.515625l0.000000 -8.984375q3.718750 1.765625 7.515625 2.687500q3.812500 0.921875 7.484375 0.921875q9.765625 0.000000 14.906250 -6.562500q5.156250 -6.562500 5.890625 -19.953125q-2.828125 4.203125 -7.187500 6.453125q-4.343750 2.250000 -9.609375 2.250000q-10.937500 0.000000 -17.312500 -6.609375q-6.375000 -6.625000 -6.375000 -18.109375q0.000000 -11.218750 6.640625 -18.000000q6.640625 -6.796875 17.671875 -6.796875q12.656250 0.000000 19.312500 9.703125q6.671875 9.687500 6.671875 28.140625q0.000000 17.234375 -8.187500 27.515625q-8.171875 10.281250 -21.984375 10.281250q-3.718750 0.000000 -7.531250 -0.734375q-3.796875 -0.734375 -7.906250 -2.203125M30.609375 -32.421875q6.640625 0.000000 10.515625 -4.531250q3.890625 -4.546875 3.890625 -12.468750q0.000000 -7.859375 -3.890625 -12.421875q-3.875000 -4.562500 -10.515625 -4.562500q-6.640625 0.000000 -10.515625 4.562500q-3.875000 4.562500 -3.875000 12.421875q0.000000 7.921875 3.875000 12.468750q3.875000 4.531250 10.515625 4.531250"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(211.686396,211.828125)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_cd96f817f3cab988d24a2b49a5577fe6" x="36.083984"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="xtick4">
+<g id="text4">
+<defs>
+<path id="c_cc8d6d580d1b10c8632f7a42cd53db8a" d="M33.015625 -40.375000q-6.640625 0.000000 -10.531250 4.546875q-3.875000 4.531250 -3.875000 12.437500q0.000000 7.859375 3.875000 12.437500q3.890625 4.562500 10.531250 4.562500q6.640625 0.000000 10.515625 -4.562500q3.875000 -4.578125 3.875000 -12.437500q0.000000 -7.906250 -3.875000 -12.437500q-3.875000 -4.546875 -10.515625 -4.546875M52.593750 -71.296875l0.000000 8.984375q-3.718750 -1.750000 -7.500000 -2.671875q-3.781250 -0.937500 -7.500000 -0.937500q-9.765625 0.000000 -14.921875 6.593750q-5.140625 6.593750 -5.875000 19.921875q2.875000 -4.250000 7.218750 -6.515625q4.359375 -2.265625 9.578125 -2.265625q10.984375 0.000000 17.359375 6.671875q6.375000 6.656250 6.375000 18.125000q0.000000 11.234375 -6.640625 18.031250q-6.640625 6.781250 -17.671875 6.781250q-12.656250 0.000000 -19.343750 -9.687500q-6.687500 -9.703125 -6.687500 -28.109375q0.000000 -17.281250 8.203125 -27.562500q8.203125 -10.281250 22.015625 -10.281250q3.718750 0.000000 7.500000 0.734375q3.781250 0.734375 7.890625 2.187500"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(236.960880,211.828125)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a" x="36.083984"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="xtick5">
+<g id="text5">
+<defs>
+<path id="c_3dcfa38a02242cb63ec6726c6e70be7a" d="M40.578125 -39.312500q7.078125 1.515625 11.046875 6.312500q3.984375 4.781250 3.984375 11.812500q0.000000 10.781250 -7.421875 16.703125q-7.421875 5.906250 -21.093750 5.906250q-4.578125 0.000000 -9.437500 -0.906250q-4.859375 -0.906250 -10.031250 -2.718750l0.000000 -9.515625q4.093750 2.390625 8.968750 3.609375q4.890625 1.218750 10.218750 1.218750q9.265625 0.000000 14.125000 -3.656250q4.859375 -3.656250 4.859375 -10.640625q0.000000 -6.453125 -4.515625 -10.078125q-4.515625 -3.640625 -12.562500 -3.640625l-8.500000 0.000000l0.000000 -8.109375l8.890625 0.000000q7.265625 0.000000 11.125000 -2.906250q3.859375 -2.906250 3.859375 -8.375000q0.000000 -5.609375 -3.984375 -8.609375q-3.968750 -3.015625 -11.390625 -3.015625q-4.062500 0.000000 -8.703125 0.890625q-4.640625 0.875000 -10.203125 2.718750l0.000000 -8.781250q5.625000 -1.562500 10.531250 -2.343750q4.906250 -0.781250 9.250000 -0.781250q11.234375 0.000000 17.765625 5.109375q6.546875 5.093750 6.546875 13.781250q0.000000 6.062500 -3.468750 10.234375q-3.468750 4.171875 -9.859375 5.781250"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(260.512948,211.828125)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_3dcfa38a02242cb63ec6726c6e70be7a" x="36.083984"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="xtick6">
+<g id="text6">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(289.348437,211.828125)scale(0.120000)">
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="63.623047"/>
+</g>
+</g>
+</g>
+<g id="xtick7">
+<g id="text7">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(308.340177,211.828125)scale(0.120000)">
+<use xlink:href="#c_3dcfa38a02242cb63ec6726c6e70be7a"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="xtick8">
+<g id="text8">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(331.853183,211.828125)scale(0.120000)">
+<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="xtick9">
+<g id="text9">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(357.080791,211.828125)scale(0.120000)">
+<use xlink:href="#c_cd96f817f3cab988d24a2b49a5577fe6"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="xtick10">
+<g id="text10">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(381.731752,211.828125)scale(0.120000)">
+<use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
+<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1" x="63.623047"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="127.246094"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="190.869141"/>
+</g>
+</g>
+</g>
+<g id="xtick11">
+<g id="text11">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(414.559729,211.828125)scale(0.120000)">
+<use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="63.623047"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="127.246094"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="190.869141"/>
+</g>
+</g>
+</g>
+</g>
+<g id="matplotlib.axis2">
+<g id="ytick1">
+<g id="text12">
+<defs>
+<path id="c_956f18cfdaf972f35a6c2b4aaac2532b" d="M8.203125 -72.906250l46.875000 0.000000l0.000000 4.203125l-26.468750 68.703125l-10.296875 0.000000l24.906250 -64.593750l-35.015625 0.000000z"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(218.601069,403.970369)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_956f18cfdaf972f35a6c2b4aaac2532b" x="36.083984"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="ytick2">
+<g id="text13">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(176.925000,384.981296)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a" x="36.083984"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="ytick3">
+<g id="text14">
+<defs>
+<path id="c_a0416418d96557a09b8c1332d34883ba" d="M37.796875 -64.312500l-24.906250 38.921875l24.906250 0.000000zM35.203125 -72.906250l12.406250 0.000000l0.000000 47.515625l10.406250 0.000000l0.000000 8.203125l-10.406250 0.000000l0.000000 17.187500l-9.812500 0.000000l0.000000 -17.187500l-32.906250 0.000000l0.000000 -9.515625z"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(141.136948,354.774044)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba" x="36.083984"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="ytick4">
+<g id="text15">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(113.675810,315.407188)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_3dcfa38a02242cb63ec6726c6e70be7a" x="36.083984"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="ytick5">
+<g id="text16">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(96.413017,269.563512)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_42baa63129a918535c52adb20d687ea7" x="36.083984"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="ytick6">
+<g id="text17">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(102.696875,220.367188)scale(0.120000)">
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="63.623047"/>
+</g>
+</g>
+</g>
+<g id="ytick7">
+<g id="text18">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(101.459892,171.170863)scale(0.120000)">
+<use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="ytick8">
+<g id="text19">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(118.332060,125.327188)scale(0.120000)">
+<use xlink:href="#c_3dcfa38a02242cb63ec6726c6e70be7a"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="ytick9">
+<g id="text20">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(145.465073,85.960331)scale(0.120000)">
+<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="ytick10">
+<g id="text21">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(181.503125,55.753079)scale(0.120000)">
+<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="ytick11">
+<g id="text22">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(223.319819,36.764006)scale(0.120000)">
+<use xlink:href="#c_956f18cfdaf972f35a6c2b4aaac2532b"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+</g>
+<g id="patch3">
+<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M295.200000 388.800000
+C341.027096 388.800000 384.983402 370.592702 417.388052 338.188052
+C449.792702 305.783402 468.000000 261.827096 468.000000 216.000000
+C468.000000 170.172904 449.792702 126.216598 417.388052 93.811948
+C384.983402 61.407298 341.027096 43.200000 295.200000 43.200000
+C249.372904 43.200000 205.416598 61.407298 173.011948 93.811948
+C140.607298 126.216598 122.400000 170.172904 122.400000 216.000000
+C122.400000 261.827096 140.607298 305.783402 173.011948 338.188052
+C205.416598 370.592702 249.372904 388.800000 295.200000 388.800000z"/>
+</g>
+</g>
+</g>
+</svg>
Modified: trunk/matplotlib/lib/matplotlib/tests/test_image.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_image.py	2010年07月23日 16:46:40 UTC (rev 8571)
+++ trunk/matplotlib/lib/matplotlib/tests/test_image.py	2010年07月23日 16:47:30 UTC (rev 8572)
@@ -95,7 +95,20 @@
 
 assert_array_equal(arr_dpi1, arr_dpi100)
 
+@image_comparison(baseline_images=['image_clip'])
+def test_image_clip():
+ from math import pi
 
+ fig = plt.figure()
+ ax = fig.add_subplot(111, projection='hammer')
+
+ d = [[1,2],[3,4]]
+
+ ax.imshow(d, extent=(-pi,pi,-pi/2,pi/2))
+
+ fig.savefig('image_clip')
+
+
 if __name__=='__main__':
 import nose
 nose.runmodule(argv=['-s','--with-doctest'], exit=False)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8571
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8571&view=rev
Author: mdboom
Date: 2010年07月23日 16:46:40 +0000 (2010年7月23日)
Log Message:
-----------
Oops in last commit.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/image.py
Modified: branches/v1_0_maint/lib/matplotlib/image.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/image.py	2010年07月23日 16:45:24 UTC (rev 8570)
+++ branches/v1_0_maint/lib/matplotlib/image.py	2010年07月23日 16:46:40 UTC (rev 8571)
@@ -338,7 +338,6 @@
 gc = renderer.new_gc()
 gc.set_clip_rectangle(self.axes.bbox.frozen())
 gc.set_clip_path(self.get_clip_path())
- print self.get_clip_path()
 
 if self._check_unsampled_image(renderer):
 self._draw_unsampled_image(renderer, gc)
@@ -542,9 +541,7 @@
 **kwargs
 )
 
- print "__init__", self.get_clip_on()
 
-
 def make_image(self, magnification=1.0):
 if self._A is None:
 raise RuntimeError('You must first set the image array or the image attribute')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8570
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8570&view=rev
Author: mdboom
Date: 2010年07月23日 16:45:24 +0000 (2010年7月23日)
Log Message:
-----------
Fix image clipping to a path and add a test.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/axes.py
 branches/v1_0_maint/lib/matplotlib/image.py
 branches/v1_0_maint/lib/matplotlib/tests/test_image.py
Added Paths:
-----------
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.pdf
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.png
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.svg
Modified: branches/v1_0_maint/lib/matplotlib/axes.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/axes.py	2010年07月23日 13:18:47 UTC (rev 8569)
+++ branches/v1_0_maint/lib/matplotlib/axes.py	2010年07月23日 16:45:24 UTC (rev 8570)
@@ -6732,7 +6732,7 @@
 im.set_data(X)
 im.set_alpha(alpha)
 self._set_artist_props(im)
- if not im.get_clip_on():
+ if im.get_clip_path() is None:
 # image does not already have clipping set, clip to axes patch
 im.set_clip_path(self.patch)
 #if norm is None and shape is None:
Modified: branches/v1_0_maint/lib/matplotlib/image.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/image.py	2010年07月23日 13:18:47 UTC (rev 8569)
+++ branches/v1_0_maint/lib/matplotlib/image.py	2010年07月23日 16:45:24 UTC (rev 8570)
@@ -338,6 +338,7 @@
 gc = renderer.new_gc()
 gc.set_clip_rectangle(self.axes.bbox.frozen())
 gc.set_clip_path(self.get_clip_path())
+ print self.get_clip_path()
 
 if self._check_unsampled_image(renderer):
 self._draw_unsampled_image(renderer, gc)
@@ -541,7 +542,9 @@
 **kwargs
 )
 
+ print "__init__", self.get_clip_on()
 
+
 def make_image(self, magnification=1.0):
 if self._A is None:
 raise RuntimeError('You must first set the image array or the image attribute')
Added: branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.pdf
===================================================================
(Binary files differ)
Property changes on: branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.pdf
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Added: branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.png
===================================================================
(Binary files differ)
Property changes on: branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.png
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Added: branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.svg
===================================================================
--- branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.svg	 (rev 0)
+++ branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_image/image_clip.svg	2010年07月23日 16:45:24 UTC (rev 8570)
@@ -0,0 +1,659 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Created with matplotlib (http://matplotlib.sourceforge.net/) -->
+<svg width="576pt" height="432pt" viewBox="0 0 576 432"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ version="1.1"
+ id="svg1">
+<filter id="colorAdd"><feComposite in="SourceGraphic" in2="BackgroundImage" operator="arithmetic" k2="1" k3="1"/></filter>
+<g id="figure1">
+<g id="patch1">
+<path style="fill: #ffffff; stroke: #ffffff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M0.000000 432.000000L576.000000 432.000000L576.000000 0.000000
+L0.000000 0.000000L0.000000 432.000000"/>
+</g>
+<g id="axes1">
+<g id="patch2">
+<path style="fill: #ffffff; opacity: 1.000000" d="M295.200000 388.800000
+C341.027096 388.800000 384.983402 370.592702 417.388052 338.188052
+C449.792702 305.783402 468.000000 261.827096 468.000000 216.000000
+C468.000000 170.172904 449.792702 126.216598 417.388052 93.811948
+C384.983402 61.407298 341.027096 43.200000 295.200000 43.200000
+C249.372904 43.200000 205.416598 61.407298 173.011948 93.811948
+C140.607298 126.216598 122.400000 170.172904 122.400000 216.000000
+C122.400000 261.827096 140.607298 305.783402 173.011948 338.188052
+C205.416598 370.592702 249.372904 388.800000 295.200000 388.800000z"/>
+</g>
+<image x="122.400000" y="41.800000" width="347.000000" height="347.000000" xlink:href="data:image/png;base64,
+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
+"/>
+<g id="matplotlib.axis1">
+<g id="xtick1">
+<g id="text1">
+<defs>
+<path id="c_7b26b13f539f13a4c64eef23b6952d29" d="M4.890625 -31.390625l26.312500 0.000000l0.000000 8.000000l-26.312500 0.000000z"/>
+<path id="c_42baa63129a918535c52adb20d687ea7" d="M12.406250 -8.296875l16.109375 0.000000l0.000000 -55.625000l-17.531250 3.515625l0.000000 -8.984375l17.437500 -3.515625l9.859375 0.000000l0.000000 64.609375l16.109375 0.000000l0.000000 8.296875l-41.984375 0.000000z"/>
+<path id="c_1260a2df50f305f3db244e29828f968e" d="M10.796875 -72.906250l38.718750 0.000000l0.000000 8.312500l-29.687500 0.000000l0.000000 17.859375q2.140625 -0.734375 4.281250 -1.093750q2.156250 -0.359375 4.312500 -0.359375q12.203125 0.000000 19.328125 6.687500q7.140625 6.687500 7.140625 18.109375q0.000000 11.765625 -7.328125 18.296875q-7.328125 6.515625 -20.656250 6.515625q-4.593750 0.000000 -9.359375 -0.781250q-4.750000 -0.781250 -9.828125 -2.343750l0.000000 -9.921875q4.390625 2.390625 9.078125 3.562500q4.687500 1.171875 9.906250 1.171875q8.453125 0.000000 13.375000 -4.437500q4.937500 -4.437500 4.937500 -12.062500q0.000000 -7.609375 -4.937500 -12.046875q-4.921875 -4.453125 -13.375000 -4.453125q-3.953125 0.000000 -7.890625 0.875000q-3.921875 0.875000 -8.015625 2.734375z"/>
+<path id="c_7a2040fe3b94fcd41d0a72c84e93b115" d="M31.781250 -66.406250q-7.609375 0.000000 -11.453125 7.500000q-3.828125 7.484375 -3.828125 22.531250q0.000000 14.984375 3.828125 22.484375q3.843750 7.500000 11.453125 7.500000q7.671875 0.000000 11.500000 -7.500000q3.843750 -7.500000 3.843750 -22.484375q0.000000 -15.046875 -3.843750 -22.531250q-3.828125 -7.500000 -11.500000 -7.500000M31.781250 -74.218750q12.265625 0.000000 18.734375 9.703125q6.468750 9.687500 6.468750 28.140625q0.000000 18.406250 -6.468750 28.109375q-6.468750 9.687500 -18.734375 9.687500q-12.250000 0.000000 -18.718750 -9.687500q-6.468750 -9.703125 -6.468750 -28.109375q0.000000 -18.453125 6.468750 -28.140625q6.468750 -9.703125 18.718750 -9.703125"/>
+<path id="c_40880da00a2fb346f185ce8104650367" d="M25.000000 -67.921875q-3.906250 0.000000 -6.593750 2.718750q-2.687500 2.703125 -2.687500 6.609375q0.000000 3.859375 2.687500 6.515625q2.687500 2.656250 6.593750 2.656250q3.906250 0.000000 6.593750 -2.656250q2.687500 -2.656250 2.687500 -6.515625q0.000000 -3.859375 -2.718750 -6.593750q-2.703125 -2.734375 -6.562500 -2.734375M25.000000 -74.218750q3.125000 0.000000 6.000000 1.203125q2.890625 1.187500 4.984375 3.437500q2.250000 2.187500 3.375000 4.984375q1.125000 2.781250 1.125000 6.000000q0.000000 6.437500 -4.515625 10.906250q-4.515625 4.468750 -11.062500 4.468750q-6.593750 0.000000 -11.000000 -4.390625q-4.390625 -4.390625 -4.390625 -10.984375q0.000000 -6.546875 4.484375 -11.078125q4.500000 -4.546875 11.000000 -4.546875"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(146.848084,211.828125)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_42baa63129a918535c52adb20d687ea7" x="36.083984"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="99.707031"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="163.330078"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="226.953125"/>
+</g>
+</g>
+</g>
+<g id="xtick2">
+<g id="text2">
+<defs>
+<path id="c_ed3f3ed3ebfbd18bcb9c012009a68ad1" d="M19.187500 -8.296875l34.421875 0.000000l0.000000 8.296875l-46.281250 0.000000l0.000000 -8.296875q5.609375 -5.812500 15.296875 -15.593750q9.703125 -9.796875 12.187500 -12.640625q4.734375 -5.312500 6.609375 -9.000000q1.890625 -3.687500 1.890625 -7.250000q0.000000 -5.812500 -4.078125 -9.468750q-4.078125 -3.671875 -10.625000 -3.671875q-4.640625 0.000000 -9.796875 1.609375q-5.140625 1.609375 -11.000000 4.890625l0.000000 -9.968750q5.953125 -2.390625 11.125000 -3.609375q5.187500 -1.218750 9.484375 -1.218750q11.328125 0.000000 18.062500 5.671875q6.734375 5.656250 6.734375 15.125000q0.000000 4.500000 -1.687500 8.531250q-1.671875 4.015625 -6.125000 9.484375q-1.218750 1.421875 -7.765625 8.187500q-6.531250 6.765625 -18.453125 18.921875"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(179.676061,211.828125)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_42baa63129a918535c52adb20d687ea7" x="36.083984"/>
+<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1" x="99.707031"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="163.330078"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="226.953125"/>
+</g>
+</g>
+</g>
+<g id="xtick3">
+<g id="text3">
+<defs>
+<path id="c_cd96f817f3cab988d24a2b49a5577fe6" d="M10.984375 -1.515625l0.000000 -8.984375q3.718750 1.765625 7.515625 2.687500q3.812500 0.921875 7.484375 0.921875q9.765625 0.000000 14.906250 -6.562500q5.156250 -6.562500 5.890625 -19.953125q-2.828125 4.203125 -7.187500 6.453125q-4.343750 2.250000 -9.609375 2.250000q-10.937500 0.000000 -17.312500 -6.609375q-6.375000 -6.625000 -6.375000 -18.109375q0.000000 -11.218750 6.640625 -18.000000q6.640625 -6.796875 17.671875 -6.796875q12.656250 0.000000 19.312500 9.703125q6.671875 9.687500 6.671875 28.140625q0.000000 17.234375 -8.187500 27.515625q-8.171875 10.281250 -21.984375 10.281250q-3.718750 0.000000 -7.531250 -0.734375q-3.796875 -0.734375 -7.906250 -2.203125M30.609375 -32.421875q6.640625 0.000000 10.515625 -4.531250q3.890625 -4.546875 3.890625 -12.468750q0.000000 -7.859375 -3.890625 -12.421875q-3.875000 -4.562500 -10.515625 -4.562500q-6.640625 0.000000 -10.515625 4.562500q-3.875000 4.562500 -3.875000 12.421875q0.000000 7.921875 3.875000 12.468750q3.875000 4.531250 10.515625 4.531250"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(211.686396,211.828125)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_cd96f817f3cab988d24a2b49a5577fe6" x="36.083984"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="xtick4">
+<g id="text4">
+<defs>
+<path id="c_cc8d6d580d1b10c8632f7a42cd53db8a" d="M33.015625 -40.375000q-6.640625 0.000000 -10.531250 4.546875q-3.875000 4.531250 -3.875000 12.437500q0.000000 7.859375 3.875000 12.437500q3.890625 4.562500 10.531250 4.562500q6.640625 0.000000 10.515625 -4.562500q3.875000 -4.578125 3.875000 -12.437500q0.000000 -7.906250 -3.875000 -12.437500q-3.875000 -4.546875 -10.515625 -4.546875M52.593750 -71.296875l0.000000 8.984375q-3.718750 -1.750000 -7.500000 -2.671875q-3.781250 -0.937500 -7.500000 -0.937500q-9.765625 0.000000 -14.921875 6.593750q-5.140625 6.593750 -5.875000 19.921875q2.875000 -4.250000 7.218750 -6.515625q4.359375 -2.265625 9.578125 -2.265625q10.984375 0.000000 17.359375 6.671875q6.375000 6.656250 6.375000 18.125000q0.000000 11.234375 -6.640625 18.031250q-6.640625 6.781250 -17.671875 6.781250q-12.656250 0.000000 -19.343750 -9.687500q-6.687500 -9.703125 -6.687500 -28.109375q0.000000 -17.281250 8.203125 -27.562500q8.203125 -10.281250 22.015625 -10.281250q3.718750 0.000000 7.500000 0.734375q3.781250 0.734375 7.890625 2.187500"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(236.960880,211.828125)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a" x="36.083984"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="xtick5">
+<g id="text5">
+<defs>
+<path id="c_3dcfa38a02242cb63ec6726c6e70be7a" d="M40.578125 -39.312500q7.078125 1.515625 11.046875 6.312500q3.984375 4.781250 3.984375 11.812500q0.000000 10.781250 -7.421875 16.703125q-7.421875 5.906250 -21.093750 5.906250q-4.578125 0.000000 -9.437500 -0.906250q-4.859375 -0.906250 -10.031250 -2.718750l0.000000 -9.515625q4.093750 2.390625 8.968750 3.609375q4.890625 1.218750 10.218750 1.218750q9.265625 0.000000 14.125000 -3.656250q4.859375 -3.656250 4.859375 -10.640625q0.000000 -6.453125 -4.515625 -10.078125q-4.515625 -3.640625 -12.562500 -3.640625l-8.500000 0.000000l0.000000 -8.109375l8.890625 0.000000q7.265625 0.000000 11.125000 -2.906250q3.859375 -2.906250 3.859375 -8.375000q0.000000 -5.609375 -3.984375 -8.609375q-3.968750 -3.015625 -11.390625 -3.015625q-4.062500 0.000000 -8.703125 0.890625q-4.640625 0.875000 -10.203125 2.718750l0.000000 -8.781250q5.625000 -1.562500 10.531250 -2.343750q4.906250 -0.781250 9.250000 -0.781250q11.234375 0.000000 17.765625 5.109375q6.546875 5.093750 6.546875 13.781250q0.000000 6.062500 -3.468750 10.234375q-3.468750 4.171875 -9.859375 5.781250"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(260.512948,211.828125)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_3dcfa38a02242cb63ec6726c6e70be7a" x="36.083984"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="xtick6">
+<g id="text6">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(289.348437,211.828125)scale(0.120000)">
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="63.623047"/>
+</g>
+</g>
+</g>
+<g id="xtick7">
+<g id="text7">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(308.340177,211.828125)scale(0.120000)">
+<use xlink:href="#c_3dcfa38a02242cb63ec6726c6e70be7a"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="xtick8">
+<g id="text8">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(331.853183,211.828125)scale(0.120000)">
+<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="xtick9">
+<g id="text9">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(357.080791,211.828125)scale(0.120000)">
+<use xlink:href="#c_cd96f817f3cab988d24a2b49a5577fe6"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="xtick10">
+<g id="text10">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(381.731752,211.828125)scale(0.120000)">
+<use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
+<use xlink:href="#c_ed3f3ed3ebfbd18bcb9c012009a68ad1" x="63.623047"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="127.246094"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="190.869141"/>
+</g>
+</g>
+</g>
+<g id="xtick11">
+<g id="text11">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(414.559729,211.828125)scale(0.120000)">
+<use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="63.623047"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="127.246094"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="190.869141"/>
+</g>
+</g>
+</g>
+</g>
+<g id="matplotlib.axis2">
+<g id="ytick1">
+<g id="text12">
+<defs>
+<path id="c_956f18cfdaf972f35a6c2b4aaac2532b" d="M8.203125 -72.906250l46.875000 0.000000l0.000000 4.203125l-26.468750 68.703125l-10.296875 0.000000l24.906250 -64.593750l-35.015625 0.000000z"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(218.601069,403.970369)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_956f18cfdaf972f35a6c2b4aaac2532b" x="36.083984"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="ytick2">
+<g id="text13">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(176.925000,384.981296)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a" x="36.083984"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="ytick3">
+<g id="text14">
+<defs>
+<path id="c_a0416418d96557a09b8c1332d34883ba" d="M37.796875 -64.312500l-24.906250 38.921875l24.906250 0.000000zM35.203125 -72.906250l12.406250 0.000000l0.000000 47.515625l10.406250 0.000000l0.000000 8.203125l-10.406250 0.000000l0.000000 17.187500l-9.812500 0.000000l0.000000 -17.187500l-32.906250 0.000000l0.000000 -9.515625z"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(141.136948,354.774044)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba" x="36.083984"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="ytick4">
+<g id="text15">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(113.675810,315.407188)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_3dcfa38a02242cb63ec6726c6e70be7a" x="36.083984"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="ytick5">
+<g id="text16">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(96.413017,269.563512)scale(0.120000)">
+<use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29"/>
+<use xlink:href="#c_42baa63129a918535c52adb20d687ea7" x="36.083984"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="99.707031"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="163.330078"/>
+</g>
+</g>
+</g>
+<g id="ytick6">
+<g id="text17">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(102.696875,220.367188)scale(0.120000)">
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="63.623047"/>
+</g>
+</g>
+</g>
+<g id="ytick7">
+<g id="text18">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(101.459892,171.170863)scale(0.120000)">
+<use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="ytick8">
+<g id="text19">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(118.332060,125.327188)scale(0.120000)">
+<use xlink:href="#c_3dcfa38a02242cb63ec6726c6e70be7a"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="ytick9">
+<g id="text20">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(145.465073,85.960331)scale(0.120000)">
+<use xlink:href="#c_a0416418d96557a09b8c1332d34883ba"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="ytick10">
+<g id="text21">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(181.503125,55.753079)scale(0.120000)">
+<use xlink:href="#c_cc8d6d580d1b10c8632f7a42cd53db8a"/>
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+<g id="ytick11">
+<g id="text22">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(223.319819,36.764006)scale(0.120000)">
+<use xlink:href="#c_956f18cfdaf972f35a6c2b4aaac2532b"/>
+<use xlink:href="#c_1260a2df50f305f3db244e29828f968e" x="63.623047"/>
+<use xlink:href="#c_40880da00a2fb346f185ce8104650367" x="127.246094"/>
+</g>
+</g>
+</g>
+</g>
+<g id="patch3">
+<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M295.200000 388.800000
+C341.027096 388.800000 384.983402 370.592702 417.388052 338.188052
+C449.792702 305.783402 468.000000 261.827096 468.000000 216.000000
+C468.000000 170.172904 449.792702 126.216598 417.388052 93.811948
+C384.983402 61.407298 341.027096 43.200000 295.200000 43.200000
+C249.372904 43.200000 205.416598 61.407298 173.011948 93.811948
+C140.607298 126.216598 122.400000 170.172904 122.400000 216.000000
+C122.400000 261.827096 140.607298 305.783402 173.011948 338.188052
+C205.416598 370.592702 249.372904 388.800000 295.200000 388.800000z"/>
+</g>
+</g>
+</g>
+</svg>
Modified: branches/v1_0_maint/lib/matplotlib/tests/test_image.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/tests/test_image.py	2010年07月23日 13:18:47 UTC (rev 8569)
+++ branches/v1_0_maint/lib/matplotlib/tests/test_image.py	2010年07月23日 16:45:24 UTC (rev 8570)
@@ -95,7 +95,20 @@
 
 assert_array_equal(arr_dpi1, arr_dpi100)
 
+@image_comparison(baseline_images=['image_clip'])
+def test_image_clip():
+ from math import pi
 
+ fig = plt.figure()
+ ax = fig.add_subplot(111, projection='hammer')
+
+ d = [[1,2],[3,4]]
+
+ ax.imshow(d, extent=(-pi,pi,-pi/2,pi/2))
+
+ fig.savefig('image_clip')
+
+
 if __name__=='__main__':
 import nose
 nose.runmodule(argv=['-s','--with-doctest'], exit=False)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8569
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8569&view=rev
Author: mdboom
Date: 2010年07月23日 13:18:47 +0000 (2010年7月23日)
Log Message:
-----------
Merged revisions 8568 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8568 | mdboom | 2010年07月23日 09:17:15 -0400 (2010年7月23日) | 2 lines
 
 Prevent traceback when window icon can not be loaded in Gtk backend.
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8566 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8568 /trunk/matplotlib:1-7315
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2010年07月23日 13:17:15 UTC (rev 8568)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2010年07月23日 13:18:47 UTC (rev 8569)
@@ -33,6 +33,7 @@
 
 from matplotlib import lines
 from matplotlib import cbook
+from matplotlib import verbose
 
 backend_version = "%d.%d.%d" % gtk.pygtk_version
 
@@ -1224,7 +1225,6 @@
 window_icon = None
 verbose.report('Could not load matplotlib icon: %s' % sys.exc_info()[1])
 
-
 def error_msg_gtk(msg, parent=None):
 if parent is not None: # find the toplevel gtk.Window
 parent = parent.get_toplevel()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8568
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8568&view=rev
Author: mdboom
Date: 2010年07月23日 13:17:15 +0000 (2010年7月23日)
Log Message:
-----------
Prevent traceback when window icon can not be loaded in Gtk backend.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py	2010年07月20日 18:29:08 UTC (rev 8567)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py	2010年07月23日 13:17:15 UTC (rev 8568)
@@ -33,6 +33,7 @@
 
 from matplotlib import lines
 from matplotlib import cbook
+from matplotlib import verbose
 
 backend_version = "%d.%d.%d" % gtk.pygtk_version
 
@@ -1224,7 +1225,6 @@
 window_icon = None
 verbose.report('Could not load matplotlib icon: %s' % sys.exc_info()[1])
 
-
 def error_msg_gtk(msg, parent=None):
 if parent is not None: # find the toplevel gtk.Window
 parent = parent.get_toplevel()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8567
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8567&view=rev
Author: dsdale
Date: 2010年07月20日 18:29:08 +0000 (2010年7月20日)
Log Message:
-----------
Merged revisions 8566 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8566 | dsdale | 2010年07月20日 10:00:55 -0400 (2010年7月20日) | 2 lines
 
 Return Qt4's default cursor when leaving the canvas
........
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/lib/matplotlib/backends/backend_qt4.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
 - /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_91_maint:1-6428 /branches/v1_0_maint:1-8564
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8566 /trunk/matplotlib:1-7315
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2010年07月20日 14:00:55 UTC (rev 8566)
+++ trunk/matplotlib/CHANGELOG	2010年07月20日 18:29:08 UTC (rev 8567)
@@ -1,3 +1,5 @@
+2010年07月20日 Return Qt4's default cursor when leaving the canvas - DSD
+
 2010年07月06日 Tagging for mpl 1.0 at r8502
 
 
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py	2010年07月20日 14:00:55 UTC (rev 8566)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py	2010年07月20日 18:29:08 UTC (rev 8567)
@@ -150,6 +150,7 @@
 FigureCanvasBase.enter_notify_event(self, event)
 
 def leaveEvent(self, event):
+ QtGui.QApplication.restoreOverrideCursor()
 FigureCanvasBase.leave_notify_event(self, event)
 
 def mousePressEvent( self, event ):
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
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:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564
 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8566
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8566&view=rev
Author: dsdale
Date: 2010年07月20日 14:00:55 +0000 (2010年7月20日)
Log Message:
-----------
Return Qt4's default cursor when leaving the canvas
Modified Paths:
--------------
 branches/v1_0_maint/CHANGELOG
 branches/v1_0_maint/lib/matplotlib/backends/backend_qt4.py
Modified: branches/v1_0_maint/CHANGELOG
===================================================================
--- branches/v1_0_maint/CHANGELOG	2010年07月17日 07:08:43 UTC (rev 8565)
+++ branches/v1_0_maint/CHANGELOG	2010年07月20日 14:00:55 UTC (rev 8566)
@@ -1,3 +1,5 @@
+2010年07月20日 Return Qt4's default cursor when leaving the canvas - DSD
+
 2010年07月06日 Tagging for mpl 1.0 at r8502
 
 
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_qt4.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_qt4.py	2010年07月17日 07:08:43 UTC (rev 8565)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_qt4.py	2010年07月20日 14:00:55 UTC (rev 8566)
@@ -150,6 +150,7 @@
 FigureCanvasBase.enter_notify_event(self, event)
 
 def leaveEvent(self, event):
+ QtGui.QApplication.restoreOverrideCursor()
 FigureCanvasBase.leave_notify_event(self, event)
 
 def mousePressEvent( self, event ):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8565
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8565&view=rev
Author: leejjoon
Date: 2010年07月17日 07:08:43 +0000 (2010年7月17日)
Log Message:
-----------
Merged revisions 8562,8564 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8562 | efiring | 2010年07月16日 16:44:52 -0400 (2010年7月16日) | 3 lines
 
 backends: factored out most of the show() code into ShowBase class.
 Also fixed various fltkagg problems.
........
 r8564 | leejjoon | 2010年07月17日 03:06:06 -0400 (2010年7月17日) | 1 line
 
 fix wrong baseline for multiple line legend
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/offsetbox.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
 - /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8559
 + /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_91_maint:1-6428 /branches/v1_0_maint:1-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
Modified: trunk/matplotlib/lib/matplotlib/offsetbox.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/offsetbox.py	2010年07月17日 07:06:06 UTC (rev 8564)
+++ trunk/matplotlib/lib/matplotlib/offsetbox.py	2010年07月17日 07:08:43 UTC (rev 8565)
@@ -641,14 +641,14 @@
 bbox, info = self._text._get_layout(renderer)
 w, h = bbox.width, bbox.height
 
- line = info[0][0] # first line
-
+ line = info[-1][0] # last line
 _, hh, dd = renderer.get_text_width_height_descent(
 line, self._text._fontproperties, ismath=ismath)
+ d = dd # the baseline of the last line
 
+ self._baseline_transform.clear()
 
- self._baseline_transform.clear()
- d = h-(hh-dd) # the baseline of the first line
+
 if len(info) > 1 and self._multilinebaseline:
 d_new = 0.5 * h - 0.5 * (h_ - d_)
 self._baseline_transform.translate(0, d - d_new)
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564
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:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8562
 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8564
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8564&view=rev
Author: leejjoon
Date: 2010年07月17日 07:06:06 +0000 (2010年7月17日)
Log Message:
-----------
fix wrong baseline for multiple line legend
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/offsetbox.py
Modified: branches/v1_0_maint/lib/matplotlib/offsetbox.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/offsetbox.py	2010年07月16日 20:55:35 UTC (rev 8563)
+++ branches/v1_0_maint/lib/matplotlib/offsetbox.py	2010年07月17日 07:06:06 UTC (rev 8564)
@@ -641,14 +641,14 @@
 bbox, info = self._text._get_layout(renderer)
 w, h = bbox.width, bbox.height
 
- line = info[0][0] # first line
-
+ line = info[-1][0] # last line
 _, hh, dd = renderer.get_text_width_height_descent(
 line, self._text._fontproperties, ismath=ismath)
+ d = dd # the baseline of the last line
 
+ self._baseline_transform.clear()
 
- self._baseline_transform.clear()
- d = h-(hh-dd) # the baseline of the first line
+
 if len(info) > 1 and self._multilinebaseline:
 d_new = 0.5 * h - 0.5 * (h_ - d_)
 self._baseline_transform.translate(0, d - d_new)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8563
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8563&view=rev
Author: efiring
Date: 2010年07月16日 20:55:35 +0000 (2010年7月16日)
Log Message:
-----------
Merged revisions 8559,8562 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8559 | ianthomas23 | 2010年07月16日 03:46:14 -1000 (2010年7月16日) | 2 lines
 
 Added tri* functions to pyplot docs.
........
 r8562 | efiring | 2010年07月16日 10:44:52 -1000 (2010年7月16日) | 3 lines
 
 backends: factored out most of the show() code into ShowBase class.
 Also fixed various fltkagg problems.
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/backend_bases.py
 trunk/matplotlib/lib/matplotlib/backends/backend_cocoaagg.py
 trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py
 trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
 trunk/matplotlib/lib/matplotlib/backends/backend_macosx.py
 trunk/matplotlib/lib/matplotlib/backends/backend_qt.py
 trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py
 trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
 trunk/matplotlib/lib/matplotlib/backends/backend_wx.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: 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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
Modified: trunk/matplotlib/lib/matplotlib/backend_bases.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backend_bases.py	2010年07月16日 20:44:52 UTC (rev 8562)
+++ trunk/matplotlib/lib/matplotlib/backend_bases.py	2010年07月16日 20:55:35 UTC (rev 8563)
@@ -21,6 +21,11 @@
 pressed, x and y locations in pixel and
 :class:`~matplotlib.axes.Axes` coordinates.
 
+:class:`ShowBase`
+ The base class for the Show class of each interactive backend;
+ the 'show' callable is then set to Show.__call__, inherited from
+ ShowBase.
+
 """
 
 from __future__ import division
@@ -33,6 +38,8 @@
 import matplotlib.widgets as widgets
 #import matplotlib.path as path
 from matplotlib import rcParams
+from matplotlib import is_interactive
+from matplotlib._pylab_helpers import Gcf
 
 from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
 import cStringIO
@@ -53,7 +60,37 @@
 _backend_d[format] = backend_class
 
 
+class ShowBase(object):
+ """
+ Simple base class to generate a show() callable in backends.
 
+ Subclass must override mainloop() method.
+ """
+ def __call__(self):
+ """
+ Show all figures.
+ """
+ managers = Gcf.get_all_fig_managers()
+ if not managers:
+ return
+
+ for manager in managers:
+ manager.show()
+
+ try:
+ if not self._needmain: # ipython flag
+ return
+ except AttributeError:
+ pass
+
+ if not is_interactive():
+ self.mainloop()
+
+ def mainloop(self):
+ pass
+
+
+
 class RendererBase:
 """An abstract base class to handle drawing/rendering operations.
 
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_cocoaagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_cocoaagg.py	2010年07月16日 20:44:52 UTC (rev 8562)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_cocoaagg.py	2010年07月16日 20:55:35 UTC (rev 8563)
@@ -30,6 +30,8 @@
 import matplotlib
 from matplotlib.figure import Figure
 from matplotlib.backend_bases import FigureManagerBase, FigureCanvasBase
+from matplotlib.backend_bases import ShowBase
+
 from backend_agg import FigureCanvasAgg
 from matplotlib._pylab_helpers import Gcf
 
@@ -41,10 +43,24 @@
 canvas = FigureCanvasCocoaAgg(thisFig)
 return FigureManagerCocoaAgg(canvas, num)
 
-def show():
- for manager in Gcf.get_all_fig_managers():
- manager.show()
+## Below is the original show() function:
+#def show():
+# for manager in Gcf.get_all_fig_managers():
+# manager.show()
+#
+## It appears that this backend is unusual in having a separate
+## run function invoked for each figure, instead of a single
+## mainloop. Presumably there is no blocking at all.
+##
+## Using the Show class below should cause no difference in
+## behavior.
 
+class Show(ShowBase):
+ def mainloop(self):
+ pass
+
+show = Show()
+
 def draw_if_interactive():
 if matplotlib.is_interactive():
 figManager = Gcf.get_active()
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py	2010年07月16日 20:44:52 UTC (rev 8562)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py	2010年07月16日 20:55:35 UTC (rev 8563)
@@ -24,24 +24,14 @@
 from matplotlib.backend_bases import \
 RendererBase, GraphicsContextBase, FigureManagerBase, FigureCanvasBase,\
 NavigationToolbar2, cursors
+from matplotlib.backend_bases import ShowBase
+
+
 from matplotlib.figure import Figure
 from matplotlib._pylab_helpers import Gcf
 import matplotlib.backends.windowing as windowing
 from matplotlib.widgets import SubplotTool
 
-
-import thread,time
-
-Fl_running=thread.allocate_lock()
-def Fltk_run_interactive():
- global Fl_running
- if Fl_running.acquire(0):
- while True:
- Fltk.Fl.check()
- time.sleep(0.005)
- else:
- print "fl loop already running"
-
 # the true dots per inch on the screen; should be display dependent
 # see http://groups.google.com/groups?q=screen+dpi+x11&hl=en&lr=&ie=UTF-8&oe=UTF-8&safe=off&selm=7077.26e81ad5%40swift.cs.tcd.ie&rnum=5 for some info about screen dpi
 PIXELS_PER_INCH = 75
@@ -75,30 +65,13 @@
 if figManager is not None:
 figManager.canvas.draw()
 
+class Show(ShowBase):
+ def mainloop(self):
+ Fltk.Fl.run()
 
-def ishow():
- """
- Show all the figures and enter the fltk mainloop in another thread
- This allows to keep hand in interractive python session
- Warning: does not work under windows
- This should be the last line of your script
- """
- for manager in Gcf.get_all_fig_managers():
- manager.show()
- if show._needmain:
- thread.start_new_thread(Fltk_run_interactive,())
- show._needmain = False
+show = Show()
 
-def show():
- """
- Show all the figures and enter the fltk mainloop
 
- This should be the last line of your script
- """
- for manager in Gcf.get_all_fig_managers():
- manager.show()
- Fltk.Fl.run()
-
 def new_figure_manager(num, *args, **kwargs):
 """
 Create a new figure manager instance
@@ -249,8 +222,9 @@
 FigureCanvasBase.stop_event_loop_default(self)
 stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
 
-def destroy_figure(ptr,figman):
+def destroy_figure(ptr, figman):
 figman.window.hide()
+ Fltk.Fl.wait(0) # This is needed to make the last figure vanish.
 Gcf.destroy(figman._num)
 
 class FigureManagerFltkAgg(FigureManagerBase):
@@ -301,6 +275,11 @@
 self.canvas.draw()
 self.window.redraw()
 
+ def destroy(self):
+ self.window.hide()
+ Fltk.Fl.wait(0) # This is needed to make the last figure vanish.
+ Gcf.destroy(self._num)
+
 def set_window_title(self, title):
 self.window_title=title
 self.window.label(title)
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2010年07月16日 20:44:52 UTC (rev 8562)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2010年07月16日 20:55:35 UTC (rev 8563)
@@ -20,10 +20,11 @@
 _new_tooltip_api = (gtk.pygtk_version[1] >= 12)
 
 import matplotlib
-from matplotlib import verbose
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
 FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors, TimerBase
+from matplotlib.backend_bases import ShowBase
+
 from matplotlib.backends.backend_gdk import RendererGDK, FigureCanvasGDK
 from matplotlib.cbook import is_string_like, is_writable_file_like
 from matplotlib.colors import colorConverter
@@ -65,17 +66,12 @@
 figManager.canvas.draw_idle()
 
 
-def show(mainloop=True):
- """
- Show all the figures and enter the gtk main loop
- This should be the last line of your script
- """
- for manager in Gcf.get_all_fig_managers():
- manager.window.show()
+class Show(ShowBase):
+ def mainloop(self):
+ if gtk.main_level() == 0:
+ gtk.main()
 
- if mainloop and gtk.main_level() == 0 and \
- len(Gcf.get_all_fig_managers())>0:
- gtk.main()
+show = Show()
 
 def new_figure_manager(num, *args, **kwargs):
 """
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_macosx.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_macosx.py	2010年07月16日 20:44:52 UTC (rev 8562)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_macosx.py	2010年07月16日 20:55:35 UTC (rev 8563)
@@ -7,6 +7,8 @@
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
 FigureManagerBase, FigureCanvasBase, NavigationToolbar2
+from matplotlib.backend_bases import ShowBase
+
 from matplotlib.cbook import maxdict
 from matplotlib.figure import Figure
 from matplotlib.path import Path
@@ -20,19 +22,16 @@
 import matplotlib
 from matplotlib.backends import _macosx
 
-def show():
- """Show all the figures and enter the Cocoa mainloop.
- This function will not return until all windows are closed or
- the interpreter exits."""
- # Having a Python-level function "show" wrapping the built-in
- # function "show" in the _macosx extension module allows us to
- # to add attributes to "show". This is something ipython does.
- _macosx.show()
+class Show(ShowBase):
+ def mainloop(self):
+ _macosx.show()
 
+show = Show()
+
 class RendererMac(RendererBase):
 """
 The renderer handles drawing/rendering operations. Most of the renderer's
- methods forwards the command to the renderer's graphics context. The
+ methods forward the command to the renderer's graphics context. The
 renderer does not wrap a C object and is written in pure Python.
 """
 
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_qt.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_qt.py	2010年07月16日 20:44:52 UTC (rev 8562)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_qt.py	2010年07月16日 20:55:35 UTC (rev 8563)
@@ -8,6 +8,8 @@
 from matplotlib.cbook import is_string_like, onetrue
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
 FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors
+from matplotlib.backend_bases import ShowBase
+
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.figure import Figure
 from matplotlib.mathtext import MathTextParser
@@ -54,24 +56,14 @@
 
 _create_qApp.qAppCreatedHere = False
 
-def show():
- """
- Show all the figures and enter the qt main loop
- This should be the last line of your script
- """
- for manager in Gcf.get_all_fig_managers():
- manager.window.show()
+class Show(ShowBase):
+ def mainloop(self):
+ if _create_qApp.qAppCreatedHere:
+ qt.qApp.exec_loop()
 
- if DEBUG: print 'Inside show'
+show = Show()
 
- figManager = Gcf.get_active()
- if figManager != None:
- figManager.canvas.draw()
 
- if _create_qApp.qAppCreatedHere:
- qt.qApp.exec_loop()
-
-
 def new_figure_manager( num, *args, **kwargs ):
 """
 Create a new figure manager instance
@@ -281,6 +273,9 @@
 'set the canvas size in pixels'
 self.window.resize(width, height)
 
+ def show(self):
+ self.window.show()
+
 def destroy( self, *args ):
 if self.window._destroying: return
 self.window._destroying = True
@@ -359,6 +354,7 @@
 # reference holder for subplots_adjust window
 self.adj_window = None
 
+
 def destroy( self ):
 for text, tooltip_text, image_file, callback in self.toolitems:
 if text is not None:
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py	2010年07月16日 20:44:52 UTC (rev 8562)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py	2010年07月16日 20:55:35 UTC (rev 8563)
@@ -9,6 +9,8 @@
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
 FigureManagerBase, FigureCanvasBase, NavigationToolbar2, IdleEvent, \
 cursors, TimerBase
+from matplotlib.backend_bases import ShowBase
+
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.figure import Figure
 from matplotlib.mathtext import MathTextParser
@@ -56,24 +58,14 @@
 
 _create_qApp.qAppCreatedHere = False
 
-def show():
- """
- Show all the figures and enter the qt main loop
- This should be the last line of your script
- """
- for manager in Gcf.get_all_fig_managers():
- manager.window.show()
+class Show(ShowBase):
+ def mainloop(self):
+ if _create_qApp.qAppCreatedHere:
+ QtGui.qApp.exec_()
 
- if DEBUG: print 'Inside show'
+show = Show()
 
- figManager = Gcf.get_active()
- if figManager != None:
- figManager.canvas.draw()
 
- if _create_qApp.qAppCreatedHere:
- QtGui.qApp.exec_()
-
-
 def new_figure_manager( num, *args, **kwargs ):
 """
 Create a new figure manager instance
@@ -370,6 +362,9 @@
 'set the canvas size in pixels'
 self.window.resize(width, height)
 
+ def show(self):
+ self.window.show()
+
 def destroy( self, *args ):
 if self.window._destroying: return
 self.window._destroying = True
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py	2010年07月16日 20:44:52 UTC (rev 8562)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py	2010年07月16日 20:55:35 UTC (rev 8563)
@@ -18,9 +18,10 @@
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase
 from matplotlib.backend_bases import FigureManagerBase, FigureCanvasBase
 from matplotlib.backend_bases import NavigationToolbar2, cursors, TimerBase
+from matplotlib.backend_bases import ShowBase
+from matplotlib._pylab_helpers import Gcf
 
 from matplotlib.figure import Figure
-from matplotlib._pylab_helpers import Gcf
 
 from matplotlib.widgets import SubplotTool
 
@@ -63,22 +64,12 @@
 if figManager is not None:
 figManager.show()
 
-
-def show():
- """
- Show all figures.
-
- """
- for manager in Gcf.get_all_fig_managers():
- manager.show()
- try:
- if not show._needmain: # might have been added by ipython
- return
- except AttributeError:
- pass
- if not matplotlib.is_interactive():
+class Show(ShowBase):
+ def mainloop(self):
 Tk.mainloop()
 
+show = Show()
+
 def new_figure_manager(num, *args, **kwargs):
 """
 Create a new figure manager instance
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wx.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_wx.py	2010年07月16日 20:44:52 UTC (rev 8562)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_wx.py	2010年07月16日 20:55:35 UTC (rev 8563)
@@ -24,6 +24,8 @@
 import sys, os, os.path, math, StringIO, weakref, warnings
 import numpy as np
 
+
+
 # Debugging settings here...
 # Debug level set here. If the debug level is less than 5, information
 # messages (progressively more info for lower value) are printed. In addition,
@@ -117,6 +119,8 @@
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
 FigureCanvasBase, FigureManagerBase, NavigationToolbar2, \
 cursors, TimerBase
+from matplotlib.backend_bases import ShowBase
+
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.artist import Artist
 from matplotlib.cbook import exception_to_str, is_string_like, is_writable_file_like
@@ -1394,24 +1398,16 @@
 if figManager is not None:
 figManager.canvas.draw_idle()
 
-def show():
- """
- Show all the figures and enter the wx main loop.
- This should be the last line of your script.
- """
- DEBUG_MSG("show()", 3, None)
+class Show(ShowBase):
+ def mainloop(self):
+ needmain = not wx.App.IsMainLoopRunning()
+ if needmain:
+ wxapp = wx.GetApp()
+ if wxapp is not None:
+ wxapp.MainLoop()
 
- for figwin in Gcf.get_all_fig_managers():
- figwin.frame.Show()
+show = Show()
 
- needmain = not wx.App.IsMainLoopRunning()
- if needmain and len(Gcf.get_all_fig_managers())>0:
- wxapp = wx.GetApp()
- if wxapp is not None:
- wxapp.MainLoop()
- # start the wxPython gui event if there is not already one running
-
-
 def new_figure_manager(num, *args, **kwargs):
 """
 Create a new figure manager instance
@@ -1555,6 +1551,8 @@
 # attach a show method to the figure
 self.canvas.figure.show = showfig
 
+ def show(self):
+ self.frame.Show()
 
 def destroy(self, *args):
 DEBUG_MSG("destroy()", 1, self)
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8562
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:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559
 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8562
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8562
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8562&view=rev
Author: efiring
Date: 2010年07月16日 20:44:52 +0000 (2010年7月16日)
Log Message:
-----------
backends: factored out most of the show() code into ShowBase class.
Also fixed various fltkagg problems.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/backend_bases.py
 branches/v1_0_maint/lib/matplotlib/backends/backend_cocoaagg.py
 branches/v1_0_maint/lib/matplotlib/backends/backend_fltkagg.py
 branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py
 branches/v1_0_maint/lib/matplotlib/backends/backend_macosx.py
 branches/v1_0_maint/lib/matplotlib/backends/backend_qt.py
 branches/v1_0_maint/lib/matplotlib/backends/backend_qt4.py
 branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py
 branches/v1_0_maint/lib/matplotlib/backends/backend_wx.py
Modified: branches/v1_0_maint/lib/matplotlib/backend_bases.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backend_bases.py	2010年07月16日 18:45:49 UTC (rev 8561)
+++ branches/v1_0_maint/lib/matplotlib/backend_bases.py	2010年07月16日 20:44:52 UTC (rev 8562)
@@ -21,6 +21,11 @@
 pressed, x and y locations in pixel and
 :class:`~matplotlib.axes.Axes` coordinates.
 
+:class:`ShowBase`
+ The base class for the Show class of each interactive backend;
+ the 'show' callable is then set to Show.__call__, inherited from
+ ShowBase.
+
 """
 
 from __future__ import division
@@ -33,6 +38,8 @@
 import matplotlib.widgets as widgets
 #import matplotlib.path as path
 from matplotlib import rcParams
+from matplotlib import is_interactive
+from matplotlib._pylab_helpers import Gcf
 
 from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
 import cStringIO
@@ -49,7 +56,37 @@
 _backend_d[format] = backend_class
 
 
+class ShowBase(object):
+ """
+ Simple base class to generate a show() callable in backends.
 
+ Subclass must override mainloop() method.
+ """
+ def __call__(self):
+ """
+ Show all figures.
+ """
+ managers = Gcf.get_all_fig_managers()
+ if not managers:
+ return
+
+ for manager in managers:
+ manager.show()
+
+ try:
+ if not self._needmain: # ipython flag
+ return
+ except AttributeError:
+ pass
+
+ if not is_interactive():
+ self.mainloop()
+
+ def mainloop(self):
+ pass
+
+
+
 class RendererBase:
 """An abstract base class to handle drawing/rendering operations.
 
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_cocoaagg.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_cocoaagg.py	2010年07月16日 18:45:49 UTC (rev 8561)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_cocoaagg.py	2010年07月16日 20:44:52 UTC (rev 8562)
@@ -30,6 +30,8 @@
 import matplotlib
 from matplotlib.figure import Figure
 from matplotlib.backend_bases import FigureManagerBase, FigureCanvasBase
+from matplotlib.backend_bases import ShowBase
+
 from backend_agg import FigureCanvasAgg
 from matplotlib._pylab_helpers import Gcf
 
@@ -41,10 +43,24 @@
 canvas = FigureCanvasCocoaAgg(thisFig)
 return FigureManagerCocoaAgg(canvas, num)
 
-def show():
- for manager in Gcf.get_all_fig_managers():
- manager.show()
+## Below is the original show() function:
+#def show():
+# for manager in Gcf.get_all_fig_managers():
+# manager.show()
+#
+## It appears that this backend is unusual in having a separate
+## run function invoked for each figure, instead of a single
+## mainloop. Presumably there is no blocking at all.
+##
+## Using the Show class below should cause no difference in
+## behavior.
 
+class Show(ShowBase):
+ def mainloop(self):
+ pass
+
+show = Show()
+
 def draw_if_interactive():
 if matplotlib.is_interactive():
 figManager = Gcf.get_active()
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_fltkagg.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_fltkagg.py	2010年07月16日 18:45:49 UTC (rev 8561)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_fltkagg.py	2010年07月16日 20:44:52 UTC (rev 8562)
@@ -24,24 +24,14 @@
 from matplotlib.backend_bases import \
 RendererBase, GraphicsContextBase, FigureManagerBase, FigureCanvasBase,\
 NavigationToolbar2, cursors
+from matplotlib.backend_bases import ShowBase
+
+
 from matplotlib.figure import Figure
 from matplotlib._pylab_helpers import Gcf
 import matplotlib.backends.windowing as windowing
 from matplotlib.widgets import SubplotTool
 
-
-import thread,time
-
-Fl_running=thread.allocate_lock()
-def Fltk_run_interactive():
- global Fl_running
- if Fl_running.acquire(0):
- while True:
- Fltk.Fl.check()
- time.sleep(0.005)
- else:
- print "fl loop already running"
-
 # the true dots per inch on the screen; should be display dependent
 # see http://groups.google.com/groups?q=screen+dpi+x11&hl=en&lr=&ie=UTF-8&oe=UTF-8&safe=off&selm=7077.26e81ad5%40swift.cs.tcd.ie&rnum=5 for some info about screen dpi
 PIXELS_PER_INCH = 75
@@ -75,30 +65,13 @@
 if figManager is not None:
 figManager.canvas.draw()
 
+class Show(ShowBase):
+ def mainloop(self):
+ Fltk.Fl.run()
 
-def ishow():
- """
- Show all the figures and enter the fltk mainloop in another thread
- This allows to keep hand in interractive python session
- Warning: does not work under windows
- This should be the last line of your script
- """
- for manager in Gcf.get_all_fig_managers():
- manager.show()
- if show._needmain:
- thread.start_new_thread(Fltk_run_interactive,())
- show._needmain = False
+show = Show()
 
-def show():
- """
- Show all the figures and enter the fltk mainloop
 
- This should be the last line of your script
- """
- for manager in Gcf.get_all_fig_managers():
- manager.show()
- Fltk.Fl.run()
-
 def new_figure_manager(num, *args, **kwargs):
 """
 Create a new figure manager instance
@@ -249,8 +222,9 @@
 FigureCanvasBase.stop_event_loop_default(self)
 stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
 
-def destroy_figure(ptr,figman):
+def destroy_figure(ptr, figman):
 figman.window.hide()
+ Fltk.Fl.wait(0) # This is needed to make the last figure vanish.
 Gcf.destroy(figman._num)
 
 class FigureManagerFltkAgg(FigureManagerBase):
@@ -301,6 +275,11 @@
 self.canvas.draw()
 self.window.redraw()
 
+ def destroy(self):
+ self.window.hide()
+ Fltk.Fl.wait(0) # This is needed to make the last figure vanish.
+ Gcf.destroy(self._num)
+
 def set_window_title(self, title):
 self.window_title=title
 self.window.label(title)
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py	2010年07月16日 18:45:49 UTC (rev 8561)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py	2010年07月16日 20:44:52 UTC (rev 8562)
@@ -20,10 +20,11 @@
 _new_tooltip_api = (gtk.pygtk_version[1] >= 12)
 
 import matplotlib
-from matplotlib import verbose
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
 FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors, TimerBase
+from matplotlib.backend_bases import ShowBase
+
 from matplotlib.backends.backend_gdk import RendererGDK, FigureCanvasGDK
 from matplotlib.cbook import is_string_like, is_writable_file_like
 from matplotlib.colors import colorConverter
@@ -65,17 +66,12 @@
 figManager.canvas.draw_idle()
 
 
-def show(mainloop=True):
- """
- Show all the figures and enter the gtk main loop
- This should be the last line of your script
- """
- for manager in Gcf.get_all_fig_managers():
- manager.window.show()
+class Show(ShowBase):
+ def mainloop(self):
+ if gtk.main_level() == 0:
+ gtk.main()
 
- if mainloop and gtk.main_level() == 0 and \
- len(Gcf.get_all_fig_managers())>0:
- gtk.main()
+show = Show()
 
 def new_figure_manager(num, *args, **kwargs):
 """
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_macosx.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_macosx.py	2010年07月16日 18:45:49 UTC (rev 8561)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_macosx.py	2010年07月16日 20:44:52 UTC (rev 8562)
@@ -7,6 +7,8 @@
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
 FigureManagerBase, FigureCanvasBase, NavigationToolbar2
+from matplotlib.backend_bases import ShowBase
+
 from matplotlib.cbook import maxdict
 from matplotlib.figure import Figure
 from matplotlib.path import Path
@@ -20,19 +22,16 @@
 import matplotlib
 from matplotlib.backends import _macosx
 
-def show():
- """Show all the figures and enter the Cocoa mainloop.
- This function will not return until all windows are closed or
- the interpreter exits."""
- # Having a Python-level function "show" wrapping the built-in
- # function "show" in the _macosx extension module allows us to
- # to add attributes to "show". This is something ipython does.
- _macosx.show()
+class Show(ShowBase):
+ def mainloop(self):
+ _macosx.show()
 
+show = Show()
+
 class RendererMac(RendererBase):
 """
 The renderer handles drawing/rendering operations. Most of the renderer's
- methods forwards the command to the renderer's graphics context. The
+ methods forward the command to the renderer's graphics context. The
 renderer does not wrap a C object and is written in pure Python.
 """
 
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_qt.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_qt.py	2010年07月16日 18:45:49 UTC (rev 8561)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_qt.py	2010年07月16日 20:44:52 UTC (rev 8562)
@@ -8,6 +8,8 @@
 from matplotlib.cbook import is_string_like, onetrue
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
 FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors
+from matplotlib.backend_bases import ShowBase
+
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.figure import Figure
 from matplotlib.mathtext import MathTextParser
@@ -54,24 +56,14 @@
 
 _create_qApp.qAppCreatedHere = False
 
-def show():
- """
- Show all the figures and enter the qt main loop
- This should be the last line of your script
- """
- for manager in Gcf.get_all_fig_managers():
- manager.window.show()
+class Show(ShowBase):
+ def mainloop(self):
+ if _create_qApp.qAppCreatedHere:
+ qt.qApp.exec_loop()
 
- if DEBUG: print 'Inside show'
+show = Show()
 
- figManager = Gcf.get_active()
- if figManager != None:
- figManager.canvas.draw()
 
- if _create_qApp.qAppCreatedHere:
- qt.qApp.exec_loop()
-
-
 def new_figure_manager( num, *args, **kwargs ):
 """
 Create a new figure manager instance
@@ -281,6 +273,9 @@
 'set the canvas size in pixels'
 self.window.resize(width, height)
 
+ def show(self):
+ self.window.show()
+
 def destroy( self, *args ):
 if self.window._destroying: return
 self.window._destroying = True
@@ -359,6 +354,7 @@
 # reference holder for subplots_adjust window
 self.adj_window = None
 
+
 def destroy( self ):
 for text, tooltip_text, image_file, callback in self.toolitems:
 if text is not None:
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_qt4.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_qt4.py	2010年07月16日 18:45:49 UTC (rev 8561)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_qt4.py	2010年07月16日 20:44:52 UTC (rev 8562)
@@ -9,6 +9,8 @@
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
 FigureManagerBase, FigureCanvasBase, NavigationToolbar2, IdleEvent, \
 cursors, TimerBase
+from matplotlib.backend_bases import ShowBase
+
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.figure import Figure
 from matplotlib.mathtext import MathTextParser
@@ -56,24 +58,14 @@
 
 _create_qApp.qAppCreatedHere = False
 
-def show():
- """
- Show all the figures and enter the qt main loop
- This should be the last line of your script
- """
- for manager in Gcf.get_all_fig_managers():
- manager.window.show()
+class Show(ShowBase):
+ def mainloop(self):
+ if _create_qApp.qAppCreatedHere:
+ QtGui.qApp.exec_()
 
- if DEBUG: print 'Inside show'
+show = Show()
 
- figManager = Gcf.get_active()
- if figManager != None:
- figManager.canvas.draw()
 
- if _create_qApp.qAppCreatedHere:
- QtGui.qApp.exec_()
-
-
 def new_figure_manager( num, *args, **kwargs ):
 """
 Create a new figure manager instance
@@ -370,6 +362,9 @@
 'set the canvas size in pixels'
 self.window.resize(width, height)
 
+ def show(self):
+ self.window.show()
+
 def destroy( self, *args ):
 if self.window._destroying: return
 self.window._destroying = True
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py	2010年07月16日 18:45:49 UTC (rev 8561)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py	2010年07月16日 20:44:52 UTC (rev 8562)
@@ -18,9 +18,10 @@
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase
 from matplotlib.backend_bases import FigureManagerBase, FigureCanvasBase
 from matplotlib.backend_bases import NavigationToolbar2, cursors, TimerBase
+from matplotlib.backend_bases import ShowBase
+from matplotlib._pylab_helpers import Gcf
 
 from matplotlib.figure import Figure
-from matplotlib._pylab_helpers import Gcf
 
 from matplotlib.widgets import SubplotTool
 
@@ -63,22 +64,12 @@
 if figManager is not None:
 figManager.show()
 
-
-def show():
- """
- Show all figures.
-
- """
- for manager in Gcf.get_all_fig_managers():
- manager.show()
- try:
- if not show._needmain: # might have been added by ipython
- return
- except AttributeError:
- pass
- if not matplotlib.is_interactive():
+class Show(ShowBase):
+ def mainloop(self):
 Tk.mainloop()
 
+show = Show()
+
 def new_figure_manager(num, *args, **kwargs):
 """
 Create a new figure manager instance
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_wx.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_wx.py	2010年07月16日 18:45:49 UTC (rev 8561)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_wx.py	2010年07月16日 20:44:52 UTC (rev 8562)
@@ -24,6 +24,8 @@
 import sys, os, os.path, math, StringIO, weakref, warnings
 import numpy as np
 
+
+
 # Debugging settings here...
 # Debug level set here. If the debug level is less than 5, information
 # messages (progressively more info for lower value) are printed. In addition,
@@ -117,6 +119,8 @@
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
 FigureCanvasBase, FigureManagerBase, NavigationToolbar2, \
 cursors, TimerBase
+from matplotlib.backend_bases import ShowBase
+
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.artist import Artist
 from matplotlib.cbook import exception_to_str, is_string_like, is_writable_file_like
@@ -1394,24 +1398,16 @@
 if figManager is not None:
 figManager.canvas.draw_idle()
 
-def show():
- """
- Show all the figures and enter the wx main loop.
- This should be the last line of your script.
- """
- DEBUG_MSG("show()", 3, None)
+class Show(ShowBase):
+ def mainloop(self):
+ needmain = not wx.App.IsMainLoopRunning()
+ if needmain:
+ wxapp = wx.GetApp()
+ if wxapp is not None:
+ wxapp.MainLoop()
 
- for figwin in Gcf.get_all_fig_managers():
- figwin.frame.Show()
+show = Show()
 
- needmain = not wx.App.IsMainLoopRunning()
- if needmain and len(Gcf.get_all_fig_managers())>0:
- wxapp = wx.GetApp()
- if wxapp is not None:
- wxapp.MainLoop()
- # start the wxPython gui event if there is not already one running
-
-
 def new_figure_manager(num, *args, **kwargs):
 """
 Create a new figure manager instance
@@ -1555,6 +1551,8 @@
 # attach a show method to the figure
 self.canvas.figure.show = showfig
 
+ def show(self):
+ self.frame.Show()
 
 def destroy(self, *args):
 DEBUG_MSG("destroy()", 1, self)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8561
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8561&view=rev
Author: mdboom
Date: 2010年07月16日 18:45:49 +0000 (2010年7月16日)
Log Message:
-----------
Able to produce simple_plot.py!!!
Modified Paths:
--------------
 branches/py3k/examples/pylab_examples/simple_plot.py
 branches/py3k/lib/matplotlib/artist.py
 branches/py3k/lib/matplotlib/axes.py
 branches/py3k/lib/matplotlib/backends/backend_agg.py
 branches/py3k/lib/matplotlib/backends/tkagg.py
 branches/py3k/lib/matplotlib/docstring.py
 branches/py3k/lib/matplotlib/figure.py
 branches/py3k/lib/matplotlib/font_manager.py
 branches/py3k/lib/matplotlib/lines.py
 branches/py3k/lib/matplotlib/mlab.py
 branches/py3k/lib/matplotlib/patches.py
 branches/py3k/lib/matplotlib/text.py
 branches/py3k/setup.py
 branches/py3k/setupext.py
 branches/py3k/src/_backend_agg.cpp
 branches/py3k/src/_png.cpp
Removed Paths:
-------------
 branches/py3k/src/nxutils.c
Modified: branches/py3k/examples/pylab_examples/simple_plot.py
===================================================================
--- branches/py3k/examples/pylab_examples/simple_plot.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/examples/pylab_examples/simple_plot.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -8,4 +8,5 @@
 ylabel('voltage (mV)')
 title('About as simple as it gets, folks')
 grid(True)
+savefig("test.png")
 show()
Modified: branches/py3k/lib/matplotlib/artist.py
===================================================================
--- branches/py3k/lib/matplotlib/artist.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/lib/matplotlib/artist.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -481,7 +481,7 @@
 :class:`~matplotlib.transforms.Transform`) |
 :class:`~matplotlib.patches.Patch` | None ]
 """
- from patches import Patch, Rectangle
+ from matplotlib.patches import Patch, Rectangle
 
 success = False
 if transform is None:
Modified: branches/py3k/lib/matplotlib/axes.py
===================================================================
--- branches/py3k/lib/matplotlib/axes.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/lib/matplotlib/axes.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -1,5 +1,5 @@
 from __future__ import division, generators
-import math, sys, warnings, datetime, new
+import math, sys, warnings, datetime
 from operator import itemgetter
 import itertools
 
@@ -8400,9 +8400,15 @@
 
 new_class = _subplot_classes.get(axes_class)
 if new_class is None:
- new_class = new.classobj("%sSubplot" % (axes_class.__name__),
- (SubplotBase, axes_class),
- {'_axes_class': axes_class})
+ if sys.hexversion >= 0x03000000:
+ new_class = type("%sSubplot" % (axes_class.__name__),
+ (SubplotBase, axes_class),
+ {'_axes_class': axes_class})
+ else:
+ import new
+ new_class = new.classobj("%sSubplot" % (axes_class.__name__),
+ (SubplotBase, axes_class),
+ {'_axes_class': axes_class})
 _subplot_classes[axes_class] = new_class
 
 return new_class
Modified: branches/py3k/lib/matplotlib/backends/backend_agg.py
===================================================================
--- branches/py3k/lib/matplotlib/backends/backend_agg.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/lib/matplotlib/backends/backend_agg.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -35,7 +35,7 @@
 from matplotlib.path import Path
 from matplotlib.transforms import Bbox, BboxBase
 
-from _backend_agg import RendererAgg as _RendererAgg
+from matplotlib.backends._backend_agg import RendererAgg as _RendererAgg
 from matplotlib import _png
 
 backend_version = 'v2.2'
@@ -429,7 +429,7 @@
 original_dpi = renderer.dpi
 renderer.dpi = self.figure.dpi
 if is_string_like(filename_or_obj):
- filename_or_obj = file(filename_or_obj, 'wb')
+ filename_or_obj = open(filename_or_obj, 'wb')
 renderer._renderer.write_rgba(filename_or_obj)
 renderer.dpi = original_dpi
 print_rgba = print_raw
@@ -440,7 +440,7 @@
 original_dpi = renderer.dpi
 renderer.dpi = self.figure.dpi
 if is_string_like(filename_or_obj):
- filename_or_obj = file(filename_or_obj, 'wb')
+ filename_or_obj = open(filename_or_obj, 'wb')
 _png.write_png(renderer._renderer.buffer_rgba(0, 0),
 renderer.width, renderer.height,
 filename_or_obj, self.figure.dpi)
Modified: branches/py3k/lib/matplotlib/backends/tkagg.py
===================================================================
--- branches/py3k/lib/matplotlib/backends/tkagg.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/lib/matplotlib/backends/tkagg.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -1,4 +1,4 @@
-import _tkagg
+from matplotlib import _tkagg
 import Tkinter as Tk
 
 def blit(photoimage, aggimage, bbox=None, colormode=1):
Modified: branches/py3k/lib/matplotlib/docstring.py
===================================================================
--- branches/py3k/lib/matplotlib/docstring.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/lib/matplotlib/docstring.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -1,29 +1,31 @@
 from matplotlib import cbook
+import sys
+import types
 
 class Substitution(object):
 """
 A decorator to take a function's docstring and perform string
 substitution on it.
- 
+
 This decorator should be robust even if func.__doc__ is None
 (for example, if -OO was passed to the interpreter)
- 
+
 Usage: construct a docstring.Substitution with a sequence or
 dictionary suitable for performing substitution; then
 decorate a suitable function with the constructed object. e.g.
- 
+
 sub_author_name = Substitution(author='Jason')
- 
+
 @sub_author_name
 def some_function(x):
 "%(author)s wrote this function"
- 
+
 # note that some_function.__doc__ is now "Jason wrote this function"
- 
+
 One can also use positional arguments.
- 
+
 sub_first_last_names = Substitution('Edgar Allen', 'Poe')
- 
+
 @sub_first_last_names
 def some_function(x):
 "%s %s wrote the Raven"
@@ -56,16 +58,16 @@
 """
 A function decorator that will append an addendum to the docstring
 of the target function.
- 
+
 This decorator should be robust even if func.__doc__ is None
 (for example, if -OO was passed to the interpreter).
- 
+
 Usage: construct a docstring.Appender with a string to be joined to
 the original docstring. An optional 'join' parameter may be supplied
 which will be used to join the docstring and addendum. e.g.
- 
+
 add_copyright = Appender("Copyright (c) 2009", join='\n')
- 
+
 @add_copyright
 def my_dog(has='fleas'):
 "This docstring will have a copyright below"
@@ -100,6 +102,8 @@
 def dedent_interpd(func):
 """A special case of the interpd that first performs a dedent on
 the incoming docstring"""
+ if isinstance(func, types.MethodType) and sys.hexversion <= 0x03000000:
+ func = func.im_func
 return interpd(dedent(func))
 
 def copy_dedent(source):
Modified: branches/py3k/lib/matplotlib/figure.py
===================================================================
--- branches/py3k/lib/matplotlib/figure.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/lib/matplotlib/figure.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -17,7 +17,7 @@
 from artist import Artist, allow_rasterization
 from axes import Axes, SubplotBase, subplot_class_factory
 from cbook import flatten, allequal, Stack, iterable, is_string_like
-import _image
+from matplotlib import _image
 import colorbar as cbar
 from image import FigureImage
 from matplotlib import rcParams
Modified: branches/py3k/lib/matplotlib/font_manager.py
===================================================================
--- branches/py3k/lib/matplotlib/font_manager.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/lib/matplotlib/font_manager.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -235,13 +235,12 @@
 within them.
 """
 fontpaths = []
- def add(arg,directory,files):
- fontpaths.append(directory)
 
 for fontdir in OSXFontDirectories:
 try:
 if os.path.isdir(fontdir):
- os.path.walk(fontdir, add, None)
+ for root, dirs, files in os.walk(fontdir):
+ fontpaths.append(root)
 except (IOError, OSError, TypeError, ValueError):
 pass
 return fontpaths
@@ -274,13 +273,12 @@
 within them.
 """
 fontpaths = []
- def add(arg,directory,files):
- fontpaths.append(directory)
 
 for fontdir in X11FontDirectories:
 try:
 if os.path.isdir(fontdir):
- os.path.walk(fontdir, add, None)
+ for root, dirs, files in os.walk(fontdir):
+ fontpaths.append(root)
 except (IOError, OSError, TypeError, ValueError):
 pass
 return fontpaths
@@ -304,6 +302,7 @@
 return fontfiles
 
 if pipe.returncode == 0:
+ output = str(output)
 for line in output.split('\n'):
 fname = line.split(':')[0]
 if (os.path.splitext(fname)[1][1:] in fontext and
@@ -945,7 +944,8 @@
 Equivalent to pickle.dump(data, open(filename, 'w'))
 but closes the file to prevent filehandle leakage.
 """
- fh = open(filename, 'w')
+ fh = open(filename, 'wb')
+ print data
 try:
 pickle.dump(data, fh)
 finally:
@@ -956,7 +956,7 @@
 Equivalent to pickle.load(open(filename, 'r'))
 but closes the file to prevent filehandle leakage.
 """
- fh = open(filename, 'r')
+ fh = open(filename, 'rb')
 try:
 data = pickle.load(fh)
 finally:
@@ -975,7 +975,7 @@
 # Increment this version number whenever the font cache data
 # format or behavior has changed and requires a existing font
 # cache files to be rebuilt.
- __version__ = 7
+ __version__ = 8
 
 def __init__(self, size=None, weight='normal'):
 self._version = self.__version__
@@ -1317,7 +1317,10 @@
 return result
 
 else:
- _fmcache = os.path.join(get_configdir(), 'fontList.cache')
+ if sys.hexversion >= 0x03000000:
+ _fmcache = os.path.join(get_configdir(), 'fontList.py3k.cache')
+ else:
+ _fmcache = os.path.join(get_configdir(), 'fontList.py3k.cache')
 
 fontManager = None
 
Modified: branches/py3k/lib/matplotlib/lines.py
===================================================================
--- branches/py3k/lib/matplotlib/lines.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/lib/matplotlib/lines.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -1811,4 +1811,4 @@
 
 # You can not set the docstring of an instancemethod,
 # but you can on the underlying function. Go figure.
-docstring.dedent_interpd(Line2D.__init__.im_func)
+docstring.dedent_interpd(Line2D.__init__)
Modified: branches/py3k/lib/matplotlib/mlab.py
===================================================================
--- branches/py3k/lib/matplotlib/mlab.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/lib/matplotlib/mlab.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -148,7 +148,6 @@
 ma = np.ma
 from matplotlib import verbose
 
-import matplotlib.nxutils as nxutils
 import matplotlib.cbook as cbook
 from matplotlib import docstring
 
@@ -2965,6 +2964,7 @@
 Return value is a sequence of indices into points for the points
 that are inside the polygon.
 """
+ # PY3KTODO: Reimplement in terms of _path module
 res, = np.nonzero(nxutils.points_inside_poly(points, verts))
 return res
 
Modified: branches/py3k/lib/matplotlib/patches.py
===================================================================
--- branches/py3k/lib/matplotlib/patches.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/lib/matplotlib/patches.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -401,7 +401,7 @@
 docstring.interpd.update({k:patchdoc})
 
 # define Patch.__init__ docstring after the class has been added to interpd
-docstring.dedent_interpd(Patch.__init__.im_func)
+docstring.dedent_interpd(Patch.__init__)
 
 class Shadow(Patch):
 def __str__(self):
Modified: branches/py3k/lib/matplotlib/text.py
===================================================================
--- branches/py3k/lib/matplotlib/text.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/lib/matplotlib/text.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -22,8 +22,6 @@
 
 from matplotlib.artist import allow_rasterization
 
-import matplotlib.nxutils as nxutils
-
 from matplotlib.path import Path
 import matplotlib.font_manager as font_manager
 from matplotlib.ft2font import FT2Font
@@ -210,12 +208,9 @@
 
 r = l+w
 t = b+h
- xyverts = (l,b), (l, t), (r, t), (r, b)
 x, y = mouseevent.x, mouseevent.y
- inside = nxutils.pnpoly(x, y, xyverts)
+ return x >= l and x <= r and y >= t and y <= b
 
- return inside,{}
-
 def _get_xy_display(self):
 'get the (possibly unit converted) transformed x, y in display coords'
 x, y = self.get_position()
@@ -997,7 +992,7 @@
 self.set_fontproperties(fp)
 
 docstring.interpd.update(Text = artist.kwdoc(Text))
-docstring.dedent_interpd(Text.__init__.im_func)
+docstring.dedent_interpd(Text.__init__)
 
 
 class TextWithDash(Text):
Modified: branches/py3k/setup.py
===================================================================
--- branches/py3k/setup.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/setup.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -39,7 +39,7 @@
 from distutils.command.build_py import build_py
 from setupext import build_agg, build_gtkagg, build_tkagg, build_wxagg,\
 build_macosx, build_ft2font, build_image, build_windowing, build_path, \
- build_contour, build_delaunay, build_nxutils, build_gdk, \
+ build_contour, build_delaunay, build_gdk, \
 build_ttconv, print_line, print_status, print_message, \
 print_raw, check_for_freetype, check_for_libpng, check_for_gtk, \
 check_for_tk, check_for_wx, check_for_macosx, check_for_numpy, \
@@ -136,7 +136,6 @@
 build_ttconv(ext_modules, packages)
 build_contour(ext_modules, packages)
 build_delaunay(ext_modules, packages)
-build_nxutils(ext_modules, packages)
 build_path(ext_modules, packages)
 build_tri(ext_modules, packages)
 
Modified: branches/py3k/setupext.py
===================================================================
--- branches/py3k/setupext.py	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/setupext.py	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -106,7 +106,6 @@
 BUILT_WINDOWING = False
 BUILT_CONTOUR = False
 BUILT_DELAUNAY = False
-BUILT_NXUTILS = False
 BUILT_CONTOUR = False
 BUILT_GDK = False
 BUILT_PATH = False
@@ -1394,22 +1393,6 @@
 BUILT_CONTOUR = True
 
 
-def build_nxutils(ext_modules, packages):
- global BUILT_NXUTILS
- if BUILT_NXUTILS: return # only build it if you you haven't already
- module = Extension(
- 'matplotlib.nxutils',
- [ 'src/nxutils.c'],
- include_dirs=numpy_inc_dirs,
- define_macros=defines
- )
- add_numpy_flags(module)
- add_base_flags(module)
- ext_modules.append(module)
-
- BUILT_NXUTILS = True
-
-
 def build_gdk(ext_modules, packages):
 global BUILT_GDK
 if BUILT_GDK: return # only build it if you you haven't already
Modified: branches/py3k/src/_backend_agg.cpp
===================================================================
--- branches/py3k/src/_backend_agg.cpp	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/src/_backend_agg.cpp	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -1743,16 +1743,16 @@
 
 //segments, trans, clipbox, colors, linewidths, antialiaseds
 GCAgg gc(args[0], dpi);
- agg::trans_affine master_transform = py_to_agg_transformation_matrix(args[1].ptr());
- size_t mesh_width = Py::Int(args[2]);
- size_t mesh_height = Py::Int(args[3]);
- Py::Object coordinates = args[4];
- Py::Object offsets_obj = args[5];
- agg::trans_affine offset_trans = py_to_agg_transformation_matrix(args[6].ptr());
- Py::Object facecolors_obj = args[7];
- bool antialiased = Py::Boolean(args[8]);
- bool showedges = Py::Boolean(args[9]);
- bool free_edgecolors = false;
+ agg::trans_affine master_transform = py_to_agg_transformation_matrix(args[1].ptr());
+ size_t mesh_width = Py::Int(args[2]);
+ size_t mesh_height = Py::Int(args[3]);
+ Py::Object coordinates = args[4];
+ Py::Object offsets_obj = args[5];
+ agg::trans_affine offset_trans = py_to_agg_transformation_matrix(args[6].ptr());
+ Py::Object facecolors_obj = args[7];
+ bool antialiased = Py::Boolean(args[8]);
+ bool showedges = Py::Boolean(args[9]);
+ bool free_edgecolors = false;
 
 QuadMeshGenerator path_generator(mesh_width, mesh_height, coordinates.ptr());
 
Modified: branches/py3k/src/_png.cpp
===================================================================
--- branches/py3k/src/_png.cpp	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/src/_png.cpp	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -199,24 +199,30 @@
 }
 catch (...)
 {
+ if (png_ptr && info_ptr)
+ {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ }
+ delete [] row_pointers;
 if (fp && close_file)
 {
 fclose(fp);
 }
- delete [] row_pointers;
 /* Changed calls to png_destroy_write_struct to follow
 http://www.libpng.org/pub/png/libpng-manual.txt.
 This ensures the info_ptr memory is released.
 */
- if (png_ptr && info_ptr)
- {
- png_destroy_write_struct(&png_ptr, &info_ptr);
- }
 throw;
 }
 
 png_destroy_write_struct(&png_ptr, &info_ptr);
 delete [] row_pointers;
+#if PY_MAJOR_VERSION >= 3
+ if (fp)
+ {
+ fflush(fp);
+ }
+#endif
 if (fp && close_file)
 {
 fclose(fp);
Deleted: branches/py3k/src/nxutils.c
===================================================================
--- branches/py3k/src/nxutils.c	2010年07月16日 13:55:35 UTC (rev 8560)
+++ branches/py3k/src/nxutils.c	2010年07月16日 18:45:49 UTC (rev 8561)
@@ -1,252 +0,0 @@
-#include <Python.h>
-#include "structmember.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "numpy/arrayobject.h"
-
-
-/*
- pnpoly license
- Copyright (c) 1970-2003, Wm. Randolph Franklin
-
- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
- 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers.
- 2. Redistributions in binary form must reproduce the above copyright notice in the documentation and/or other materials provided with the distribution.
- 3. The name of W. Randolph Franklin may not be used to endorse or promote products derived from this Software without specific prior written permission.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-int pnpoly_api(int npol, double *xp, double *yp, double x, double y)
-{
- int i, j, c = 0;
- for (i = 0, j = npol-1; i < npol; j = i++) {
- if ((((yp[i]<=y) && (y<yp[j])) ||
- ((yp[j]<=y) && (y<yp[i]))) &&
- (x < (xp[j] - xp[i]) * (y - yp[i]) / (yp[j] - yp[i]) + xp[i]))
-
- c = !c;
- }
- return c;
-}
-
-
-static PyObject *
-pnpoly(PyObject *self, PyObject *args)
-{
- int npol, i;
- double x, y;
- double *xv, *yv;
- int b;
- PyObject *vertsarg;
- PyArrayObject *verts;
- if (! PyArg_ParseTuple(args, "ddO", &x, &y, &vertsarg))
- return NULL;
-
- verts = (PyArrayObject *) PyArray_FromObject(vertsarg,NPY_DOUBLE, 2, 2);
-
- if (verts == NULL)
- {
- PyErr_SetString(PyExc_ValueError,
- "Arguments verts must be a Nx2 array.");
- Py_XDECREF(verts);
- return NULL;
-
- }
-
- npol = verts->dimensions[0];
- //printf ("found %d verts\n", npol);
- if (verts->dimensions[1]!=2)
- {
- PyErr_SetString(PyExc_ValueError,
- "Arguments verts must be a Nx2 array.");
- Py_XDECREF(verts);
- return NULL;
-
- }
-
-
- xv = (double *) PyMem_Malloc(sizeof(double) * npol);
- if (xv == NULL)
- {
- Py_XDECREF(verts);
- return NULL;
- }
-
- yv = (double *) PyMem_Malloc(sizeof(double) * npol);
- if (yv == NULL)
- {
- Py_XDECREF(verts);
- PyMem_Free(xv);
- return NULL;
- }
-
- for (i=0; i<npol; ++i) {
- xv[i] = *(double *)(verts->data + i*verts->strides[0]);
- yv[i] = *(double *)(verts->data + i*verts->strides[0] + verts->strides[1]);
- //printf("adding vert: %1.3f, %1.3f\n", xv[i], yv[i]);
- }
-
- b = pnpoly_api(npol, xv, yv, x, y);
- //printf("in poly %d\n", b);
-
- Py_XDECREF(verts);
- PyMem_Free(xv);
- PyMem_Free(yv);
- return Py_BuildValue("i", b);
-
-}
-
-static PyObject *
-points_inside_poly(PyObject *self, PyObject *args)
-{
- int npol, npoints, i;
- double *xv, *yv, x, y;
- int b;
- PyObject *xypointsarg, *vertsarg, *ret;
- PyArrayObject *xypoints, *verts;
- PyArrayObject *mask;
- npy_intp dimensions[1];
-
- if (! PyArg_ParseTuple(args, "OO", &xypointsarg, &vertsarg))
- return NULL;
-
- verts = (PyArrayObject *) PyArray_FromObject(vertsarg, NPY_DOUBLE, 2, 2);
-
- if (verts == NULL)
- {
- PyErr_SetString(PyExc_ValueError,
- "Argument verts must be a Nx2 array.");
- Py_XDECREF(verts);
- return NULL;
-
- }
-
- npol = verts->dimensions[0];
- //printf ("found %d verts\n", npol);
- if (verts->dimensions[1]!=2)
- {
- PyErr_SetString(PyExc_ValueError,
- "Arguments verts must be a Nx2 array.");
- Py_XDECREF(verts);
- return NULL;
-
- }
-
-
- xv = (double *) PyMem_Malloc(sizeof(double) * npol);
- if (xv == NULL)
- {
- Py_XDECREF(verts);
- return NULL;
- }
-
- yv = (double *) PyMem_Malloc(sizeof(double) * npol);
- if (yv == NULL)
- {
- Py_XDECREF(verts);
- PyMem_Free(xv);
- return NULL;
- }
-
- // fill the verts arrays
- for (i=0; i<npol; ++i) {
- xv[i] = *(double *)(verts->data + i*verts->strides[0]);
- yv[i] = *(double *)(verts->data + i*verts->strides[0] + verts->strides[1]);
- //printf("adding vert: %1.3f, %1.3f\n", xv[i], yv[i]);
- }
-
- xypoints = (PyArrayObject *) PyArray_FromObject(xypointsarg, NPY_DOUBLE, 2, 2);
-
- if (xypoints == NULL)
- {
- PyErr_SetString(PyExc_ValueError,
- "Arguments xypoints must an Nx2 array.");
- Py_XDECREF(verts);
- Py_XDECREF(xypoints);
- PyMem_Free(xv);
- PyMem_Free(yv);
- return NULL;
-
- }
-
- if (xypoints->dimensions[1]!=2)
- {
- PyErr_SetString(PyExc_ValueError,
- "Arguments xypoints must be a Nx2 array.");
-
- Py_XDECREF(verts);
- Py_XDECREF(xypoints);
- PyMem_Free(xv);
- PyMem_Free(yv);
- return NULL;
- }
-
- npoints = xypoints->dimensions[0];
- dimensions[0] = npoints;
-
- mask = (PyArrayObject *)PyArray_SimpleNew(1,dimensions, NPY_BOOL);
- if (mask==NULL) {
- Py_XDECREF(verts);
- Py_XDECREF(xypoints);
- PyMem_Free(xv);
- PyMem_Free(yv);
- return NULL; }
-
- for (i=0; i<npoints; ++i) {
- x = *(double *)(xypoints->data + i*xypoints->strides[0]);
- y = *(double *)(xypoints->data + i*xypoints->strides[0] + xypoints->strides[1]);
- b = pnpoly_api(npol, xv, yv, x, y);
- //printf("checking %d, %d, %1.3f, %1.3f, %d\n", npol, npoints, x, y, b);
- *(char *)(mask->data + i*mask->strides[0]) = b;
-
- }
-
-
- Py_XDECREF(verts);
- Py_XDECREF(xypoints);
-
- PyMem_Free(xv);
- PyMem_Free(yv);
- ret = Py_BuildValue("O", mask);
- Py_XDECREF(mask);
- return ret;
-
-
-}
-
-static PyMethodDef module_methods[] = {
- {"pnpoly", pnpoly, METH_VARARGS,
- "inside = pnpoly(x, y, xyverts)\n\n"
- "Return 1 if x,y is inside the polygon, 0 otherwise.\n\n"
- "*xyverts*\n a sequence of x,y vertices.\n\n"
- "A point on the boundary may be treated as inside or outside.\n"
- "See `pnpoly <http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html>`_"},
- {"points_inside_poly", points_inside_poly, METH_VARARGS,
- "mask = points_inside_poly(xypoints, xyverts)\n\n"
- "Return a boolean ndarray, True for points inside the polygon.\n\n"
- "*xypoints*\n a sequence of N x,y pairs.\n"
- "*xyverts*\n sequence of x,y vertices of the polygon.\n"
- "*mask* an ndarray of length N.\n\n"
- "A point on the boundary may be treated as inside or outside.\n"
- "See `pnpoly <http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html>`_\n"},
- {NULL} /* Sentinel */
-};
-
-PyMODINIT_FUNC
-initnxutils(void)
-{
- PyObject* m;
-
- m = Py_InitModule3("nxutils", module_methods,
- "general purpose numerical utilities, eg for computational geometry, that are not available in `numpy <http://numpy.scipy.org>`_");
-
- if (m == NULL)
- return;
-
- import_array();
-}
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8560
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8560&view=rev
Author: ianthomas23
Date: 2010年07月16日 13:55:35 +0000 (2010年7月16日)
Log Message:
-----------
Merged revisions 8559 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8559 | ianthomas23 | 2010年07月16日 14:46:14 +0100 (2010年7月16日) | 2 lines
 
 Added tri* functions to pyplot docs.
........
Modified Paths:
--------------
 trunk/matplotlib/doc/_templates/index.html
 trunk/matplotlib/doc/api/api_changes.rst
 trunk/matplotlib/lib/matplotlib/pylab.py
 trunk/matplotlib/lib/matplotlib/tri/tricontour.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_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8557 /trunk/matplotlib:1-7315
 + /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8559
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559
Modified: trunk/matplotlib/doc/_templates/index.html
===================================================================
--- trunk/matplotlib/doc/_templates/index.html	2010年07月16日 13:46:14 UTC (rev 8559)
+++ trunk/matplotlib/doc/_templates/index.html	2010年07月16日 13:55:35 UTC (rev 8560)
@@ -994,7 +994,6 @@
 </td>
 
 </tr>
-
 <tr>
 <th align="left">
 <a href="api/pyplot_api.html#matplotlib.pyplot.title">title</a>
@@ -1008,6 +1007,50 @@
 </tr>
 <tr>
 <th align="left">
+ <a href="api/pyplot_api.html#matplotlib.pyplot.tricontour">tricontour</a>
+
+ </th>
+
+ <td align="left">
+ make a contour plot on a triangular grid
+ </td>
+
+ </tr>
+ <tr>
+ <th align="left">
+ <a href="api/pyplot_api.html#matplotlib.pyplot.tricontourf">tricontourf</a>
+
+ </th>
+
+ <td align="left">
+ make a filled contour plot on a triangular grid
+ </td>
+
+ </tr>
+ <tr>
+ <th align="left">
+ <a href="api/pyplot_api.html#matplotlib.pyplot.tripcolor">tripcolor</a>
+
+ </th>
+
+ <td align="left">
+ make a pseudocolor plot on a triangular grid
+ </td>
+
+ </tr>
+ <tr>
+ <th align="left">
+ <a href="api/pyplot_api.html#matplotlib.pyplot.triplot">triplot</a>
+
+ </th>
+
+ <td align="left">
+ plot a triangular grid
+ </td>
+
+ </tr>
+ <tr>
+ <th align="left">
 <a href="api/pyplot_api.html#matplotlib.pyplot.xcorr">xcorr</a>
 
 </th>
Modified: trunk/matplotlib/doc/api/api_changes.rst
===================================================================
--- trunk/matplotlib/doc/api/api_changes.rst	2010年07月16日 13:46:14 UTC (rev 8559)
+++ trunk/matplotlib/doc/api/api_changes.rst	2010年07月16日 13:55:35 UTC (rev 8560)
@@ -117,6 +117,21 @@
 
 draw_image(self, gc, x, y, im)
 
+* There are four new Axes methods with corresponding pyplot
+ functions that deal with unstructured triangular grids:
+
+ + :meth:`matplotlib.axes.Axes.tricontour` draws contour lines
+ on a triangular grid.
+
+ + :meth:`matplotlib.axes.Axes.tricontourf` draws filled contours
+ on a triangular grid.
+
+ + :meth:`matplotlib.axes.Axes.tripcolor` draws a pseudocolor
+ plot on a triangular grid.
+
+ + :meth:`matplotlib.axes.Axes.triplot` draws a triangular grid
+ as lines and/or markers.
+
 Changes in 0.99
 ======================
 
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559
Modified: trunk/matplotlib/lib/matplotlib/pylab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pylab.py	2010年07月16日 13:46:14 UTC (rev 8559)
+++ trunk/matplotlib/lib/matplotlib/pylab.py	2010年07月16日 13:55:35 UTC (rev 8560)
@@ -92,6 +92,10 @@
 tick_params - control the appearance of ticks and tick labels
 ticklabel_format - control the format of tick labels
 title - add a title to the current axes
+ tricontour - make a contour plot on a triangular grid
+ tricontourf - make a filled contour plot on a triangular grid
+ tripcolor - make a pseudocolor plot on a triangular grid
+ triplot - plot a triangular grid
 xcorr - plot the autocorrelation function of x and y
 xlim - set/get the xlimits
 ylim - set/get the ylimits
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559
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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557
 + /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:7323-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,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559
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:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557
 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559
Modified: trunk/matplotlib/lib/matplotlib/tri/tricontour.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tri/tricontour.py	2010年07月16日 13:46:14 UTC (rev 8559)
+++ trunk/matplotlib/lib/matplotlib/tri/tricontour.py	2010年07月16日 13:55:35 UTC (rev 8560)
@@ -93,7 +93,8 @@
 tricontour_doc = """
 :func:`~matplotlib.pyplot.tricontour` and
 :func:`~matplotlib.pyplot.tricontourf` draw contour lines and
- filled contours, respectively. Except as noted, function
+ filled contours, respectively, on an unstructured triangular
+ grid. Except as noted, function
 signatures and return values are the same for both versions.
 
 The triangulation can be specified in one of two ways; either::
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8559
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8559&view=rev
Author: ianthomas23
Date: 2010年07月16日 13:46:14 +0000 (2010年7月16日)
Log Message:
-----------
Added tri* functions to pyplot docs.
Modified Paths:
--------------
 branches/v1_0_maint/doc/_templates/index.html
 branches/v1_0_maint/doc/api/api_changes.rst
 branches/v1_0_maint/lib/matplotlib/pylab.py
 branches/v1_0_maint/lib/matplotlib/tri/tricontour.py
Modified: branches/v1_0_maint/doc/_templates/index.html
===================================================================
--- branches/v1_0_maint/doc/_templates/index.html	2010年07月15日 20:47:28 UTC (rev 8558)
+++ branches/v1_0_maint/doc/_templates/index.html	2010年07月16日 13:46:14 UTC (rev 8559)
@@ -994,7 +994,6 @@
 </td>
 
 </tr>
-
 <tr>
 <th align="left">
 <a href="api/pyplot_api.html#matplotlib.pyplot.title">title</a>
@@ -1008,6 +1007,50 @@
 </tr>
 <tr>
 <th align="left">
+ <a href="api/pyplot_api.html#matplotlib.pyplot.tricontour">tricontour</a>
+
+ </th>
+
+ <td align="left">
+ make a contour plot on a triangular grid
+ </td>
+
+ </tr>
+ <tr>
+ <th align="left">
+ <a href="api/pyplot_api.html#matplotlib.pyplot.tricontourf">tricontourf</a>
+
+ </th>
+
+ <td align="left">
+ make a filled contour plot on a triangular grid
+ </td>
+
+ </tr>
+ <tr>
+ <th align="left">
+ <a href="api/pyplot_api.html#matplotlib.pyplot.tripcolor">tripcolor</a>
+
+ </th>
+
+ <td align="left">
+ make a pseudocolor plot on a triangular grid
+ </td>
+
+ </tr>
+ <tr>
+ <th align="left">
+ <a href="api/pyplot_api.html#matplotlib.pyplot.triplot">triplot</a>
+
+ </th>
+
+ <td align="left">
+ plot a triangular grid
+ </td>
+
+ </tr>
+ <tr>
+ <th align="left">
 <a href="api/pyplot_api.html#matplotlib.pyplot.xcorr">xcorr</a>
 
 </th>
Modified: branches/v1_0_maint/doc/api/api_changes.rst
===================================================================
--- branches/v1_0_maint/doc/api/api_changes.rst	2010年07月15日 20:47:28 UTC (rev 8558)
+++ branches/v1_0_maint/doc/api/api_changes.rst	2010年07月16日 13:46:14 UTC (rev 8559)
@@ -117,6 +117,21 @@
 
 draw_image(self, gc, x, y, im)
 
+* There are four new Axes methods with corresponding pyplot
+ functions that deal with unstructured triangular grids:
+
+ + :meth:`matplotlib.axes.Axes.tricontour` draws contour lines
+ on a triangular grid.
+
+ + :meth:`matplotlib.axes.Axes.tricontourf` draws filled contours
+ on a triangular grid.
+
+ + :meth:`matplotlib.axes.Axes.tripcolor` draws a pseudocolor
+ plot on a triangular grid.
+
+ + :meth:`matplotlib.axes.Axes.triplot` draws a triangular grid
+ as lines and/or markers.
+
 Changes in 0.99
 ======================
 
Modified: branches/v1_0_maint/lib/matplotlib/pylab.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/pylab.py	2010年07月15日 20:47:28 UTC (rev 8558)
+++ branches/v1_0_maint/lib/matplotlib/pylab.py	2010年07月16日 13:46:14 UTC (rev 8559)
@@ -92,6 +92,10 @@
 tick_params - control the appearance of ticks and tick labels
 ticklabel_format - control the format of tick labels
 title - add a title to the current axes
+ tricontour - make a contour plot on a triangular grid
+ tricontourf - make a filled contour plot on a triangular grid
+ tripcolor - make a pseudocolor plot on a triangular grid
+ triplot - plot a triangular grid
 xcorr - plot the autocorrelation function of x and y
 xlim - set/get the xlimits
 ylim - set/get the ylimits
Modified: branches/v1_0_maint/lib/matplotlib/tri/tricontour.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/tri/tricontour.py	2010年07月15日 20:47:28 UTC (rev 8558)
+++ branches/v1_0_maint/lib/matplotlib/tri/tricontour.py	2010年07月16日 13:46:14 UTC (rev 8559)
@@ -93,7 +93,8 @@
 tricontour_doc = """
 :func:`~matplotlib.pyplot.tricontour` and
 :func:`~matplotlib.pyplot.tricontourf` draw contour lines and
- filled contours, respectively. Except as noted, function
+ filled contours, respectively, on an unstructured triangular
+ grid. Except as noted, function
 signatures and return values are the same for both versions.
 
 The triangulation can be specified in one of two ways; either::
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.