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

Removed unneeded (and somewhat expensive) checks

Browse source 
CURA-3311
This commit is contained in:
Jaime van Kessel 2017-02-13 11:06:21 +01:00
parent 7838888d5c
commit c18fb02f82
1 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -477,13 +477,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
if machine_compatibility: if machine_compatibility:
new_material_id = self.id + "_" + machine_id new_material_id = self.id + "_" + machine_id
# It could be that we are overwriting, so check if the ID already exists. new_material = XmlMaterialProfile(new_material_id)
materials = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id=new_material_id)
if materials:
new_material = materials[0]
new_material.clearData()
else:
new_material = XmlMaterialProfile(new_material_id)
# Update the private directly, as we want to prevent the lookup that is done when using setName # Update the private directly, as we want to prevent the lookup that is done when using setName
new_material._name = self.getName() new_material._name = self.getName()
@ -495,8 +489,8 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
new_material.setCachedValues(cached_machine_setting_properties) new_material.setCachedValues(cached_machine_setting_properties)
new_material._dirty = False new_material._dirty = False
if not materials:
UM.Settings.ContainerRegistry.getInstance().addContainer(new_material) UM.Settings.ContainerRegistry.getInstance().addContainer(new_material)
hotends = machine.iterfind("./um:hotend", self.__namespaces) hotends = machine.iterfind("./um:hotend", self.__namespaces)
for hotend in hotends: for hotend in hotends:
@ -526,14 +520,9 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
else: else:
Logger.log("d", "Unsupported material setting %s", key) Logger.log("d", "Unsupported material setting %s", key)
# It could be that we are overwriting, so check if the ID already exists.
new_hotend_id = self.id + "_" + machine_id + "_" + hotend_id.replace(" ", "_") new_hotend_id = self.id + "_" + machine_id + "_" + hotend_id.replace(" ", "_")
materials = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id=new_hotend_id)
if materials: new_hotend_material = XmlMaterialProfile(new_hotend_id)
new_hotend_material = materials[0]
new_hotend_material.clearData()
else:
new_hotend_material = XmlMaterialProfile(new_hotend_id)
# Update the private directly, as we want to prevent the lookup that is done when using setName # Update the private directly, as we want to prevent the lookup that is done when using setName
new_hotend_material._name = self.getName() new_hotend_material._name = self.getName()
@ -549,8 +538,8 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
new_hotend_material.setCachedValues(cached_hotend_setting_properties) new_hotend_material.setCachedValues(cached_hotend_setting_properties)
new_hotend_material._dirty = False new_hotend_material._dirty = False
if not materials: # It was not added yet, do so now.
UM.Settings.ContainerRegistry.getInstance().addContainer(new_hotend_material) UM.Settings.ContainerRegistry.getInstance().addContainer(new_hotend_material)
def _addSettingElement(self, builder, instance): def _addSettingElement(self, builder, instance):
try: try: