MiRCARTToolFill.py: don't process cells more than once.

This commit is contained in:
Lucio Andrés Illanes Albornoz 2018-01-11 02:06:09 +01:00
parent 44490912b2
commit 508a3cd489
1 changed files with 13 additions and 11 deletions

View File

@ -31,7 +31,7 @@ class MiRCARTToolFill(MiRCARTTool):
#
# onMouseEvent(self, event, atPoint, brushColours, brushSize, isDragging, isLeftDown, isRightDown, dispatchFn, eventDc): XXX
def onMouseEvent(self, event, atPoint, brushColours, brushSize, isDragging, isLeftDown, isRightDown, dispatchFn, eventDc):
pointStack = [list(atPoint)]
pointStack = [list(atPoint)]; pointsDone = [];
testColour = self.parentCanvas.canvasMap[atPoint[1]][atPoint[0]][0][1]
if isLeftDown or isRightDown:
if isRightDown:
@ -40,15 +40,17 @@ class MiRCARTToolFill(MiRCARTTool):
point = pointStack.pop()
pointCell = self.parentCanvas.canvasMap[point[1]][point[0]]
if pointCell[0][1] == testColour:
dispatchFn(eventDc, False, [point.copy(), \
[brushColours[0], brushColours[0]], 0, " "])
if point[0] > 0:
pointStack.append([point[0] - 1, point[1]])
if point[0] < (self.parentCanvas.canvasSize[0] - 1):
pointStack.append([point[0] + 1, point[1]])
if point[1] > 0:
pointStack.append([point[0], point[1] - 1])
if point[1] < (self.parentCanvas.canvasSize[1] - 1):
pointStack.append([point[0], point[1] + 1])
if not point in pointsDone:
dispatchFn(eventDc, False, [point.copy(), \
[brushColours[0], brushColours[0]], 0, " "])
if point[0] > 0:
pointStack.append([point[0] - 1, point[1]])
if point[0] < (self.parentCanvas.canvasSize[0] - 1):
pointStack.append([point[0] + 1, point[1]])
if point[1] > 0:
pointStack.append([point[0], point[1] - 1])
if point[1] < (self.parentCanvas.canvasSize[1] - 1):
pointStack.append([point[0], point[1] + 1])
pointsDone += [point]
# vim:expandtab foldmethod=marker sw=4 ts=4 tw=120