Revision: 6553
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6553&view=rev
Author: jdh2358
Date: 2008-12-10 21:02:44 +0000 (Wed, 10 Dec 2008)
Log Message:
-----------
added some docs for linestyles and markers
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
trunk/matplotlib/doc/matplotlibrc
trunk/matplotlib/doc/pyplots/whats_new_98_4_legend.py
trunk/matplotlib/lib/matplotlib/lines.py
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2008-12-10 17:29:21 UTC (rev
6552)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2008-12-10 21:02:44 UTC (rev
6553)
@@ -62,45 +62,12 @@
:file:`MANIFEST.in`. This file determines what goes into the source
distribution of the mpl build.
-* Keep the maintenance branch and trunk in sync where it makes sense.
- If there is a bug on both that needs fixing, use `svnmerge.py
+* Keep the maintenance branch (0.91) the latest release branch (eg
+ 0.98.4) and trunk in sync where it makes sense. If there is a bug
+ on both that needs fixing, use `svnmerge.py
<http://www.orcaware.com/svn/wiki/Svnmerge.py>`_ to keep them in
- sync. The basic procedure is:
+ sync. See :ref:`svn-merge` below.
- * install ``svnmerge.py`` in your PATH::
-
- > wget http://svn.collab.net/repos/svn/trunk/contrib/client-side/\
- svnmerge/svnmerge.py
-
- * get a svn copy of the maintenance branch and the trunk (see above)
-
- * Michael advises making the change on the branch and committing
- it. Make sure you svn upped on the trunk and have no local
- modifications, and then from the svn trunk do::
-
- > svnmerge.py merge
-
- If you wish to merge only specific revisions (in an unusual
- situation), do::
-
- > svnmerge.py merge -rNNN1-NNN2
-
- where the ``NNN`` are the revision numbers. Ranges are also
- acceptable.
-
- The merge may have found some conflicts (code that must be
- manually resolved). Correct those conflicts, build matplotlib and
- test your choices. If you have resolved any conflicts, you can
- let svn clean up the conflict files for you::
-
- > svn -R resolved .
-
- ``svnmerge.py`` automatically creates a file containing the commit
- messages, so you are ready to make the commit::
-
- > svn commit -F svnmerge-commit-message.txt
-
-
.. _style-guide:
Style guide
@@ -385,10 +352,84 @@
> python simple_plot.py -d module://my_backend
+.. _svn-merge:
+Using svn-merge
+================
+The basic procedure is:
+* install ``svnmerge.py`` in your PATH::
+ > wget http://svn.collab.net/repos/svn/trunk/contrib/client-side/\
+ svnmerge/svnmerge.py
+
+* get a svn copy of the maintenance branch and the trunk (see above)
+
+* Michael advises making the change on the branch and committing it.
+ Make sure you svn upped on the trunk and have no local
+ modifications, and then from the svn trunk do::
+
+ svnmerge.py merge
+
+ If you wish to merge only specific revisions (in an unusual
+ situation), do::
+
+ > svnmerge.py merge -rNNN1-NNN2
+
+ where the ``NNN`` are the revision numbers. Ranges are also
+ acceptable.
+
+ The merge may have found some conflicts (code that must be manually
+ resolved). Correct those conflicts, build matplotlib and test your
+ choices. If you have resolved any conflicts, you can let svn clean
+ up the conflict files for you::
+
+ > svn -R resolved .
+
+ ``svnmerge.py`` automatically creates a file containing the commit
+ messages, so you are ready to make the commit::
+
+ > svn commit -F svnmerge-commit-message.txt
+
+
+* You can add a new branch for the trunk to "track" using
+ "svnmerge.py init", e.g., from a working copy of the trunk::
+
+ > svnmerge.py init
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_4_maint
+ property 'svnmerge-integrated' set on '.'
+
+ After doing a "svn commit" on this, this merge tracking is available
+ to everyone, so there's no need for anyone else to do the "svnmerge
+ init". I'll go ahead and commit this now.
+
+ Now, the trunk is tracking two branches for merges, 0.91.x and
+ 0.98.4. This means that when doing a merge, one must manually
+ specify which branch to merge from using the "-S" parameter. You
+ can see which branches are available for merge using "svnmerge.py
+ avail"::
+
+ > svnmerge.py avail
+ svnmerge: multiple sources found. Explicit source argument
(-S/--source) required.
+ The merge sources available are:
+ /branches/v0_91_maint
+ /branches/v0_98_4_maint
+
+ So to merge from 0.98.4, one would type::
+
+ > svnmerge.py --source v0_98_4_maint merge
+
+ (rather than the "svnmerge.py merge" we used to do).
+
+* The tracking for 0.98.4 can be removed with the "svnmerge.py
+ uninit" command, e.g.::
+
+ > svnmerge.py --source v0_9_4_maint uninit
+
+ This will make merging slightly easier, (since the -S parameter is
+ not required), and it is generally good practice in the long run to
+ not keep extra branches lying around.
+
.. _license-discussion:
Licenses
Modified: trunk/matplotlib/doc/matplotlibrc
===================================================================
--- trunk/matplotlib/doc/matplotlibrc 2008-12-10 17:29:21 UTC (rev 6552)
+++ trunk/matplotlib/doc/matplotlibrc 2008-12-10 21:02:44 UTC (rev 6553)
@@ -43,7 +43,7 @@
### LINES
# See http://matplotlib.sourceforge.net/matplotlib.lines.html for more
# information on line properties.
-#lines.linewidth : 1.0 # line width in points
+lines.linewidth : 1.5 # line width in points
#lines.linestyle : - # solid line
#lines.color : blue
#lines.marker : None # the default marker
Modified: trunk/matplotlib/doc/pyplots/whats_new_98_4_legend.py
===================================================================
--- trunk/matplotlib/doc/pyplots/whats_new_98_4_legend.py 2008-12-10
17:29:21 UTC (rev 6552)
+++ trunk/matplotlib/doc/pyplots/whats_new_98_4_legend.py 2008-12-10
21:02:44 UTC (rev 6553)
@@ -4,12 +4,12 @@
ax = plt.subplot(111)
-t1 = np.arange(0.0, 1.0, 0.1)
+t1 = np.arange(0.0, 1.0, 0.01)
for n in [1, 2, 3, 4]:
plt.plot(t1, t1**n, label="n=%d"%(n,))
-leg = plt.legend(loc='best', ncol=4, mode="expand", shadow=True, fancybox=True)
-leg.get_frame().set_alpha(0.7)
+leg = plt.legend(loc='best', nncol=2, mode="expand", shadow=True,
fancybox=True)
+leg.get_frame().set_alpha(0.5)
plt.show()
Modified: trunk/matplotlib/lib/matplotlib/lines.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/lines.py 2008-12-10 17:29:21 UTC (rev
6552)
+++ trunk/matplotlib/lib/matplotlib/lines.py 2008-12-10 21:02:44 UTC (rev
6553)
@@ -313,7 +313,7 @@
'return the pick radius used for containment tests'
return self.pickradius
- def set_pickradius(self,d):
+ def setpickradius(self,d):
"""Sets the pick radius used for containment tests
ACCEPTS: float distance in points
@@ -689,6 +689,7 @@
'' nothing
========= ==========================
+
ACCEPTS: [ '+' | '*' | ',' | '.' | '1' | '2' | '3' | '4'
| '<' | '>' | 'D' | 'H' | '^' | '_' | 'd'
| 'h' | 'o' | 'p' | 's' | 'v' | 'x' | '|'
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
