3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-31 05:51:47 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Paint: Simplify and clarify input-event-code.

Browse source 
part of CURA-12543
This commit is contained in:
Remco Burema 2025-06-18 12:42:45 +02:00
parent 4fae9b231a
commit 01c02e4479
2 changed files with 11 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

38
plugins/PaintTool/PaintTool.py
View file

@ -4,7 +4,8 @@
from enum import IntEnum from enum import IntEnum
import numpy import numpy
from PyQt6.QtCore import Qt from PyQt6.QtCore import Qt
from PyQt6.QtGui import QImage, QPainter, QColor, QBrush, QPen from PyQt6.QtGui import QImage, QPainter, QColor, QPen
from PyQt6 import QtWidgets
from typing import cast, Dict, List, Optional, Tuple from typing import cast, Dict, List, Optional, Tuple
from UM.Application import Application from UM.Application import Application
@ -50,8 +51,6 @@ class PaintTool(Tool):
self._brush_pen: QPen = self._createBrushPen() self._brush_pen: QPen = self._createBrushPen()
self._mouse_held: bool = False self._mouse_held: bool = False
self._ctrl_held: bool = False
self._shift_held: bool = False
self._last_text_coords: Optional[numpy.ndarray] = None self._last_text_coords: Optional[numpy.ndarray] = None
self._last_face_id: Optional[int] = None self._last_face_id: Optional[int] = None
@ -209,27 +208,14 @@ class PaintTool(Tool):
controller.setActiveView("SolidView") controller.setActiveView("SolidView")
return True return True
if event.type == Event.KeyPressEvent:
evt = cast(KeyEvent, event)
if evt.key == KeyEvent.ControlKey:
self._ctrl_held = True
return True
if evt.key == KeyEvent.ShiftKey:
self._shift_held = True
return True
return False
if event.type == Event.KeyReleaseEvent: if event.type == Event.KeyReleaseEvent:
evt = cast(KeyEvent, event) key_release = cast(KeyEvent, event)
if evt.key == KeyEvent.ControlKey: modifiers = QtWidgets.QApplication.keyboardModifiers()
self._ctrl_held = False ctrl_held = modifiers & Qt.KeyboardModifier.ControlModifier != Qt.KeyboardModifier.NoModifier
return True if key_release.key == Qt.Key.Key_L and ctrl_held:
if evt.key == KeyEvent.ShiftKey:
self._shift_held = False
return True
if evt.key == Qt.Key.Key_L and self._ctrl_held:
# NOTE: Ctrl-L is used here instead of Ctrl-Z, as the latter is the application-wide one that takes precedence. # NOTE: Ctrl-L is used here instead of Ctrl-Z, as the latter is the application-wide one that takes precedence.
return self.undoStackAction(self._shift_held) shift_held = modifiers & Qt.KeyboardModifier.ShiftModifier != Qt.KeyboardModifier.NoModifier
return self.undoStackAction(shift_held)
return False return False
if event.type == Event.MouseReleaseEvent and self._controller.getToolsEnabled(): if event.type == Event.MouseReleaseEvent and self._controller.getToolsEnabled():
@ -246,9 +232,9 @@ class PaintTool(Tool):
if is_moved and not self._mouse_held: if is_moved and not self._mouse_held:
return False return False
evt = cast(MouseEvent, event) mouse_evt = cast(MouseEvent, event)
if is_pressed: if is_pressed:
if MouseEvent.LeftButton not in evt.buttons: if MouseEvent.LeftButton not in mouse_evt.buttons:
return False return False
else: else:
self._mouse_held = True self._mouse_held = True
@ -276,15 +262,13 @@ class PaintTool(Tool):
if not self._mesh_transformed_cache: if not self._mesh_transformed_cache:
return False return False
evt = cast(MouseEvent, event)
if not self._picking_pass: if not self._picking_pass:
self._picking_pass = PickingPass(camera.getViewportWidth(), camera.getViewportHeight()) self._picking_pass = PickingPass(camera.getViewportWidth(), camera.getViewportHeight())
self._picking_pass.render() self._picking_pass.render()
self._selection_pass.renderFacesMode() self._selection_pass.renderFacesMode()
face_id, texcoords = self._getTexCoordsFromClick(node, evt.x, evt.y) face_id, texcoords = self._getTexCoordsFromClick(node, mouse_evt.x, mouse_evt.y)
if texcoords is None: if texcoords is None:
return False return False
if self._last_text_coords is None: if self._last_text_coords is None:

1
plugins/SolidView/SolidView.py
View file

@ -36,7 +36,6 @@ class SolidView(View):
_show_xray_warning_preference = "view/show_xray_warning" _show_xray_warning_preference = "view/show_xray_warning"
_show_overhang_preference = "view/show_overhang" _show_overhang_preference = "view/show_overhang"
_paint_active_preference = "view/paint_active"
def __init__(self): def __init__(self):
super().__init__() super().__init__()