Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted to old method names/signatures for wx.DC, updated lib and

Browse Source 
demo to match.  Also fixed some deprecation warnings.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-02 02:41:33 +00:00
parent 019fd9d379
commit d7403ad2d1
61 changed files with 536 additions and 702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wxPython/wx/lib/wxPlotCanvas.py
View File

@@ -135,7 +135,7 @@ class PolyMarker(PolyPoints):
f(dc, xc, yc, size)
def _circle(self, dc, xc, yc, size=1):
dc.DrawEllipse((xc-2.5*size,yc-2.5*size), (5.*size,5.*size))
dc.DrawEllipse(xc-2.5*size,yc-2.5*size, 5.*size,5.*size)
def _dot(self, dc, xc, yc, size=1):
dc.DrawPoint(xc,yc)
@@ -154,12 +154,12 @@ class PolyMarker(PolyPoints):
(0.0,0.577350*size*5)],xc,yc)
def _cross(self, dc, xc, yc, size=1):
dc.DrawLine((xc-2.5*size, yc-2.5*size), (xc+2.5*size,yc+2.5*size))
dc.DrawLine((xc-2.5*size,yc+2.5*size), (xc+2.5*size,yc-2.5*size))
dc.DrawLine(xc-2.5*size, yc-2.5*size, xc+2.5*size,yc+2.5*size)
dc.DrawLine(xc-2.5*size,yc+2.5*size, xc+2.5*size,yc-2.5*size)
def _plus(self, dc, xc, yc, size=1):
dc.DrawLine((xc-2.5*size,yc), (xc+2.5*size,yc))
dc.DrawLine((xc,yc-2.5*size,xc), (yc+2.5*size))
dc.DrawLine(xc-2.5*size,yc, xc+2.5*size,yc)
dc.DrawLine(xc,yc-2.5*size,xc, yc+2.5*size)
class PlotGraphics:
@@ -318,12 +318,12 @@ class PlotCanvas(wx.Window):
for y, d in [(bb1[1], -3), (bb2[1], 3)]:
p1 = scale*Numeric.array([lower, y])+shift
p2 = scale*Numeric.array([upper, y])+shift
dc.DrawLine((p1[0],p1[1]), (p2[0],p2[1]))
dc.DrawLine(p1[0],p1[1], p2[0],p2[1])
for x, label in xticks:
p = scale*Numeric.array([x, y])+shift
dc.DrawLine((p[0],p[1]), (p[0],p[1]+d))
dc.DrawLine(p[0],p[1], p[0],p[1]+d)
if text:
dc.DrawText(label, (p[0],p[1]))
dc.DrawText(label, p[0],p[1])
text = 0
if yaxis is not None:
@@ -333,13 +333,13 @@ class PlotCanvas(wx.Window):
for x, d in [(bb1[0], -3), (bb2[0], 3)]:
p1 = scale*Numeric.array([x, lower])+shift
p2 = scale*Numeric.array([x, upper])+shift
dc.DrawLine((p1[0],p1[1]), (p2[0],p2[1]))
dc.DrawLine(p1[0],p1[1], p2[0],p2[1])
for y, label in yticks:
p = scale*Numeric.array([x, y])+shift
dc.DrawLine((p[0],p[1]), (p[0]-d,p[1]))
dc.DrawLine(p[0],p[1], p[0]-d,p[1])
if text:
dc.DrawText(label,
(p[0]-dc.GetTextExtent(label)[0], p[1]-0.5*h))
p[0]-dc.GetTextExtent(label)[0], p[1]-0.5*h)
text = 0
def _ticks(self, lower, upper):