3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 17:57:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix default value for getMaterialPreferenceValue other than spool_weight, added cleanup code for saving default values. CURA-5408

Browse source
This commit is contained in:
Jack Ha 2018-07-10 15:40:13 +02:00
parent e7c1d31bee
commit 5eb2230d82
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
resources/qml/Preferences/MaterialView.qml
View file

@ -515,7 +515,21 @@ TabView
// value has not changed // value has not changed
return; return;
} }
materialPreferenceValues[material_guid][entry_name] = new_value; if (entry_name in materialPreferenceValues[material_guid] && new_value.toString() == 0)
{
// no need to store a 0, that's the default, so remove it
materialPreferenceValues[material_guid].delete(entry_name);
if (!(materialPreferenceValues[material_guid]))
{
// remove empty map
materialPreferenceValues.delete(material_guid);
}
}
if (new_value.toString() != 0)
{
// store new value
materialPreferenceValues[material_guid][entry_name] = new_value;
}
// store preference // store preference
UM.Preferences.setValue("cura/material_settings", JSON.stringify(materialPreferenceValues)); UM.Preferences.setValue("cura/material_settings", JSON.stringify(materialPreferenceValues));
@ -527,9 +541,12 @@ TabView
{ {
return materialPreferenceValues[material_guid][entry_name]; return materialPreferenceValues[material_guid][entry_name];
} }
if (entry_name === "spool_weight") {
var material_weight = Cura.ContainerManager.getContainerMetaDataEntry(base.containerId, "properties/weight"); // get the default value from the metadata
return material_weight || 0; var material_weight = Cura.ContainerManager.getContainerMetaDataEntry(base.containerId, "properties/weight");
return material_weight || 0;
}
return 0;
} }
// update the display name of the material // update the display name of the material