3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 21:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix merge conflicts with master

Browse source
This commit is contained in:
Lipu Fei 2018-02-27 13:08:29 +01:00
commit 75573da9dd
64 changed files with 89 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cura/CuraApplication.py
View file

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