Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8f400b9

Browse files
mdboommdboom
committed
Merged revisions 4135-4190 via svnmerge from
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib ........ r4155 | dsdale | 2007-11-07 19:09:17 -0500 (Wed, 07 Nov 2007) | 2 lines move configobj.py to lib/, install in site-packages only if required ........ r4156 | dsdale | 2007-11-07 19:24:57 -0500 (Wed, 07 Nov 2007) | 3 lines update enthought package to version 2.6b1, stripped of setuptools installed in site-packages, if not already present ........ r4160 | mdboom | 2007-11-08 09:31:15 -0500 (Thu, 08 Nov 2007) | 2 lines Throw in dummy characters for symbols not in the Bakoma fonts. ........ r4167 | dsdale | 2007-11-08 18:25:44 -0500 (Thu, 08 Nov 2007) | 3 lines move pyparsing from lib/matplotlib/ to lib/ install pyparsing only if not already available ........ r4168 | jdh2358 | 2007-11-08 18:29:46 -0500 (Thu, 08 Nov 2007) | 2 lines added recarray utils module ........ r4169 | dsdale | 2007-11-08 19:19:45 -0500 (Thu, 08 Nov 2007) | 2 lines updated pyparsing to version 1.4.8 ........ r4170 | dsdale | 2007-11-08 19:22:03 -0500 (Thu, 08 Nov 2007) | 3 lines added checks that also print version numbers for pyparsing, pytz, dateutil, configobj ........ r4171 | dsdale | 2007-11-08 19:31:48 -0500 (Thu, 08 Nov 2007) | 2 lines note pyparsing change to API_CHANGES ........ r4172 | dsdale | 2007-11-08 20:37:02 -0500 (Thu, 08 Nov 2007) | 2 lines remove old version of pytz ........ r4173 | dsdale | 2007-11-08 20:40:54 -0500 (Thu, 08 Nov 2007) | 2 lines added pytz-2007g ........ r4174 | dsdale | 2007-11-08 20:43:18 -0500 (Thu, 08 Nov 2007) | 2 lines fixed bug in dateutil version check ........ r4175 | jdh2358 | 2007-11-08 21:55:47 -0500 (Thu, 08 Nov 2007) | 2 lines reverted rec utils to mlab ........ r4176 | efiring | 2007-11-09 02:25:08 -0500 (Fri, 09 Nov 2007) | 2 lines Pylab uses numpy instead of oldnumeric ........ r4177 | dsdale | 2007-11-09 08:08:48 -0500 (Fri, 09 Nov 2007) | 2 lines move pyparsing back into mpl namespace ........ r4178 | mdboom | 2007-11-09 08:10:12 -0500 (Fri, 09 Nov 2007) | 3 lines Avoid annoying Qt4 messages when mpl raises an exception. (Thanks to Martin Teichmann in patch 1828813) ........ r4179 | mdboom | 2007-11-09 08:19:38 -0500 (Fri, 09 Nov 2007) | 2 lines Fix font caching bug on OSX ........ r4180 | dsdale | 2007-11-09 08:20:10 -0500 (Fri, 09 Nov 2007) | 3 lines committed Martin Teichmann's patch 1828813 to fix qt4 error messages related to QPainter ........ r4181 | mdboom | 2007-11-09 08:47:40 -0500 (Fri, 09 Nov 2007) | 3 lines Remove duplicate line caused by myself and Darren committing the same patch and virtually the same time. ........ r4182 | dsdale | 2007-11-09 08:49:54 -0500 (Fri, 09 Nov 2007) | 2 lines updated CHANGELOG and API_CHANGES ........ r4183 | dsdale | 2007-11-09 09:24:41 -0500 (Fri, 09 Nov 2007) | 2 lines updated dependency report during build process ........ r4187 | jdh2358 | 2007-11-09 11:42:55 -0500 (Fri, 09 Nov 2007) | 2 lines added face and edge color = 'None' support to patches ........ r4188 | jdh2358 | 2007-11-09 11:43:38 -0500 (Fri, 09 Nov 2007) | 2 lines removed unneeded draw command from tkagg ........ svn path=/branches/transforms/; revision=4192
2 parents 8037b94 + c187ee2 commit 8f400b9

643 files changed

Lines changed: 4746 additions & 15827 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎API_CHANGES‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ TRANSFORMS REFACTORING
169169

170170
END OF TRANSFORMS REFACTORING
171171

172+
Moved mlab.csv2rec -> recutils.csv2rec
173+
172174
Added ax kwarg to pyplot.colorbar and Figure.colorbar so that
173175
one can specify the axes object from which space for the colorbar
174176
is to be taken, if one does not want to make the colorbar axes

‎CHANGELOG‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,41 @@
1-
2007-11-02 Commited Phil Thompson's patch 1599876, fixes to Qt4Agg
2-
backend and qt4 blitting demo - DSD
1+
2007-11-09 Applied Martin Teichmann's patch 1828813: a QPainter is used in
2+
paintEvent, which has to be destroyed using the method end(). If
3+
matplotlib raises an exception before the call to end - and it
4+
does if you feed it with bad data - this method end() is never
5+
called and Qt4 will start spitting error messages
6+
7+
2007-11-09 Moved pyparsing back into matplotlib namespace. Don't use
8+
system pyparsing, API is too variable from one release
9+
to the next - DSD
10+
11+
2007-11-08 Made pylab use straight numpy instead of oldnumeric
12+
by default - EF
13+
14+
2007-11-08 Added additional record array utilites to mlab (rec2excel,
15+
rec2gtk, rec_join, rec_append_field, rec_drop_field) - JDH
16+
17+
2007-11-08 Updated pytz to version 2007g - DSD
18+
19+
2007-11-08 Updated pyparsing to version 1.4.8 - DSD
20+
21+
2007-11-08 Moved csv2rec to recutils and added other record array
22+
utilities - JDH
23+
24+
2007-11-08 If available, use existing pyparsing installation - DSD
25+
26+
2007-11-07 Removed old enthought.traits from lib/matplotlib, added
27+
Gael Varoquaux's enthought.traits-2.6b1, which is stripped
28+
of setuptools. The package is installed to site-packages
29+
if not already available - DSD
30+
31+
2007-11-05 Added easy access to minor tick properties; slight mod
32+
of patch by Pierre G-M - EF
33+
34+
2007-11-02 Commited Phil Thompson's patch 1599876, fixes to Qt4Agg
35+
backend and qt4 blitting demo - DSD
36+
37+
2007-11-02 Commited Phil Thompson's patch 1599876, fixes to Qt4Agg
38+
backend and qt4 blitting demo - DSD
339

440
2007-10-31 Made log color scale easier to use with contourf;
541
automatic level generation now works. - EF
@@ -93,7 +129,7 @@
93129
generator expressions are not supported by python-2.3 - DSD
94130

95131
2007-10-01 Made matplotlib.use() raise an exception if called after
96-
backends has been imported.
132+
backends has been imported. - EF
97133

98134
2007-09-30 Modified update* methods of Bbox and Interval so they
99135
work with reversed axes. Prior to this, trying to
@@ -253,7 +289,7 @@
253289

254290
2007-07-19 completed numpification of most trivial cases - NN
255291

256-
2007-07-19 converted non-numpy relicts troughout the code - NN
292+
2007-07-19 converted non-numpy relicts throughout the code - NN
257293

258294
2007-07-19 replaced the Python code in numerix/ by a minimal wrapper around
259295
numpy that explicitly mentions all symbols that need to be

‎examples/image_demo2.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
w, h = 512, 512
55
s = file('data/ct.raw', 'rb').read()
6-
A = fromstring(s, UInt16).astype(Float)
6+
A = fromstring(s, uint16).astype(float)
77
A *= 1.0/max(A)
88
A.shape = w, h
99

‎examples/loadrec.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from matplotlib.mlab import csv2rec
1+
from matplotlib import mlab
22
from pylab import figure, show
33

4-
a = csv2rec('data/msft.csv')
4+
a = mlab.csv2rec('data/msft.csv')
55
print a.dtype
66

77
fig = figure()

‎examples/mathtext_demo.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
latex rendering, see the text.usetex option
55
"""
66
import numpy as npy
7-
from pylab import figure, show
7+
from matplotlib.pyplot import figure, show
8+
89
fig = figure()
910
fig.subplots_adjust(bottom=0.2)
1011

@@ -21,7 +22,8 @@
2122

2223
ax.legend(("Foo", "Testing $x^2$"))
2324

24-
#title(r'$\Delta_i^j \hspace{0.4} \rm{versus} \hspace{0.4} \Delta_{i+1}^j$', fontsize=20)
25-
fig.savefig('mathtext_demo')
25+
ax.set_title(r'$\Delta_i^j \hspace{0.4} \rm{versus} \hspace{0.4} \Delta_{i+1}^j$', fontsize=20)
26+
#fig.savefig('mathtext_demo')
2627

2728
show()
29+

‎examples/mathtext_examples.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
r'$\widehat{abc}\widetilde{def}$',
5050
r'$\Gamma \Delta \Theta \Lambda \Xi \Pi \Sigma \Upsilon \Phi \Psi \Omega$',
5151
r'$\alpha \beta \gamma \delta \epsilon \zeta \eta \theta \iota \lambda \mu \nu \xi \pi \kappa \rho \sigma \tau \upsilon \phi \chi \psi$',
52-
ur'Generic symbol: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
52+
#ur'Generic symbol: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
5353
]
5454

5555
from pylab import *
@@ -63,12 +63,13 @@ def doall():
6363
axis([0, 3, -len(tests), 0])
6464
yticks(arange(len(tests)) * -1)
6565
for i, s in enumerate(tests):
66-
print "%02d: %s" % (i, s)
66+
print (i, s)
6767
text(0.1, -i, s, fontsize=20)
6868

69-
savefig('mathtext_example')
70-
close('all')
71-
69+
#savefig('mathtext_example')
70+
#close('all')
71+
show()
72+
7273
if '--latex' in sys.argv:
7374
fd = open("mathtext_examples.ltx", "w")
7475
fd.write("\\documentclass{article}\n")

‎examples/mri_with_eeg.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
if 1: # load the data
1616
# data are 256x256 16 bit integers
1717
dfile = 'data/s1045.ima'
18-
im = fromstring(file(dfile, 'rb').read(), UInt16).astype(Float)
18+
im = fromstring(file(dfile, 'rb').read(), uint16).astype(float)
1919
im.shape = 256, 256
2020

2121
if 1: # plot the MRI in pcolor
@@ -37,7 +37,7 @@
3737
if 1: # plot the EEG
3838
# load the data
3939
numSamples, numRows = 800,4
40-
data = fromstring(file('data/eeg.dat', 'rb').read(), Float)
40+
data = fromstring(file('data/eeg.dat', 'rb').read(), float)
4141
data.shape = numSamples, numRows
4242
t = arange(numSamples)/float(numSamples)*10.0
4343
ticklocs = []

‎examples/rc_traits.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# below.
88

99
import sys, os, re
10-
import matplotlib.enthought.traits as traits
10+
import enthought.traits.api as traits
1111
from matplotlib.cbook import is_string_like
1212
from matplotlib.artist import Artist
1313

lib/matplotlib/config/configobj.py renamed to lib/configobj.py

File renamed without changes.

‎lib/dateutil/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
"""
77
__author__ = "Gustavo Niemeyer <[email protected]>"
88
__license__ = "PSF License"
9+
__version__ = "1.2"

0 commit comments

Comments
 (0)