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

Fix reloading multiple objects from 3mf file

Browse Source 
CURA-7333
This commit is contained in:
Kostas Karmas 2020-03-31 17:57:23 +02:00
parent cbccb08103
commit 134541ee6e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cura/CuraApplication.py
View File

@ -1382,13 +1382,14 @@ class CuraApplication(QtApplication):
if not nodes: if not nodes:
return return
for node in nodes: for obj, node in enumerate(nodes):
mesh_data = node.getMeshData() mesh_data = node.getMeshData()
if mesh_data: if mesh_data:
file_name = mesh_data.getFileName() file_name = mesh_data.getFileName()
if file_name: if file_name:
job = ReadMeshJob(file_name) job = ReadMeshJob(file_name)
job.object_to_be_reloaded = obj # The object index to be loaded by this specific ReadMeshJob
job._node = node # type: ignore job._node = node # type: ignore
job.finished.connect(self._reloadMeshFinished) job.finished.connect(self._reloadMeshFinished)
if has_merged_nodes: if has_merged_nodes:
@ -1575,10 +1576,15 @@ class CuraApplication(QtApplication):
def _reloadMeshFinished(self, job): def _reloadMeshFinished(self, job):
# TODO; This needs to be fixed properly. We now make the assumption that we only load a single mesh! # TODO; This needs to be fixed properly. We now make the assumption that we only load a single mesh!
job_result = job.getResult() job_result = job.getResult()
object_to_be_reloaded = job.object_to_be_reloaded
if len(job_result) == 0: if len(job_result) == 0:
Logger.log("e", "Reloading the mesh failed.") Logger.log("e", "Reloading the mesh failed.")
return return
mesh_data = job_result[0].getMeshData() try: # In case the object has disappeared after reloading, log a warning and keep the old mesh in the scene
mesh_data = job_result[object_to_be_reloaded].getMeshData()
except IndexError:
Logger.warning("Object at index {} no longer exists! Keeping the old version in the scene.".format(object_to_be_reloaded))
return
if not mesh_data: if not mesh_data:
Logger.log("w", "Could not find a mesh in reloaded node.") Logger.log("w", "Could not find a mesh in reloaded node.")
return return