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

Fix job name mismatching

Browse source 
CURA-4276
This commit is contained in:
Lipu Fei 2017-09-06 18:09:18 +02:00
parent c614f02d0f
commit b0916e4b67
2 changed files with 47 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

23
resources/qml/JobSpecs.qml
View file

@ -13,13 +13,7 @@ Item {
id: base
property bool activity: CuraApplication.platformActivity
property string fileBaseName
property variant activeMachineName: Cura.MachineManager.activeMachineName
onActiveMachineNameChanged:
{
printJobTextfield.text = PrintInformation.createJobName(base.fileBaseName);
}
property string fileBaseName: ""
UM.I18nCatalog { id: catalog; name:"cura"}
@ -30,23 +24,26 @@ Item {
target: backgroundItem
onHasMesh:
{
base.fileBaseName = name
if (base.fileBaseName == "")
{
base.fileBaseName = name;
}
}
}
onActivityChanged: {
if (activity == true && base.fileBaseName == ''){
//this only runs when you open a file from the terminal (or something that works the same way; for example when you drag a file on the icon in MacOS or use 'open with' on Windows)
base.fileBaseName = PrintInformation.jobName; //get the fileBaseName from PrintInformation.py because this saves the filebase when the file is opened using the terminal (or something alike)
printJobTextfield.text = PrintInformation.createJobName(base.fileBaseName);
base.fileBaseName = PrintInformation.baseName; //get the fileBaseName from PrintInformation.py because this saves the filebase when the file is opened using the terminal (or something alike)
PrintInformation.setBaseName(base.fileBaseName);
}
if (activity == true && base.fileBaseName != ''){
//this runs in all other cases where there is a mesh on the buildplate (activity == true). It uses the fileBaseName from the hasMesh signal
printJobTextfield.text = PrintInformation.createJobName(base.fileBaseName);
PrintInformation.setBaseName(base.fileBaseName);
}
if (activity == false){
//When there is no mesh in the buildplate; the printJobTextField is set to an empty string so it doesn't set an empty string as a jobName (which is later used for saving the file)
printJobTextfield.text = '';
PrintInformation.setJobName('')
}
}
@ -102,7 +99,7 @@ Item {
width: Math.max(__contentWidth + UM.Theme.getSize("default_margin").width, 50)
maximumLength: 120
property int unremovableSpacing: 5
text: ''
text: PrintInformation.jobName
horizontalAlignment: TextInput.AlignRight
onTextChanged: {
PrintInformation.setJobName(text);