Skip to content

Commit ee3bedd

Browse files
committed
sync to 0.54
svn path=/trunk/matplotlib/; revision=311
1 parent b257466 commit ee3bedd

18 files changed

+111
-65
lines changed

.matplotlibrc

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#### CONFIGURATION BEGINS HERE
2727
backend : GTKAgg # the default backend
2828
numerix : Numeric # Numeric or numarray
29-
#numerix : numarray # Numeric or numarray
3029
interactive : False # see http://matplotlib.sourceforge.net/interactive.html
3130

3231
### LINES
@@ -105,7 +104,7 @@ text.color : k # black
105104
axes.hold : True # whether to clear the axes by default on
106105
axes.facecolor : w # background color; white
107106
axes.edgecolor : k # edge color; black
108-
axes.linewidth : 0.5 # edge linewidth
107+
axes.linewidth : 1.0 # edge linewidth
109108
axes.grid : False # display grid or not
110109
axes.titlesize : 14 # fontsize of the axes title
111110
axes.labelsize : 12 # fontsize of the x any y labels

API_CHANGES

+10
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,16 @@ symbol in points) as in matlab and is not in data coords as before.
5555
Using sizes in data coords caused several problems. So you will need
5656
to adjust your size arguments accordingly or use scatter_classic.
5757

58+
mathtext spacing
59+
----------------
60+
61+
For reasons not clear to me (and which I'll eventually fix) spacing no
62+
longer works in font groups. However, I added three new spacing
63+
commands which compensate for this '\ ' (regular space), '\/' (small
64+
space) and '\hspace{frac}' where frac is a fraction of fontsize in
65+
points. You will need to quote spaces in font strings, is
66+
67+
title(r'$\rm{Histogram\ of\ IQ:}\ \mu=100,\ \sigma=15$')
5868

5969

6070

CHANGELOG

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
New entries should be added at the top
2+
3+
4+
25
------------------------------------------------------------
6+
2004-05-19 0.54 released - JDH
37

48
2004-05-18 Added newline seperated text with rotations to text.Text
59
layout - JDH

LICENSE/LICENSE

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LICENSE AGREEMENT FOR MATPLOTLIB 0.53.1
1+
LICENSE AGREEMENT FOR MATPLOTLIB 0.54
22
--------------------------------------
33

44
1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and the
@@ -9,30 +9,30 @@ documentation.
99
2. Subject to the terms and conditions of this License Agreement, JDH
1010
hereby grants Licensee a nonexclusive, royalty-free, world-wide license
1111
to reproduce, analyze, test, perform and/or display publicly, prepare
12-
derivative works, distribute, and otherwise use matplotlib 0.53.1
12+
derivative works, distribute, and otherwise use matplotlib 0.54
1313
alone or in any derivative version, provided, however, that JDH's
1414
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
1515
2002-2004 John D. Hunter; All Rights Reserved" are retained in
16-
matplotlib 0.53.1 alone or in any derivative version prepared by
16+
matplotlib 0.54 alone or in any derivative version prepared by
1717
Licensee.
1818

1919
3. In the event Licensee prepares a derivative work that is based on or
20-
incorporates matplotlib 0.53.1 or any part thereof, and wants to
20+
incorporates matplotlib 0.54 or any part thereof, and wants to
2121
make the derivative work available to others as provided herein, then
2222
Licensee hereby agrees to include in any such work a brief summary of
23-
the changes made to matplotlib 0.53.1.
23+
the changes made to matplotlib 0.54.
2424

25-
4. JDH is making matplotlib 0.53.1 available to Licensee on an "AS
25+
4. JDH is making matplotlib 0.54 available to Licensee on an "AS
2626
IS" basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
2727
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
2828
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
29-
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.53.1
29+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.54
3030
WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
3131

3232
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
33-
0.53.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
33+
0.54 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
3434
LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
35-
MATPLOTLIB 0.53.1, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
35+
MATPLOTLIB 0.54, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
3636
THE POSSIBILITY THEREOF.
3737

3838
6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee. This License Agreement does not grant permission to use JDH
4444
trademarks or trade name in a trademark sense to endorse or promote
4545
products or services of Licensee, or any third party.
4646

47-
8. By copying, installing or otherwise using matplotlib 0.53.1,
47+
8. By copying, installing or otherwise using matplotlib 0.54,
4848
Licensee agrees to be bound by the terms and conditions of this License
4949
Agreement.

MANIFEST

+2
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ examples/invert_axes.py
217217
examples/legend_demo.py
218218
examples/legend_demo2.py
219219
examples/line_styles.py
220+
examples/log_bar.py
220221
examples/log_demo.py
221222
examples/log_test.py
222223
examples/logo.py
@@ -228,6 +229,7 @@ examples/mpl_with_glade.glade
228229
examples/mpl_with_glade.py
229230
examples/mri_demo.py
230231
examples/mri_with_eeg.py
232+
examples/multiline.py
231233
examples/multiple_figs_demo.py
232234
examples/object_picker.py
233235
examples/pcolor_demo.py

Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# Copyright (C) 2003 <jdhunter@ace.bsd.uchicago.edu>
33
# $Header$
44
# $Log$
5+
# Revision 1.33 2004/05/19 19:55:18 jdh2358
6+
# sync to 0.54
7+
#
58
# Revision 1.32 2004/05/17 15:08:44 jdh2358
69
# updated goals and what's new
710
#
@@ -131,7 +134,7 @@ htmldocs:
131134
cd htdocs;\
132135
${PYTHON} process_docs.py;\
133136
${PYTHON} convert.py;\
134-
tar cfz site.tar.gz *.html screenshots tut examples gd .matplotlibrc NUMARRAY_ISSUES API_CHANGES;\
137+
tar cfz site.tar.gz *.html screenshots tut examples gd .matplotlibrc CHANGELOG NUMARRAY_ISSUES API_CHANGES;\
135138
cd ..;\
136139
cp -a matplotlib htdocs
137140

TODO

+9-3
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,9 @@
349349

350350
-- DONE y clipping broken
351351

352-
-- fix data lim problem with image; see image_demo2
352+
-- DONE fix data lim problem with image; see image_demo2
353353

354-
-- handle space in roman/font text
354+
-- DONE handle space in roman/font text
355355

356356
-- DONE scatter demos whacked
357357

@@ -386,4 +386,10 @@
386386

387387
-- fix + 2 hack in width, height of ft2font and backend_agg and GTK
388388

389-
-- check mathtext in GTK
389+
-- DONE check mathtext in GTK
390+
391+
-- DONE axes frame dim
392+
393+
-- DONE image data scaling
394+
395+
-- y tick outside frame?

examples/alignment_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
rotation='vertical',
7272
transform=ax.transAxes)
7373

74-
ax.text(left, top, 'rotated',
74+
ax.text(left, top, 'rotated\nwith newlines',
7575
horizontalalignment='center',
7676
verticalalignment='center',
7777
rotation=45,

examples/backend_driver.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ def drive(backend):
6363
for line in file(fname):
6464
if line.strip().startswith('from __future__ import division'): continue
6565
if line.strip().startswith('matplotlib.use'): continue
66-
if line.strip().startswith('savefig'): continue
66+
if line.strip().startswith('#savefig'): continue
6767
if line.strip().startswith('show'): continue
6868
lines.append(line)
6969
basename, ext = os.path.splitext(fname)
7070
outfile = basename + '_%s'%backend
7171
if backend in ('GTK', 'WX', 'TkAgg'):
7272
lines.append('show()')
7373
else:
74-
lines.append('savefig("%s", dpi=150)' % outfile)
74+
lines.append('#savefig("%s", dpi=150)' % outfile)
7575
tmpfile = '_tmp_%s.py' % basename
7676
file(tmpfile, 'w').write(''.join(lines))
7777
os.system('python %s' % tmpfile)

examples/histogram_demo.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
xlabel('Smarts')
1616
ylabel('Probability')
17-
title(r'$\rm{Histogram of IQ: }\mu=100, \sigma=15$')
17+
title(r'$\rm{Histogram\ of\ IQ:}\ \mu=100,\ \sigma=15$')
1818
axis([40, 160, 0, 0.03])
1919
grid(True)
20-
set(gca(), 'yscale', 'log')
20+
2121
#set(gca(), 'xlim', [40, 160])
2222
#savefig('histogram_demo',dpi=72)
2323
show()

examples/image_demo2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
ylabel('density')
3131
set(gca(), 'xticklabels', [])
3232

33-
savefig('image_demo2')
33+
#savefig('image_demo2')
3434
show()
3535

examples/log_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from matplotlib.matlab import *
33

44
dt = 0.01
5-
t = arange(dt, 20.0, dt)
5+
t = arange(dt, 200.0, dt)
66

77
semilogx(t, exp(-t/5.0))
88
grid(True)

examples/mathtext_demo.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
#plot(x, sin(2*pi*x))
1717
grid(True)
1818
xlabel(r'$\Delta_i^j$', fontsize=20)
19-
ylabel(r'$\Delta_{i+1}^j$', fontsize=20)
19+
ylabel(r'$\Delta_{i+1}^j$', fontsize=20, # no rotation yet for mathtext
20+
verticalalignment='center',
21+
horizontalalignment='right',
22+
rotation='horizontal')
2023
tex = r'$\cal{R}\prod_{i=\alpha_{i+1}}^\infty a_i\rm{sin}(2 \pi f x_i)$'
2124
#tex = r'$\cal{R}\prod^\infty a_i\rm{sin}(2 \pi f x_i)$'
2225

examples/scatter_demo2.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
set(gca(), 'xticks', arange(-0.06, 0.061, 0.02))
1515
set(gca(), 'yticks', arange(-0.06, 0.061, 0.02))
1616
xlabel(r'$\Delta_i$', fontsize='x-large')
17-
ylabel(r'$\Delta_{i+1}$', fontsize='x-large')
17+
ylabel(r'$\Delta_{i+1}$', fontsize='x-large',
18+
verticalalignment='center',
19+
horizontalalignment='right',
20+
rotation='horizontal'
21+
)
1822
title(r'Volume and percent change')
1923
grid(True)
2024
#savefig('scatter_demo2')

examples/simple_plot.py

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
xlabel('time (s)')
1010
ylabel('voltage (mV)')
1111
title('About as simple as it gets, folks')
12-
#title('AAAAAAAAAAAAAAAAAAAAAAA')
1312
grid(True)
1413
#axis([0,1,-1,1])
1514
#savefig('simple_plot', dpi=300)

0 commit comments

Comments
 (0)