Menu
▾
▴
matplotlib-checkins — Commit notification. DO NOT POST to this list, just subscribe to it.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(115) |
Aug
(120) |
Sep
(137) |
Oct
(170) |
Nov
(461) |
Dec
(263) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(120) |
Feb
(74) |
Mar
(35) |
Apr
(74) |
May
(245) |
Jun
(356) |
Jul
(240) |
Aug
(115) |
Sep
(78) |
Oct
(225) |
Nov
(98) |
Dec
(271) |
| 2009 |
Jan
(132) |
Feb
(84) |
Mar
(74) |
Apr
(56) |
May
(90) |
Jun
(79) |
Jul
(83) |
Aug
(296) |
Sep
(214) |
Oct
(76) |
Nov
(82) |
Dec
(66) |
| 2010 |
Jan
(46) |
Feb
(58) |
Mar
(51) |
Apr
(77) |
May
(58) |
Jun
(126) |
Jul
(128) |
Aug
(64) |
Sep
(50) |
Oct
(44) |
Nov
(48) |
Dec
(54) |
| 2011 |
Jan
(68) |
Feb
(52) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <md...@us...> - 2008-06-27 13:32:03
|
Revision: 5686
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5686&view=rev
Author: mdboom
Date: 2008-06-27 06:31:53 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
Minor docstring typo (thanks, Chris Walker)
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/afm.py
Modified: trunk/matplotlib/lib/matplotlib/afm.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/afm.py 2008-06-27 12:51:50 UTC (rev 5685)
+++ trunk/matplotlib/lib/matplotlib/afm.py 2008-06-27 13:31:53 UTC (rev 5686)
@@ -4,7 +4,7 @@
than mine) I decided not to go with them because either they were
either
- 1) copyighted or used a non-BSD compatible license
+ 1) copyrighted or used a non-BSD compatible license
2) had too many dependencies and I wanted a free standing lib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-06-27 12:51:51
|
Revision: 5685
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5685&view=rev
Author: mdboom
Date: 2008-06-27 05:51:50 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
Merged revisions 5678-5684 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_91_maint
........
r5684 | mdboom | 2008-06-27 08:49:34 -0400 (Fri, 27 Jun 2008) | 2 lines
Fix mathtext parsing bug.
........
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/mathtext.py
Property Changed:
----------------
trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Name: svnmerge-integrated
- /branches/v0_91_maint:1-5677
+ /branches/v0_91_maint:1-5684
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-06-27 12:49:34 UTC (rev 5684)
+++ trunk/matplotlib/CHANGELOG 2008-06-27 12:51:50 UTC (rev 5685)
@@ -1,3 +1,5 @@
+2008-06-26 Fix mathtext bug for expressions like $x_{\leftarrow}$ - MGD
+
2008-06-26 Fix direction of horizontal/vertical hatches - MGD
2008-06-25 Figure.figurePatch renamed Figure.patch, Axes.axesPatch
Modified: trunk/matplotlib/lib/matplotlib/mathtext.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mathtext.py 2008-06-27 12:49:34 UTC (rev 5684)
+++ trunk/matplotlib/lib/matplotlib/mathtext.py 2008-06-27 12:51:50 UTC (rev 5685)
@@ -2088,7 +2088,7 @@
start_group
+ ZeroOrMore(
autoDelim
- | simple)
+ ^ simple)
- end_group
).setParseAction(self.group).setName("group")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-06-27 12:49:37
|
Revision: 5684
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5684&view=rev
Author: mdboom
Date: 2008-06-27 05:49:34 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
Fix mathtext parsing bug.
Modified Paths:
--------------
branches/v0_91_maint/CHANGELOG
branches/v0_91_maint/lib/matplotlib/mathtext.py
Modified: branches/v0_91_maint/CHANGELOG
===================================================================
--- branches/v0_91_maint/CHANGELOG 2008-06-26 20:15:45 UTC (rev 5683)
+++ branches/v0_91_maint/CHANGELOG 2008-06-27 12:49:34 UTC (rev 5684)
@@ -1,3 +1,5 @@
+2008-06-26 Fix mathtext bug for expressions like $x_{\leftarrow}$ - MGD
+
2008-06-26 Fix direction of horizontal/vertical hatches - MGD
===============================================================
Modified: branches/v0_91_maint/lib/matplotlib/mathtext.py
===================================================================
--- branches/v0_91_maint/lib/matplotlib/mathtext.py 2008-06-26 20:15:45 UTC (rev 5683)
+++ branches/v0_91_maint/lib/matplotlib/mathtext.py 2008-06-27 12:49:34 UTC (rev 5684)
@@ -2087,7 +2087,7 @@
start_group
+ ZeroOrMore(
autoDelim
- | simple)
+ ^ simple)
+ end_group
).setParseAction(self.group).setName("group")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-06-26 20:15:52
|
Revision: 5683
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5683&view=rev
Author: jdh2358
Date: 2008-06-26 13:15:45 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
cleaned some more examples
Modified Paths:
--------------
trunk/matplotlib/examples/pylab_examples/cohere_demo.py
trunk/matplotlib/examples/pylab_examples/csd_demo.py
trunk/matplotlib/examples/pylab_examples/fill_demo.py
trunk/matplotlib/examples/pylab_examples/hexbin_demo.py
trunk/matplotlib/examples/pylab_examples/histogram_demo.py
trunk/matplotlib/examples/pylab_examples/image_demo.py
Added Paths:
-----------
trunk/matplotlib/lib/mpl_examples
Modified: trunk/matplotlib/examples/pylab_examples/cohere_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/cohere_demo.py 2008-06-26 19:08:48 UTC (rev 5682)
+++ trunk/matplotlib/examples/pylab_examples/cohere_demo.py 2008-06-26 20:15:45 UTC (rev 5683)
@@ -2,36 +2,35 @@
"""
Compute the coherence of two signals
"""
-import numpy as n
+import numpy as np
+import matplotlib.pyplot as plt
-from pylab import figure, show
+# make a little extra space between the subplots
+plt.subplots_adjust(wspace=0.5)
dt = 0.01
-t = n.arange(0, 30, dt)
-Nt = len(t)
-nse1 = n.random.randn(Nt) # white noise 1
-nse2 = n.random.randn(Nt) # white noise 2
-r = n.exp(-t/0.05)
+t = np.arange(0, 30, dt)
+nse1 = np.random.randn(len(t)) # white noise 1
+nse2 = np.random.randn(len(t)) # white noise 2
+r = np.exp(-t/0.05)
-cnse1 = n.convolve(nse1, r)*dt # colored noise 1
-cnse1 = cnse1[:Nt]
-cnse2 = n.convolve(nse2, r)*dt # colored noise 2
-cnse2 = cnse2[:Nt]
+cnse1 = np.convolve(nse1, r, mode='same')*dt # colored noise 1
+cnse2 = np.convolve(nse2, r, mode='same')*dt # colored noise 2
# two signals with a coherent part and a random part
-s1 = 0.01*n.sin(2*n.pi*10*t) + cnse1
-s2 = 0.01*n.sin(2*n.pi*10*t) + cnse2
+s1 = 0.01*np.sin(2*np.pi*10*t) + cnse1
+s2 = 0.01*np.sin(2*np.pi*10*t) + cnse2
-fig = figure()
-ax = fig.add_subplot(211)
-ax.plot(t, s1, 'b-', t, s2, 'g-')
-ax.set_xlim(0,5)
-ax.set_xlabel('time')
-ax.set_ylabel('s1 and s2')
+plt.subplot(211)
+plt.plot(t, s1, 'b-', t, s2, 'g-')
+plt.xlim(0,5)
+plt.xlabel('time')
+plt.ylabel('s1 and s2')
+plt.grid(True)
-ax = fig.add_subplot(212)
-cxy, f = ax.cohere(s1, s2, 256, 1./dt)
+plt.subplot(212)
+cxy, f = plt.cohere(s1, s2, 256, 1./dt)
+plt.ylabel('coherence')
+plt.show()
-show()
-
Modified: trunk/matplotlib/examples/pylab_examples/csd_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/csd_demo.py 2008-06-26 19:08:48 UTC (rev 5682)
+++ trunk/matplotlib/examples/pylab_examples/csd_demo.py 2008-06-26 20:15:45 UTC (rev 5683)
@@ -2,32 +2,35 @@
"""
Compute the cross spectral density of two signals
"""
-from __future__ import division
-from pylab import *
+import numpy as np
+import matplotlib.pyplot as plt
+# make a little extra space between the subplots
+plt.subplots_adjust(wspace=0.5)
+
dt = 0.01
-t = arange(0, 30, dt)
-nse1 = randn(len(t)) # white noise 1
-nse2 = randn(len(t)) # white noise 2
-r = exp(divide(-t,0.05))
+t = np.arange(0, 30, dt)
+nse1 = np.random.randn(len(t)) # white noise 1
+nse2 = np.random.randn(len(t)) # white noise 2
+r = np.exp(-t/0.05)
-cnse1 = convolve(nse1, r, mode=2)*dt # colored noise 1
-cnse1 = cnse1[:len(t)]
-cnse2 = convolve(nse2, r, mode=2)*dt # colored noise 2
-cnse2 = cnse2[:len(t)]
+cnse1 = np.convolve(nse1, r, mode='same')*dt # colored noise 1
+cnse2 = np.convolve(nse2, r, mode='same')*dt # colored noise 2
# two signals with a coherent part and a random part
-s1 = 0.01*sin(2*pi*10*t) + cnse1
-s2 = 0.01*sin(2*pi*10*t) + cnse2
+s1 = 0.01*np.sin(2*np.pi*10*t) + cnse1
+s2 = 0.01*np.sin(2*np.pi*10*t) + cnse2
-subplot(211)
-plot(t, s1, 'b-', t, s2, 'g-')
-xlim(0,5)
-xlabel('time')
-ylabel('s1 and s2')
+plt.subplot(211)
+plt.plot(t, s1, 'b-', t, s2, 'g-')
+plt.xlim(0,5)
+plt.xlabel('time')
+plt.ylabel('s1 and s2')
+plt.grid(True)
-subplot(212)
-cxy, f = csd(s1, s2, 256, 1/dt)
-show()
+plt.subplot(212)
+cxy, f = plt.csd(s1, s2, 256, 1./dt)
+plt.ylabel('CSD (db)')
+plt.show()
Modified: trunk/matplotlib/examples/pylab_examples/fill_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/fill_demo.py 2008-06-26 19:08:48 UTC (rev 5682)
+++ trunk/matplotlib/examples/pylab_examples/fill_demo.py 2008-06-26 20:15:45 UTC (rev 5683)
@@ -1,8 +1,10 @@
#!/usr/bin/env python
-from pylab import *
-t = arange(0.0, 1.01, 0.01)
-s = sin(2*2*pi*t)
+import numpy as np
+import matplotlib.pyplot as plt
-fill(t, s*exp(-5*t), 'r')
-grid(True)
-show()
+t = np.arange(0.0, 1.01, 0.01)
+s = np.sin(2*2*np.pi*t)
+
+plt.fill(t, s*np.exp(-5*t), 'r')
+plt.grid(True)
+plt.show()
Modified: trunk/matplotlib/examples/pylab_examples/hexbin_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/hexbin_demo.py 2008-06-26 19:08:48 UTC (rev 5682)
+++ trunk/matplotlib/examples/pylab_examples/hexbin_demo.py 2008-06-26 20:15:45 UTC (rev 5683)
@@ -1,13 +1,12 @@
-'''
+"""
hexbin is an axes method or pyplot function that is essentially
a pcolor of a 2-D histogram with hexagonal cells. It can be
much more informative than a scatter plot; in the first subplot
below, try substituting 'scatter' for 'hexbin'.
-'''
+"""
-from matplotlib.pyplot import *
import numpy as np
-
+import matplotlib.pyplot as plt
n = 100000
x = np.random.standard_normal(n)
y = 2.0 + 3.0 * x + 4.0 * np.random.standard_normal(n)
@@ -16,19 +15,20 @@
ymin = y.min()
ymax = y.max()
-subplot(121)
-hexbin(x,y)
-axis([xmin, xmax, ymin, ymax])
-title("Hexagon binning")
-cb = colorbar()
+plt.subplots_adjust(hspace=0.5)
+plt.subplot(121)
+plt.hexbin(x,y)
+plt.axis([xmin, xmax, ymin, ymax])
+plt.title("Hexagon binning")
+cb = plt.colorbar()
cb.set_label('counts')
-subplot(122)
-hexbin(x,y,bins='log')
-axis([xmin, xmax, ymin, ymax])
-title("With a log color scale")
-cb = colorbar()
+plt.subplot(122)
+plt.hexbin(x,y,bins='log')
+plt.axis([xmin, xmax, ymin, ymax])
+plt.title("With a log color scale")
+cb = plt.colorbar()
cb.set_label('log10(N)')
-show()
+plt.show()
Modified: trunk/matplotlib/examples/pylab_examples/histogram_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/histogram_demo.py 2008-06-26 19:08:48 UTC (rev 5682)
+++ trunk/matplotlib/examples/pylab_examples/histogram_demo.py 2008-06-26 20:15:45 UTC (rev 5683)
@@ -1,23 +1,22 @@
#!/usr/bin/env python
-import pylab as P
+import numpy as np
+import matplotlib.mlab as mlab
+import matplotlib.pyplot as plt
mu, sigma = 100, 15
-x = mu + sigma*P.randn(10000)
+x = mu + sigma*np.random.randn(10000)
# the histogram of the data
-n, bins, patches = P.hist(x, 50, normed=1)
-P.setp(patches, 'facecolor', 'g', 'alpha', 0.75)
+n, bins, patches = plt.hist(x, 50, normed=1, facecolor='green', alpha=0.75)
# add a 'best fit' line
-y = P.normpdf( bins, mu, sigma)
-l = P.plot(bins, y, 'r--')
-P.setp(l, 'linewidth', 1)
+y = mlab.normpdf( bins, mu, sigma)
+l = plt.plot(bins, y, 'r--', linewidth=1)
-P.xlabel('Smarts')
-P.ylabel('Probability')
-P.title(r'$\mathrm{Histogram\ of\ IQ:}\ \mu=100,\ \sigma=15$')
-P.axis([40, 160, 0, 0.03])
-P.grid(True)
+plt.xlabel('Smarts')
+plt.ylabel('Probability')
+plt.title(r'$\mathrm{Histogram\ of\ IQ:}\ \mu=100,\ \sigma=15$')
+plt.axis([40, 160, 0, 0.03])
+plt.grid(True)
-#P.savefig('histogram_demo',dpi=72)
-P.show()
+plt.show()
Modified: trunk/matplotlib/examples/pylab_examples/image_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/image_demo.py 2008-06-26 19:08:48 UTC (rev 5682)
+++ trunk/matplotlib/examples/pylab_examples/image_demo.py 2008-06-26 20:15:45 UTC (rev 5683)
@@ -1,16 +1,18 @@
#!/usr/bin/env python
-from pylab import *
+import numpy as np
+import matplotlib.cm as cm
+import matplotlib.mlab as mlab
+import matplotlib.pyplot as plt
delta = 0.025
-x = y = arange(-3.0, 3.0, delta)
-X, Y = meshgrid(x, y)
-Z1 = bivariate_normal(X, Y, 1.0, 1.0, 0.0, 0.0)
-Z2 = bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
+x = y = np.arange(-3.0, 3.0, delta)
+X, Y = np.meshgrid(x, y)
+Z1 = mlab.bivariate_normal(X, Y, 1.0, 1.0, 0.0, 0.0)
+Z2 = mlab.bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
Z = Z2-Z1 # difference of Gaussians
-im = imshow(Z, interpolation='bilinear', cmap=cm.gray,
- origin='lower', extent=[-3,3,-3,3])
+im = plt.imshow(Z, interpolation='bilinear', cmap=cm.gray,
+ origin='lower', extent=[-3,3,-3,3])
-savefig('image_demo')
-show()
+plt.show()
Added: trunk/matplotlib/lib/mpl_examples
===================================================================
--- trunk/matplotlib/lib/mpl_examples (rev 0)
+++ trunk/matplotlib/lib/mpl_examples 2008-06-26 20:15:45 UTC (rev 5683)
@@ -0,0 +1 @@
+link ../examples
\ No newline at end of file
Property changes on: trunk/matplotlib/lib/mpl_examples
___________________________________________________________________
Name: svn:special
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-06-26 19:08:50
|
Revision: 5682
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5682&view=rev
Author: jdh2358
Date: 2008-06-26 12:08:48 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
cleaned some docs for api examples
Modified Paths:
--------------
trunk/matplotlib/examples/pylab_examples/bar_stacked.py
trunk/matplotlib/examples/pylab_examples/broken_barh.py
trunk/matplotlib/examples/pylab_examples/hline_demo.py
trunk/matplotlib/examples/pylab_examples/xcorr_demo.py
Modified: trunk/matplotlib/examples/pylab_examples/bar_stacked.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/bar_stacked.py 2008-06-26 18:05:17 UTC (rev 5681)
+++ trunk/matplotlib/examples/pylab_examples/bar_stacked.py 2008-06-26 19:08:48 UTC (rev 5682)
@@ -1,23 +1,25 @@
#!/usr/bin/env python
# a stacked bar plot with errorbars
-from pylab import *
+import numpy as np
+import matplotlib.pyplot as plt
+
N = 5
menMeans = (20, 35, 30, 35, 27)
womenMeans = (25, 32, 34, 20, 25)
menStd = (2, 3, 4, 1, 2)
womenStd = (3, 5, 2, 3, 3)
-ind = arange(N) # the x locations for the groups
+ind = np.arange(N) # the x locations for the groups
width = 0.35 # the width of the bars: can also be len(x) sequence
-p1 = bar(ind, menMeans, width, color='r', yerr=womenStd)
-p2 = bar(ind, womenMeans, width, color='y',
- bottom=menMeans, yerr=menStd)
+p1 = plt.bar(ind, menMeans, width, color='r', yerr=womenStd)
+p2 = plt.bar(ind, womenMeans, width, color='y',
+ bottom=menMeans, yerr=menStd)
-ylabel('Scores')
-title('Scores by group and gender')
-xticks(ind+width/2., ('G1', 'G2', 'G3', 'G4', 'G5') )
-yticks(arange(0,81,10))
-legend( (p1[0], p2[0]), ('Men', 'Women') )
+plt.ylabel('Scores')
+plt.title('Scores by group and gender')
+plt.xticks(ind+width/2., ('G1', 'G2', 'G3', 'G4', 'G5') )
+plt.yticks(np.arange(0,81,10))
+plt.legend( (p1[0], p2[0]), ('Men', 'Women') )
-show()
+plt.show()
Modified: trunk/matplotlib/examples/pylab_examples/broken_barh.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/broken_barh.py 2008-06-26 18:05:17 UTC (rev 5681)
+++ trunk/matplotlib/examples/pylab_examples/broken_barh.py 2008-06-26 19:08:48 UTC (rev 5682)
@@ -1,10 +1,9 @@
-
"""
Make a "broken" horizontal bar plot, ie one with gaps
"""
-from matplotlib.pyplot import figure, show
+import matplotlib.pyplot as plt
-fig = figure()
+fig = plt.figure()
ax = fig.add_subplot(111)
ax.broken_barh([ (110, 30), (150, 10) ] , (10, 9), facecolors='blue')
ax.broken_barh([ (10, 50), (100, 20), (130, 10)] , (20, 9),
@@ -22,4 +21,4 @@
horizontalalignment='right', verticalalignment='top')
#fig.savefig('broken_barh', dpi=100)
-show()
+plt.show()
Modified: trunk/matplotlib/examples/pylab_examples/hline_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/hline_demo.py 2008-06-26 18:05:17 UTC (rev 5681)
+++ trunk/matplotlib/examples/pylab_examples/hline_demo.py 2008-06-26 19:08:48 UTC (rev 5682)
@@ -1,22 +1,23 @@
#!/usr/bin/env python
-from matplotlib.pyplot import *
-from numpy import sin, exp, absolute, pi, arange
-from numpy.random import normal
+import numpy as np
+import matplotlib.pyplot as plt
def f(t):
- s1 = sin(2*pi*t)
- e1 = exp(-t)
- return absolute((s1*e1))+.05
+ s1 = np.sin(2*np.pi*t)
+ e1 = np.exp(-t)
+ return np.absolute((s1*e1))+.05
-t = arange(0.0, 5.0, 0.1)
+t = np.arange(0.0, 5.0, 0.1)
s = f(t)
-nse = normal(0.0, 0.3, t.shape) * s
+nse = np.random.normal(0.0, 0.3, t.shape) * s
-plot(s+nse, t, 'b^')
-hlines(t, [0], s)
-xlabel('time (s)')
-title('Comparison of model with data')
-savefig('test')
-show()
+plt.plot(s+nse, t, 'b^')
+plt.hlines(t, [0], s, lw=2)
+plt.xlabel('time (s)')
+plt.title('Comparison of model with data')
+plt.savefig('test')
+plt.xlim(xmin=0)
+plt.show()
+
Modified: trunk/matplotlib/examples/pylab_examples/xcorr_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/xcorr_demo.py 2008-06-26 18:05:17 UTC (rev 5681)
+++ trunk/matplotlib/examples/pylab_examples/xcorr_demo.py 2008-06-26 19:08:48 UTC (rev 5682)
@@ -1,17 +1,17 @@
-from matplotlib.pylab import figure, show
-import numpy
+import matplotlib.pyplot as plt
+import numpy as np
-x,y = numpy.random.randn(2,100)
-fig = figure()
+x,y = np.random.randn(2,100)
+fig = plt.figure()
ax1 = fig.add_subplot(211)
-ax1.xcorr(x, y, usevlines=True, maxlags=50, normed=True)
+ax1.xcorr(x, y, usevlines=True, maxlags=50, normed=True, lw=2)
ax1.grid(True)
ax1.axhline(0, color='black', lw=2)
ax2 = fig.add_subplot(212, sharex=ax1)
-ax2.acorr(x, usevlines=True, normed=True, maxlags=50)
+ax2.acorr(x, usevlines=True, normed=True, maxlags=50, lw=2)
ax2.grid(True)
ax2.axhline(0, color='black', lw=2)
-show()
+plt.show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-06-26 18:05:18
|
Revision: 5681
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5681&view=rev
Author: mdboom
Date: 2008-06-26 11:05:17 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
Include some examples inline in the api docs.
Modified Paths:
--------------
trunk/matplotlib/doc/sphinxext/plot_directive.py
trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/doc/sphinxext/plot_directive.py
===================================================================
--- trunk/matplotlib/doc/sphinxext/plot_directive.py 2008-06-26 17:47:04 UTC (rev 5680)
+++ trunk/matplotlib/doc/sphinxext/plot_directive.py 2008-06-26 18:05:17 UTC (rev 5681)
@@ -13,7 +13,7 @@
source will be included inline, as well as a link to the source.
"""
-import sys, os, glob
+import sys, os, glob, shutil
from docutils.parsers.rst import directives
try:
@@ -40,29 +40,10 @@
'class': directives.class_option,
'include-source': directives.flag }
-template_no_source = """
+template = """
.. htmlonly::
- [ `<../%(srcdir)s/%(reference)s>`__,
- `png <../%(srcdir)s/%(basename)s.hires.png>`__,
- `pdf <../%(srcdir)s/%(basename)s.pdf>`__]
-
- .. image:: ../%(srcdir)s/%(basename)s.png
-%(options)s
-
-
-.. latexonly::
- .. image:: ../%(srcdir)s/%(basename)s.pdf
-%(options)s
-
-"""
-
-template_source = """
-.. literalinclude:: ../pyplots/%(reference)s
-
-.. htmlonly::
-
- [ `py <../%(srcdir)s/%(reference)s>`__,
+ [`py <../%(srcdir)s/%(basename)s.py>`__,
`png <../%(srcdir)s/%(basename)s.hires.png>`__,
`pdf <../%(srcdir)s/%(basename)s.pdf>`__]
@@ -90,6 +71,9 @@
basename, ext = os.path.splitext(fname)
all_exists = True
+ if basedir != outdir:
+ shutil.copyfile(fullpath, os.path.join(outdir, fname))
+
for format, dpi in formats:
outname = os.path.join(outdir, '%s.%s' % (basename, format))
if not os.path.exists(outname):
@@ -109,10 +93,10 @@
if os.path.exists(outname): continue
plt.savefig(outname, dpi=dpi)
-
def run(arguments, options, state_machine, lineno):
reference = directives.uri(arguments[0])
- basename, ext = os.path.splitext(reference)
+ basedir, fname = os.path.split(reference)
+ basename, ext = os.path.splitext(fname)
# todo - should we be using the _static dir for the outdir, I am
# not sure we want to corrupt that dir with autogenerated files
@@ -126,16 +110,16 @@
# the figs into the right place, so we may want to do that here instead.
if options.has_key('include-source'):
- template = template_source
+ lines = ['.. literalinclude:: ../pyplots/%(reference)s' % locals()]
del options['include-source']
else:
- template = template_no_source
+ lines = []
+
options = [' :%s: %s' % (key, val) for key, val in
options.items()]
options = "\n".join(options)
- lines = template % locals()
- lines = lines.split('\n')
+ lines.extend((template % locals()).split('\n'))
state_machine.insert_input(
lines, state_machine.input_lines.source(0))
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2008-06-26 17:47:04 UTC (rev 5680)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2008-06-26 18:05:17 UTC (rev 5681)
@@ -2879,6 +2879,9 @@
*linestyle*:
[ 'solid' | 'dashed' | 'dashdot' | 'dotted' ]
+ **Example:**
+
+ .. plot:: ../mpl_examples/pylab_examples/hline_demo.py
"""
if kwargs.get('fmt') is not None:
raise DeprecationWarning(
@@ -3362,6 +3365,13 @@
See the respective :meth:`~matplotlib.axes.Axes.plot` or
:meth:`~matplotlib.axes.Axes.vlines` functions for
documentation on valid kwargs.
+
+ **Example:**
+
+ :func:`~matplotlib.pyplot.xcorr` above, and
+ :func:`~matplotlib.pyplot.acorr` below.
+
+ .. plot:: ../mpl_examples/pylab_examples/xcorr_demo.py
"""
return self.xcorr(x, x, **kwargs)
acorr.__doc__ = cbook.dedent(acorr.__doc__) % martist.kwdocd
@@ -3410,6 +3420,13 @@
*maxlags* is a positive integer detailing the number of lags to show.
The default value of *None* will return all ``(2*len(x)-1)`` lags.
+
+ **Example:**
+
+ :func:`~matplotlib.pyplot.xcorr` above, and
+ :func:`~matplotlib.pyplot.acorr` below.
+
+ .. plot:: ../mpl_examples/pylab_examples/xcorr_demo.py
"""
Nx = len(x)
@@ -3706,6 +3723,12 @@
Other optional kwargs:
%(Rectangle)s
+
+ **Example:**
+
+ A stacked bar chart.
+
+ .. plot:: ../mpl_examples/pylab_examples/bar_stacked.py
"""
if not self._hold: self.cla()
@@ -3998,6 +4021,10 @@
or a sequence of arguments for the various bars, ie::
facecolors = ('black', 'red', 'green')
+
+ **Example:**
+
+ .. plot:: ../mpl_examples/pylab_examples/broken_barh.py
"""
col = mcoll.BrokenBarHCollection(xranges, yrange, **kwargs)
self.add_collection(col, autolim=True)
@@ -5013,6 +5040,10 @@
:meth:`~matplotlib.collection.PolyCollection.get_array` on
this :class:`~matplotlib.collections.PolyCollection` to get
the counts in each hexagon.
+
+ **Example:**
+
+ .. plot:: ../mpl_examples/pylab_examples/hexbin_demo.py
"""
if not self._hold: self.cla()
@@ -5166,6 +5197,10 @@
Optional kwargs control the arrow properties:
%(FancyArrow)s
+
+ **Example:**
+
+ .. plot:: ../mpl_examples/pylab_examples/arrow_demo.py
"""
a = mpatches.FancyArrow(x, y, dx, dy, **kwargs)
self.add_artist(a)
@@ -5225,6 +5260,10 @@
kwargs control the Polygon properties:
%(Polygon)s
+
+ **Example:**
+
+ .. plot:: ../mpl_examples/pylab_examples/fill_demo.py
"""
if not self._hold: self.cla()
@@ -5334,6 +5373,10 @@
Additional kwargs are :class:`~matplotlib.artist.Artist` properties:
%(Artist)s
+
+ **Example:**
+
+ .. plot:: ../mpl_examples/pylab_examples/image_demo.py
"""
if not self._hold: self.cla()
@@ -6081,42 +6124,6 @@
%(Rectangle)s
- Here is an example which generates a histogram of normally
- distributed random numbers and plot the analytic PDF over it::
-
- import numpy as np
- import matplotlib.pyplot as plt
- import matplotlib.mlab as mlab
-
- mu, sigma = 100, 15
- x = mu + sigma * np.random.randn(10000)
-
- fig = plt.figure()
- ax = fig.add_subplot(111)
-
- # the histogram of the data
- n, bins, patches = ax.hist(x, 50, normed=1, facecolor='green', alpha=0.75)
-
- # hist uses np.histogram under the hood to create 'n' and 'bins'.
- # np.histogram returns the bin edges, so there will be 50 probability
- # density values in n, 51 bin edges in bins and 50 patches. To get
- # everything lined up, we'll compute the bin centers
- bincenters = 0.5*(bins[1:]+bins[:-1])
-
- # add a 'best fit' line for the normal PDF
- y = mlab.normpdf( bincenters, mu, sigma)
- l = ax.plot(bincenters, y, 'r--', linewidth=1)
-
- ax.set_xlabel('Smarts')
- ax.set_ylabel('Probability')
- ax.set_title(r'$\mathrm{Histogram\ of\ IQ:}\ \mu=100,\ \sigma=15$')
- ax.set_xlim(40, 160)
- ax.set_ylim(0, 0.03)
- ax.grid(True)
-
- #fig.savefig('histogram_demo',dpi=72)
- plt.show()
-
You can use labels for your histogram, and only the first
:class:`~matplotlib.patches.Rectangle` gets the label (the
others get the magic string '_nolegend_'. This will make the
@@ -6126,6 +6133,9 @@
ax.hist(12+3*np.random.randn(1000), label='women', alpha=0.5)
ax.legend()
+ **Example:**
+
+ .. plot:: ../mpl_examples/pylab_examples/histogram_demo.py
"""
if not self._hold: self.cla()
@@ -6413,6 +6423,10 @@
kwargs control the Line2D properties:
%(Line2D)s
+
+ **Example:**
+
+ .. plot:: ../mpl_examples/pylab_examples/csd_demo.py
"""
if not self._hold: self.cla()
pxy, freqs = mlab.csd(x, y, NFFT, Fs, detrend, window, noverlap)
@@ -6466,6 +6480,10 @@
properties of the coherence plot:
%(Line2D)s
+
+ **Example:**
+
+ .. plot:: ../mpl_examples/pylab_examples/cohere_demo.py
"""
if not self._hold: self.cla()
cxy, freqs = mlab.cohere(x, y, NFFT, Fs, detrend, window, noverlap)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-06-26 17:47:07
|
Revision: 5680
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5680&view=rev
Author: mdboom
Date: 2008-06-26 10:47:04 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
Fix documentation build on Debian.
Modified Paths:
--------------
trunk/matplotlib/doc/pyplots/tex_unicode_demo.py
Modified: trunk/matplotlib/doc/pyplots/tex_unicode_demo.py
===================================================================
--- trunk/matplotlib/doc/pyplots/tex_unicode_demo.py 2008-06-26 14:05:34 UTC (rev 5679)
+++ trunk/matplotlib/doc/pyplots/tex_unicode_demo.py 2008-06-26 17:47:04 UTC (rev 5680)
@@ -13,7 +13,7 @@
plot(t, s)
xlabel(r'\textbf{time (s)}')
-ylabel(unicode(r'\textit{Velocity (\xB0/sec)}','latin-1'),fontsize=16)
+ylabel(unicode('\\textit{Velocity (\xB0/sec)}','latin-1'),fontsize=16)
title(r"\TeX\ is Number $\displaystyle\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}$!",
fontsize=16, color='r')
grid(True)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-06-26 14:05:35
|
Revision: 5679
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5679&view=rev
Author: mdboom
Date: 2008-06-26 07:05:34 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
Tagging 0.98.2 release.
Added Paths:
-----------
tags/v0_98_2/
Copied: tags/v0_98_2 (from rev 5667, trunk/matplotlib)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-06-26 12:39:36
|
Revision: 5678
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5678&view=rev
Author: mdboom
Date: 2008-06-26 05:39:30 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
Merged revisions 5676-5677 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_91_maint
........
r5677 | mdboom | 2008-06-26 08:36:15 -0400 (Thu, 26 Jun 2008) | 1 line
Oops in last commit
........
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
Property Changed:
----------------
trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Name: svnmerge-integrated
- /branches/v0_91_maint:1-5675
+ /branches/v0_91_maint:1-5677
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_ps.py 2008-06-26 12:36:15 UTC (rev 5677)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_ps.py 2008-06-26 12:39:30 UTC (rev 5678)
@@ -254,7 +254,7 @@
hatchr cvi hatchgap idiv hatchgap mul
{hatcht m 0 hatchb hatcht sub r }
for
- strokeCHAN
+ stroke
grestore
""" % (angle, 12/density)
self._pswriter.write("gsave\n")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-06-26 12:36:55
|
Revision: 5677
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5677&view=rev
Author: mdboom
Date: 2008-06-26 05:36:15 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
Oops in last commit
Modified Paths:
--------------
branches/v0_91_maint/lib/matplotlib/backends/backend_ps.py
Modified: branches/v0_91_maint/lib/matplotlib/backends/backend_ps.py
===================================================================
--- branches/v0_91_maint/lib/matplotlib/backends/backend_ps.py 2008-06-26 12:32:32 UTC (rev 5676)
+++ branches/v0_91_maint/lib/matplotlib/backends/backend_ps.py 2008-06-26 12:36:15 UTC (rev 5677)
@@ -254,7 +254,7 @@
hatchr cvi hatchgap idiv hatchgap mul
{hatcht moveto 0 hatchb hatcht sub rlineto}
for
- strokeCHAN
+ stroke
grestore
""" % (angle, 12/density)
self._pswriter.write("gsave\n")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-06-26 12:32:34
|
Revision: 5676
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5676&view=rev
Author: mdboom
Date: 2008-06-26 05:32:32 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
Merged revisions 5635-5675 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_91_maint
........
r5638 | cmoad | 2008-06-22 22:11:08 -0400 (Sun, 22 Jun 2008) | 1 line
minor rev bump
........
r5675 | mdboom | 2008-06-26 08:28:48 -0400 (Thu, 26 Jun 2008) | 2 lines
Fix direction of horizontal and vertical hatching.
........
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
Property Changed:
----------------
trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Name: svnmerge-integrated
- /branches/v0_91_maint:1-5635
+ /branches/v0_91_maint:1-5675
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-06-26 12:28:48 UTC (rev 5675)
+++ trunk/matplotlib/CHANGELOG 2008-06-26 12:32:32 UTC (rev 5676)
@@ -1,3 +1,5 @@
+2008-06-26 Fix direction of horizontal/vertical hatches - MGD
+
2008-06-25 Figure.figurePatch renamed Figure.patch, Axes.axesPatch
renamed Axes.patch, Axes.axesFrame renamed Axes.frame,
Axes.get_frame, which returns Axes.patch, is deprecated.
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_ps.py 2008-06-26 12:28:48 UTC (rev 5675)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_ps.py 2008-06-26 12:32:32 UTC (rev 5676)
@@ -254,12 +254,12 @@
hatchr cvi hatchgap idiv hatchgap mul
{hatcht m 0 hatchb hatcht sub r }
for
- stroke
+ strokeCHAN
grestore
""" % (angle, 12/density)
self._pswriter.write("gsave\n")
- self._pswriter.write(do_hatch(0, hatches['horiz']))
- self._pswriter.write(do_hatch(90, hatches['vert']))
+ self._pswriter.write(do_hatch(90, hatches['horiz']))
+ self._pswriter.write(do_hatch(0, hatches['vert']))
self._pswriter.write(do_hatch(45, hatches['diag1']))
self._pswriter.write(do_hatch(-45, hatches['diag2']))
self._pswriter.write("grestore\n")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-06-26 12:28:51
|
Revision: 5675
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5675&view=rev
Author: mdboom
Date: 2008-06-26 05:28:48 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
Fix direction of horizontal and vertical hatching.
Modified Paths:
--------------
branches/v0_91_maint/CHANGELOG
branches/v0_91_maint/lib/matplotlib/backends/backend_ps.py
Modified: branches/v0_91_maint/CHANGELOG
===================================================================
--- branches/v0_91_maint/CHANGELOG 2008-06-25 22:03:15 UTC (rev 5674)
+++ branches/v0_91_maint/CHANGELOG 2008-06-26 12:28:48 UTC (rev 5675)
@@ -1,3 +1,5 @@
+2008-06-26 Fix direction of horizontal/vertical hatches - MGD
+
===============================================================
2008-06-22 Released 0.91.4 at revision 5638
Modified: branches/v0_91_maint/lib/matplotlib/backends/backend_ps.py
===================================================================
--- branches/v0_91_maint/lib/matplotlib/backends/backend_ps.py 2008-06-25 22:03:15 UTC (rev 5674)
+++ branches/v0_91_maint/lib/matplotlib/backends/backend_ps.py 2008-06-26 12:28:48 UTC (rev 5675)
@@ -254,12 +254,12 @@
hatchr cvi hatchgap idiv hatchgap mul
{hatcht moveto 0 hatchb hatcht sub rlineto}
for
- stroke
+ strokeCHAN
grestore
""" % (angle, 12/density)
self._pswriter.write("gsave\n")
- self._pswriter.write(do_hatch(0, hatches['horiz']))
- self._pswriter.write(do_hatch(90, hatches['vert']))
+ self._pswriter.write(do_hatch(90, hatches['horiz']))
+ self._pswriter.write(do_hatch(0, hatches['vert']))
self._pswriter.write(do_hatch(45, hatches['diag1']))
self._pswriter.write(do_hatch(-45, hatches['diag2']))
self._pswriter.write("grestore\n")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-06-25 22:03:39
|
Revision: 5674
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5674&view=rev
Author: jdh2358
Date: 2008-06-25 15:03:15 -0700 (Wed, 25 Jun 2008)
Log Message:
-----------
renamed axesPatch, axesFrame and figurePatch to be less redundant
Modified Paths:
--------------
trunk/matplotlib/API_CHANGES
trunk/matplotlib/CHANGELOG
trunk/matplotlib/doc/faq/howto_faq.rst
trunk/matplotlib/doc/pyplots/fig_axes_customize_simple.py
trunk/matplotlib/doc/users/artists.rst
trunk/matplotlib/examples/api/logo2.py
trunk/matplotlib/examples/pylab_examples/set_and_get.py
trunk/matplotlib/lib/matplotlib/axes.py
trunk/matplotlib/lib/matplotlib/figure.py
trunk/matplotlib/lib/matplotlib/image.py
Modified: trunk/matplotlib/API_CHANGES
===================================================================
--- trunk/matplotlib/API_CHANGES 2008-06-25 21:43:09 UTC (rev 5673)
+++ trunk/matplotlib/API_CHANGES 2008-06-25 22:03:15 UTC (rev 5674)
@@ -1,3 +1,10 @@
+Changes for 0.98.x
+==================
+
+* Figure.figurePatch renamed Figure.patch, Axes.axesPatch renamed
+ Axes.patch, Axes.axesFrame renamed Axes.frame, Axes.get_frame, which
+ returns Axes.patch, is deprecated. Examples and users guide updated
+
Changes for 0.98.1
==================
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-06-25 21:43:09 UTC (rev 5673)
+++ trunk/matplotlib/CHANGELOG 2008-06-25 22:03:15 UTC (rev 5674)
@@ -1,3 +1,8 @@
+2008-06-25 Figure.figurePatch renamed Figure.patch, Axes.axesPatch
+ renamed Axes.patch, Axes.axesFrame renamed Axes.frame,
+ Axes.get_frame, which returns Axes.patch, is deprecated.
+ Examples and users guide updated - JDH
+
2008-06-25 Fix rendering quality of pcolor - MGD
=================================================================
Modified: trunk/matplotlib/doc/faq/howto_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/howto_faq.rst 2008-06-25 21:43:09 UTC (rev 5673)
+++ trunk/matplotlib/doc/faq/howto_faq.rst 2008-06-25 22:03:15 UTC (rev 5674)
@@ -17,15 +17,15 @@
image on the screen. If you need finer grained control, eg you do not
want full transparency or you to affect the screen displayed version
as well, you can set the alpha properties directly. The figure has a
-:class:`matplotlib.patches.Rectangle` instance called *figurePatch*
-and the axes has a Rectangle instance called *axesPatch*. You can set
+:class:`matplotlib.patches.Rectangle` instance called *patch*
+and the axes has a Rectangle instance called *patch*. You can set
any property on them directly (*facecolor*, *edgecolor*, *linewidth*,
*linestyle*, *alpha*). Eg::
fig = plt.figure()
- fig.figurePatch.set_alpha(0.5)
+ fig.patch.set_alpha(0.5)
ax = fig.add_subplot(111)
- ax.axesPatch.set_alpha(0.5)
+ ax.patch.set_alpha(0.5)
If you need *all* the figure elements to be transparent, there is
currently no global alpha setting, but you can set the alpha channel
Modified: trunk/matplotlib/doc/pyplots/fig_axes_customize_simple.py
===================================================================
--- trunk/matplotlib/doc/pyplots/fig_axes_customize_simple.py 2008-06-25 21:43:09 UTC (rev 5673)
+++ trunk/matplotlib/doc/pyplots/fig_axes_customize_simple.py 2008-06-25 22:03:15 UTC (rev 5674)
@@ -3,11 +3,11 @@
# plt.figure creates a matplotlib.figure.Figure instance
fig = plt.figure()
-rect = fig.figurePatch # a rectangle instance
+rect = fig.patch # a rectangle instance
rect.set_facecolor('lightgoldenrodyellow')
ax1 = fig.add_axes([0.1, 0.3, 0.4, 0.4])
-rect = ax1.axesPatch
+rect = ax1.patch
rect.set_facecolor('lightslategray')
Modified: trunk/matplotlib/doc/users/artists.rst
===================================================================
--- trunk/matplotlib/doc/users/artists.rst 2008-06-25 21:43:09 UTC (rev 5673)
+++ trunk/matplotlib/doc/users/artists.rst 2008-06-25 22:03:15 UTC (rev 5674)
@@ -151,9 +151,9 @@
(the standard white box with black edges in the typical matplotlib
plot, has a ``Rectangle`` instance that determines the color,
transparency, and other properties of the Axes. These instances are
-stored as member variables :attr:`Figure.figurePatch
-<matplotlib.figure.Figure.figurePatch>` and :attr:`Axes.axesPatch
-<matplotlib.axes.Axes.axesPatch>` ("Patch" is a name inherited from
+stored as member variables :attr:`Figure.patch
+<matplotlib.figure.Figure.patch>` and :attr:`Axes.patch
+<matplotlib.axes.Axes.patch>` ("Patch" is a name inherited from
MATLAB™, and is a 2D "patch" of color on the figure, eg. rectangles,
circles and polygons). Every matplotlib ``Artist`` has the following
properties
@@ -199,7 +199,7 @@
.. sourcecode:: ipython
- In [149]: matplotlib.artist.getp(fig.figurePatch)
+ In [149]: matplotlib.artist.getp(fig.patch)
alpha = 1.0
animated = False
antialiased or aa = True
@@ -261,7 +261,7 @@
:class:`matplotlib.figure.Figure`, and it contains everything in the
figure. The background of the figure is a
:class:`~matplotlib.patches.Rectangle` which is stored in
-:attr:`Figure.figurePatch <matplotlib.figure.Figure.figurePatch>`. As
+:attr:`Figure.patch <matplotlib.figure.Figure.patch>`. As
you add subplots (:meth:`~matplotlib.figure.Figure.add_subplot`) and
axes (:meth:`~matplotlib.figure.Figure.add_axes`) to the figure
these will be appended to the :attr:`Figure.axes
@@ -336,7 +336,7 @@
Figure attribute Description
================ ===============================================================
axes A list of Axes instances (includes Subplot)
-figurePatch The Rectangle background
+patch The Rectangle background
images A list of FigureImages patches - useful for raw pixel display
legends A list of Figure Legend instances (different from Axes.legends)
lines A list of Figure Line2D instances (rarely used, see Axes.lines)
@@ -356,13 +356,13 @@
customize the ``Artists`` it contains. Like the
:class:`~matplotlib.figure.Figure`, it contains a
:class:`~matplotlib.patches.Patch`
-:attr:`~matplotlib.axes.Axes.axesPatch` which is a
+:attr:`~matplotlib.axes.Axes.patch` which is a
:class:`~matplotlib.patches.Rectangle` for Cartesian coordinates and a
:class:`~matplotlib.patches.Circle` for polar coordinates; this patch
determines the shape, background and border of the plotting region::
ax = fig.add_subplot(111)
- rect = ax.axesPatch # a Rectangle instance
+ rect = ax.patch # a Rectangle instance
rect.set_facecolor('green')
When you call a plotting method, eg. the canonical
@@ -511,7 +511,7 @@
Axes attribute Description
============== ======================================
artists A list of Artist instances
-axesPatch Rectangle instance for Axes background
+patch Rectangle instance for Axes background
collections A list of Collection instances
images A list of AxesImage
legends A list of Legend instances
Modified: trunk/matplotlib/examples/api/logo2.py
===================================================================
--- trunk/matplotlib/examples/api/logo2.py 2008-06-25 21:43:09 UTC (rev 5673)
+++ trunk/matplotlib/examples/api/logo2.py 2008-06-25 22:03:15 UTC (rev 5674)
@@ -7,12 +7,12 @@
figcolor = '#FFFFCC'
dpi = 80
fig = plt.figure(figsize=(8, 2),dpi=dpi)
-fig.figurePatch.set_edgecolor(figcolor)
-fig.figurePatch.set_facecolor(figcolor)
+fig.patch.set_edgecolor(figcolor)
+fig.patch.set_facecolor(figcolor)
# the polar bar plot
ax = fig.add_axes([0.05, 0.05, 0.2, 01], polar=True)
-ax.axesPatch.set_alpha(axalpha)
+ax.patch.set_alpha(axalpha)
N = 20
theta = np.arange(0.0, 2*np.pi, 2*np.pi/N) + np.pi
radii = 10*np.random.rand(N)
@@ -31,7 +31,7 @@
# the histogram
axhist = fig.add_axes([0.275, 0.075, 0.2, 0.4])
-axhist.axesPatch.set_alpha(axalpha)
+axhist.patch.set_alpha(axalpha)
mu, sigma = 100, 15
x = mu + sigma*np.random.randn(10000)
Modified: trunk/matplotlib/examples/pylab_examples/set_and_get.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/set_and_get.py 2008-06-25 21:43:09 UTC (rev 5673)
+++ trunk/matplotlib/examples/pylab_examples/set_and_get.py 2008-06-25 22:03:15 UTC (rev 5674)
@@ -83,9 +83,9 @@
getp(l1)
print 'Rectangle setters'
-setp(gca().axesPatch)
+setp(gca().patch)
print 'Rectangle getters'
-getp(gca().axesPatch)
+getp(gca().patch)
t = title('Hi mom')
print 'Text setters'
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2008-06-25 21:43:09 UTC (rev 5673)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2008-06-25 22:03:15 UTC (rev 5674)
@@ -815,7 +815,7 @@
a.set_transform(self.transData)
a.axes = self
- def get_axes_patch(self):
+ def _gen_axes_patch(self):
"""
Returns the patch used to draw the background of the axes. It
is also used as the clipping path for any data elements on the
@@ -878,24 +878,30 @@
self._set_artist_props(self.title)
- self.axesPatch = self.get_axes_patch()
- self.axesPatch.set_figure(self.figure)
- self.axesPatch.set_facecolor(self._axisbg)
- self.axesPatch.set_edgecolor(rcParams['axes.edgecolor'])
- self.axesPatch.set_linewidth(rcParams['axes.linewidth'])
- self.axesPatch.set_transform(self.transAxes)
+ # the patch draws the background of the axes. we want this to
+ # be below the other artists; the axesPatch name is deprecated
+ self.patch = self.axesPatch = self._gen_axes_patch()
+ self.patch.set_figure(self.figure)
+ self.patch.set_facecolor(self._axisbg)
+ self.patch.set_edgecolor(rcParams['axes.edgecolor'])
+ self.patch.set_linewidth(rcParams['axes.linewidth'])
+ self.patch.set_transform(self.transAxes)
- self.axesFrame = self.get_axes_patch()
- self.axesFrame.set_figure(self.figure)
- self.axesFrame.set_facecolor('none')
- self.axesFrame.set_edgecolor(rcParams['axes.edgecolor'])
- self.axesFrame.set_linewidth(rcParams['axes.linewidth'])
- self.axesFrame.set_transform(self.transAxes)
- self.axesFrame.set_zorder(2.5)
+ # the frame draws the border around the axes and we want this
+ # above. this is a place holder for a more sophisticated
+ # artist that might just draw a left, bottom frame, or a
+ # centered frame, etc the axesFrame name is deprecated
+ self.frame = self.axesFrame = self._gen_axes_patch()
+ self.frame.set_figure(self.figure)
+ self.frame.set_facecolor('none')
+ self.frame.set_edgecolor(rcParams['axes.edgecolor'])
+ self.frame.set_linewidth(rcParams['axes.linewidth'])
+ self.frame.set_transform(self.transAxes)
+ self.frame.set_zorder(2.5)
self.axison = True
- self.xaxis.set_clip_path(self.axesPatch)
- self.yaxis.set_clip_path(self.axesPatch)
+ self.xaxis.set_clip_path(self.patch)
+ self.yaxis.set_clip_path(self.patch)
def clear(self):
@@ -1211,7 +1217,8 @@
def get_frame(self):
'Return the axes Rectangle frame'
- return self.axesPatch
+ warnings.warn('use ax.patch instead', DeprecationWarning)
+ return self.patch
def get_legend(self):
'Return the legend.Legend instance, or None if no legend is defined'
@@ -1271,7 +1278,7 @@
a.set_axes(self)
self.artists.append(a)
self._set_artist_props(a)
- a.set_clip_path(self.axesPatch)
+ a.set_clip_path(self.patch)
a._remove_method = lambda h: self.artists.remove(h)
def add_collection(self, collection, autolim=True):
@@ -1284,7 +1291,7 @@
collection.set_label('collection%d'%len(self.collections))
self.collections.append(collection)
self._set_artist_props(collection)
- collection.set_clip_path(self.axesPatch)
+ collection.set_clip_path(self.patch)
if autolim:
if collection._paths and len(collection._paths):
self.update_datalim(collection.get_datalim(self.transData))
@@ -1296,7 +1303,7 @@
lines
'''
self._set_artist_props(line)
- line.set_clip_path(self.axesPatch)
+ line.set_clip_path(self.patch)
self._update_line_limits(line)
if not line.get_label():
@@ -1317,7 +1324,7 @@
"""
self._set_artist_props(p)
- p.set_clip_path(self.axesPatch)
+ p.set_clip_path(self.patch)
self._update_patch_limits(p)
self.patches.append(p)
p._remove_method = lambda h: self.patches.remove(h)
@@ -1345,7 +1352,7 @@
'''
self._set_artist_props(tab)
self.tables.append(tab)
- tab.set_clip_path(self.axesPatch)
+ tab.set_clip_path(self.patch)
tab._remove_method = lambda h: self.tables.remove(h)
def relim(self):
@@ -1419,7 +1426,7 @@
return *True* if the given *mouseevent* (in display coords)
is in the Axes
'''
- return self.axesPatch.contains(mouseevent)[0]
+ return self.patch.contains(mouseevent)[0]
def get_autoscale_on(self):
"""
@@ -1475,7 +1482,7 @@
self.apply_aspect(self.get_position(True))
if self.axison and self._frameon:
- self.axesPatch.draw(renderer)
+ self.patch.draw(renderer)
artists = []
@@ -1508,8 +1515,8 @@
# respect z-order for now
renderer.draw_image(
round(l), round(b), im, self.bbox,
- self.axesPatch.get_path(),
- self.axesPatch.get_transform())
+ self.patch.get_path(),
+ self.patch.get_transform())
artists.extend(self.collections)
artists.extend(self.patches)
@@ -1529,7 +1536,7 @@
if self.legend_ is not None:
artists.append(self.legend_)
if self.axison and self._frameon:
- artists.append(self.axesFrame)
+ artists.append(self.frame)
dsu = [ (a.zorder, i, a) for i, a in enumerate(artists)
if not a.get_animated() ]
@@ -1696,7 +1703,7 @@
"""
self._axisbg = color
- self.axesPatch.set_facecolor(color)
+ self.patch.set_facecolor(color)
### data limits, ticks, tick labels, and formatting
@@ -2364,8 +2371,8 @@
children.append(self.legend_)
children.extend(self.collections)
children.append(self.title)
- children.append(self.axesPatch)
- children.append(self.axesFrame)
+ children.append(self.patch)
+ children.append(self.frame)
return children
def contains(self,mouseevent):
@@ -2375,7 +2382,7 @@
"""
if callable(self._contains): return self._contains(self,mouseevent)
- inside = self.axesPatch.contains(mouseevent.x, mouseevent.y)
+ inside = self.patch.contains(mouseevent.x, mouseevent.y)
return inside,{}
def pick(self, *args):
@@ -2647,7 +2654,7 @@
a = mtext.Annotation(*args, **kwargs)
a.set_transform(mtransforms.IdentityTransform())
self._set_artist_props(a)
- if kwargs.has_key('clip_on'): a.set_clip_path(self.axesPatch)
+ if kwargs.has_key('clip_on'): a.set_clip_path(self.patch)
self.texts.append(a)
return a
annotate.__doc__ = cbook.dedent(annotate.__doc__) % martist.kwdocd
@@ -5342,7 +5349,7 @@
im.set_data(X)
im.set_alpha(alpha)
self._set_artist_props(im)
- im.set_clip_path(self.axesPatch)
+ im.set_clip_path(self.patch)
#if norm is None and shape is None:
# im.set_clim(vmin, vmax)
if vmin is not None or vmax is not None:
Modified: trunk/matplotlib/lib/matplotlib/figure.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/figure.py 2008-06-25 21:43:09 UTC (rev 5673)
+++ trunk/matplotlib/lib/matplotlib/figure.py 2008-06-25 22:03:15 UTC (rev 5674)
@@ -209,7 +209,7 @@
The figure patch is drawn by a the attribute
- *figurePatch*
+ *patch*
a :class:`matplotlib.patches.Rectangle` instance
*suppressComposite*
@@ -265,12 +265,13 @@
self.transFigure = BboxTransformTo(self.bbox)
- self.figurePatch = Rectangle(
+ # the figurePatch name is deprecated
+ self.patch = self.figurePatch = Rectangle(
xy=(0,0), width=1, height=1,
facecolor=facecolor, edgecolor=edgecolor,
linewidth=linewidth,
)
- self._set_artist_props(self.figurePatch)
+ self._set_artist_props(self.patch)
self._hold = rcParams['axes.hold']
self.canvas = None
@@ -331,7 +332,7 @@
def get_children(self):
'get a list of artists contained in the figure'
- children = [self.figurePatch]
+ children = [self.patch]
children.extend(self.artists)
children.extend(self.axes)
children.extend(self.lines)
@@ -527,11 +528,11 @@
def get_edgecolor(self):
'Get the edge color of the Figure rectangle'
- return self.figurePatch.get_edgecolor()
+ return self.patch.get_edgecolor()
def get_facecolor(self):
'Get the face color of the Figure rectangle'
- return self.figurePatch.get_facecolor()
+ return self.patch.get_facecolor()
def get_figwidth(self):
'Return the figwidth as a float'
@@ -555,7 +556,7 @@
ACCEPTS: any matplotlib color - see help(colors)
"""
- self.figurePatch.set_edgecolor(color)
+ self.patch.set_edgecolor(color)
def set_facecolor(self, color):
"""
@@ -563,7 +564,7 @@
ACCEPTS: any matplotlib color - see help(colors)
"""
- self.figurePatch.set_facecolor(color)
+ self.patch.set_facecolor(color)
def set_dpi(self, val):
"""
@@ -795,7 +796,7 @@
if not self.get_visible(): return
renderer.open_group('figure')
- if self.frameon: self.figurePatch.draw(renderer)
+ if self.frameon: self.patch.draw(renderer)
# todo: respect zorder
for p in self.patches: p.draw(renderer)
@@ -1022,20 +1023,20 @@
transparent = kwargs.pop('transparent', False)
if transparent:
- original_figure_alpha = self.figurePatch.get_alpha()
- self.figurePatch.set_alpha(0.0)
+ original_figure_alpha = self.patch.get_alpha()
+ self.patch.set_alpha(0.0)
original_axes_alpha = []
for ax in self.axes:
- axesPatch = ax.get_frame()
- original_axes_alpha.append(axesPatch.get_alpha())
- axesPatch.set_alpha(0.0)
+ patch = ax.patch
+ original_axes_alpha.append(patch.get_alpha())
+ patch.set_alpha(0.0)
self.canvas.print_figure(*args, **kwargs)
if transparent:
- self.figurePatch.set_alpha(original_figure_alpha)
+ self.patch.set_alpha(original_figure_alpha)
for ax, alpha in zip(self.axes, original_axes_alpha):
- ax.get_frame().set_alpha(alpha)
+ ax.patch.set_alpha(alpha)
def colorbar(self, mappable, cax=None, ax=None, **kw):
if ax is None:
Modified: trunk/matplotlib/lib/matplotlib/image.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/image.py 2008-06-25 21:43:09 UTC (rev 5673)
+++ trunk/matplotlib/lib/matplotlib/image.py 2008-06-25 22:03:15 UTC (rev 5674)
@@ -193,7 +193,7 @@
else:
im = self._imcache
- fc = self.axes.get_frame().get_facecolor()
+ fc = self.axes.patch.get_facecolor()
bg = mcolors.colorConverter.to_rgba(fc, 0)
im.set_bg( *bg)
@@ -400,7 +400,7 @@
im = _image.pcolor(self._Ax, self._Ay, self._A,
height, width,
(x0, x0+v_width, y0, y0+v_height))
- fc = self.axes.get_frame().get_facecolor()
+ fc = self.axes.patch.get_facecolor()
bg = mcolors.colorConverter.to_rgba(fc, 0)
im.set_bg(*bg)
return im
@@ -500,7 +500,7 @@
def make_image(self, magnification=1.0):
if self._A is None:
raise RuntimeError('You must first set the image array')
- fc = self.axes.get_frame().get_facecolor()
+ fc = self.axes.patch.get_facecolor()
bg = mcolors.colorConverter.to_rgba(fc, 0)
bg = (np.array(bg)*255).astype(np.uint8)
l, b, r, t = self.axes.bbox.extents
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-06-25 21:43:10
|
Revision: 5673
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5673&view=rev
Author: jdh2358
Date: 2008-06-25 14:43:09 -0700 (Wed, 25 Jun 2008)
Log Message:
-----------
updated the autotick label faq to use bboxes and transforms rather than iteration
Modified Paths:
--------------
trunk/matplotlib/doc/faq/howto_faq.rst
trunk/matplotlib/doc/pyplots/auto_subplots_adjust.py
Modified: trunk/matplotlib/doc/faq/howto_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/howto_faq.rst 2008-06-25 14:37:23 UTC (rev 5672)
+++ trunk/matplotlib/doc/faq/howto_faq.rst 2008-06-25 21:43:09 UTC (rev 5673)
@@ -112,9 +112,9 @@
get the window extent there, and then do something with it, eg move
the left of the canvas over; see :ref:`event-handling-tutorial`.
-Here is a recursive, iterative solution that will gradually move the
-left of the subplot over until the label fits w/o going outside the
-figure border (requires matplotlib 0.98)
+Here is that gets a bounding box in relative figure coordinates (0..1)
+of each of the labels and uses it to move the left of the subplots
+over so that the tick labels fit in the figure
.. plot:: auto_subplots_adjust.py
:include-source:
Modified: trunk/matplotlib/doc/pyplots/auto_subplots_adjust.py
===================================================================
--- trunk/matplotlib/doc/pyplots/auto_subplots_adjust.py 2008-06-25 14:37:23 UTC (rev 5672)
+++ trunk/matplotlib/doc/pyplots/auto_subplots_adjust.py 2008-06-25 21:43:09 UTC (rev 5673)
@@ -1,5 +1,5 @@
import matplotlib.pyplot as plt
-
+import matplotlib.transforms as mtransforms
fig = plt.figure()
ax = fig.add_subplot(111)
ax.plot(range(10))
@@ -7,13 +7,24 @@
labels = ax.set_yticklabels(('really, really, really', 'long', 'labels'))
def on_draw(event):
+ bboxes = []
for label in labels:
bbox = label.get_window_extent()
- if bbox.xmin<0:
- fig.subplots_adjust(left=1.1*fig.subplotpars.left)
- fig.canvas.draw()
- break
+ # the figure transform goes from relative coords->pixels and we
+ # want the inverse of that
+ bboxi = bbox.inverse_transformed(fig.transFigure)
+ bboxes.append(bboxi)
+ # this is the bbox that bounds all the bboxes, again in relative
+ # figure coords
+ bbox = mtransforms.Bbox.union(bboxes)
+ if fig.subplotpars.left < bbox.width:
+ # we need to move it over
+ fig.subplots_adjust(left=1.1*bbox.width) # pad a little
+ fig.canvas.draw()
+ return False
+
fig.canvas.mpl_connect('draw_event', on_draw)
plt.show()
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-06-25 14:37:31
|
Revision: 5672
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5672&view=rev
Author: jdh2358
Date: 2008-06-25 07:37:23 -0700 (Wed, 25 Jun 2008)
Log Message:
-----------
added transparent figure faq
Modified Paths:
--------------
trunk/matplotlib/doc/faq/howto_faq.rst
Modified: trunk/matplotlib/doc/faq/howto_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/howto_faq.rst 2008-06-25 12:49:57 UTC (rev 5671)
+++ trunk/matplotlib/doc/faq/howto_faq.rst 2008-06-25 14:37:23 UTC (rev 5672)
@@ -6,7 +6,35 @@
.. contents::
+.. _howto-transparent:
+How do I save transparent figures?
+==================================
+
+The :meth:`~matplotlib.pyplot.savefig` command has a keyword argument
+*transparent* which, if True, will make the figure and axes
+backgrounds transparent when saving, but will not affect the displayed
+image on the screen. If you need finer grained control, eg you do not
+want full transparency or you to affect the screen displayed version
+as well, you can set the alpha properties directly. The figure has a
+:class:`matplotlib.patches.Rectangle` instance called *figurePatch*
+and the axes has a Rectangle instance called *axesPatch*. You can set
+any property on them directly (*facecolor*, *edgecolor*, *linewidth*,
+*linestyle*, *alpha*). Eg::
+
+ fig = plt.figure()
+ fig.figurePatch.set_alpha(0.5)
+ ax = fig.add_subplot(111)
+ ax.axesPatch.set_alpha(0.5)
+
+If you need *all* the figure elements to be transparent, there is
+currently no global alpha setting, but you can set the alpha channel
+on individual elements, eg::
+
+ ax.plot(x, y, alpha=0.5)
+ ax.set_xlabel('volts', alpha=0.5)
+
+
.. _howto-subplots-adjust:
How do I move the edge of my axes area over to make room for my tick labels?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-06-25 12:50:19
|
Revision: 5671
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5671&view=rev
Author: mdboom
Date: 2008-06-25 05:49:57 -0700 (Wed, 25 Jun 2008)
Log Message:
-----------
Fix rendering quality of pcolor.
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/axes.py
trunk/matplotlib/lib/matplotlib/collections.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-06-24 19:15:20 UTC (rev 5670)
+++ trunk/matplotlib/CHANGELOG 2008-06-25 12:49:57 UTC (rev 5671)
@@ -1,9 +1,11 @@
+2008-06-25 Fix rendering quality of pcolor - MGD
+
=================================================================
-2006-02-24 Released 0.98.2 at svn r5667 - (source only for debian) JDH
+2008-06-24 Released 0.98.2 at svn r5667 - (source only for debian) JDH
-2006-06-24 Added "transparent" kwarg to savefig. - MGD
+2008-06-24 Added "transparent" kwarg to savefig. - MGD
-2006-06-24 Applied Stefan's patch to draw a sinle centered marker over
+2008-06-24 Applied Stefan's patch to draw a sinle centered marker over
a line with numpoints==1 - JDH
2008-06-23 Use splines to render circles in scatter plots - MGD
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2008-06-24 19:15:20 UTC (rev 5670)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2008-06-25 12:49:57 UTC (rev 5671)
@@ -5563,8 +5563,8 @@
edgecolors = (0,0,0,1),
linewidths = (0.25,)
else:
- edgecolors = 'None'
- linewidths = (0.0,)
+ edgecolors = 'face'
+ linewidths = (1.0,)
kwargs.setdefault('edgecolors', edgecolors)
kwargs.setdefault('antialiaseds', (0,))
kwargs.setdefault('linewidths', linewidths)
@@ -5607,8 +5607,8 @@
*C* may be a masked array, but *X* and *Y* may not. Masked
array support is implemented via *cmap* and *norm*; in
- contrast, *pcolor* simply does not draw quadrilaterals with
- masked colors or vertices.
+ contrast, :func:`~matplotlib.pyplot.pcolor` simply does not
+ draw quadrilaterals with masked colors or vertices.
Keyword arguments:
@@ -5646,7 +5646,7 @@
*alpha*: 0 <= scalar <= 1
the alpha blending value
- Return value is a :class:`matplotlib.collection.Collection`
+ Return value is a :class:`matplotlib.collection.QuadMesh`
object.
See :func:`~matplotlib.pyplot.pcolor` for an explanation of
Modified: trunk/matplotlib/lib/matplotlib/collections.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/collections.py 2008-06-24 19:15:20 UTC (rev 5670)
+++ trunk/matplotlib/lib/matplotlib/collections.py 2008-06-25 12:49:57 UTC (rev 5671)
@@ -184,11 +184,16 @@
offsets = transOffset.transform_non_affine(offsets)
transOffset = transOffset.get_affine()
+ if self._edgecolors == 'face':
+ edgecolors = self._facecolors
+ else:
+ edgecolors = self._edgecolors
+
renderer.draw_path_collection(
transform.frozen(), self.clipbox, clippath, clippath_trans,
paths, self.get_transforms(),
offsets, transOffset,
- self._facecolors, self._edgecolors, self._linewidths,
+ self._facecolors, edgecolors, self._linewidths,
self._linestyles, self._antialiaseds)
renderer.close_group(self.__class__.__name__)
@@ -318,12 +323,18 @@
Set the edgecolor(s) of the collection. *c* can be a
matplotlib color arg (all patches have same color), or a
sequence or rgba tuples; if it is a sequence the patches will
- cycle through the sequence
+ cycle through the sequence.
+ If *c* is 'face', the edge color will always be the same as
+ the face color.
+
ACCEPTS: matplotlib color arg or sequence of rgba tuples
"""
- if c is None: c = mpl.rcParams['patch.edgecolor']
- self._edgecolors = _colors.colorConverter.to_rgba_array(c, self._alpha)
+ if c == 'face':
+ self._edgecolors = 'face'
+ else:
+ if c is None: c = mpl.rcParams['patch.edgecolor']
+ self._edgecolors = _colors.colorConverter.to_rgba_array(c, self._alpha)
set_edgecolors = set_edgecolor
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-06-24 19:15:22
|
Revision: 5670
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5670&view=rev
Author: jdh2358
Date: 2008-06-24 12:15:20 -0700 (Tue, 24 Jun 2008)
Log Message:
-----------
use plain text rather than text image for watermark example
Modified Paths:
--------------
trunk/matplotlib/doc/devel/release_guide.rst
trunk/matplotlib/examples/api/watermark_text.py
Modified: trunk/matplotlib/doc/devel/release_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/release_guide.rst 2008-06-24 18:58:41 UTC (rev 5669)
+++ trunk/matplotlib/doc/devel/release_guide.rst 2008-06-24 19:15:20 UTC (rev 5670)
@@ -55,10 +55,17 @@
* ftp the source and binaries to the anonymous FTP site::
- local> cd dist
- local> ncftp upload.sourceforge.net
- ncftp> cd incoming
- ncftp> put tar.gz, zip exe
+ mpl> svn-clean
+ mpl> python setup.py sdist
+ mpl> cd dist/
+ dist> sftp jd...@fr...
+ Connecting to frs.sourceforge.net...
+ sftp> cd uploads
+ sftp> ls
+ sftp> lls
+ matplotlib-0.98.2.tar.gz
+ sftp> put matplotlib-0.98.2.tar.gz
+ Uploading matplotlib-0.98.2.tar.gz to /incoming/j/jd/jdh2358/uploads/matplotlib-0.98.2.tar.gz
* go https://sourceforge.net/project/admin/?group_id=80706 and do a
file release. Click on the "Admin" tab to log in as an admin, and
Modified: trunk/matplotlib/examples/api/watermark_text.py
===================================================================
--- trunk/matplotlib/examples/api/watermark_text.py 2008-06-24 18:58:41 UTC (rev 5669)
+++ trunk/matplotlib/examples/api/watermark_text.py 2008-06-24 19:15:20 UTC (rev 5670)
@@ -1,34 +1,22 @@
"""
-Use a PNG file as a watermark
+Use a Text as a watermark
"""
import numpy as np
import matplotlib
matplotlib.use('Agg')
-import matplotlib.mathtext as mathtext
import matplotlib.pyplot as plt
-import matplotlib
-matplotlib.rc('image', origin='upper')
-dpi = 100 # save dpi
-w, h = 8, 6 # inches
+fig = plt.figure()
-parser = mathtext.MathTextParser("Bitmap")
-
-rgba, depth1 = parser.to_rgba(r'Property of MPL', color='gray',
- fontsize=30, dpi=200)
-rgba[:,:,-1] *= 0.5
-fig = plt.figure(figsize=(w,h))
-
ax = fig.add_subplot(111)
ax.plot(np.random.rand(20), '-o', ms=20, lw=2, alpha=0.7, mfc='orange')
ax.grid()
-imh, imw, tmp = rgba.shape
+# position bottom right
+fig.text(0.95, 0.05, 'Property of MPL',
+ fontsize=50, color='gray',
+ ha='right', va='bottom', alpha=0.5)
-# position image at bottom right
-fig.figimage(rgba.astype(float)/255., w*dpi-imw, 0)
+fig.savefig('watermarked_text', transparent=True)
-
-fig.savefig('watermarked_text', transparent=True, dpi=dpi)
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-06-24 18:58:44
|
Revision: 5669
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5669&view=rev
Author: jdh2358
Date: 2008-06-24 11:58:41 -0700 (Tue, 24 Jun 2008)
Log Message:
-----------
added simple watermark examples
Added Paths:
-----------
trunk/matplotlib/examples/api/watermark_image.py
trunk/matplotlib/examples/api/watermark_text.py
trunk/matplotlib/examples/data/logo2.png
Added: trunk/matplotlib/examples/api/watermark_image.py
===================================================================
--- trunk/matplotlib/examples/api/watermark_image.py (rev 0)
+++ trunk/matplotlib/examples/api/watermark_image.py 2008-06-24 18:58:41 UTC (rev 5669)
@@ -0,0 +1,22 @@
+"""
+Use a PNG file as a watermark
+"""
+import numpy as np
+import matplotlib
+matplotlib.use('Agg')
+
+import matplotlib.image as image
+import matplotlib.pyplot as plt
+
+im = image.imread('../data/logo2.png')
+im[:,:,-1] = 0.5 # set the alpha channel
+
+fig = plt.figure()
+ax = fig.add_subplot(111)
+
+ax.plot(np.random.rand(20), '-o', ms=20, lw=2, alpha=0.7, mfc='orange')
+ax.grid()
+fig.figimage(im, 10, 10)
+
+fig.savefig('watermarked', transparent=True)
+
Added: trunk/matplotlib/examples/api/watermark_text.py
===================================================================
--- trunk/matplotlib/examples/api/watermark_text.py (rev 0)
+++ trunk/matplotlib/examples/api/watermark_text.py 2008-06-24 18:58:41 UTC (rev 5669)
@@ -0,0 +1,34 @@
+"""
+Use a PNG file as a watermark
+"""
+import numpy as np
+import matplotlib
+matplotlib.use('Agg')
+
+import matplotlib.mathtext as mathtext
+import matplotlib.pyplot as plt
+import matplotlib
+matplotlib.rc('image', origin='upper')
+
+dpi = 100 # save dpi
+w, h = 8, 6 # inches
+
+parser = mathtext.MathTextParser("Bitmap")
+
+rgba, depth1 = parser.to_rgba(r'Property of MPL', color='gray',
+ fontsize=30, dpi=200)
+rgba[:,:,-1] *= 0.5
+fig = plt.figure(figsize=(w,h))
+
+ax = fig.add_subplot(111)
+ax.plot(np.random.rand(20), '-o', ms=20, lw=2, alpha=0.7, mfc='orange')
+ax.grid()
+
+imh, imw, tmp = rgba.shape
+
+# position image at bottom right
+fig.figimage(rgba.astype(float)/255., w*dpi-imw, 0)
+
+
+fig.savefig('watermarked_text', transparent=True, dpi=dpi)
+
Added: trunk/matplotlib/examples/data/logo2.png
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/examples/data/logo2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-06-24 18:16:30
|
Revision: 5668
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5668&view=rev
Author: jdh2358
Date: 2008-06-24 11:16:11 -0700 (Tue, 24 Jun 2008)
Log Message:
-----------
tagged 0.98.2
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-06-24 18:13:40 UTC (rev 5667)
+++ trunk/matplotlib/CHANGELOG 2008-06-24 18:16:11 UTC (rev 5668)
@@ -1,3 +1,6 @@
+=================================================================
+2006-02-24 Released 0.98.2 at svn r5667 - (source only for debian) JDH
+
2006-06-24 Added "transparent" kwarg to savefig. - MGD
2006-06-24 Applied Stefan's patch to draw a sinle centered marker over
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-06-24 18:13:48
|
Revision: 5667
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5667&view=rev
Author: jdh2358
Date: 2008-06-24 11:13:40 -0700 (Tue, 24 Jun 2008)
Log Message:
-----------
tagging 98.2
Modified Paths:
--------------
trunk/matplotlib/MANIFEST.in
trunk/matplotlib/doc/make.py
trunk/matplotlib/examples/user_interfaces/embedding_in_wx4.py
trunk/matplotlib/lib/matplotlib/__init__.py
trunk/matplotlib/lib/matplotlib/artist.py
trunk/matplotlib/lib/matplotlib/scale.py
Removed Paths:
-------------
trunk/matplotlib/examples/animation/dynamic_demo_wx.py
Modified: trunk/matplotlib/MANIFEST.in
===================================================================
--- trunk/matplotlib/MANIFEST.in 2008-06-24 18:06:22 UTC (rev 5666)
+++ trunk/matplotlib/MANIFEST.in 2008-06-24 18:13:40 UTC (rev 5667)
@@ -15,6 +15,7 @@
include lib/matplotlib/mpl-data/fonts/afm/*
recursive-include license LICENSE*
recursive-include examples *
+recursive-include doc *
recursive-include src *.cpp *.c *.h
recursive-include CXX *.cxx *.hxx *.c *.h
recursive-include agg24 *
Modified: trunk/matplotlib/doc/make.py
===================================================================
--- trunk/matplotlib/doc/make.py 2008-06-24 18:06:22 UTC (rev 5666)
+++ trunk/matplotlib/doc/make.py 2008-06-24 18:13:40 UTC (rev 5667)
@@ -20,9 +20,8 @@
def sfpdf():
'push a copy to the sf site'
+ os.system('cd build/latex; scp Matplotlib.pdf jd...@ma...:/home/groups/m/ma/matplotlib/htdocs/doc/')
- #os.system('cd build/latex; scp Matplotlib.pdf jd...@ma...:/home/groups/m/ma/matplotlib/htdocs/doc/')
-
def figs():
os.system('cd users/figures/ && python make.py')
Deleted: trunk/matplotlib/examples/animation/dynamic_demo_wx.py
===================================================================
--- trunk/matplotlib/examples/animation/dynamic_demo_wx.py 2008-06-24 18:06:22 UTC (rev 5666)
+++ trunk/matplotlib/examples/animation/dynamic_demo_wx.py 2008-06-24 18:13:40 UTC (rev 5667)
@@ -1,132 +0,0 @@
-#!/usr/bin/env python
-"""
-Copyright (C) Jeremy O'Donoghue, 2003
-
-License: This work is licensed under the PSF. A copy should be included
-with this source code, and is also available at
-http://www.python.org/psf/license.html
-
-This is a sample showing how to embed a matplotlib figure in a wxPanel,
-and update the contents whenever a timer event occurs. It is inspired
-by the GTK script dynamic_demo.py, by John Hunter (should be supplied with
-this file) but I have assumed that you may wish to embed a figure inside
-your own arbitrary frame, which makes the code slightly more complicated.
-
-It goes without saying that you can update the display on any event, not
-just a timer...
-
-Should you require a toolbar and navigation, inspire yourself from
-embedding_in_wx.py, which provides these features.
-
-Modification History:
-$Log$
-Revision 1.7 2005/06/15 20:24:56 jdh2358
-syncing for 82
-
-Revision 1.6 2004/10/26 18:08:13 astraw
-Converted to use new NavigationToolbar2 (from old Toolbar).
-
-Revision 1.5 2004/06/26 06:37:20 astraw
-Trivial bugfix to eliminate IndexError
-
-Revision 1.4 2004/05/03 12:12:26 jdh2358
-added bang header to examples
-
-Revision 1.3 2004/03/08 22:17:20 jdh2358
-
-* Fixed embedding_in_wx and dynamic_demo_wx examples
-
-* Ported build to darwin
-
-* Tk:
-
- removed default figman=None from nav toolbar since it needs the
- figman
-
- fixed close bug
-
- small changes to aid darwin build
-
-Revision 1.2 2004/02/26 20:22:58 jaytmiller
-Added the "numerix" Numeric/numarray selector module enabling matplotlib
-to work with either numarray or Numeric. See matplotlib.numerix.__doc__.
-
-Revision 1.1 2003/12/30 17:22:09 jodonoghue
-First version of dynamic_demo for backend_wx
-"""
-
-
-import matplotlib
-matplotlib.use('WX')
-from matplotlib.backends.backend_wx import FigureCanvasWx,\
- FigureManager, NavigationToolbar2Wx
-
-from matplotlib.figure import Figure
-import numpy
-from wx import *
-
-
-TIMER_ID = NewId()
-
-class PlotFigure(Frame):
-
- def __init__(self):
- Frame.__init__(self, None, -1, "Test embedded wxFigure")
-
- self.fig = Figure((5,4), 75)
- self.canvas = FigureCanvasWx(self, -1, self.fig)
- self.toolbar = NavigationToolbar2Wx(self.canvas)
- self.toolbar.Realize()
-
- # On Windows, default frame size behaviour is incorrect
- # you don't need this under Linux
- tw, th = self.toolbar.GetSizeTuple()
- fw, fh = self.canvas.GetSizeTuple()
- self.toolbar.SetSize(Size(fw, th))
-
- # Create a figure manager to manage things
- self.figmgr = FigureManager(self.canvas, 1, self)
- # Now put all into a sizer
- sizer = BoxSizer(VERTICAL)
- # This way of adding to sizer allows resizing
- sizer.Add(self.canvas, 1, LEFT|TOP|GROW)
- # Best to allow the toolbar to resize!
- sizer.Add(self.toolbar, 0, GROW)
- self.SetSizer(sizer)
- self.Fit()
- EVT_TIMER(self, TIMER_ID, self.onTimer)
-
- def init_plot_data(self):
- a = self.fig.add_subplot(111)
- self.ind = numpy.arange(60)
- tmp = []
- for i in range(60):
- tmp.append(numpy.sin((self.ind+i)*numpy.pi/15))
- self.X = numpy.array(tmp)
- self.lines = a.plot(self.X[:,0],'o')
- self.count = 0
-
- def GetToolBar(self):
- # You will need to override GetToolBar if you are using an
- # unmanaged toolbar in your frame
- return self.toolbar
-
- def onTimer(self, evt):
- self.count += 1
- if self.count >= 60: self.count = 0
- self.lines[0].set_data(self.ind, self.X[:,self.count])
- self.canvas.draw()
- self.canvas.gui_repaint()
-
-if __name__ == '__main__':
- app = PySimpleApp()
- frame = PlotFigure()
- frame.init_plot_data()
-
- # Initialise the timer - wxPython requires this to be connected to the
- # receivicng event handler
- t = Timer(frame, TIMER_ID)
- t.Start(100)
-
- frame.Show()
- app.MainLoop()
Modified: trunk/matplotlib/examples/user_interfaces/embedding_in_wx4.py
===================================================================
--- trunk/matplotlib/examples/user_interfaces/embedding_in_wx4.py 2008-06-24 18:06:22 UTC (rev 5666)
+++ trunk/matplotlib/examples/user_interfaces/embedding_in_wx4.py 2008-06-24 18:13:40 UTC (rev 5667)
@@ -8,11 +8,6 @@
import matplotlib
-# uncomment the following to use wx rather than wxagg
-#matplotlib.use('WX')
-#from matplotlib.backends.backend_wx import FigureCanvasWx as FigureCanvas
-
-# comment out the following to use wx rather than wxagg
matplotlib.use('WXAgg')
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg
Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py 2008-06-24 18:06:22 UTC (rev 5666)
+++ trunk/matplotlib/lib/matplotlib/__init__.py 2008-06-24 18:13:40 UTC (rev 5667)
@@ -89,7 +89,7 @@
"""
from __future__ import generators
-__version__ = '0.98.1'
+__version__ = '0.98.2'
__revision__ = '$Revision$'
__date__ = '$Date$'
Modified: trunk/matplotlib/lib/matplotlib/artist.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/artist.py 2008-06-24 18:06:22 UTC (rev 5666)
+++ trunk/matplotlib/lib/matplotlib/artist.py 2008-06-24 18:13:40 UTC (rev 5667)
@@ -690,37 +690,43 @@
return lines
-def getp(o, *args):
+def getp(o, property=None):
"""
- .. TODO: What are 's' and 'h' arguments described below?
+ Return the value of handle property. property is an optional string
+ for the property you want to return
- Return the value of handle property s
+ Example usage::
- h is an instance of a class, eg a Line2D or an Axes or Text.
- if s is 'somename', this function returns
+ getp(o) # get all the object properties
+ getp(o, 'linestyle') # get the linestyle property
+
+ o is a :class:`Artist` instance, eg
+ :class:`~matplotllib.lines.Line2D` or an instance of a
+ :class:`~matplotlib.axes.Axes` or :class:`matplotlib.text.Text`.
+ If the *property* is 'somename', this function returns
+
o.get_somename()
getp can be used to query all the gettable properties with getp(o)
Many properties have aliases for shorter typing, eg 'lw' is an
alias for 'linewidth'. In the output, aliases and full property
- names will be listed as:
+ names will be listed as::
property or alias = value
- e.g.:
+ e.g.::
linewidth or lw = 2
"""
insp = ArtistInspector(o)
- if len(args)==0:
+ if property is None:
print '\n'.join(insp.pprint_getters())
return
- name = args[0]
- func = getattr(o, 'get_' + name)
+ func = getattr(o, 'get_' + property)
return func()
def get(o, *args, **kwargs):
Modified: trunk/matplotlib/lib/matplotlib/scale.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/scale.py 2008-06-24 18:06:22 UTC (rev 5666)
+++ trunk/matplotlib/lib/matplotlib/scale.py 2008-06-24 18:13:40 UTC (rev 5667)
@@ -178,10 +178,8 @@
*subsx*/*subsy*:
Where to place the subticks between each major tick.
Should be a sequence of integers. For example, in a log10
- scale::
+ scale: ``[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]``
- [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-
will place 10 logarithmically spaced minor ticks between
each major tick.
"""
@@ -291,10 +289,8 @@
*subsx*/*subsy*:
Where to place the subticks between each major tick.
Should be a sequence of integers. For example, in a log10
- scale::
+ scale: ``[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]``
- [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-
will place 10 logarithmically spaced minor ticks between
each major tick.
"""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-06-24 18:06:43
|
Revision: 5666
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5666&view=rev
Author: jdh2358
Date: 2008-06-24 11:06:22 -0700 (Tue, 24 Jun 2008)
Log Message:
-----------
removed draft timeout/idle from backend bases; using events instead
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/backend_bases.py
Modified: trunk/matplotlib/lib/matplotlib/backend_bases.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backend_bases.py 2008-06-24 18:05:55 UTC (rev 5665)
+++ trunk/matplotlib/lib/matplotlib/backend_bases.py 2008-06-24 18:06:22 UTC (rev 5666)
@@ -1330,37 +1330,6 @@
newCanvas = FigureCanvasClass(self.figure)
return newCanvas
- def mpl_idle_add(self, func, *args, **kwargs):
- """
- add func to idle handler. The signature of func is::
-
- b = func(canvas, *args, **kwargs)
-
- The function will continue to be called until func returns
- False or a call to ``canvas.mpl_remove_source(func)``
-
- use :meth:`mpl_source_remove` to remove func from the idle handler.
- """
- raise NotImplementedError('GUI backend must override')
-
- def mpl_timeout_add(self, millisec, func, *args, **kwargs):
- """
- add func to timeout handler; func will be called every
- millisec. The signature of func is::
-
- The function will continue to be called until func returns
- False or a call to ``canvas.mpl_remove_source(func)``
-
- use :meth:`mpl_source_remove` to remove func from the timeout handler.
- """
- raise NotImplementedError('GUI backend must override')
-
- def mpl_source_remove(self, func):
- """
- remove func from idle or timeout handler
- """
- raise NotImplementedError('GUI backend must override')
-
def mpl_connect(self, s, func):
"""
Connect event with string *s* to *func*. The signature of *func* is::
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-06-24 18:05:58
|
Revision: 5665
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5665&view=rev
Author: jdh2358
Date: 2008-06-24 11:05:55 -0700 (Tue, 24 Jun 2008)
Log Message:
-----------
removed draft timeout/idle from backend bases; using events instead
Modified Paths:
--------------
trunk/matplotlib/examples/event_handling/idle_and_timeout.py
Modified: trunk/matplotlib/examples/event_handling/idle_and_timeout.py
===================================================================
--- trunk/matplotlib/examples/event_handling/idle_and_timeout.py 2008-06-24 17:46:40 UTC (rev 5664)
+++ trunk/matplotlib/examples/event_handling/idle_and_timeout.py 2008-06-24 18:05:55 UTC (rev 5665)
@@ -1,5 +1,7 @@
"""
Demonstrate/test the idle and timeout API
+
+This is only tested on gtk so far and is a prototype implementation
"""
import numpy as np
import matplotlib.pyplot as plt
@@ -21,24 +23,13 @@
event.canvas.draw()
# test boolean return removal
if on_idle.count==N:
- fig.canvas.mpl_disconnect(on_idle.cid)
+ return False
+ return True
on_idle.cid = None
on_idle.count = 0
-def on_timeout(canvas):
- on_timeout.count +=1
- line2.set_ydata(np.cos(2*np.pi*t*(N-on_idle.count)/float(N)))
- line2.figure.canvas.draw()
- print 'timeout', on_timeout.count
- # test explicit removal
- if on_timeout.count==N:
- return False
- return True
-on_timeout.count = 0
+fig.canvas.mpl_connect('idle_event', on_idle)
-on_idle.cid = fig.canvas.mpl_connect('idle_event', on_idle)
-#fig.canvas.mpl_timeout_add(100, on_timeout)
-
plt.show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-06-24 17:46:54
|
Revision: 5664
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5664&view=rev
Author: mdboom
Date: 2008-06-24 10:46:40 -0700 (Tue, 24 Jun 2008)
Log Message:
-----------
Updating changelog.
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-06-24 17:44:09 UTC (rev 5663)
+++ trunk/matplotlib/CHANGELOG 2008-06-24 17:46:40 UTC (rev 5664)
@@ -1,4 +1,6 @@
-2006-08-24 Applied Stefan's patch to draw a sinle centered marker over
+2006-06-24 Added "transparent" kwarg to savefig. - MGD
+
+2006-06-24 Applied Stefan's patch to draw a sinle centered marker over
a line with numpoints==1 - JDH
2008-06-23 Use splines to render circles in scatter plots - MGD
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-06-24 17:44:27
|
Revision: 5663
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5663&view=rev
Author: jdh2358
Date: 2008-06-24 10:44:09 -0700 (Tue, 24 Jun 2008)
Log Message:
-----------
fixed rectangle get linestyle bug
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/patches.py
Modified: trunk/matplotlib/lib/matplotlib/patches.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/patches.py 2008-06-24 17:41:08 UTC (rev 5662)
+++ trunk/matplotlib/lib/matplotlib/patches.py 2008-06-24 17:44:09 UTC (rev 5663)
@@ -121,7 +121,7 @@
self.set_fill(other.get_fill())
self.set_hatch(other.get_hatch())
self.set_linewidth(other.get_linewidth())
- self.set_linestyle(other.get_linestyle)
+ self.set_linestyle(other.get_linestyle())
self.set_transform(other.get_data_transform())
self.set_figure(other.get_figure())
self.set_alpha(other.get_alpha())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-06-24 17:41:17
|
Revision: 5662
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5662&view=rev
Author: mdboom
Date: 2008-06-24 10:41:08 -0700 (Tue, 24 Jun 2008)
Log Message:
-----------
Docstring formatting fixes.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2008-06-24 17:36:44 UTC (rev 5661)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2008-06-24 17:41:08 UTC (rev 5662)
@@ -4663,14 +4663,14 @@
*style*:
the style of the regular symbol:
- ===== =========================================
+ ===== =============================================
Value Description
- ===== =========================================
+ ===== =============================================
0 a regular polygon
1 a star-like symbol
2 an asterisk
- 3 a circle (numsides and angle is ignored)
- ===== =========================================
+ 3 a circle (*numsides* and *angle* is ignored)
+ ===== =============================================
*angle*:
the angle of rotation of the symbol
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
