Skip to content

Commit 87130f9

Browse files
committed
added finance module
svn path=/trunk/matplotlib/; revision=248
1 parent cc85685 commit 87130f9

File tree

9 files changed

+40
-22
lines changed

9 files changed

+40
-22
lines changed

CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
New entries should be added at the top
22

3+
2004-04-19 - Fixed vertical alignment bug in PS backend - JDH
4+
35
2004-04-17 Added support for two scales on the "same axes" with tick
46
different ticking and labeling left right or top bottom.
57
See examples/two_scales.py - JDH

LICENSE/LICENSE

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LICENSE AGREEMENT FOR MATPLOTLIB 0.52
1+
LICENSE AGREEMENT FOR MATPLOTLIB 0.53b
22
--------------------------------------
33

44
1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and
@@ -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
1111
license to reproduce, analyze, test, perform and/or display publicly,
12-
prepare derivative works, distribute, and otherwise use matplotlib 0.52
12+
prepare derivative works, distribute, and otherwise use matplotlib 0.53b
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, 2003 John D. Hunter; All Rights Reserved" are retained in
16-
matplotlib 0.52 alone or in any derivative version prepared by
16+
matplotlib 0.53b 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
20-
or incorporates matplotlib 0.52 or any part thereof, and wants to make
20+
or incorporates matplotlib 0.53b or any part thereof, and wants to make
2121
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.52.
23+
the changes made to matplotlib 0.53b.
2424

25-
4. JDH is making matplotlib 0.52 available to Licensee on an "AS IS"
25+
4. JDH is making matplotlib 0.53b available to Licensee on an "AS IS"
2626
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.52 WILL NOT
29+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.53b WILL NOT
3030
INFRINGE ANY THIRD PARTY RIGHTS.
3131

3232
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
33-
MATPLOTLIB 0.52 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
33+
MATPLOTLIB 0.53b FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
3434
OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
35-
MATPLOTLIB 0.52, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
35+
MATPLOTLIB 0.53b, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
3636
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.52, Licensee
47+
8. By copying, installing or otherwise using matplotlib 0.53b, Licensee
4848
agrees to be bound by the terms and conditions of this License
4949
Agreement.

MANIFEST

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ GOALS
55
INSTALL
66
INTERACTIVE
77
KNOWN_BUGS
8-
MANIFEST
98
MANIFEST.in
109
Makefile
1110
README
@@ -176,8 +175,7 @@ examples/barchart_demo.py
176175
examples/break.py
177176
examples/color_demo.py
178177
examples/colours.py
179-
examples/coords_demo_gtk.py
180-
examples/coords_interact.py
178+
examples/coords_demo.py
181179
examples/csd_demo.py
182180
examples/data_helper.py
183181
examples/date_demo1.py
@@ -192,6 +190,7 @@ examples/errorbar_demo.py
192190
examples/figtext.py
193191
examples/fill_demo.py
194192
examples/font_properties_demo.py
193+
examples/fonts_demo.py
195194
examples/ftface_props.py
196195
examples/gdtest.py
197196
examples/histogram_demo.py
@@ -200,13 +199,15 @@ examples/image_demo2.py
200199
examples/image_demo_na.py
201200
examples/interactive.py
202201
examples/interactive2.py
202+
examples/invert_axes.py
203203
examples/legend_demo.py
204204
examples/legend_demo2.py
205205
examples/line_styles.py
206206
examples/log_demo.py
207207
examples/log_test.py
208208
examples/logo.py
209209
examples/major_minor_demo1.py
210+
examples/major_minor_demo2.py
210211
examples/mathtext_demo.py
211212
examples/mpl_with_glade.glade
212213
examples/mpl_with_glade.py
@@ -228,6 +229,7 @@ examples/system_monitor.py
228229
examples/table_demo.py
229230
examples/text_handles.py
230231
examples/text_themes.py
232+
examples/two_scales.py
231233
examples/vertical_ticklabels.py
232234
examples/vline_demo.py
233235
examples/data/AAPL.dat
@@ -342,7 +344,6 @@ matplotlib/numerix.py
342344
matplotlib/patches.py
343345
matplotlib/postinstall.py
344346
matplotlib/pyparsing.py
345-
matplotlib/setup.py
346347
matplotlib/setupext.py
347348
matplotlib/table.py
348349
matplotlib/text.py

Makefile

Lines changed: 4 additions & 0 deletions
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.27 2004/04/20 11:32:35 jdh2358
6+
# added finance module
7+
#
58
# Revision 1.26 2004/03/16 20:26:36 jdh2358
69
# sync to 0.52 release
710
#
@@ -127,6 +130,7 @@ clean:
127130
find . -name "_tmp*.py" | xargs rm -f;\
128131
find . \( -name "*~" -o -name "*.pyc" \) | xargs rm -f;\
129132
find examples \( -name "*.png" -o -name "*.ps" -o -name "*.jpg" -o -name "*.eps" \) | xargs rm -f
133+
find . \( -name "#*" -o -name ".#*" -o -name ".*~" -o -name "*~"\) | xargs rm -f
130134

131135
htmldocs:
132136
cp build/lib.linux-i686-2.3/matplotlib/*.so matplotlib/;\

TODO

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,11 @@
308308

309309
-- mathtext s l o w
310310

311-
-- ps backend fails alignment test
311+
-- DONE ps backend fails alignment test
312312

313313
-- ps backend is slow! Almost all of this is eaten by parsing afm
314314
files
315315

316-
-- decreasing log axes needs fix
316+
-- decreasing log axes needs fix
317+
318+
-- overflow error in math.floor(ld) on stock_demo in OSX

examples/alignment_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
transx=ax.xaxis.transAxis,
6262
transy=ax.yaxis.transAxis)
6363

64-
ax.text(left, 0.5*(bottom+top), 'leftcenter',
64+
ax.text(left, 0.5*(bottom+top), 'left center',
6565
horizontalalignment='left',
6666
verticalalignment='center',
6767
rotation='vertical',

examples/date_demo1.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
from matplotlib.finance import quotes_historical_yahoo
3333
from matplotlib.ticker import YearLocator, MonthLocator, DateFormatter
3434

35-
36-
37-
3835
date1 = datetime.date( 1995, 1, 1 )
3936
date2 = datetime.date( 2004, 4, 12 )
4037

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
build_image(ext_modules, packages, BUILD_IMAGE)
8686

8787
setup(name="matplotlib",
88-
version= '0.53a',
88+
version= '0.53b',
8989
description = "Matlab style python plotting package",
9090
author = "John D. Hunter",
9191
author_email="jdhunter@ace.bsd.uchicago.edu",

setupext.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,11 @@ def add_ft2font_flags(module):
9898
basedirs = module.include_dirs[:] # copy the list to avoid inf loop!
9999
for d in basedirs:
100100
module.include_dirs.append(os.path.join(d, 'freetype2'))
101+
if sys.platform == 'darwin':
102+
module.include_dirs.append(
103+
os.path.join(d, 'lib/freetype2/include'))
104+
module.include_dirs.append(
105+
os.path.join(d, 'lib/freetype2/include/freetype2'))
101106

102107

103108
if sys.platform == 'win32':
@@ -174,9 +179,16 @@ def find_tcltk():
174179
else:
175180
tk.withdraw()
176181
o.tcl_lib = os.path.join((tk.getvar('tcl_library')), '../')
177-
o.tcl_inc = os.path.join((tk.getvar('tcl_library')), '../../include')
182+
178183
o.tk_lib = os.path.join((tk.getvar('tk_library')), '../')
184+
o.tcl_inc = os.path.join((tk.getvar('tcl_library')), '../../include')
179185
o.tkv = str(Tkinter.TkVersion)[:3]
186+
if not os.path.exists(o.tcl_inc):
187+
o.tcl_inc = os.path.join((tk.getvar('tcl_library')), '../../include/tcl'+o.tkv)
188+
if not os.path.exists(o.tcl_inc):
189+
print 'cannot find tcl/tk headers. giving up.'
190+
sys.exit()
191+
180192
return o
181193

182194

0 commit comments

Comments
 (0)