2019-09-07 04:39:26 -04:00
|
|
|
#!/usr/bin/env python3
|
|
|
|
#
|
2019-09-10 04:14:12 -04:00
|
|
|
# RoarCanvasWindow.py
|
2019-09-07 04:39:26 -04:00
|
|
|
# Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
|
|
|
|
#
|
|
|
|
|
2019-09-10 04:14:12 -04:00
|
|
|
from GuiWindow import GuiWindow
|
2019-09-12 06:49:53 -04:00
|
|
|
from ToolObject import ToolObject
|
|
|
|
import json, wx, sys
|
2019-09-13 14:20:26 -04:00
|
|
|
import time
|
2019-09-12 06:49:53 -04:00
|
|
|
|
|
|
|
class RoarCanvasWindowDropTarget(wx.TextDropTarget):
|
|
|
|
# {{{ OnDropText(self, x, y, data)
|
|
|
|
def OnDropText(self, x, y, data):
|
|
|
|
rc = False
|
|
|
|
try:
|
|
|
|
dropMap, dropSize = json.loads(data)
|
|
|
|
viewRect = self.parent.GetViewStart()
|
|
|
|
rectX, rectY = x - (x % self.parent.backend.cellSize[0]), y - (y % self.parent.backend.cellSize[1])
|
|
|
|
mapX, mapY = int(rectX / self.parent.backend.cellSize[0] if rectX else 0), int(rectY / self.parent.backend.cellSize[1] if rectY else 0)
|
|
|
|
mapPoint = [m + n for m, n in zip((mapX, mapY), viewRect)]
|
Implements merged object tool & flip operators.
assets/images/toolObject.png: added.
liboperators/Operator{,Flip{Horizontal,Vertical}}.py: initial implementation.
libroar/RoarCanvasCommands.py: adds RoarCanvasCommandsOperators.
libroar/RoarCanvasCommandsOperators.py: initial implementation.
libroar/Roar{CanvasCommands{,Tools},Client}.py: replaces ToolSelect{Clone,Move} w/ ToolObject.
libroar/RoarCanvasWindow.py:RoarCanvasWindowDropTarget.OnDropText(): update ToolObject() invocation.
libroar/RoarCanvasWindow.py:{applyTool,onMouseInput}(): pass keyModifiers to Tool.onMouseEvent().
libroar/RoarCanvasWindow.py:applyTool(): only switch back to lastTool if current object tool contains an external object.
libroar/RoarCanvasWindow.py:onLeaveWindow(): disable hiding cursor for now.
libtools/Tool{,Circle,Fill,Line,Rect,Text}.py:onMouseEvent(): update type signature.
libtools/Tool{Object,Select{,Clone,Move}}.py: merged into libtools/ToolObject.py.
roar.py: add liboperators to sys.path[].
assets/text/TODO: updated.
2019-09-15 05:06:25 -04:00
|
|
|
self.parent.commands.lastTool, self.parent.commands.currentTool = self.parent.commands.currentTool, ToolObject()
|
|
|
|
self.parent.commands.currentTool.setRegion(self.parent.canvas, mapPoint, dropMap, dropSize, external=True)
|
2019-09-12 06:49:53 -04:00
|
|
|
self.parent.commands.update(toolName=self.parent.commands.currentTool.name)
|
|
|
|
eventDc = self.parent.backend.getDeviceContext(self.parent.GetClientSize(), self.parent, viewRect)
|
|
|
|
self.parent.applyTool(eventDc, True, None, None, self.parent.brushPos, False, False, False, self.parent.commands.currentTool, viewRect)
|
|
|
|
rc = True
|
|
|
|
except:
|
|
|
|
with wx.MessageDialog(self.parent, "Error: {}".format(sys.exc_info()[1]), "", wx.OK | wx.OK_DEFAULT) as dialog:
|
|
|
|
dialogChoice = dialog.ShowModal()
|
|
|
|
return rc
|
|
|
|
# }}}
|
|
|
|
# {{{ __init__(self, parent)
|
|
|
|
def __init__(self, parent):
|
|
|
|
super().__init__(); self.parent = parent;
|
|
|
|
# }}}
|
2019-09-07 04:39:26 -04:00
|
|
|
|
2019-09-10 04:14:12 -04:00
|
|
|
class RoarCanvasWindow(GuiWindow):
|
Initial canvas panel scrollbar implementation.
assets/text/TODO: updated.
libgui/GuiCanvasPanel.py:__init__(): provide self.winSize & call SetScrollRate().
libgui/GuiCanvasPanel.py:{_drawPatch,dispatch{DeltaPatches,Patch},onPanel{Input,LeaveWindow},resize,update}(): receive and/or pass viewRect.
libgui/GuiCanvasPanel.py:onPanelPaint(): updated.
libgui/GuiCanvasPanel.py:resize(): call SetVirtualSize().
libgui/GuiCanvasWxBackend.py:_{draw{Brush,Char}Patch,_get{Brush,Char}PatchColours,xlatePoint}(): updated.
libgui/GuiCanvasWxBackend.py:{draw{CursorMaskWithJournal,Patch},getDeviceContext,xlateEventPoint}(): receive and/or pass viewRect.
libgui/GuiCanvasWxBackend.py:getDeviceContext(): return ClientDC() if viewRect > (0, 0)
libgui/GuiCanvasWxBackend.py:onPanelPaintEvent(): blit subset of canvasBitmap into BufferedPaintDC() if viewRect > (0, 0).
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py: receive & pass viewRect to dispatchFn().
2019-09-09 06:30:25 -04:00
|
|
|
# {{{ _drawPatch(self, eventDc, isCursor, patch, viewRect)
|
|
|
|
def _drawPatch(self, eventDc, isCursor, patch, viewRect):
|
2019-09-07 04:39:26 -04:00
|
|
|
if not self.canvas.dirtyCursor:
|
Initial canvas panel scrollbar implementation.
assets/text/TODO: updated.
libgui/GuiCanvasPanel.py:__init__(): provide self.winSize & call SetScrollRate().
libgui/GuiCanvasPanel.py:{_drawPatch,dispatch{DeltaPatches,Patch},onPanel{Input,LeaveWindow},resize,update}(): receive and/or pass viewRect.
libgui/GuiCanvasPanel.py:onPanelPaint(): updated.
libgui/GuiCanvasPanel.py:resize(): call SetVirtualSize().
libgui/GuiCanvasWxBackend.py:_{draw{Brush,Char}Patch,_get{Brush,Char}PatchColours,xlatePoint}(): updated.
libgui/GuiCanvasWxBackend.py:{draw{CursorMaskWithJournal,Patch},getDeviceContext,xlateEventPoint}(): receive and/or pass viewRect.
libgui/GuiCanvasWxBackend.py:getDeviceContext(): return ClientDC() if viewRect > (0, 0)
libgui/GuiCanvasWxBackend.py:onPanelPaintEvent(): blit subset of canvasBitmap into BufferedPaintDC() if viewRect > (0, 0).
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py: receive & pass viewRect to dispatchFn().
2019-09-09 06:30:25 -04:00
|
|
|
self.backend.drawCursorMaskWithJournal(self.canvas.journal, eventDc, viewRect)
|
2019-09-07 04:39:26 -04:00
|
|
|
self.canvas.dirtyCursor = True
|
Initial canvas panel scrollbar implementation.
assets/text/TODO: updated.
libgui/GuiCanvasPanel.py:__init__(): provide self.winSize & call SetScrollRate().
libgui/GuiCanvasPanel.py:{_drawPatch,dispatch{DeltaPatches,Patch},onPanel{Input,LeaveWindow},resize,update}(): receive and/or pass viewRect.
libgui/GuiCanvasPanel.py:onPanelPaint(): updated.
libgui/GuiCanvasPanel.py:resize(): call SetVirtualSize().
libgui/GuiCanvasWxBackend.py:_{draw{Brush,Char}Patch,_get{Brush,Char}PatchColours,xlatePoint}(): updated.
libgui/GuiCanvasWxBackend.py:{draw{CursorMaskWithJournal,Patch},getDeviceContext,xlateEventPoint}(): receive and/or pass viewRect.
libgui/GuiCanvasWxBackend.py:getDeviceContext(): return ClientDC() if viewRect > (0, 0)
libgui/GuiCanvasWxBackend.py:onPanelPaintEvent(): blit subset of canvasBitmap into BufferedPaintDC() if viewRect > (0, 0).
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py: receive & pass viewRect to dispatchFn().
2019-09-09 06:30:25 -04:00
|
|
|
if self.backend.drawPatch(eventDc, patch, viewRect) and isCursor:
|
2019-09-07 04:39:26 -04:00
|
|
|
patchDeltaCell = self.canvas.map[patch[1]][patch[0]]; patchDelta = [*patch[0:2], *patchDeltaCell];
|
|
|
|
self.canvas.journal.pushCursor(patchDelta)
|
|
|
|
# }}}
|
|
|
|
|
2019-09-10 04:14:12 -04:00
|
|
|
# {{{ applyTool(self, eventDc, eventMouse, keyChar, keyModifiers, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, tool, viewRect)
|
|
|
|
def applyTool(self, eventDc, eventMouse, keyChar, keyModifiers, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, tool, viewRect):
|
2019-09-13 15:09:51 -04:00
|
|
|
if mapPoint != None:
|
|
|
|
mapPoint = [a + b for a, b in zip(mapPoint, viewRect)]
|
libcanvas/Canvas.py:dispatchPatchSingle(): cloned from dispatchPatch().
lib{canvas/Canvas{,Journal},gui/GuiCanvasPanel}.py: replace dirtyJournal & pushDeltas() w/ explicit {begin,end}().
libgui/GuiCanvasPanel.py:applyTool(): updated.
libgui/GuiCanvasPanel.py:dispatchPatchSingle(): cloned from dispatchPatch().
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py:on{Mouse,Keyboard}Event(): return rc, dirty.
libtools/ToolSelect{Clone,Move}.py:onSelectEvent(): return rc, dirty.
2019-09-09 12:43:33 -04:00
|
|
|
dirty, self.canvas.dirtyCursor, rc = False, False, False
|
|
|
|
self.canvas.journal.begin()
|
2019-09-10 04:14:12 -04:00
|
|
|
if eventMouse:
|
2019-09-12 10:24:53 -04:00
|
|
|
if ((mapPoint[0] < self.canvas.size[0]) \
|
|
|
|
and (mapPoint[1] < self.canvas.size[1])) \
|
2019-09-13 14:20:26 -04:00
|
|
|
and ((self.lastCellState == None) \
|
|
|
|
or (self.lastCellState != [list(mapPoint), mouseDragging, mouseLeftDown, mouseRightDown, list(viewRect)])):
|
2019-09-12 10:24:53 -04:00
|
|
|
self.brushPos = list(mapPoint)
|
2019-09-13 14:20:26 -04:00
|
|
|
self.lastCellState = [list(mapPoint), mouseDragging, mouseLeftDown, mouseRightDown, list(viewRect)]
|
Implements merged object tool & flip operators.
assets/images/toolObject.png: added.
liboperators/Operator{,Flip{Horizontal,Vertical}}.py: initial implementation.
libroar/RoarCanvasCommands.py: adds RoarCanvasCommandsOperators.
libroar/RoarCanvasCommandsOperators.py: initial implementation.
libroar/Roar{CanvasCommands{,Tools},Client}.py: replaces ToolSelect{Clone,Move} w/ ToolObject.
libroar/RoarCanvasWindow.py:RoarCanvasWindowDropTarget.OnDropText(): update ToolObject() invocation.
libroar/RoarCanvasWindow.py:{applyTool,onMouseInput}(): pass keyModifiers to Tool.onMouseEvent().
libroar/RoarCanvasWindow.py:applyTool(): only switch back to lastTool if current object tool contains an external object.
libroar/RoarCanvasWindow.py:onLeaveWindow(): disable hiding cursor for now.
libtools/Tool{,Circle,Fill,Line,Rect,Text}.py:onMouseEvent(): update type signature.
libtools/Tool{Object,Select{,Clone,Move}}.py: merged into libtools/ToolObject.py.
roar.py: add liboperators to sys.path[].
assets/text/TODO: updated.
2019-09-15 05:06:25 -04:00
|
|
|
rc, dirty = tool.onMouseEvent(self.brushColours, self.brushSize, self.canvas, self.dispatchPatchSingle, eventDc, keyModifiers, self.brushPos, mouseDragging, mouseLeftDown, mouseRightDown, viewRect)
|
2019-09-10 04:14:12 -04:00
|
|
|
else:
|
2019-09-10 06:12:12 -04:00
|
|
|
rc, dirty = tool.onKeyboardEvent(self.brushColours, self.brushSize, self.canvas, self.dispatchPatchSingle, eventDc, keyChar, keyModifiers, self.brushPos, viewRect)
|
libcanvas/Canvas.py:dispatchPatchSingle(): cloned from dispatchPatch().
lib{canvas/Canvas{,Journal},gui/GuiCanvasPanel}.py: replace dirtyJournal & pushDeltas() w/ explicit {begin,end}().
libgui/GuiCanvasPanel.py:applyTool(): updated.
libgui/GuiCanvasPanel.py:dispatchPatchSingle(): cloned from dispatchPatch().
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py:on{Mouse,Keyboard}Event(): return rc, dirty.
libtools/ToolSelect{Clone,Move}.py:onSelectEvent(): return rc, dirty.
2019-09-09 12:43:33 -04:00
|
|
|
if dirty:
|
libgui/GuiCanvasInterface.py:canvasTool(): call applyTool() w/ new tool post-selection.
libgui/GuiCanvasPanel.py:{applyTool,onPanelInput}(): split from onPanelInput().
libtools/Tool{,Circle,Fill,Line,Rect,Select,Text}.py:on{Keyboard,Mouse}Event(): updated.
libtools/ToolFill.py:onMouseEvent(): display cursor.
libtools/ToolSelect{,Clone,Move}.py:onSelectEvent(): updated.
2019-09-09 12:18:54 -04:00
|
|
|
self.dirty = True
|
2019-09-10 06:06:56 -04:00
|
|
|
self.commands.update(dirty=self.dirty, cellPos=self.brushPos, undoLevel=self.canvas.journal.patchesUndoLevel)
|
2019-09-10 04:14:12 -04:00
|
|
|
else:
|
2019-09-10 06:06:56 -04:00
|
|
|
self.commands.update(cellPos=mapPoint if mapPoint else self.brushPos)
|
libcanvas/Canvas.py:dispatchPatchSingle(): cloned from dispatchPatch().
lib{canvas/Canvas{,Journal},gui/GuiCanvasPanel}.py: replace dirtyJournal & pushDeltas() w/ explicit {begin,end}().
libgui/GuiCanvasPanel.py:applyTool(): updated.
libgui/GuiCanvasPanel.py:dispatchPatchSingle(): cloned from dispatchPatch().
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py:on{Mouse,Keyboard}Event(): return rc, dirty.
libtools/ToolSelect{Clone,Move}.py:onSelectEvent(): return rc, dirty.
2019-09-09 12:43:33 -04:00
|
|
|
self.canvas.journal.end()
|
Implements merged object tool & flip operators.
assets/images/toolObject.png: added.
liboperators/Operator{,Flip{Horizontal,Vertical}}.py: initial implementation.
libroar/RoarCanvasCommands.py: adds RoarCanvasCommandsOperators.
libroar/RoarCanvasCommandsOperators.py: initial implementation.
libroar/Roar{CanvasCommands{,Tools},Client}.py: replaces ToolSelect{Clone,Move} w/ ToolObject.
libroar/RoarCanvasWindow.py:RoarCanvasWindowDropTarget.OnDropText(): update ToolObject() invocation.
libroar/RoarCanvasWindow.py:{applyTool,onMouseInput}(): pass keyModifiers to Tool.onMouseEvent().
libroar/RoarCanvasWindow.py:applyTool(): only switch back to lastTool if current object tool contains an external object.
libroar/RoarCanvasWindow.py:onLeaveWindow(): disable hiding cursor for now.
libtools/Tool{,Circle,Fill,Line,Rect,Text}.py:onMouseEvent(): update type signature.
libtools/Tool{Object,Select{,Clone,Move}}.py: merged into libtools/ToolObject.py.
roar.py: add liboperators to sys.path[].
assets/text/TODO: updated.
2019-09-15 05:06:25 -04:00
|
|
|
if rc and (tool.__class__ == ToolObject) \
|
|
|
|
and (tool.toolState == tool.TS_NONE) \
|
|
|
|
and tool.external:
|
2019-09-12 06:49:53 -04:00
|
|
|
self.commands.currentTool, self.commands.lastTool = self.commands.lastTool, self.commands.currentTool
|
|
|
|
self.commands.update(toolName=self.commands.currentTool.name)
|
libgui/GuiCanvasInterface.py:canvasTool(): call applyTool() w/ new tool post-selection.
libgui/GuiCanvasPanel.py:{applyTool,onPanelInput}(): split from onPanelInput().
libtools/Tool{,Circle,Fill,Line,Rect,Select,Text}.py:on{Keyboard,Mouse}Event(): updated.
libtools/ToolFill.py:onMouseEvent(): display cursor.
libtools/ToolSelect{,Clone,Move}.py:onSelectEvent(): updated.
2019-09-09 12:18:54 -04:00
|
|
|
return rc
|
|
|
|
# }}}
|
2019-09-08 12:08:04 -04:00
|
|
|
# {{{ dispatchDeltaPatches(self, deltaPatches)
|
2019-09-07 04:39:26 -04:00
|
|
|
def dispatchDeltaPatches(self, deltaPatches):
|
2019-09-12 11:03:21 -04:00
|
|
|
viewRect = self.GetViewStart()
|
|
|
|
eventDc = self.backend.getDeviceContext(self.GetClientSize(), self, viewRect)
|
|
|
|
if self.canvas.dirtyCursor:
|
|
|
|
self.backend.drawCursorMaskWithJournal(self.canvas.journal, eventDc, viewRect)
|
|
|
|
self.canvas.dirtyCursor = False
|
2019-09-07 04:39:26 -04:00
|
|
|
for patch in deltaPatches:
|
|
|
|
if patch == None:
|
|
|
|
continue
|
|
|
|
elif patch[0] == "resize":
|
2019-09-11 02:28:56 -04:00
|
|
|
del eventDc; self.resize(patch[1:], False); eventDc = self.backend.getDeviceContext(self.GetClientSize(), self, self.GetViewStart());
|
2019-09-07 04:39:26 -04:00
|
|
|
else:
|
Initial canvas panel scrollbar implementation.
assets/text/TODO: updated.
libgui/GuiCanvasPanel.py:__init__(): provide self.winSize & call SetScrollRate().
libgui/GuiCanvasPanel.py:{_drawPatch,dispatch{DeltaPatches,Patch},onPanel{Input,LeaveWindow},resize,update}(): receive and/or pass viewRect.
libgui/GuiCanvasPanel.py:onPanelPaint(): updated.
libgui/GuiCanvasPanel.py:resize(): call SetVirtualSize().
libgui/GuiCanvasWxBackend.py:_{draw{Brush,Char}Patch,_get{Brush,Char}PatchColours,xlatePoint}(): updated.
libgui/GuiCanvasWxBackend.py:{draw{CursorMaskWithJournal,Patch},getDeviceContext,xlateEventPoint}(): receive and/or pass viewRect.
libgui/GuiCanvasWxBackend.py:getDeviceContext(): return ClientDC() if viewRect > (0, 0)
libgui/GuiCanvasWxBackend.py:onPanelPaintEvent(): blit subset of canvasBitmap into BufferedPaintDC() if viewRect > (0, 0).
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py: receive & pass viewRect to dispatchFn().
2019-09-09 06:30:25 -04:00
|
|
|
self.canvas._commitPatch(patch); self.backend.drawPatch(eventDc, patch, self.GetViewStart());
|
2019-09-07 04:39:26 -04:00
|
|
|
# }}}
|
Initial canvas panel scrollbar implementation.
assets/text/TODO: updated.
libgui/GuiCanvasPanel.py:__init__(): provide self.winSize & call SetScrollRate().
libgui/GuiCanvasPanel.py:{_drawPatch,dispatch{DeltaPatches,Patch},onPanel{Input,LeaveWindow},resize,update}(): receive and/or pass viewRect.
libgui/GuiCanvasPanel.py:onPanelPaint(): updated.
libgui/GuiCanvasPanel.py:resize(): call SetVirtualSize().
libgui/GuiCanvasWxBackend.py:_{draw{Brush,Char}Patch,_get{Brush,Char}PatchColours,xlatePoint}(): updated.
libgui/GuiCanvasWxBackend.py:{draw{CursorMaskWithJournal,Patch},getDeviceContext,xlateEventPoint}(): receive and/or pass viewRect.
libgui/GuiCanvasWxBackend.py:getDeviceContext(): return ClientDC() if viewRect > (0, 0)
libgui/GuiCanvasWxBackend.py:onPanelPaintEvent(): blit subset of canvasBitmap into BufferedPaintDC() if viewRect > (0, 0).
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py: receive & pass viewRect to dispatchFn().
2019-09-09 06:30:25 -04:00
|
|
|
# {{{ dispatchPatch(self, eventDc, isCursor, patch, viewRect)
|
|
|
|
def dispatchPatch(self, eventDc, isCursor, patch, viewRect):
|
2019-09-08 13:04:27 -04:00
|
|
|
if self.canvas.dispatchPatch(isCursor, patch, False if isCursor else True):
|
Initial canvas panel scrollbar implementation.
assets/text/TODO: updated.
libgui/GuiCanvasPanel.py:__init__(): provide self.winSize & call SetScrollRate().
libgui/GuiCanvasPanel.py:{_drawPatch,dispatch{DeltaPatches,Patch},onPanel{Input,LeaveWindow},resize,update}(): receive and/or pass viewRect.
libgui/GuiCanvasPanel.py:onPanelPaint(): updated.
libgui/GuiCanvasPanel.py:resize(): call SetVirtualSize().
libgui/GuiCanvasWxBackend.py:_{draw{Brush,Char}Patch,_get{Brush,Char}PatchColours,xlatePoint}(): updated.
libgui/GuiCanvasWxBackend.py:{draw{CursorMaskWithJournal,Patch},getDeviceContext,xlateEventPoint}(): receive and/or pass viewRect.
libgui/GuiCanvasWxBackend.py:getDeviceContext(): return ClientDC() if viewRect > (0, 0)
libgui/GuiCanvasWxBackend.py:onPanelPaintEvent(): blit subset of canvasBitmap into BufferedPaintDC() if viewRect > (0, 0).
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py: receive & pass viewRect to dispatchFn().
2019-09-09 06:30:25 -04:00
|
|
|
self._drawPatch(eventDc, isCursor, patch, viewRect)
|
2019-09-07 04:39:26 -04:00
|
|
|
# }}}
|
libcanvas/Canvas.py:dispatchPatchSingle(): cloned from dispatchPatch().
lib{canvas/Canvas{,Journal},gui/GuiCanvasPanel}.py: replace dirtyJournal & pushDeltas() w/ explicit {begin,end}().
libgui/GuiCanvasPanel.py:applyTool(): updated.
libgui/GuiCanvasPanel.py:dispatchPatchSingle(): cloned from dispatchPatch().
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py:on{Mouse,Keyboard}Event(): return rc, dirty.
libtools/ToolSelect{Clone,Move}.py:onSelectEvent(): return rc, dirty.
2019-09-09 12:43:33 -04:00
|
|
|
# {{{ dispatchPatchSingle(self, eventDc, isCursor, patch, viewRect)
|
|
|
|
def dispatchPatchSingle(self, eventDc, isCursor, patch, viewRect):
|
|
|
|
if self.canvas.dispatchPatchSingle(isCursor, patch, False if isCursor else True):
|
|
|
|
self._drawPatch(eventDc, isCursor, patch, viewRect)
|
|
|
|
# }}}
|
2019-09-08 12:08:04 -04:00
|
|
|
# {{{ resize(self, newSize, commitUndo=True)
|
2019-09-07 04:39:26 -04:00
|
|
|
def resize(self, newSize, commitUndo=True):
|
|
|
|
oldSize = [0, 0] if self.canvas.map == None else self.canvas.size
|
|
|
|
deltaSize = [b - a for a, b in zip(oldSize, newSize)]
|
|
|
|
if self.canvas.resize(newSize, commitUndo):
|
2019-09-10 04:14:12 -04:00
|
|
|
super().resize([a * b for a, b in zip(newSize, self.backend.cellSize)])
|
2019-09-07 04:39:26 -04:00
|
|
|
self.backend.resize(newSize, self.backend.cellSize)
|
2019-09-11 02:28:56 -04:00
|
|
|
viewRect = self.GetViewStart(); eventDc = self.backend.getDeviceContext(self.GetClientSize(), self, viewRect);
|
2019-09-07 04:39:26 -04:00
|
|
|
if deltaSize[0] > 0:
|
|
|
|
for numRow in range(oldSize[1]):
|
|
|
|
for numNewCol in range(oldSize[0], newSize[0]):
|
Initial canvas panel scrollbar implementation.
assets/text/TODO: updated.
libgui/GuiCanvasPanel.py:__init__(): provide self.winSize & call SetScrollRate().
libgui/GuiCanvasPanel.py:{_drawPatch,dispatch{DeltaPatches,Patch},onPanel{Input,LeaveWindow},resize,update}(): receive and/or pass viewRect.
libgui/GuiCanvasPanel.py:onPanelPaint(): updated.
libgui/GuiCanvasPanel.py:resize(): call SetVirtualSize().
libgui/GuiCanvasWxBackend.py:_{draw{Brush,Char}Patch,_get{Brush,Char}PatchColours,xlatePoint}(): updated.
libgui/GuiCanvasWxBackend.py:{draw{CursorMaskWithJournal,Patch},getDeviceContext,xlateEventPoint}(): receive and/or pass viewRect.
libgui/GuiCanvasWxBackend.py:getDeviceContext(): return ClientDC() if viewRect > (0, 0)
libgui/GuiCanvasWxBackend.py:onPanelPaintEvent(): blit subset of canvasBitmap into BufferedPaintDC() if viewRect > (0, 0).
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py: receive & pass viewRect to dispatchFn().
2019-09-09 06:30:25 -04:00
|
|
|
self._drawPatch(eventDc, False, [numNewCol, numRow, 1, 1, 0, " "], viewRect)
|
2019-09-07 04:39:26 -04:00
|
|
|
if deltaSize[1] > 1:
|
|
|
|
for numNewRow in range(oldSize[1], newSize[1]):
|
|
|
|
for numNewCol in range(newSize[0]):
|
Initial canvas panel scrollbar implementation.
assets/text/TODO: updated.
libgui/GuiCanvasPanel.py:__init__(): provide self.winSize & call SetScrollRate().
libgui/GuiCanvasPanel.py:{_drawPatch,dispatch{DeltaPatches,Patch},onPanel{Input,LeaveWindow},resize,update}(): receive and/or pass viewRect.
libgui/GuiCanvasPanel.py:onPanelPaint(): updated.
libgui/GuiCanvasPanel.py:resize(): call SetVirtualSize().
libgui/GuiCanvasWxBackend.py:_{draw{Brush,Char}Patch,_get{Brush,Char}PatchColours,xlatePoint}(): updated.
libgui/GuiCanvasWxBackend.py:{draw{CursorMaskWithJournal,Patch},getDeviceContext,xlateEventPoint}(): receive and/or pass viewRect.
libgui/GuiCanvasWxBackend.py:getDeviceContext(): return ClientDC() if viewRect > (0, 0)
libgui/GuiCanvasWxBackend.py:onPanelPaintEvent(): blit subset of canvasBitmap into BufferedPaintDC() if viewRect > (0, 0).
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py: receive & pass viewRect to dispatchFn().
2019-09-09 06:30:25 -04:00
|
|
|
self._drawPatch(eventDc, False, [numNewCol, numNewRow, 1, 1, 0, " "], viewRect)
|
2019-09-10 06:06:56 -04:00
|
|
|
self.commands.update(size=newSize, undoLevel=self.canvas.journal.patchesUndoLevel)
|
2019-09-07 04:39:26 -04:00
|
|
|
# }}}
|
2019-09-08 12:08:04 -04:00
|
|
|
# {{{ update(self, newSize, commitUndo=True, newCanvas=None)
|
2019-09-07 04:39:26 -04:00
|
|
|
def update(self, newSize, commitUndo=True, newCanvas=None):
|
|
|
|
self.resize(newSize, commitUndo)
|
|
|
|
self.canvas.update(newSize, newCanvas)
|
2019-09-11 02:28:56 -04:00
|
|
|
eventDc = self.backend.getDeviceContext(self.GetClientSize(), self, self.GetViewStart())
|
2019-09-07 04:39:26 -04:00
|
|
|
for numRow in range(newSize[1]):
|
|
|
|
for numCol in range(newSize[0]):
|
Initial canvas panel scrollbar implementation.
assets/text/TODO: updated.
libgui/GuiCanvasPanel.py:__init__(): provide self.winSize & call SetScrollRate().
libgui/GuiCanvasPanel.py:{_drawPatch,dispatch{DeltaPatches,Patch},onPanel{Input,LeaveWindow},resize,update}(): receive and/or pass viewRect.
libgui/GuiCanvasPanel.py:onPanelPaint(): updated.
libgui/GuiCanvasPanel.py:resize(): call SetVirtualSize().
libgui/GuiCanvasWxBackend.py:_{draw{Brush,Char}Patch,_get{Brush,Char}PatchColours,xlatePoint}(): updated.
libgui/GuiCanvasWxBackend.py:{draw{CursorMaskWithJournal,Patch},getDeviceContext,xlateEventPoint}(): receive and/or pass viewRect.
libgui/GuiCanvasWxBackend.py:getDeviceContext(): return ClientDC() if viewRect > (0, 0)
libgui/GuiCanvasWxBackend.py:onPanelPaintEvent(): blit subset of canvasBitmap into BufferedPaintDC() if viewRect > (0, 0).
libtools/Tool{,Circle,Fill,Line,Rect,Select{,Clone,Move},Text}.py: receive & pass viewRect to dispatchFn().
2019-09-09 06:30:25 -04:00
|
|
|
self.backend.drawPatch(eventDc, [numCol, numRow, *self.canvas.map[numRow][numCol]], self.GetViewStart())
|
2019-09-07 04:39:26 -04:00
|
|
|
# }}}
|
|
|
|
|
2019-09-10 04:14:12 -04:00
|
|
|
# {{{ onKeyboardInput(self, event)
|
|
|
|
def onKeyboardInput(self, event):
|
2019-09-11 02:28:56 -04:00
|
|
|
viewRect = self.GetViewStart(); eventDc = self.backend.getDeviceContext(self.GetClientSize(), self, viewRect);
|
2019-09-10 04:14:12 -04:00
|
|
|
keyChar, keyModifiers = chr(event.GetUnicodeKey()), event.GetModifiers()
|
2019-09-10 06:06:56 -04:00
|
|
|
if not self.applyTool(eventDc, False, keyChar, keyModifiers, None, None, None, None, self.commands.currentTool, viewRect):
|
libgui/GuiCanvasInterface.py:canvasTool(): call applyTool() w/ new tool post-selection.
libgui/GuiCanvasPanel.py:{applyTool,onPanelInput}(): split from onPanelInput().
libtools/Tool{,Circle,Fill,Line,Rect,Select,Text}.py:on{Keyboard,Mouse}Event(): updated.
libtools/ToolFill.py:onMouseEvent(): display cursor.
libtools/ToolSelect{,Clone,Move}.py:onSelectEvent(): updated.
2019-09-09 12:18:54 -04:00
|
|
|
event.Skip()
|
2019-09-07 04:39:26 -04:00
|
|
|
# }}}
|
2019-09-12 10:24:53 -04:00
|
|
|
# {{{ onEnterWindow(self, event)
|
|
|
|
def onEnterWindow(self, event):
|
2019-09-13 14:20:26 -04:00
|
|
|
self.lastCellState = None
|
2019-09-12 10:24:53 -04:00
|
|
|
# }}}
|
2019-09-10 04:14:12 -04:00
|
|
|
# {{{ onLeaveWindow(self, event)
|
|
|
|
def onLeaveWindow(self, event):
|
Implements merged object tool & flip operators.
assets/images/toolObject.png: added.
liboperators/Operator{,Flip{Horizontal,Vertical}}.py: initial implementation.
libroar/RoarCanvasCommands.py: adds RoarCanvasCommandsOperators.
libroar/RoarCanvasCommandsOperators.py: initial implementation.
libroar/Roar{CanvasCommands{,Tools},Client}.py: replaces ToolSelect{Clone,Move} w/ ToolObject.
libroar/RoarCanvasWindow.py:RoarCanvasWindowDropTarget.OnDropText(): update ToolObject() invocation.
libroar/RoarCanvasWindow.py:{applyTool,onMouseInput}(): pass keyModifiers to Tool.onMouseEvent().
libroar/RoarCanvasWindow.py:applyTool(): only switch back to lastTool if current object tool contains an external object.
libroar/RoarCanvasWindow.py:onLeaveWindow(): disable hiding cursor for now.
libtools/Tool{,Circle,Fill,Line,Rect,Text}.py:onMouseEvent(): update type signature.
libtools/Tool{Object,Select{,Clone,Move}}.py: merged into libtools/ToolObject.py.
roar.py: add liboperators to sys.path[].
assets/text/TODO: updated.
2019-09-15 05:06:25 -04:00
|
|
|
if False:
|
|
|
|
eventDc = self.backend.getDeviceContext(self.GetClientSize(), self, self.GetViewStart())
|
|
|
|
self.backend.drawCursorMaskWithJournal(self.canvas.journal, eventDc, self.GetViewStart())
|
2019-09-13 14:20:26 -04:00
|
|
|
self.lastCellState = None
|
2019-09-07 04:39:26 -04:00
|
|
|
# }}}
|
2019-09-10 04:14:12 -04:00
|
|
|
# {{{ onMouseInput(self, event)
|
|
|
|
def onMouseInput(self, event):
|
2019-09-11 02:28:56 -04:00
|
|
|
viewRect = self.GetViewStart(); eventDc = self.backend.getDeviceContext(self.GetClientSize(), self, viewRect);
|
2019-09-10 04:14:12 -04:00
|
|
|
mouseDragging, mouseLeftDown, mouseRightDown = event.Dragging(), event.LeftIsDown(), event.RightIsDown()
|
|
|
|
mapPoint = self.backend.xlateEventPoint(event, eventDc, viewRect)
|
Implements merged object tool & flip operators.
assets/images/toolObject.png: added.
liboperators/Operator{,Flip{Horizontal,Vertical}}.py: initial implementation.
libroar/RoarCanvasCommands.py: adds RoarCanvasCommandsOperators.
libroar/RoarCanvasCommandsOperators.py: initial implementation.
libroar/Roar{CanvasCommands{,Tools},Client}.py: replaces ToolSelect{Clone,Move} w/ ToolObject.
libroar/RoarCanvasWindow.py:RoarCanvasWindowDropTarget.OnDropText(): update ToolObject() invocation.
libroar/RoarCanvasWindow.py:{applyTool,onMouseInput}(): pass keyModifiers to Tool.onMouseEvent().
libroar/RoarCanvasWindow.py:applyTool(): only switch back to lastTool if current object tool contains an external object.
libroar/RoarCanvasWindow.py:onLeaveWindow(): disable hiding cursor for now.
libtools/Tool{,Circle,Fill,Line,Rect,Text}.py:onMouseEvent(): update type signature.
libtools/Tool{Object,Select{,Clone,Move}}.py: merged into libtools/ToolObject.py.
roar.py: add liboperators to sys.path[].
assets/text/TODO: updated.
2019-09-15 05:06:25 -04:00
|
|
|
if not self.applyTool(eventDc, True, None, event.GetModifiers(), mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, self.commands.currentTool, viewRect):
|
2019-09-10 04:14:12 -04:00
|
|
|
event.Skip()
|
2019-09-07 04:39:26 -04:00
|
|
|
# }}}
|
2019-09-14 09:44:17 -04:00
|
|
|
# {{{ onMouseWheel(self, event)
|
|
|
|
def onMouseWheel(self, event):
|
|
|
|
if event.GetModifiers() == wx.MOD_CONTROL:
|
|
|
|
cd = +1 if event.GetWheelRotation() >= event.GetWheelDelta() else -1
|
|
|
|
newCellSize = [cs + cd for cs in self.backend.cellSize]
|
|
|
|
if (newCellSize[0] > 0) and (newCellSize[1] > 0):
|
|
|
|
self.backend.cellSize = newCellSize
|
|
|
|
super().resize([a * b for a, b in zip(self.canvas.size, self.backend.cellSize)])
|
|
|
|
self.backend.resize(self.canvas.size, self.backend.cellSize)
|
|
|
|
viewRect = self.GetViewStart(); eventDc = self.backend.getDeviceContext(self.GetClientSize(), self, viewRect);
|
|
|
|
for numRow in range(self.canvas.size[1]):
|
|
|
|
for numCol in range(len(self.canvas.map[numRow])):
|
|
|
|
self._drawPatch(eventDc, False, [numCol, numRow, *self.canvas.map[numRow][numCol]], viewRect)
|
|
|
|
else:
|
|
|
|
event.Skip()
|
|
|
|
# }}}
|
2019-09-10 04:14:12 -04:00
|
|
|
# {{{ onPaint(self, event)
|
|
|
|
def onPaint(self, event):
|
2019-09-11 02:28:56 -04:00
|
|
|
self.backend.onPaint(self.GetClientSize(), self, self.GetViewStart())
|
2019-09-09 11:34:50 -04:00
|
|
|
# }}}
|
2019-09-10 04:14:12 -04:00
|
|
|
# {{{ onScroll(self, event)
|
|
|
|
def onScroll(self, event):
|
2019-09-14 05:33:13 -04:00
|
|
|
viewRect = self.GetViewStart()
|
|
|
|
eventDc = self.backend.getDeviceContext(self.GetClientSize(), self, viewRect)
|
|
|
|
self.backend.drawCursorMaskWithJournal(self.canvas.journal, eventDc, viewRect)
|
2019-09-09 13:03:14 -04:00
|
|
|
event.Skip()
|
|
|
|
# }}}
|
2019-09-07 04:39:26 -04:00
|
|
|
|
|
|
|
#
|
2019-09-10 06:06:56 -04:00
|
|
|
# __init__(self, backend, canvas, cellSize, commands, parent, parentFrame, pos, scrollStep, size): initialisation method
|
|
|
|
def __init__(self, backend, canvas, cellSize, commands, parent, parentFrame, pos, scrollStep, size):
|
2019-09-10 04:14:12 -04:00
|
|
|
super().__init__(parent, pos, scrollStep, [w * h for w, h in zip(cellSize, size)])
|
2019-09-10 06:06:56 -04:00
|
|
|
self.backend, self.canvas, self.cellSize, self.commands, self.parentFrame = backend(self.size, cellSize), canvas, cellSize, commands(self, parentFrame), parentFrame
|
2019-09-13 14:20:26 -04:00
|
|
|
self.brushColours, self.brushPos, self.brushSize, self.dirty, self.lastCellState = [4, 1], [0, 0], [1, 1], False, None
|
2019-09-12 06:49:53 -04:00
|
|
|
self.dropTarget = RoarCanvasWindowDropTarget(self)
|
|
|
|
self.SetDropTarget(self.dropTarget)
|
2019-09-14 09:44:17 -04:00
|
|
|
self.Bind(wx.EVT_MOUSEWHEEL, self.onMouseWheel)
|
2019-09-07 04:39:26 -04:00
|
|
|
|
2019-09-08 10:57:45 -04:00
|
|
|
# vim:expandtab foldmethod=marker sw=4 ts=4 tw=120
|