GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 05:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use absolute transformation to set location for arrange"

Browse Source 
This reverts commit 920809f064d39f2426312428a02c7db0b3c4410d.
This commit is contained in:
c.lamboo 2023-12-06 12:10:34 +01:00
parent 920809f064
commit 237d1a899b
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cura/Arranging/Nest2DArrange.py
View File

@ -14,7 +14,7 @@ from UM.Math.Quaternion import Quaternion
from UM.Math.Vector import Vector from UM.Math.Vector import Vector
from UM.Operations.AddSceneNodeOperation import AddSceneNodeOperation from UM.Operations.AddSceneNodeOperation import AddSceneNodeOperation
from UM.Operations.GroupedOperation import GroupedOperation from UM.Operations.GroupedOperation import GroupedOperation
from UM.Operations.SetTransformOperation import SetTransformOperation from UM.Operations.RotateOperation import RotateOperation
from UM.Operations.TranslateOperation import TranslateOperation from UM.Operations.TranslateOperation import TranslateOperation
from cura.Arranging.Arranger import Arranger from cura.Arranging.Arranger import Arranger
@ -140,17 +140,13 @@ class Nest2DArrange(Arranger):
grouped_operation.addOperation(AddSceneNodeOperation(node, scene_root)) grouped_operation.addOperation(AddSceneNodeOperation(node, scene_root))
if node_item.binId() == 0: if node_item.binId() == 0:
# We found a spot for it
rotation_matrix = Matrix() rotation_matrix = Matrix()
rotation_matrix.setByRotationAxis(node_item.rotation(), Vector(0, -1, 0)) rotation_matrix.setByRotationAxis(node_item.rotation(), Vector(0, -1, 0))
grouped_operation.addOperation(RotateOperation(node, Quaternion.fromMatrix(rotation_matrix)))
orientation = node.getWorldOrientation() * Quaternion.fromMatrix(rotation_matrix)
translation = node.getWorldPosition().preMultiply(rotation_matrix) + Vector(
node_item.translation().x() / self._factor,
0,
node_item.translation().y() / self._factor
)
grouped_operation.addOperation( grouped_operation.addOperation(
SetTransformOperation(node, orientation=orientation, translation=translation)) TranslateOperation(node, Vector(node_item.translation().x() / self._factor, 0,
node_item.translation().y() / self._factor)))
else: else:
# We didn't find a spot # We didn't find a spot
grouped_operation.addOperation( grouped_operation.addOperation(