3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Removed the need of a _3mf root node

Browse source 
This significantly decreases the issues that we had with saving files, as we no
longer need to take special cases into account CURA-382
This commit is contained in:
Jaime van Kessel 2016-11-01 11:16:43 +01:00
parent d897392eea
commit fc3d16e8c8
1 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

43
plugins/3MFReader/ThreeMFReader.py
View file

@ -113,6 +113,8 @@ class ThreeMFReader(MeshReader):
def read(self, file_name): def read(self, file_name):
result = SceneNode() result = SceneNode()
group_decorator = GroupDecorator()
result.addDecorator(group_decorator)
# The base object of 3mf is a zipped archive. # The base object of 3mf is a zipped archive.
archive = zipfile.ZipFile(file_name, "r") archive = zipfile.ZipFile(file_name, "r")
self._base_name = os.path.basename(file_name) self._base_name = os.path.basename(file_name)
@ -129,6 +131,34 @@ class ThreeMFReader(MeshReader):
transform = build_item.get("transform") transform = build_item.get("transform")
if transform is not None: if transform is not None:
build_item_node.setTransformation(self._createMatrixFromTransformationString(transform)) build_item_node.setTransformation(self._createMatrixFromTransformationString(transform))
global_container_stack = UM.Application.getInstance().getGlobalContainerStack()
# Create a transformation Matrix to convert from 3mf worldspace into ours.
# First step: flip the y and z axis.
transformation_matrix = Matrix()
transformation_matrix._data[1, 1] = 0
transformation_matrix._data[1, 2] = 1
transformation_matrix._data[2, 1] = -1
transformation_matrix._data[2, 2] = 0
# Second step: 3MF defines the left corner of the machine as center, whereas cura uses the center of the
# build volume.
if global_container_stack:
translation_vector = Vector(x = -global_container_stack.getProperty("machine_width", "value") / 2,
y = -global_container_stack.getProperty("machine_depth", "value") / 2,
z = 0)
translation_matrix = Matrix()
translation_matrix.setByTranslation(translation_vector)
transformation_matrix.multiply(translation_matrix)
# Third step: 3MF also defines a unit, wheras Cura always assumes mm.
scale_matrix = Matrix()
scale_matrix.setByScaleVector(self._getScaleFromUnit(self._unit))
transformation_matrix.multiply(scale_matrix)
# Pre multiply the transformation with the loaded transformation, so the data is handled correctly.
build_item_node.setTransformation(build_item_node.getLocalTransformation().preMultiply(transformation_matrix))
result.addChild(build_item_node) result.addChild(build_item_node)
except Exception as e: except Exception as e:
@ -139,18 +169,7 @@ class ThreeMFReader(MeshReader):
except: except:
return None return None
global_container_stack = UM.Application.getInstance().getGlobalContainerStack()
flip_matrix = Matrix()
flip_matrix._data[1, 1] = 0
flip_matrix._data[1, 2] = 1
flip_matrix._data[2, 1] = -1
flip_matrix._data[2, 2] = 0
result.setTransformation(flip_matrix)
if global_container_stack:
translation = Vector(x=-global_container_stack.getProperty("machine_width", "value") / 2, z=0,
y=-global_container_stack.getProperty("machine_depth", "value") / 2)
result.translate(translation)
result.scale(self._getScaleFromUnit(self._unit))
result.setEnabled(False) # The result should not be moved in any way, so disable it. result.setEnabled(False) # The result should not be moved in any way, so disable it.
return result return result