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

Revert "CuraApplication/UM.MeshBuilder: Removing _reloadMeshFinished"

Browse Source 
This reverts commit 269b52487ed28e42daf7e2716117c4d3d27bc2fa. It was crashing Cura when pressing F5.
The completion of this job should not be moved to Uranium because the job exists only in Cura.

Contributes to issue CURA-4912.
This commit is contained in:
Ghostkeeper 2018-02-27 11:47:17 +01:00
parent b54d709f96
commit c47045a42e
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cura/CuraApplication.py
View File

@ -1307,7 +1307,7 @@ class CuraApplication(QtApplication):
if file_name: if file_name:
job = ReadMeshJob(file_name) job = ReadMeshJob(file_name)
job._node = node job._node = node
job.finished.connect(node._reloadJobFinished) job.finished.connect(self._reloadMeshFinished)
job.start() job.start()
else: else:
Logger.log("w", "Unable to reload data because we don't have a filename.") Logger.log("w", "Unable to reload data because we don't have a filename.")
@ -1436,6 +1436,14 @@ class CuraApplication(QtApplication):
fileLoaded = pyqtSignal(str) fileLoaded = pyqtSignal(str)
fileCompleted = pyqtSignal(str) fileCompleted = pyqtSignal(str)
def _reloadMeshFinished(self, job):
# TODO; This needs to be fixed properly. We now make the assumption that we only load a single mesh!
mesh_data = job.getResult()[0].getMeshData()
if mesh_data:
job._node.setMeshData(mesh_data)
else:
Logger.log("w", "Could not find a mesh in reloaded node.")
def _openFile(self, filename): def _openFile(self, filename):
self.readLocalFile(QUrl.fromLocalFile(filename)) self.readLocalFile(QUrl.fromLocalFile(filename))