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

Changes needed wrt how we build Savitar with Sip 6.

Browse source 
part of CURA-7924
This commit is contained in:
Remco Burema 2022-02-25 14:31:51 +01:00
parent 08c49c6c13
commit 7511ac843e
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/3MFReader/ThreeMFReader.py
View file

@ -5,7 +5,7 @@ import os.path
import zipfile import zipfile
from typing import List, Optional, Union, TYPE_CHECKING, cast from typing import List, Optional, Union, TYPE_CHECKING, cast
import Savitar import pySavitar
import numpy import numpy
from UM.Logger import Logger from UM.Logger import Logger
@ -90,7 +90,7 @@ class ThreeMFReader(MeshReader):
return temp_mat return temp_mat
def _convertSavitarNodeToUMNode(self, savitar_node: Savitar.SceneNode, file_name: str = "") -> Optional[SceneNode]: def _convertSavitarNodeToUMNode(self, savitar_node: pySavitar.SceneNode, file_name: str = "") -> Optional[SceneNode]:
"""Convenience function that converts a SceneNode object (as obtained from libSavitar) to a scene node. """Convenience function that converts a SceneNode object (as obtained from libSavitar) to a scene node.
:returns: Scene node. :returns: Scene node.
@ -206,7 +206,7 @@ class ThreeMFReader(MeshReader):
try: try:
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)
parser = Savitar.ThreeMFParser() parser = pySavitar.ThreeMFParser()
scene_3mf = parser.parse(archive.open("3D/3dmodel.model").read()) scene_3mf = parser.parse(archive.open("3D/3dmodel.model").read())
self._unit = scene_3mf.getUnit() self._unit = scene_3mf.getUnit()

8
plugins/3MFWriter/ThreeMFWriter.py
View file

@ -15,7 +15,7 @@ from cura.Snapshot import Snapshot
from PyQt6.QtCore import QBuffer from PyQt6.QtCore import QBuffer
import Savitar import pySavitar
import numpy import numpy
import datetime import datetime
@ -85,7 +85,7 @@ class ThreeMFWriter(MeshWriter):
if um_node.callDecoration("getBuildPlateNumber") != active_build_plate_nr: if um_node.callDecoration("getBuildPlateNumber") != active_build_plate_nr:
return return
savitar_node = Savitar.SceneNode() savitar_node = pySavitar.SceneNode()
savitar_node.setName(um_node.getName()) savitar_node.setName(um_node.getName())
node_matrix = um_node.getLocalTransformation() node_matrix = um_node.getLocalTransformation()
@ -169,7 +169,7 @@ class ThreeMFWriter(MeshWriter):
# Add thumbnail relation to _rels/.rels file # Add thumbnail relation to _rels/.rels file
thumbnail_relation_element = ET.SubElement(relations_element, "Relationship", Target = "/Metadata/thumbnail.png", Id = "rel1", Type = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail") thumbnail_relation_element = ET.SubElement(relations_element, "Relationship", Target = "/Metadata/thumbnail.png", Id = "rel1", Type = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail")
savitar_scene = Savitar.Scene() savitar_scene = pySavitar.Scene()
metadata_to_store = CuraApplication.getInstance().getController().getScene().getMetaData() metadata_to_store = CuraApplication.getInstance().getController().getScene().getMetaData()
@ -215,7 +215,7 @@ class ThreeMFWriter(MeshWriter):
if savitar_node: if savitar_node:
savitar_scene.addSceneNode(savitar_node) savitar_scene.addSceneNode(savitar_node)
parser = Savitar.ThreeMFParser() parser = pySavitar.ThreeMFParser()
scene_string = parser.sceneToString(savitar_scene) scene_string = parser.sceneToString(savitar_scene)
archive.writestr(model_file, scene_string) archive.writestr(model_file, scene_string)