Skip to content

Commit 80cd333

Browse files
committed
added werners wx patch
svn path=/trunk/matplotlib/; revision=1160
1 parent 892fae4 commit 80cd333

File tree

8 files changed

+454
-379
lines changed

8 files changed

+454
-379
lines changed

CHANGELOG

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
New entries should be added at the top
22

3-
2005-04-11 fixed wxapp init bug
3+
2005-04-11 Incorporated Werner's wx patch -- wx backend should be
4+
compatible with wxpython2.4 and recent versions of 2.5.
5+
Some early versions of wxpython 2.5 will not work because
6+
there was a temporary change in the dc API that was rolled
7+
back to make it 2.4 compliant
8+
9+
2005-04-11 modified tkagg show so that new figure window pops up on
10+
call to figure
11+
12+
2005-04-11 fixed wxapp init bug
413

514
2005-04-02 updated backend_ps.draw_lines, draw_markers for use with the
615
new API - DSD

TODO

+1-1
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
701701

702702
-- multiple tick marks
703703

704-
-- colorbar not updating in CVS
704+
-- DONE colorbar not updating in CVS
705705

706706
-- tkagg figure not launching new figure until plot is called?

lib/matplotlib/backends/backend_ps.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,9 @@ def draw_markers(self, gc, path, rgbFace, x, y, transform):
349349
ps_cmd.append('closepath')
350350
elif code == agg.path_cmd_mask:
351351
pass
352-
else: print code
352+
else:
353+
pass
354+
#print code
353355
if rgbFace:
354356
ps_cmd.append('gsave')
355357
ps_cmd.append(ps_color)

lib/matplotlib/backends/backend_template.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def new_figure_manager(num, *args, **kwargs):
173173
# if a main-level app must be created, this is the usual place to
174174
# do it -- see backend_wx, backend_wxagg and backend_tkagg for
175175
# examples. Not all GUIs require explicit instantiation of a
176-
# main-level app (egg backend_gtk, backend_gtkagg)
176+
# main-level app (egg backend_gtk, backend_gtkagg) for pylab
177177

178178
thisFig = Figure(*args, **kwargs)
179179
canvas = FigureCanvasTemplate(thisFig)

lib/matplotlib/backends/backend_tkagg.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ def new_figure_manager(num, *args, **kwargs):
8484
window = Tk.Tk()
8585
canvas = FigureCanvasTkAgg(figure, master=window)
8686
figManager = FigureManagerTkAgg(canvas, num, window)
87+
if matplotlib.is_interactive():
88+
figManager.show()
8789
return figManager
8890

8991

@@ -286,7 +288,8 @@ def destroy(*args):
286288
self.window.deiconify()
287289
# anim.py requires this
288290
if sys.platform=='win32' : self.window.update()
289-
else: self.canvas.draw()
291+
else:
292+
self.canvas.draw()
290293
self._shown = True
291294

292295

0 commit comments

Comments
 (0)