Correct indentation and Snap calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -991,8 +991,8 @@ class LineShape(Shape):
|
|||||||
if self._to.GetAttachmentMode() == ATTACHMENT_MODE_NONE:
|
if self._to.GetAttachmentMode() == ATTACHMENT_MODE_NONE:
|
||||||
other_end_x, other_end_y = self._to.GetPerimeterPoint(self._to.GetX(), self._to.GetY(), fromX, fromY)
|
other_end_x, other_end_y = self._to.GetPerimeterPoint(self._to.GetX(), self._to.GetY(), fromX, fromY)
|
||||||
|
|
||||||
#print type(self._from), type(self._to), end_x, end_y, other_end_x, other_end_y
|
return end_x, end_y, other_end_x, other_end_y
|
||||||
return end_x, end_y, other_end_x, other_end_y
|
|
||||||
|
|
||||||
def OnDraw(self, dc):
|
def OnDraw(self, dc):
|
||||||
if not self._lineControlPoints:
|
if not self._lineControlPoints:
|
||||||
@@ -1146,7 +1146,7 @@ class LineShape(Shape):
|
|||||||
dc.SetBrush(wx.TRANSPARENT_BRUSH)
|
dc.SetBrush(wx.TRANSPARENT_BRUSH)
|
||||||
|
|
||||||
if pt._type == CONTROL_POINT_LINE:
|
if pt._type == CONTROL_POINT_LINE:
|
||||||
x, y = self._canvas.Snap()
|
x, y = self._canvas.Snap(x, y)
|
||||||
|
|
||||||
pt.SetX(x)
|
pt.SetX(x)
|
||||||
pt.SetY(y)
|
pt.SetY(y)
|
||||||
@@ -1170,7 +1170,7 @@ class LineShape(Shape):
|
|||||||
|
|
||||||
if pt._type == CONTROL_POINT_LINE:
|
if pt._type == CONTROL_POINT_LINE:
|
||||||
pt._originalPos = pt._point
|
pt._originalPos = pt._point
|
||||||
x, y = self._canvas.Snap()
|
x, y = self._canvas.Snap(x, y)
|
||||||
|
|
||||||
self.Erase(dc)
|
self.Erase(dc)
|
||||||
|
|
||||||
@@ -1202,7 +1202,7 @@ class LineShape(Shape):
|
|||||||
self.SetBrush(old_brush)
|
self.SetBrush(old_brush)
|
||||||
|
|
||||||
if pt._type == CONTROL_POINT_ENDPOINT_FROM or pt._type == CONTROL_POINT_ENDPOINT_TO:
|
if pt._type == CONTROL_POINT_ENDPOINT_FROM or pt._type == CONTROL_POINT_ENDPOINT_TO:
|
||||||
self._canvas.SetCursor(wx.Cursor(wx.CURSOR_BULLSEYE))
|
self._canvas.SetCursor(wx.StockCursor(wx.CURSOR_BULLSEYE))
|
||||||
pt._oldCursor = wx.STANDARD_CURSOR
|
pt._oldCursor = wx.STANDARD_CURSOR
|
||||||
|
|
||||||
def OnSizingEndDragLeft(self, pt, x, y, keys = 0, attachment = 0):
|
def OnSizingEndDragLeft(self, pt, x, y, keys = 0, attachment = 0):
|
||||||
@@ -1212,7 +1212,7 @@ class LineShape(Shape):
|
|||||||
self.SetDisableLabel(False)
|
self.SetDisableLabel(False)
|
||||||
|
|
||||||
if pt._type == CONTROL_POINT_LINE:
|
if pt._type == CONTROL_POINT_LINE:
|
||||||
x, y = self._canvas.Snap()
|
x, y = self._canvas.Snap(x, y)
|
||||||
|
|
||||||
rpt = wx.RealPoint(x, y)
|
rpt = wx.RealPoint(x, y)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user