mirror of
https://github.com/lalbornoz/roar.git
synced 2024-12-23 04:46:37 +00:00
ced45fa0d4
1) Add background colour toolbar beneath (foreground) colour toolbar.
2) Add colour flipping command w/ {accelerator,{menu,toolbar} item}.
3) Add {de,in}crease {brush,canvas} size accelerator.
4) Add {hide,show} assets window toolbar item.
5) Circle tool: draw outline with foreground colour.
6) Circle tool: honour transparency.
7) Fill tool: change comprehensive fill modifier key from <Shift> to <Ctrl>.
8) Fill tool: fill with {back,fore}ground colour given <[RL]MB>
9) Fix arrow keys cursor motion when scrolled down.
10 Instantly reflect {brush size,colour,tool} changes in canvas.
11) Object tool: honour transparency w/ non-external objects.
12) Object tool: update selection rectangle during <LMB> whilst dragging, set w/ release of <LMB>.
13) Rectangle tool: draw outline with foreground colour.
14) Rectangle tool: honour transparency.
15) Replace wx.ToolBar() w/ wx.lib.agw.aui.AuiToolBar() & custom wx.lib.agw.aui.AuiDefaultToolBarArt().
16) Restore scrolling position after resizing canvas.
.TODO: deleted.
assets/audio/roar{arab8,spoke11}.wav: added.
assets/text/hotkeys.txt: added to document hotkeys.
assets/text/requirements.txt, requirements.txt: moved.
assets/text/TODO: updated.
{assets/tools,lib{canvas,gui,roar,rtl,tools}}/*.py: remove Vim fold markers.
libroar/RoarCanvasCommandsFile.py:_importFile(): update wx.FileDialog() message.
libroar/RoarCanvasCommandsOperators.py:canvasOperator(): update invert colours {caption,label}.
55 lines
3.1 KiB
Python
55 lines
3.1 KiB
Python
#!/usr/bin/env python3
|
|
#
|
|
# ToolCircle.py
|
|
# Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
|
|
#
|
|
|
|
from Tool import Tool
|
|
|
|
class ToolCircle(Tool):
|
|
name = "Circle"
|
|
|
|
#
|
|
# onMouseEvent(self, atPoint, brushColours, brushPos, brushSize, canvas, dispatchFn, eventDc, keyModifiers, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown)
|
|
def onMouseEvent(self, atPoint, brushColours, brushPos, brushSize, canvas, dispatchFn, eventDc, keyModifiers, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown):
|
|
brushColours, brushSize, dirty = list(brushColours), [brushSize[0] * 2, brushSize[1]], False
|
|
originPoint, radius = (brushSize[0] / 2, brushSize[0] / 2), brushSize[0]
|
|
if mouseRightDown:
|
|
brushColours = [brushColours[1], brushColours[0]]
|
|
cells = []
|
|
for brushY in range(-radius, radius + 1):
|
|
cells += [[]]
|
|
for brushX in range(-radius, radius + 1):
|
|
if ((brushX ** 2) + (brushY ** 2) < (((radius ** 2) + radius) * 0.8)):
|
|
cells[-1] += [[mapPoint[i] + int(originPoint[i] + o) for i, o in zip((0, 1,), (brushX, brushY,))]]
|
|
if cells[-1] == []:
|
|
del cells[-1]
|
|
for numRow in range(len(cells)):
|
|
for numCol in range(len(cells[numRow])):
|
|
if ((numRow == 0) or (numRow == (len(cells) - 1))) \
|
|
or ((numCol == 0) or (numCol == (len(cells[numRow]) - 1))):
|
|
patch = [*cells[numRow][numCol], brushColours[0], brushColours[0], 0, " "]
|
|
elif ((numRow > 0) and (cells[numRow][numCol][0] < cells[numRow - 1][0][0])) \
|
|
or ((numRow < len(cells)) and (cells[numRow][numCol][0] < cells[numRow + 1][0][0])):
|
|
patch = [*cells[numRow][numCol], brushColours[0], brushColours[0], 0, " "]
|
|
elif ((numRow > 0) and (cells[numRow][numCol][0] > cells[numRow - 1][-1][0])) \
|
|
or ((numRow < len(cells)) and (cells[numRow][numCol][0] > cells[numRow + 1][-1][0])):
|
|
patch = [*cells[numRow][numCol], brushColours[0], brushColours[0], 0, " "]
|
|
elif brushColours[1] == -1:
|
|
if (cells[numRow][numCol][0] < canvas.size[0]) \
|
|
and (cells[numRow][numCol][1] < canvas.size[1]):
|
|
patch = [cells[numRow][numCol][0], cells[numRow][numCol][1], *canvas.map[cells[numRow][numCol][1]][cells[numRow][numCol][0]]]
|
|
else:
|
|
patch = [*cells[numRow][numCol], brushColours[1], brushColours[1], 0, " "]
|
|
else:
|
|
patch = [*cells[numRow][numCol], brushColours[1], brushColours[1], 0, " "]
|
|
if mouseLeftDown or mouseRightDown:
|
|
if not dirty:
|
|
dirty = True
|
|
dispatchFn(eventDc, False, patch); dispatchFn(eventDc, True, patch);
|
|
else:
|
|
dispatchFn(eventDc, True, patch)
|
|
return True, dirty
|
|
|
|
# vim:expandtab foldmethod=marker sw=4 ts=4 tw=120
|