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

Make it possible to skip project file check in readLocalFile()

Browse source 
CURA-5203
This commit is contained in:
Lipu Fei 2018-04-10 11:40:22 +02:00
parent 95c6258d0f
commit 95f4515e93
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/CuraApplication.py
View file

@ -1557,8 +1557,8 @@ class CuraApplication(QtApplication):
openProjectFile = pyqtSignal(QUrl, arguments = ["project_file"]) # Emitted when a project file is about to open. openProjectFile = pyqtSignal(QUrl, arguments = ["project_file"]) # Emitted when a project file is about to open.
@pyqtSlot(QUrl) @pyqtSlot(QUrl, bool)
def readLocalFile(self, file): def readLocalFile(self, file, skip_project_file_check = False):
if not file.isValid(): if not file.isValid():
return return
@ -1569,7 +1569,7 @@ class CuraApplication(QtApplication):
self.deleteAll() self.deleteAll()
break break
if self.checkIsValidProjectFile(file): if not skip_project_file_check and self.checkIsValidProjectFile(file):
self.callLater(self.openProjectFile.emit, file) self.callLater(self.openProjectFile.emit, file)
return return

2
resources/qml/AskOpenAsProjectOrModelsDialog.qml
View file

@ -53,7 +53,7 @@ UM.Dialog
UM.Preferences.setValue("cura/choice_on_open_project", "open_as_model") UM.Preferences.setValue("cura/choice_on_open_project", "open_as_model")
} }
CuraApplication.readLocalFile(base.fileUrl) CuraApplication.readLocalFile(base.fileUrl, true)
var meshName = backgroundItem.getMeshName(base.fileUrl.toString()) var meshName = backgroundItem.getMeshName(base.fileUrl.toString())
backgroundItem.hasMesh(decodeURIComponent(meshName)) backgroundItem.hasMesh(decodeURIComponent(meshName))

2
resources/qml/Menus/RecentFilesMenu.qml
View file

@ -61,7 +61,7 @@ Menu
} }
else if (toOpenAsModel) else if (toOpenAsModel)
{ {
CuraApplication.readLocalFile(modelData); CuraApplication.readLocalFile(modelData, true);
} }
var meshName = backgroundItem.getMeshName(modelData.toString()) var meshName = backgroundItem.getMeshName(modelData.toString())
backgroundItem.hasMesh(decodeURIComponent(meshName)) backgroundItem.hasMesh(decodeURIComponent(meshName))

2
resources/qml/OpenFilesIncludingProjectsDialog.qml
View file

@ -42,7 +42,7 @@ UM.Dialog
{ {
for (var i in fileUrls) for (var i in fileUrls)
{ {
CuraApplication.readLocalFile(fileUrls[i]); CuraApplication.readLocalFile(fileUrls[i], true);
} }
var meshName = backgroundItem.getMeshName(fileUrls[0].toString()); var meshName = backgroundItem.getMeshName(fileUrls[0].toString());