8000 updated htdocs · matplotlib/matplotlib@4e3de60 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4e3de60

Browse files 10000
jdh2358jdh2358
committed
updated htdocs
svn path=/trunk/matplotlib/; revision=166
1 parent 0ede385 commit 4e3de60

File tree

6 files changed

+28
-29
lines changed

6 files changed

+28
-29
lines changed

‎.matplotlibrc

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,21 @@ interactive : False # see http://matplotlib.sourceforge.net/interactive.htm
2929
# information on line properties. Note antialiased rendering looks
3030
# better, but can be slower. If you want fast antialiased rendering,
3131
# use the agg backend (or TkAgg, or GTKAgg)
32-
lines.linewidth : 0.5 # the line width in points
33-
lines.linestyle : - # solid line
34-
lines.color : b # blue; color format or hex string
35-
lines.markersize : 6 # markersize, in points
36-
lines.antialiased : True # render lines in antialised (no jaggies)
32+
lines.linewidth : 0.5 # line width in points
33+
lines.linestyle : - # solid line
34+
lines.color : b # blue; color format or hex string
35+
lines.markersize : 6 # markersize, in points
36+
lines.antialiased : True # render lines in antialised (no jaggies)
37+
lines.data_clipping : False # Use data clipping in addition to viewport
38+
# clipping. Useful if you plot long data
39+
# sets with only a fraction in the viewport
3740

3841
### TEXT
3942
# text properties used by text.Text. See
4043
# http://matplotlib.sourceforge.net/matplotlib.Text.html for more
4144
# information on text properties
42-
text.fontname : Times # the default font name
43-
text.fontsize : 10 # the default size used by axes.text
45+
text.fontname : Times # default font name
46+
text.fontsize : 10 # default size used by axes.text
4447
text.color : k # black
4548

4649
### AXES

‎TODO

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@
174174

175175
-- Fix GD color allocation bug
176176

177-
-- Write install instructions for Paint on win32 and linux
177+
-- DONE Write install instructions for Paint on win32 and linux
178178

179-
-- Write install instructions for gd on win32
179+
-- DONE Write install instructions for gd on win32
180180

181181
-- Separate out the backend web pages and get developers to maintain
182182
them.
@@ -192,7 +192,7 @@
192192

193193
-- DONE GTK facecolor reversed for line markers
194194

195-
-- figure clear
195+
-- DONE figure clear
196196

197197
-- DONE 2004-02-12 (used filledEllipse) gd filling is not working like
198198
I think - see arctest
@@ -237,30 +237,25 @@
237237

238238
-- get module docs for ft2font working right
239239

240-
-- kwargs in plot to set lineprops?
240+
-- DONE kwargs in plot to set lineprops?
241241

242-
-- fix data clipping to per matthew' suggestion
242+
-- DONE fix data clipping to per matthew' suggestion
243243

244244
-- DONE 2004-02-25 fix setup.py to build ft2
245245

246246
-- TkAgg resize
247247

248-
-- TkAgg interactive on win32
248+
-- DONE TkAgg interactive on win32
249249

250-
-- test mathdemo on win32
250+
-- DONE test mathdemo on win32
251251

252252
-- figure out what you want to do about mathtext on GTK for next relase
253253

254-
-- mathtext screenshot demo
254+
-- DONE mathtext screenshot demo
255255

256-
-- integrate numerix chooser with matplotlib.__init__
256+
-- DONE integrate numerix chooser with matplotlib.__init__
257257

258258
-- figure out how to make draw if interactive play nicely
259259

260-
-- python2.2 no default tkinter
260+
-- DONE - (Todd updated docs) - python2.2 no default tkinter
261261

262-
from backend_tkagg import error_msg, draw_if_interactive, show, new_figure_manager
263-
File "/usr/lib/python2.2/site-packages/matplotlib/backends/backend_tkagg.py",
264-
line 7, in ?
265-
import Tkinter as Tk, FileDialog
266-
ImportError: No module named Tkinter

‎examples/backend_driver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def drive(backend):
6060
lines.append('savefig("%s", dpi=150)' % outfile)
6161
tmpfile = '_tmp_%s.py' % basename
6262
file(tmpfile, 'w').write(''.join(lines))
63-
os.system('python2.2 %s' % tmpfile)
63+
os.system('python %s' % tmpfile)
6464

6565
times = {}
6666
backends = ['PS', 'GD', 'Paint', 'Agg', 'Template']

‎examples/stock_demo.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
import matplotlib.numerix as numpy
55
(d1, p1, d2, p2 ) = get_two_stock_data()
66

7-
plot(d1, p1, 'bs', d2, p2, 'go')
7+
lines = plot(d1, p1, 'bs', d2, p2, 'go')
8+
set(lines, 'data_clipping', True)
89
xlabel('Days')
910
ylabel('Normalized price')
1011
set(gca(), 'xlim', [0, 3])

‎setupext.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ def add_pygtk_flags(module):
9595

9696

9797

98-
print module.include_dirs
99-
print module.libraries
100-
print module.library_dirs
10198

10299

103100
def add_tk_flags(module):

‎src/_backend_agg.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ _gc_get_color(PyObject *gc) {
150150
double r, g, b, *palpha;
151151

152152
if (!PyArg_ParseTuple(rgb, "ddd", &r, &g, &b)) {
153-
PyErr_SetString(PyExc_ValueError,
154-
"GC _rgb must be a length 3 tuple");
153+
//PyErr_SetString(PyExc_ValueError,
154+
// "GC _rgb must be a length 3 tuple");
155155
return NULL;
156156
}
157157

@@ -553,11 +553,14 @@ RendererAgg_draw_lines(RendererAggObject *renderer, PyObject* args) {
553553
if (Nx!=Ny) {
554554
PyErr_SetString(PyExc_ValueError,
555555
"x and y must be equal length sequences");
556+
return NULL;
556557
}
557558

558559
if (Nx<2) {
559560
PyErr_SetString(PyExc_ValueError,
560561
"x and y must have length >= 2");
562+
printf("%d, %d\n", Nx, Ny);
563+
return NULL;
561564
}
562565

563566

0 commit comments

Comments
 (0)
0