SF.net SVN: matplotlib: [5258] branches/v0_91_maint/lib/matplotlib/image.py
Revision: 5258
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5258&view=rev
Author: jdh2358
Date: 2008-05-25 05:51:50 -0700 (Sun, 25 May 2008)
Log Message:
---
added pil support to imread
Modified Paths:
--
branches/v0_91_maint/lib/matplotlib/image.py
Modified: branches/v0_91_maint/lib/matplotlib/image.py
===
--- branches/v0_91_maint/lib/matplotlib/image.py2008-05-25 12:50:29 UTC
(rev 5257)
+++ branches/v0_91_maint/lib/matplotlib/image.py2008-05-25 12:51:50 UTC
(rev 5258)
@@ -609,13 +609,29 @@
Return value is a MxNx4 array of 0-1 normalized floats
+matplotlib can only read PNGs natively, but if PIL is installed,
+it will use it to load the image and return an RGBA if possible
+which can be used with imshow
"""
+
+def pilread():
+'try to load the image with PIL or return None'
+try: import Image
+except ImportError: return None
+image = Image.open( fname )
+return pil_to_array(image)
+
+
handlers = {'png' :_image.readpng,
}
basename, ext = os.path.splitext(fname)
ext = ext.lower()[1:]
+
if ext not in handlers.keys():
-raise ValueError('Only know how to handled extensions: %s' %
handlers.keys())
+im = pilread()
+if im is None:
+raise ValueError('Only know how to handle extensions: %s; with PIL
installed matplotlib can handle more images' % handlers.keys())
+return im
handler = handlers[ext]
return handler(fname)
@@ -632,6 +648,6 @@
raise RuntimeError('Unknown image mode')
x_str = im.tostring('raw',im.mode,0,-1)
-x = npy.fromstring(x_str,npy.uint8)
+x = np.fromstring(x_str,np.uint8)
x.shape = im.size[1], im.size[0], 4
return x
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5257] trunk/matplotlib/lib/matplotlib/ backend_bases.py
Revision: 5257
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5257&view=rev
Author: jdh2358
Date: 2008-05-25 05:50:29 -0700 (Sun, 25 May 2008)
Log Message:
---
experimenting with log toggle
Modified Paths:
--
trunk/matplotlib/lib/matplotlib/backend_bases.py
Modified: trunk/matplotlib/lib/matplotlib/backend_bases.py
===
--- trunk/matplotlib/lib/matplotlib/backend_bases.py2008-05-25 01:30:32 UTC
(rev 5256)
+++ trunk/matplotlib/lib/matplotlib/backend_bases.py2008-05-25 12:50:29 UTC
(rev 5257)
@@ -4,7 +4,7 @@
"""
from __future__ import division
-import os
+import os, warnings
import numpy as np
import matplotlib.cbook as cbook
@@ -1201,8 +1201,17 @@
event.inaxes.grid()
self.canvas.draw()
elif event.key == 'l':
-event.inaxes.toggle_log_lineary()
-self.canvas.draw()
+warnings.warn('log scale toggling under construction')
+if 0:
+ax = event.inaxes
+scale = ax.get_yscale()
+if scale=='log':
+ax.set_yscale('linear')
+ax.figure.canvas.draw()
+elif scale=='linear':
+ax.set_yscale('log')
+ax.figure.canvas.draw()
+
elif event.key is not None and (event.key.isdigit() and
event.key!='0') or event.key=='a':
# 'a' enables all axes
if event.key!='a':
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5259] branches/v0_91_maint/lib/matplotlib/image.py
Revision: 5259
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5259&view=rev
Author: jdh2358
Date: 2008-05-25 06:00:49 -0700 (Sun, 25 May 2008)
Log Message:
---
fixed a npy np mixup in image
Modified Paths:
--
branches/v0_91_maint/lib/matplotlib/image.py
Modified: branches/v0_91_maint/lib/matplotlib/image.py
===
--- branches/v0_91_maint/lib/matplotlib/image.py2008-05-25 12:51:50 UTC
(rev 5258)
+++ branches/v0_91_maint/lib/matplotlib/image.py2008-05-25 13:00:49 UTC
(rev 5259)
@@ -648,6 +648,6 @@
raise RuntimeError('Unknown image mode')
x_str = im.tostring('raw',im.mode,0,-1)
-x = np.fromstring(x_str,np.uint8)
+x = npy.fromstring(x_str,npy.uint8)
x.shape = im.size[1], im.size[0], 4
return x
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5260] trunk/matplotlib/
Revision: 5260 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5260&view=rev Author: jdh2358 Date: 2008-05-25 06:01:42 -0700 (Sun, 25 May 2008) Log Message: --- Merged revisions 5239 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint r5239 | sameerd | 2008-05-23 14:27:23 -0500 (Fri, 23 May 2008) | 3 lines Getting mlab.py in sync with the trunk Property Changed: trunk/matplotlib/ Property changes on: trunk/matplotlib ___ Name: svnmerge-integrated - /branches/v0_91_maint:1-5215 + /branches/v0_91_maint:1-5257 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5261] trunk/matplotlib/
Revision: 5261 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5261&view=rev Author: jdh2358 Date: 2008-05-25 06:02:59 -0700 (Sun, 25 May 2008) Log Message: --- Merged revisions 5258-5259 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint r5258 | jdh2358 | 2008-05-25 07:51:50 -0500 (Sun, 25 May 2008) | 1 line added pil support to imread r5259 | jdh2358 | 2008-05-25 08:00:49 -0500 (Sun, 25 May 2008) | 1 line fixed a npy np mixup in image Property Changed: trunk/matplotlib/ Property changes on: trunk/matplotlib ___ Name: svnmerge-integrated - /branches/v0_91_maint:1-5257 + /branches/v0_91_maint:1-5260 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5262] trunk/matplotlib/examples/pylab/logo2.py
Revision: 5262
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5262&view=rev
Author: jdh2358
Date: 2008-05-25 09:07:58 -0700 (Sun, 25 May 2008)
Log Message:
---
added logo2
Added Paths:
---
trunk/matplotlib/examples/pylab/logo2.py
Added: trunk/matplotlib/examples/pylab/logo2.py
===
--- trunk/matplotlib/examples/pylab/logo2.py(rev 0)
+++ trunk/matplotlib/examples/pylab/logo2.py2008-05-25 16:07:58 UTC (rev
5262)
@@ -0,0 +1,65 @@
+import numpy as np
+import matplotlib.pyplot as plt
+import matplotlib.cm as cm
+import matplotlib.mlab as mlab
+
+axalpha = 0.05
+fig = plt.figure(figsize=(8, 2),dpi=80)
+fig.figurePatch.set_edgecolor('#CC')
+fig.figurePatch.set_facecolor('#CC')
+
+# the polar bar plot
+ax = fig.add_axes([0.05, 0.05, 0.2, 01], polar=True)
+ax.axesPatch.set_alpha(axalpha)
+N = 20
+theta = np.arange(0.0, 2*np.pi, 2*np.pi/N)
+radii = 10*np.random.rand(N)
+width = np.pi/4*np.random.rand(N)
+bars = ax.bar(theta, radii, width=width, bottom=0.0)
+for r,bar in zip(radii, bars):
+bar.set_facecolor( cm.jet(r/10.))
+bar.set_alpha(0.5)
+
+for label in ax.get_xticklabels() + ax.get_yticklabels():
+label.set_visible(False)
+
+
+# the histogram
+axhist = fig.add_axes([0.275, 0.075, 0.2, 0.4])
+axhist.axesPatch.set_alpha(axalpha)
+mu, sigma = 100, 15
+x = mu + sigma*np.random.randn(1)
+
+# the histogram of the data
+n, bins, patches = axhist.hist(x, 50, normed=1, facecolor='green',
edgecolor='green', alpha=0.75)
+
+
+y = mlab.normpdf( bins, mu, sigma)
+l = axhist.plot(bins, y, 'r', lw=1)
+
+axhist.set_title('Density of IQ',fontsize=6)
+axhist.set_xlabel('IQ', fontsize=6)
+axhist.set_ylabel('P(IQ)', fontsize=6)
+ax.set_xlim(-2*sigma, 2*sigma)
+for label in axhist.get_xticklabels() + axhist.get_yticklabels():
+label.set_visible(False)
+
+
+axback = fig.add_axes([0., 0., 1., 1.])
+
+#the math background
+tex = r"$W^{3\beta}_{\delta_1 \rho_1 \sigma_2} = U^{3\beta}_{\delta_1 \rho_1}
+ \frac{1}{8 \pi 2} \int^{\alpha_2}_{\alpha_2} d \alpha^\prime_2 \left[\frac{
U^{2\beta}_{\delta_1 \rho_1} - \alpha^\prime_2U^{1\beta}_{\rho_1 \sigma_2}
}{U^{0\beta}_{\rho_1 \sigma_2}}\right]$"
+axback.text(0.5, 0.5, tex,
+transform=axback.transAxes, color="0.5", alpha=0.5, fontsize=40,
+ha='center', va='center')
+axback.set_axis_off()
+
+# the matplotlib title
+axback.text(0.3, 0.95, 'matplotlib', color='black', fontsize=75,
+ ha='left', va='top', alpha=1.0,
+ transform=axback.transAxes)
+
+
+
+plt.show()
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5263] trunk/matplotlib/examples
Revision: 5263
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5263&view=rev
Author: jdh2358
Date: 2008-05-25 09:09:25 -0700 (Sun, 25 May 2008)
Log Message:
---
added logo2
Added Paths:
---
trunk/matplotlib/examples/api/logo2.py
Removed Paths:
-
trunk/matplotlib/examples/pylab/logo2.py
Copied: trunk/matplotlib/examples/api/logo2.py (from rev 5262,
trunk/matplotlib/examples/pylab/logo2.py)
===
--- trunk/matplotlib/examples/api/logo2.py (rev 0)
+++ trunk/matplotlib/examples/api/logo2.py 2008-05-25 16:09:25 UTC (rev
5263)
@@ -0,0 +1,65 @@
+import numpy as np
+import matplotlib.pyplot as plt
+import matplotlib.cm as cm
+import matplotlib.mlab as mlab
+
+axalpha = 0.05
+fig = plt.figure(figsize=(8, 2),dpi=80)
+fig.figurePatch.set_edgecolor('#CC')
+fig.figurePatch.set_facecolor('#CC')
+
+# the polar bar plot
+ax = fig.add_axes([0.05, 0.05, 0.2, 01], polar=True)
+ax.axesPatch.set_alpha(axalpha)
+N = 20
+theta = np.arange(0.0, 2*np.pi, 2*np.pi/N)
+radii = 10*np.random.rand(N)
+width = np.pi/4*np.random.rand(N)
+bars = ax.bar(theta, radii, width=width, bottom=0.0)
+for r,bar in zip(radii, bars):
+bar.set_facecolor( cm.jet(r/10.))
+bar.set_alpha(0.5)
+
+for label in ax.get_xticklabels() + ax.get_yticklabels():
+label.set_visible(False)
+
+
+# the histogram
+axhist = fig.add_axes([0.275, 0.075, 0.2, 0.4])
+axhist.axesPatch.set_alpha(axalpha)
+mu, sigma = 100, 15
+x = mu + sigma*np.random.randn(1)
+
+# the histogram of the data
+n, bins, patches = axhist.hist(x, 50, normed=1, facecolor='green',
edgecolor='green', alpha=0.75)
+
+
+y = mlab.normpdf( bins, mu, sigma)
+l = axhist.plot(bins, y, 'r', lw=1)
+
+axhist.set_title('Density of IQ',fontsize=6)
+axhist.set_xlabel('IQ', fontsize=6)
+axhist.set_ylabel('P(IQ)', fontsize=6)
+ax.set_xlim(-2*sigma, 2*sigma)
+for label in axhist.get_xticklabels() + axhist.get_yticklabels():
+label.set_visible(False)
+
+
+axback = fig.add_axes([0., 0., 1., 1.])
+
+#the math background
+tex = r"$W^{3\beta}_{\delta_1 \rho_1 \sigma_2} = U^{3\beta}_{\delta_1 \rho_1}
+ \frac{1}{8 \pi 2} \int^{\alpha_2}_{\alpha_2} d \alpha^\prime_2 \left[\frac{
U^{2\beta}_{\delta_1 \rho_1} - \alpha^\prime_2U^{1\beta}_{\rho_1 \sigma_2}
}{U^{0\beta}_{\rho_1 \sigma_2}}\right]$"
+axback.text(0.5, 0.5, tex,
+transform=axback.transAxes, color="0.5", alpha=0.5, fontsize=40,
+ha='center', va='center')
+axback.set_axis_off()
+
+# the matplotlib title
+axback.text(0.3, 0.95, 'matplotlib', color='black', fontsize=75,
+ ha='left', va='top', alpha=1.0,
+ transform=axback.transAxes)
+
+
+
+plt.show()
+
Deleted: trunk/matplotlib/examples/pylab/logo2.py
===
--- trunk/matplotlib/examples/pylab/logo2.py2008-05-25 16:07:58 UTC (rev
5262)
+++ trunk/matplotlib/examples/pylab/logo2.py2008-05-25 16:09:25 UTC (rev
5263)
@@ -1,65 +0,0 @@
-import numpy as np
-import matplotlib.pyplot as plt
-import matplotlib.cm as cm
-import matplotlib.mlab as mlab
-
-axalpha = 0.05
-fig = plt.figure(figsize=(8, 2),dpi=80)
-fig.figurePatch.set_edgecolor('#CC')
-fig.figurePatch.set_facecolor('#CC')
-
-# the polar bar plot
-ax = fig.add_axes([0.05, 0.05, 0.2, 01], polar=True)
-ax.axesPatch.set_alpha(axalpha)
-N = 20
-theta = np.arange(0.0, 2*np.pi, 2*np.pi/N)
-radii = 10*np.random.rand(N)
-width = np.pi/4*np.random.rand(N)
-bars = ax.bar(theta, radii, width=width, bottom=0.0)
-for r,bar in zip(radii, bars):
-bar.set_facecolor( cm.jet(r/10.))
-bar.set_alpha(0.5)
-
-for label in ax.get_xticklabels() + ax.get_yticklabels():
-label.set_visible(False)
-
-
-# the histogram
-axhist = fig.add_axes([0.275, 0.075, 0.2, 0.4])
-axhist.axesPatch.set_alpha(axalpha)
-mu, sigma = 100, 15
-x = mu + sigma*np.random.randn(1)
-
-# the histogram of the data
-n, bins, patches = axhist.hist(x, 50, normed=1, facecolor='green',
edgecolor='green', alpha=0.75)
-
-
-y = mlab.normpdf( bins, mu, sigma)
-l = axhist.plot(bins, y, 'r', lw=1)
-
-axhist.set_title('Density of IQ',fontsize=6)
-axhist.set_xlabel('IQ', fontsize=6)
-axhist.set_ylabel('P(IQ)', fontsize=6)
-ax.set_xlim(-2*sigma, 2*sigma)
-for label in axhist.get_xticklabels() + axhist.get_yticklabels():
-label.set_visible(False)
-
-
-axback = fig.add_axes([0., 0., 1., 1.])
-
-#the math background
-tex = r"$W^{3\beta}_{\delta_1 \rho_1 \sigma_2} = U^{3\beta}_{\delta_1 \rho_1}
+ \frac{1}{8 \pi 2} \int^{\alpha_2}_{\alpha_2} d \alpha^\prime_2 \left[\frac{
U^{2\beta}_{\delta_1 \rho_1} - \alpha^\prime_2U^{1\beta}_{\rho_1 \sigma_2}
}{U^{0\beta}_{\rho_1 \sigma_2}}\right]$"
-axback.text(0.5, 0.5, tex,
-transform=axback.transAxes, color="0.5", alpha=0.5, fontsize=40,
-ha='center', va='center')
-axback.set_axis_off()
-
-# the matplotlib title
-axback.text(0.3, 0.95, 'matplotlib',
SF.net SVN: matplotlib: [5264] trunk/matplotlib/examples/api/logo2.py
Revision: 5264
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5264&view=rev
Author: jdh2358
Date: 2008-05-25 09:57:31 -0700 (Sun, 25 May 2008)
Log Message:
---
syncing logo
Modified Paths:
--
trunk/matplotlib/examples/api/logo2.py
Modified: trunk/matplotlib/examples/api/logo2.py
===
--- trunk/matplotlib/examples/api/logo2.py 2008-05-25 16:09:25 UTC (rev
5263)
+++ trunk/matplotlib/examples/api/logo2.py 2008-05-25 16:57:31 UTC (rev
5264)
@@ -4,9 +4,11 @@
import matplotlib.mlab as mlab
axalpha = 0.05
-fig = plt.figure(figsize=(8, 2),dpi=80)
-fig.figurePatch.set_edgecolor('#CC')
-fig.figurePatch.set_facecolor('#CC')
+figcolor = '#CC'
+dpi = 80
+fig = plt.figure(figsize=(8, 2),dpi=dpi)
+fig.figurePatch.set_edgecolor(figcolor)
+fig.figurePatch.set_facecolor(figcolor)
# the polar bar plot
ax = fig.add_axes([0.05, 0.05, 0.2, 01], polar=True)
@@ -60,6 +62,6 @@
transform=axback.transAxes)
-
+fig.savefig('logo2.png', facecolor=figcolor, edgecolor=figcolor, dpi=dpi)
plt.show()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5265] trunk/matplotlib
Revision: 5265 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5265&view=rev Author: jdh2358 Date: 2008-05-25 13:58:06 -0700 (Sun, 25 May 2008) Log Message: --- updated default dir names for svn checkouts Modified Paths: -- trunk/matplotlib/docs/devel/coding_guide.rst trunk/matplotlib/examples/api/logo2.py Removed Paths: - trunk/matplotlib/CODING_GUIDE Deleted: trunk/matplotlib/CODING_GUIDE === --- trunk/matplotlib/CODING_GUIDE 2008-05-25 16:57:31 UTC (rev 5264) +++ trunk/matplotlib/CODING_GUIDE 2008-05-25 20:58:06 UTC (rev 5265) @@ -1,320 +0,0 @@ -= The matplotlib developer's guide = - -This is meant to be a guide to developers on the mpl coding practices -and standards. Please edit and extend this document. - -== svn checkouts == - -# checking out everything (toolkits, user's guide, htdocs, etc..) -svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk matplotlib --username=youruser --password=yourpass - - -# checking out the main src -svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/matplotlib matplotlib --username=youruser --password=yourpass - -# branch checkouts, eg the transforms branch -svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/transforms transbranch - -== Committing changes == - -When committing changes to matplotlib, there are a few things to bear -in mind. - - * if your changes are non-trivial, please make an entry in the -CHANGELOG - - * if you change the API, please document it in API_CHANGES, and -consider posting to mpl-devel - - * Are your changes python2.3 compatible? We are still trying to -support 2.3, so avoid 2.4 only features like decorators until we -remove 2.3 support - - * Can you pass examples/backend_driver.py? This is our poor man's -unit test. - - * If you have altered extension code, do you pass -unit/memleak_hawaii.py? - - * if you have added new files or directories, or reorganized -existing ones, are the new files included in the match patterns in -MANIFEST.in. This file determines what goes into the src -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 to -keep them in sync. http://www.orcaware.com/svn/wiki/Svnmerge.py. 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 branch (svn co - https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint) -and the trunk (svn co - https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/matplotlib) - - - 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 - - # where the NNN are the revision numbers. ranges also acceptable -> svnmerge.py merge -rNNN1,NNN2 - - # this file is automatically created by the merge command -> svn commit -F svnmerge-commit-message.txt - -== Importing and name spaces == - -For numpy, use: - - -import numpy as np -a = np.array([1,2,3]) - - -For masked arrays, use: -from numpy import ma - -(The earlier recommendation, 'import matplotlib.numerix.npyma as ma', -was needed temporarily during the development of the maskedarray -implementation as a separate package. As of numpy 1.05, it -replaces the old implementation. -Note: "from numpy import ma" works with numpy < 1.05 *and* with -numpy >= 1.05. "import numpy.ma as ma" works *only* with -numpy >= 1.05, so for now we must not use it.) - -For matplotlib main module, use: - -import matplotlib as mpl -mpl.rcParams['xtick.major.pad'] = 6 - -For matplotlib modules (or any other modules), use: - -import matplotlib.cbook as cbook - -if cbook.iterable(z): -pass - -We prefer this over the equivalent 'from matplotlib import cbook' -because the latter is ambiguous whether cbook is a module or a -function to the new developer. The former makes it explcit that -you are importing a module or package. - -== Naming, spacing, and formatting conventions == - -In general, we want to hew as closely as possible to the standard -coding guidelines for python written by Guido in -http://www.python.org/dev/peps/pep-0008, though we do not do this -throughout. - - functions and class methods : lower or lower_underscore_separated - - attributes and variables : lower or lowerUpper - - classes : Upper or MixedCase - -Personally, I prefer the shortest names that are still readable. - -Also, use an editor that does not put tabs in fil
SF.net SVN: matplotlib: [5266] trunk/matplotlib
Revision: 5266 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5266&view=rev Author: jdh2358 Date: 2008-05-25 13:58:35 -0700 (Sun, 25 May 2008) Log Message: --- renamed docs dir to doc Added Paths: --- trunk/matplotlib/doc/ Removed Paths: - trunk/matplotlib/docs/ Copied: trunk/matplotlib/doc (from rev 5265, trunk/matplotlib/docs) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5267] trunk/matplotlib/coding_guide.rst
Revision: 5267 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5267&view=rev Author: jdh2358 Date: 2008-05-25 13:59:14 -0700 (Sun, 25 May 2008) Log Message: --- made top level coding guide a link Added Paths: --- trunk/matplotlib/coding_guide.rst Added: trunk/matplotlib/coding_guide.rst === --- trunk/matplotlib/coding_guide.rst (rev 0) +++ trunk/matplotlib/coding_guide.rst 2008-05-25 20:59:14 UTC (rev 5267) @@ -0,0 +1 @@ +link doc/devel/coding_guide.rst \ No newline at end of file Property changes on: trunk/matplotlib/coding_guide.rst ___ Name: svn:special + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5268] trunk/matplotlib
Revision: 5268 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5268&view=rev Author: jdh2358 Date: 2008-05-25 14:14:01 -0700 (Sun, 25 May 2008) Log Message: --- rewrote the readme to describe the dir layout Added Paths: --- trunk/matplotlib/README.txt Removed Paths: - trunk/matplotlib/README trunk/matplotlib/coding_guide.rst Deleted: trunk/matplotlib/README === --- trunk/matplotlib/README 2008-05-25 20:59:14 UTC (rev 5267) +++ trunk/matplotlib/README 2008-05-25 21:14:01 UTC (rev 5268) @@ -1,70 +0,0 @@ -INTRODUCTION: - - - matplotlib is a pure python 2D plotting library with a Matlab(TM) - syntax which produces publication quality figures using in a - variety of hardcopy formats (PNG, JPG, TIFF, PS) and interactive - GUI environments (WX, GTK) across platforms. matplotlib can be used - in python scripts, interactively from the python shell (ala matlab - or mathematica), in web application servers generating dynamic - charts, or embedded in GTK or WX applications; see backends. - - matplotlib trys to make easy things easy and hard things - possible. You can generate plots, histograms, power spectra, bar - charts, errorcharts, scatterplots, etc, with just a few lines of - code. For example, to make a histogram of data in x, you simply need - to type - - >>> hist(x, 100) # use 100 bins - - - 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. A - summary of the goals of matplotlib and the progress so far can be - found at http://matplotlib.sf.net/goals.html. - -REQUIREMENTS: - - python 2.3+, and numpy (http://numpy.scipy.org/). Other - requirements are backend dependent. See - http://matplotlib.sourceforge.net/backends.html. If you are using - python2.3, you'll also need to install setuptools; just download - http://peak.telecommunity.com/dist/ez_setup.py and run it. - -INSTALL - - The latest installation instructions can be found at - -http://matplotlib.sourceforge.net/installing.html - - and for backend specific install information see - -http://matplotlib.sourceforge.net/backends.html - - If you want to use matplotlib interactively from the prompt, see - http://matplotlib.sourceforge.net/interactive.html - - -EXAMPLES - - See the examples in the examples dir. To see examples scripts with - the outputs they produce, see - http://matplotlib.sourceforge.net/screenshots.html - -AUTHOR - - John D. Hunter <[EMAIL PROTECTED]> - Copyright (c) 2002-2007 John D. Hunter; All Rights Reserved. - - Jeremy O'Donoghue wrote the wx backend - - See http://matplotlib.sourceforge.net/credits.html for additionaly - contributors - -LICENSE - - Based on that of python 2.2. See the LICENSE file that ships with - the matplotlib source code or - http://matplotlib.sourceforge.net/license.html - Copied: trunk/matplotlib/README.txt (from rev 5265, trunk/matplotlib/README) === --- trunk/matplotlib/README.txt (rev 0) +++ trunk/matplotlib/README.txt 2008-05-25 21:14:01 UTC (rev 5268) @@ -0,0 +1,61 @@ +Overview of the matplotlib src tree +=== + +This is the source directory for matplotlib, which contains the +following files and directories. + +* doc - the matplotlib documentation. See doc/users for the user's + documentation and doc/devel for the developers documentation + +* examples - a bunch of examples using matplotib. See + examples/README.txt for information + +* setup.cfg.template - used to configure the matplotlib build process. + Copy this file to setup.cfg if you want to override the default + build behavior + +* matplotlibrc.template - a template file used to generate the + matplotlibrc config file at build time. The matplotlibrc file will + be installed in matplotlib/mpl-data/matplotlibrc + +* lib - the python src code. matplotlib ships several third party + packages here. The subdirectory lib/matplotlib contains the python + src code for matplotlib + +* src - the matplotlib extension code, mostly C++ + +* ttconv - some truetype font utilities + +* license - all the licenses for code included with matplotlib. + matplotlib uses only BSD compatible code + +* unit - some unit tests + +* CHANGELOG - all the significant changes to matplotlib, organized by + release. The top of this file will show you the most recent changes + +* API_CHANGES - any change that alters the API is listed here. The + entries are organized by release, with most recent entries first + +* MIGRATION.txt - instructions on moving from the 0.91 code to the + 0.98 trunk. + +* SEGFAULTS - some tips for how to diagnose and debug segfaults + +* setup.py - the matplotlib build script + +*
SF.net SVN: matplotlib: [5269] trunk/matplotlib/doc
Revision: 5269
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5269&view=rev
Author: jdh2358
Date: 2008-05-25 14:24:24 -0700 (Sun, 25 May 2008)
Log Message:
---
added faq placeholder
Modified Paths:
--
trunk/matplotlib/doc/index.rst
trunk/matplotlib/doc/make.py
Added Paths:
---
trunk/matplotlib/doc/faq/
trunk/matplotlib/doc/faq/index.rst
trunk/matplotlib/doc/faq/installing_faq.rst
trunk/matplotlib/doc/faq/plotting_faq.rst
Added: trunk/matplotlib/doc/faq/index.rst
===
--- trunk/matplotlib/doc/faq/index.rst (rev 0)
+++ trunk/matplotlib/doc/faq/index.rst 2008-05-25 21:24:24 UTC (rev 5269)
@@ -0,0 +1,16 @@
+.. _api-index:
+
+
+ The Matplotlib FAQ
+
+
+:Release: |version|
+:Date: |today|
+
+Frequently asked questions about matplotlib
+
+.. toctree::
+
+ installing_faq.rst
+ plotting_faq.rst
+
Added: trunk/matplotlib/doc/faq/installing_faq.rst
===
--- trunk/matplotlib/doc/faq/installing_faq.rst (rev 0)
+++ trunk/matplotlib/doc/faq/installing_faq.rst 2008-05-25 21:24:24 UTC (rev
5269)
@@ -0,0 +1,7 @@
+
+Installation FAQ
+
+
+
+
+
Added: trunk/matplotlib/doc/faq/plotting_faq.rst
===
--- trunk/matplotlib/doc/faq/plotting_faq.rst (rev 0)
+++ trunk/matplotlib/doc/faq/plotting_faq.rst 2008-05-25 21:24:24 UTC (rev
5269)
@@ -0,0 +1,5 @@
+
+Plotting FAQ
+
+
+
Modified: trunk/matplotlib/doc/index.rst
===
--- trunk/matplotlib/doc/index.rst 2008-05-25 21:14:01 UTC (rev 5268)
+++ trunk/matplotlib/doc/index.rst 2008-05-25 21:24:24 UTC (rev 5269)
@@ -11,6 +11,7 @@
:maxdepth: 2
users/index.rst
+ faq/index.rst
devel/index.rst
api/index.rst
Modified: trunk/matplotlib/doc/make.py
===
--- trunk/matplotlib/doc/make.py2008-05-25 21:14:01 UTC (rev 5268)
+++ trunk/matplotlib/doc/make.py2008-05-25 21:24:24 UTC (rev 5269)
@@ -6,7 +6,7 @@
import sys
def check_build():
-build_dirs = ['build', 'build/doctrees', 'build/html', 'build/latex',
+build_dirs = ['build', 'build/doctrees', 'build/html', 'build/latex',
'_static', '_templates']
for d in build_dirs:
try:
@@ -19,23 +19,26 @@
def html():
check_build()
+figs()
os.system('sphinx-build -b html -d build/doctrees . build/html')
def latex():
+check_build()
+figs()
if sys.platform != 'win32':
# LaTeX format.
os.system('sphinx-build -b latex -d build/doctrees . build/latex')
-
+
# Produce pdf.
os.chdir('build/latex')
-
+
# Copying the makefile produced by sphinx...
os.system('pdflatex Matplotlib.tex')
os.system('pdflatex Matplotlib.tex')
os.system('makeindex -s python.ist Matplotlib.idx')
os.system('makeindex -s python.ist modMatplotlib.idx')
os.system('pdflatex Matplotlib.tex')
-
+
os.chdir('../..')
else:
print 'latex build has not been tested on windows'
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5270] trunk/matplotlib/doc
Revision: 5270
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5270&view=rev
Author: jdh2358
Date: 2008-05-25 14:31:43 -0700 (Sun, 25 May 2008)
Log Message:
---
added readme to describe doc organization
Modified Paths:
--
trunk/matplotlib/doc/conf.py
Added Paths:
---
trunk/matplotlib/doc/README.txt
Added: trunk/matplotlib/doc/README.txt
===
--- trunk/matplotlib/doc/README.txt (rev 0)
+++ trunk/matplotlib/doc/README.txt 2008-05-25 21:31:43 UTC (rev 5270)
@@ -0,0 +1,35 @@
+maptlotlib documentation
+
+
+This is the top level build directory for the matplotlib
+documentation. All of the documentation is written using sphinx, a
+python documentation system built on top of ReST.
+
+If you are looking for plain text documentation, you can read the following
+
+* users - the user documentation, eg plotting tutorials, configuration
+ tips, etc.
+
+* devel - documentation for matplotlib developers
+
+* faq - frequently asked questions
+
+* api - placeholders to automatically generate the api documentation
+
+* make.py - the build script to build the html or PDF docs
+
+* index.rst - the top level include document for matplotlib docs
+
+* conf.py - the sphinx configuration
+
+* _static - used by the sphinx build system
+
+* _templates - used by the sphinx build system
+
+* sphinxext - Sphinx extensions for the mpl docs
+
+* mpl_data - a symbolic link to the matplotlib data for reference by
+ sphinx documentation
+
+* mpl_examples - a link to the matplotlib examples in case any
+ documentation wants to literal include them
Modified: trunk/matplotlib/doc/conf.py
===
--- trunk/matplotlib/doc/conf.py2008-05-25 21:24:24 UTC (rev 5269)
+++ trunk/matplotlib/doc/conf.py2008-05-25 21:31:43 UTC (rev 5270)
@@ -141,7 +141,7 @@
# (source start file, target name, title, author, document class
[howto/manual]).
latex_documents = [
- ('index', 'Matplotlib.tex', 'Matplotlib', 'John Hunter, Darren Dale, Michael
Droettboom', 'manual'),
+ ('index', 'Matplotlib.tex', 'Matplotlib', 'Darren Dale, Michael Droettboom,
Eric Firing, John Hunter', 'manual'),
]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
