8000 moved draw_text to renderer · matplotlib/matplotlib@8591cc1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8591cc1

Browse files
jdh2358jdh2358
committed
moved draw_text to renderer
svn path=/trunk/matplotlib/; revision=101
1 parent d01edd3 commit 8591cc1

File tree

12 files changed

+324
-32
lines changed

12 files changed

+324
-32
lines changed

‎LICENSE

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LICENSE AGREEMENT FOR MATPLOTLIB 0.40
1+
LICENSE AGREEMENT FOR MATPLOTLIB 0.41
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.40
13-
alone or in any derivative version, provided, however, that JDH's
12+
prepare derivative works, distribute, and otherwise use matplotlib
13+
0.41 alone or in any derivative version, provided, however, that JDH's
1414
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
15-
2002, 2003 John D. Hunter; All Rights Reserved" are retained in
16-
matplotlib 0.40 alone or in any derivative version prepared by
15+
2002-2004 John D. Hunter; All Rights Reserved" are retained in
16+
matplotlib 0.41 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.40 or any part thereof, and wants to make
20+
or incorporates matplotlib 0.41 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.40.
23+
the changes made to matplotlib 0.41.
2424

25-
4. JDH is making matplotlib 0.40 available to Licensee on an "AS IS"
25+
4. JDH is making matplotlib 0.41 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.40 WILL NOT
29+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.41 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.40 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
33+
MATPLOTLIB 0.41 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
3434
OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
35-
MATPLOTLIB 0.40, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
35+
MATPLOTLIB 0.41, 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.40, Licensee
47+
8. By copying, installing or otherwise using matplotlib 0.41, Licensee
4848
agrees to be bound by the terms and conditions of this License
4949
Agreement.

‎MANIFEST

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ examples/mpl_with_glade.py
4343
examples/mri_demo.py
4444
examples/mri_with_eeg.py
4545
examples/multiple_figs_demo.py
46+
examples/object_picker.py
4647
examples/pcolor_demo.py
48+
examples/print_ps.py
4749
examples/psd_demo.py
4850
examples/pstest.py
4951
examples/scatter_demo.py
@@ -149,3 +151,4 @@ matplotlib/backends/backend_gtk.py
149151
matplotlib/backends/backend_ps.py
150152
matplotlib/backends/backend_template.py
151153
matplotlib/backends/backend_wx.py
154+
test/test.py

‎TODO

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,5 @@
165165
-- Add Kishimoto's suggestions to hist
166166

167167
-- DONE 2003-12-15 - fix 8000 install path bug
168+
169+
-- Scale line width with DPI

‎examples/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎examples/embedding_in_gtk2.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,27 @@
1616
win.add(vbox)
1717
vbox.show()
1818

19-
f = Figure(figsize=(5,4), dpi=100)
20-
a = Subplot(f, 111)
19+
fig = Figure(figsize=(5,4), dpi=100)
20+
ax = Subplot(fig, 111)
2121
t = numpy.arange(0.0,3.0,0.01)
2222
s = numpy.sin(2*numpy.pi*t)
2323

24-
a.plot(t,s)
25-
f.add_axis(a)
26-
f.show()
27-
vbox.pack_start(f)
24+
ax.plot(t,s)
25+
fig.add_axis(ax)
26+
fig.show()
27+
vbox.pack_start(fig)
2828

29-
toolbar = NavigationToolbar(f, win)
29+
toolbar = NavigationToolbar(fig, win)
3030
toolbar.show()
3131
vbox.pack_start(toolbar, gtk.FALSE, gtk.FALSE)
3232

33-
button = gtk.Button('Quit')
34-
button.connect('clicked', lambda b: gtk.mainquit())
35-
button.show()
36-
vbox.pack_start(button)
33+
buttonQuit = gtk.Button('Quit')
34+
buttonQuit.connect('clicked', gtk.mainquit)
35+
buttonQuit.show()
36+
vbox.pack_start(buttonQuit)
3737

38-
win.show()
39-
gtk.mainloop()
38+
39+
40+
if __name__=='__main__':
41+
win.show()
42+
gtk.mainloop()

‎examples/gdtest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ def f(t):
3030
ax = gca()
3131

3232

33-
savefig('gdtest', dpi=150)
33+
#savefig('gdtest', dpi=150)
3434
show()

0 commit comments

Comments
 (0)
0