X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b881fc787d2823bdd8a415080b82feee90804a17..609b563c8b9ade4fcde9160f11c7deaf16a9f7b6:/wxPython/wx/lib/wxPlotCanvas.py diff --git a/wxPython/wx/lib/wxPlotCanvas.py b/wxPython/wx/lib/wxPlotCanvas.py index a02a05f218..dd7e425260 100644 --- a/wxPython/wx/lib/wxPlotCanvas.py +++ b/wxPython/wx/lib/wxPlotCanvas.py @@ -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):