From 0399753457f83e8a6dfb85c1c38f407dc7a6e5f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Thu, 12 Sep 2019 10:08:14 +0200 Subject: [PATCH] libtools/Tool{,Circle,Fill,Line,Rect,Select,Text}.py: sync function signature comments. --- libtools/Tool.py | 2 +- libtools/ToolCircle.py | 2 +- libtools/ToolFill.py | 2 +- libtools/ToolLine.py | 2 +- libtools/ToolRect.py | 2 +- libtools/ToolSelect.py | 2 +- libtools/ToolText.py | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libtools/Tool.py b/libtools/Tool.py index 8b4c01e..911deb6 100644 --- a/libtools/Tool.py +++ b/libtools/Tool.py @@ -5,7 +5,7 @@ # class Tool(): - # {{{ onKeyboardEvent(self, brushColours, brushSize, dispatchFn, eventDc, keyChar, keyModifiers, mapPoint, viewRect) + # {{{ onKeyboardEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, keyChar, keyModifiers, mapPoint, viewRect) def onKeyboardEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, keyChar, keyModifiers, mapPoint, viewRect): return False, False # }}} diff --git a/libtools/ToolCircle.py b/libtools/ToolCircle.py index 47667be..da87f18 100644 --- a/libtools/ToolCircle.py +++ b/libtools/ToolCircle.py @@ -10,7 +10,7 @@ class ToolCircle(Tool): name = "Circle" # - # onMouseEvent(self, brushColours, brushSize, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect) + # onMouseEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect) def onMouseEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect): brushColours, dirty = brushColours.copy(), False if mouseLeftDown: diff --git a/libtools/ToolFill.py b/libtools/ToolFill.py index ddbc6cb..a413830 100644 --- a/libtools/ToolFill.py +++ b/libtools/ToolFill.py @@ -10,7 +10,7 @@ class ToolFill(Tool): name = "Fill" # - # onMouseEvent(self, brushColours, brushSize, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect) + # onMouseEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect) def onMouseEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect): dirty, pointsDone, pointStack, testColour, = False, [], [list(mapPoint)], canvas.map[mapPoint[1]][mapPoint[0]][0:2] if mouseLeftDown or mouseRightDown: diff --git a/libtools/ToolLine.py b/libtools/ToolLine.py index 535cf21..d1d76e0 100644 --- a/libtools/ToolLine.py +++ b/libtools/ToolLine.py @@ -51,7 +51,7 @@ class ToolLine(Tool): # }}} # - # onMouseEvent(self, brushColours, brushSize, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect) + # onMouseEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect) def onMouseEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect): brushColours, dirty = brushColours.copy(), False if mouseLeftDown: diff --git a/libtools/ToolRect.py b/libtools/ToolRect.py index b92b38c..05fd693 100644 --- a/libtools/ToolRect.py +++ b/libtools/ToolRect.py @@ -10,7 +10,7 @@ class ToolRect(Tool): name = "Rectangle" # - # onMouseEvent(self, brushColours, brushSize, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect) + # onMouseEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect) def onMouseEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect): brushColours, dirty = brushColours.copy(), False if mouseLeftDown: diff --git a/libtools/ToolSelect.py b/libtools/ToolSelect.py index 9da808a..5b1c028 100644 --- a/libtools/ToolSelect.py +++ b/libtools/ToolSelect.py @@ -105,7 +105,7 @@ class ToolSelect(Tool): # }}} # - # onMouseEvent(self, brushColours, brushSize, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect) + # onMouseEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect) def onMouseEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect): dirty = False if self.toolState == self.TS_NONE: diff --git a/libtools/ToolText.py b/libtools/ToolText.py index 58ad948..5f0230c 100644 --- a/libtools/ToolText.py +++ b/libtools/ToolText.py @@ -11,7 +11,7 @@ class ToolText(Tool): name = "Text" # - # onKeyboardEvent(self, brushColours, brushSize, dispatchFn, eventDc, keyChar, keyModifiers, mapPoint, viewRect) + # onKeyboardEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, keyChar, keyModifiers, mapPoint, viewRect) def onKeyboardEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, keyChar, keyModifiers, mapPoint, viewRect): if keyModifiers in (wx.MOD_NONE, wx.MOD_SHIFT): rc, dirty = True, True @@ -29,7 +29,7 @@ class ToolText(Tool): return rc, dirty # - # onMouseEvent(self, brushColours, brushSize, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect) + # onMouseEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect) def onMouseEvent(self, brushColours, brushSize, canvas, dispatchFn, eventDc, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect): if mouseLeftDown or mouseRightDown: self.textPos = list(mapPoint)