GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 17:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3505 from fieldOfView/feature_support_eraser_ux

Browse Source 
Further improvements of the Support Eraser
This commit is contained in:
Ian Paschal 2018-03-16 14:59:29 +01:00 committed by GitHub
commit 19de9b263b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/PlatformPhysics.py
View File

@ -71,7 +71,7 @@ class PlatformPhysics:
# Move it downwards if bottom is above platform # Move it downwards if bottom is above platform
move_vector = Vector() move_vector = Vector()
if Preferences.getInstance().getValue("physics/automatic_drop_down") and not (node.getParent() and node.getParent().callDecoration("isGroup")) and node.isEnabled(): #If an object is grouped, don't move it down if Preferences.getInstance().getValue("physics/automatic_drop_down") and not (node.getParent() and node.getParent().callDecoration("isGroup") or node.getParent() != root) and node.isEnabled(): #If an object is grouped, don't move it down
z_offset = node.callDecoration("getZOffset") if node.getDecorator(ZOffsetDecorator.ZOffsetDecorator) else 0 z_offset = node.callDecoration("getZOffset") if node.getDecorator(ZOffsetDecorator.ZOffsetDecorator) else 0
move_vector = move_vector.set(y = -bbox.bottom + z_offset) move_vector = move_vector.set(y = -bbox.bottom + z_offset)

53
plugins/SupportEraser/SupportEraser.py
View File

@ -5,6 +5,7 @@ import os
import os.path import os.path
from PyQt5.QtCore import Qt, QTimer from PyQt5.QtCore import Qt, QTimer
from PyQt5.QtWidgets import QApplication
from UM.Math.Vector import Vector from UM.Math.Vector import Vector
from UM.Tool import Tool from UM.Tool import Tool
@ -34,7 +35,7 @@ class SupportEraser(Tool):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
self._shortcut_key = Qt.Key_G self._shortcut_key = Qt.Key_G
self._controller = Application.getInstance().getController() self._controller = self.getController()
self._selection_pass = None self._selection_pass = None
Application.getInstance().globalContainerStackChanged.connect(self._updateEnabled) Application.getInstance().globalContainerStackChanged.connect(self._updateEnabled)
@ -54,8 +55,14 @@ class SupportEraser(Tool):
def event(self, event): def event(self, event):
super().event(event) super().event(event)
modifiers = QApplication.keyboardModifiers()
ctrl_is_active = modifiers & Qt.ControlModifier
if event.type == Event.MousePressEvent and self._controller.getToolsEnabled(): if event.type == Event.MousePressEvent and self._controller.getToolsEnabled():
if ctrl_is_active:
self._controller.setActiveTool("TranslateTool")
return
if self._skip_press: if self._skip_press:
# The selection was previously cleared, do not add/remove an anti-support mesh but # The selection was previously cleared, do not add/remove an anti-support mesh but
# use this click for selection and reactivating this tool only. # use this click for selection and reactivating this tool only.
@ -120,49 +127,23 @@ class SupportEraser(Tool):
op = GroupedOperation() op = GroupedOperation()
# First add the node to the scene, so it gets the expected transform # First add the node to the scene, so it gets the expected transform
op.addOperation(AddSceneNodeOperation(node, root)) op.addOperation(AddSceneNodeOperation(node, root))
op.addOperation(SetParentOperation(node, parent))
# Determine the parent group the node should be put in
if parent.getParent().callDecoration("isGroup"):
group = parent.getParent()
else:
# Create a group-node
group = CuraSceneNode()
group.addDecorator(GroupDecorator())
group.addDecorator(BuildPlateDecorator(active_build_plate))
group.setParent(root)
center = parent.getPosition()
group.setPosition(center)
group.setCenterPosition(center)
op.addOperation(SetParentOperation(parent, group))
op.addOperation(SetParentOperation(node, group))
op.push() op.push()
Application.getInstance().getController().getScene().sceneChanged.emit(node)
# Select the picked node so the group does not get drawn as a wireframe (yet) Application.getInstance().getController().getScene().sceneChanged.emit(node)
if not Selection.isSelected(parent):
Selection.add(parent)
if Selection.isSelected(group):
Selection.remove(group)
def _removeEraserMesh(self, node: CuraSceneNode): def _removeEraserMesh(self, node: CuraSceneNode):
group = node.getParent() parent = node.getParent()
if group.callDecoration("isGroup"): if parent == self._controller.getScene().getRoot():
parent = group.getChildren()[0] parent = None
op = GroupedOperation()
op.addOperation(RemoveSceneNodeOperation(node))
if len(group.getChildren()) == 2:
op.addOperation(SetParentOperation(parent, group.getParent()))
op = RemoveSceneNodeOperation(node)
op.push() op.push()
Application.getInstance().getController().getScene().sceneChanged.emit(node)
# Select the picked node so the group does not get drawn as a wireframe (yet)
if parent and not Selection.isSelected(parent): if parent and not Selection.isSelected(parent):
Selection.add(parent) Selection.add(parent)
if Selection.isSelected(group):
Selection.remove(group) Application.getInstance().getController().getScene().sceneChanged.emit(node)
def _updateEnabled(self): def _updateEnabled(self):
plugin_enabled = False plugin_enabled = False
@ -173,8 +154,6 @@ class SupportEraser(Tool):
Application.getInstance().getController().toolEnabledChanged.emit(self._plugin_id, plugin_enabled) Application.getInstance().getController().toolEnabledChanged.emit(self._plugin_id, plugin_enabled)
def _onSelectionChanged(self): def _onSelectionChanged(self):
# When selection is passed from one object to another object, first the selection is cleared # When selection is passed from one object to another object, first the selection is cleared
# and then it is set to the new object. We are only interested in the change from no selection # and then it is set to the new object. We are only interested in the change from no selection