Revision: 6961
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6961&view=rev
Author: efiring
Date: 2009-03-07 19:32:39 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
Merged revisions 6960 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint
........
r6960 | efiring | 2009-03-07 09:19:40 -1000 (Sat, 07 Mar 2009) | 4 lines
Remove references to handle graphics;
it is registered trademark of Mathworks, and the pyplot resemblance
is only superficial.
........
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/index.html
trunk/matplotlib/doc/pyplots/tex_demo.png
trunk/matplotlib/doc/users/pyplot_tutorial.rst
trunk/matplotlib/examples/pylab_examples/axes_props.py
trunk/matplotlib/lib/matplotlib/pylab.py
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/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6952
+ /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6960
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
+ /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
Modified: trunk/matplotlib/doc/_templates/index.html
===================================================================
--- trunk/matplotlib/doc/_templates/index.html 2009-03-07 19:19:40 UTC (rev
6960)
+++ trunk/matplotlib/doc/_templates/index.html 2009-03-07 19:32:39 UTC (rev
6961)
@@ -35,7 +35,7 @@
<p>For the power user, you have full control of line styles, font
properties, axes properties, etc, via an object oriented interface
- or via a handle graphics interface familiar to Matlab® users.
+ or via a set of functions familiar to Matlab® users.
The pylab mode provides all of the <a href="api/pyplot_api.html">pyplot</a>
plotting
functions listed below, as well as non-plotting functions from
<a href="http://scipy.org/Numpy_Example_List_With_Doc";>numpy</a> and
@@ -473,7 +473,7 @@
</th>
<td align="left">
- get a handle graphics property
+ get a graphics property
</td>
</tr>
@@ -792,7 +792,7 @@
</th>
<td align="left">
- set a handle graphics property
+ set a graphics property
</td>
</tr>
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
+
/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
Modified: trunk/matplotlib/doc/pyplots/tex_demo.png
===================================================================
(Binary files differ)
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
+ /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
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
+ /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
Modified: trunk/matplotlib/doc/users/pyplot_tutorial.rst
===================================================================
--- trunk/matplotlib/doc/users/pyplot_tutorial.rst 2009-03-07 19:19:40 UTC
(rev 6960)
+++ trunk/matplotlib/doc/users/pyplot_tutorial.rst 2009-03-07 19:32:39 UTC
(rev 6961)
@@ -78,10 +78,10 @@
line.set_antialiased(False) # turn off antialising
* Use the :func:`~matplotlib.pyplot.setp` command. The example below
- uses matlab handle graphics style command to set multiple properties
+ uses a Matlab-style command to set multiple properties
on a list of lines. ``setp`` works transparently with a list of objects
or a single object. You can either use python keyword arguments or
- matlab-style string/value pairs::
+ Matlab-style string/value pairs::
lines = plt.plot(x1, y1, x2, y2)
# use keyword args
Modified: trunk/matplotlib/examples/pylab_examples/axes_props.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/axes_props.py 2009-03-07
19:19:40 UTC (rev 6960)
+++ trunk/matplotlib/examples/pylab_examples/axes_props.py 2009-03-07
19:32:39 UTC (rev 6961)
@@ -10,7 +10,7 @@
plot(t, s)
grid(True)
-# matlab handle graphics style
+# matlab style
xticklines = getp(gca(), 'xticklines')
yticklines = getp(gca(), 'yticklines')
xgridlines = getp(gca(), 'xgridlines')
Modified: trunk/matplotlib/lib/matplotlib/pylab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pylab.py 2009-03-07 19:19:40 UTC (rev
6960)
+++ trunk/matplotlib/lib/matplotlib/pylab.py 2009-03-07 19:32:39 UTC (rev
6961)
@@ -42,7 +42,7 @@
gca - return the current axes
gcf - return the current figure
gci - get the current image, or None
- getp - get a handle graphics property
+ getp - get a graphics property
grid - set whether gridding is on
hist - make a histogram
hold - set the axes hold state
@@ -70,7 +70,7 @@
rgrids - customize the radial grids and labels for polar
savefig - save the current figure
scatter - make a scatter plot
- setp - set a handle graphics property
+ setp - set a graphics property
semilogx - log x axis
semilogy - log y axis
show - show the figures
Modified: trunk/matplotlib/lib/matplotlib/pyplot.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pyplot.py 2009-03-07 19:19:40 UTC (rev
6960)
+++ trunk/matplotlib/lib/matplotlib/pyplot.py 2009-03-07 19:32:39 UTC (rev
6961)
@@ -194,7 +194,7 @@
*number* attribute holding this number.
If *num* is an integer, and ``figure(num)`` already exists, make it
- active and return the handle to it. If ``figure(num)`` does not exist
+ active and return a reference to it. If ``figure(num)`` does not exist
it will be created. Numbering starts at 1, matlab style::
figure(1)
@@ -265,7 +265,7 @@
return figManager.canvas.figure
def gcf():
- "Return a handle to the current figure."
+ "Return a reference to the current figure."
figManager = _pylab_helpers.Gcf.get_active()
if figManager is not None:
@@ -1177,7 +1177,7 @@
gca return the current axes
gcf return the current figure
gci get the current image, or None
- getp get a handle graphics property
+ getp get a graphics property
hist make a histogram
hold set the hold state on current axes
legend add a legend to the axes
@@ -1194,7 +1194,7 @@
rc control the default params
savefig save the current figure
scatter make a scatter plot
- setp set a handle graphics property
+ setp set a graphics property
semilogx log x axis
semilogy log y axis
show show the figures
@@ -1241,7 +1241,7 @@
def colors():
"""
- This is a do nothing function to provide you with help on how
+ This is a do-nothing function to provide you with help on how
matplotlib handles colors.
Commands which take color arguments can use several formats to
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
+ /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
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
+ /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
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
+ /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
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
