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

Material values are now also lazy loaded

Browse source 
CURA-3311
This commit is contained in:
Jaime van Kessel 2017-02-10 14:50:16 +01:00
parent bda818b104
commit f4d4fb9001
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -430,13 +430,13 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
for entry in settings: for entry in settings:
key = entry.get("key") key = entry.get("key")
if key in self.__material_property_setting_map: if key in self.__material_property_setting_map:
self.setProperty(self.__material_property_setting_map[key], "value", entry.text)
global_setting_values[self.__material_property_setting_map[key]] = entry.text global_setting_values[self.__material_property_setting_map[key]] = entry.text
elif key in self.__unmapped_settings: elif key in self.__unmapped_settings:
if key == "hardware compatible": if key == "hardware compatible":
global_compatibility = parseBool(entry.text) global_compatibility = parseBool(entry.text)
else: else:
Logger.log("d", "Unsupported material setting %s", key) Logger.log("d", "Unsupported material setting %s", key)
self._cached_values = global_setting_values
meta_data["compatible"] = global_compatibility meta_data["compatible"] = global_compatibility
self.setMetaData(meta_data) self.setMetaData(meta_data)
@ -457,6 +457,9 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
else: else:
Logger.log("d", "Unsupported material setting %s", key) Logger.log("d", "Unsupported material setting %s", key)
cached_machine_setting_properties = global_setting_values.copy()
cached_machine_setting_properties.update(machine_setting_values)
identifiers = machine.iterfind("./um:machine_identifier", self.__namespaces) identifiers = machine.iterfind("./um:machine_identifier", self.__namespaces)
for identifier in identifiers: for identifier in identifiers:
machine_id = self.__product_id_map.get(identifier.get("product"), None) machine_id = self.__product_id_map.get(identifier.get("product"), None)
@ -488,11 +491,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
# Don't use setMetadata, as that overrides it for all materials with same base file # Don't use setMetadata, as that overrides it for all materials with same base file
new_material.getMetaData()["compatible"] = machine_compatibility new_material.getMetaData()["compatible"] = machine_compatibility
for key, value in global_setting_values.items(): new_material.setCachedValues(cached_machine_setting_properties)
new_material.setProperty(key, "value", value)
for key, value in machine_setting_values.items():
new_material.setProperty(key, "value", value)
new_material._dirty = False new_material._dirty = False
if not materials: if not materials:
@ -542,14 +541,10 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
# Don't use setMetadata, as that overrides it for all materials with same base file # Don't use setMetadata, as that overrides it for all materials with same base file
new_hotend_material.getMetaData()["compatible"] = hotend_compatibility new_hotend_material.getMetaData()["compatible"] = hotend_compatibility
for key, value in global_setting_values.items(): cached_hotend_setting_properties = cached_machine_setting_properties.copy()
new_hotend_material.setProperty(key, "value", value) cached_hotend_setting_properties.update(hotend_setting_values)
for key, value in machine_setting_values.items(): new_hotend_material.setCachedValues(cached_hotend_setting_properties)
new_hotend_material.setProperty(key, "value", value)
for key, value in hotend_setting_values.items():
new_hotend_material.setProperty(key, "value", value)
new_hotend_material._dirty = False new_hotend_material._dirty = False
if not materials: # It was not added yet, do so now. if not materials: # It was not added yet, do so now.