CuraApplication/UM.MeshBuilder: Removing _reloadMeshFinished

If this commit gets merged into Uranium, then _reloadMeshFinished is not needed anymore.
31bff5b9b9
The function has been moved, so reloading a mesh after a file has been modified is possible.
This commit is contained in:
Thomas Karl Pietrowski 2017-11-22 17:15:47 +01:00 committed by GitHub
parent 97000d8538
commit 269b52487e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1151,7 +1151,7 @@ class CuraApplication(QtApplication):
if file_name:
job = ReadMeshJob(file_name)
job._node = node
job.finished.connect(self._reloadMeshFinished)
job.finished.connect(node._reloadJobFinished)
job.start()
else:
Logger.log("w", "Unable to reload data because we don't have a filename.")
@ -1278,14 +1278,6 @@ class CuraApplication(QtApplication):
fileLoaded = 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):
self.readLocalFile(QUrl.fromLocalFile(filename))