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

Fix reading and writing yes/no as boolean values

Browse source
This commit is contained in:
fieldOfView 2018-03-22 16:55:12 +01:00
parent a85c42c246
commit e7ca4f327e
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -566,8 +566,13 @@ class XmlMaterialProfile(InstanceContainer):
# Add namespaced Cura-specific settings # Add namespaced Cura-specific settings
settings = data.iterfind("./um:settings/cura:setting", self.__namespaces) settings = data.iterfind("./um:settings/cura:setting", self.__namespaces)
for entry in settings: for entry in settings:
value = entry.text
if value.lower() == "yes":
value = True
elif value.lower() == "no":
value = False
key = entry.get("key") key = entry.get("key")
common_setting_values[key] = entry.text common_setting_values[key] = value
self._cached_values = common_setting_values # from InstanceContainer ancestor self._cached_values = common_setting_values # from InstanceContainer ancestor
@ -596,8 +601,13 @@ class XmlMaterialProfile(InstanceContainer):
# Add namespaced Cura-specific settings # Add namespaced Cura-specific settings
settings = machine.iterfind("./cura:setting", self.__namespaces) settings = machine.iterfind("./cura:setting", self.__namespaces)
for entry in settings: for entry in settings:
value = entry.text
if value.lower() == "yes":
value = True
elif value.lower() == "no":
value = False
key = entry.get("key") key = entry.get("key")
machine_setting_values[key] = entry.text machine_setting_values[key] = value
cached_machine_setting_properties = common_setting_values.copy() cached_machine_setting_properties = common_setting_values.copy()
cached_machine_setting_properties.update(machine_setting_values) cached_machine_setting_properties.update(machine_setting_values)
@ -708,8 +718,13 @@ class XmlMaterialProfile(InstanceContainer):
# Add namespaced Cura-specific settings # Add namespaced Cura-specific settings
settings = hotend.iterfind("./cura:setting", self.__namespaces) settings = hotend.iterfind("./cura:setting", self.__namespaces)
for entry in settings: for entry in settings:
value = entry.text
if value.lower() == "yes":
value = True
elif value.lower() == "no":
value = False
key = entry.get("key") key = entry.get("key")
hotend_setting_values[key] = entry.text hotend_setting_values[key] = value
new_hotend_specific_material_id = self.getId() + "_" + machine_id + "_" + hotend_name.replace(" ", "_") new_hotend_specific_material_id = self.getId() + "_" + machine_id + "_" + hotend_name.replace(" ", "_")
@ -944,8 +959,15 @@ class XmlMaterialProfile(InstanceContainer):
# Skip material properties (eg diameter) or metadata (eg GUID) # Skip material properties (eg diameter) or metadata (eg GUID)
return return
if instance.value is True:
data = "yes"
elif instance.value is False:
data = "no"
else:
data = str(instance.value)
builder.start(tag_name, { "key": key }) builder.start(tag_name, { "key": key })
builder.data(str(instance.value)) builder.data(data)
builder.end(tag_name) builder.end(tag_name)
@classmethod @classmethod