Load and serialize container ID and name properly: not in metadata

We shouldn't write the name or ID, who are now in the metadata.
Also we should load the name and ID properly from the file.

Contributes to issue CURA-4243.
This commit is contained in:
Ghostkeeper 2017-10-27 16:50:13 +02:00
parent a31c39b225
commit 8bbb6c1af5
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A

View file

@ -133,6 +133,8 @@ class XmlMaterialProfile(InstanceContainer):
metadata.pop("type", "")
metadata.pop("base_file", "")
metadata.pop("approximate_diameter", "")
metadata.pop("id", "")
metadata.pop("container_type", "")
## Begin Name Block
builder.start("name")
@ -417,15 +419,18 @@ class XmlMaterialProfile(InstanceContainer):
try:
data = ET.fromstring(serialized)
except:
Logger.logException("e", "An exception occured while parsing the material profile")
Logger.logException("e", "An exception occurred while parsing the material profile")
return
# Reset previous metadata
old_id = self.getId()
self.clearData() # Ensure any previous data is gone.
meta_data = {}
meta_data["type"] = "material"
meta_data["base_file"] = self.getId()
meta_data["status"] = "unknown" # TODO: Add material verification
meta_data["id"] = old_id
meta_data["container_type"] = XmlMaterialProfile
common_setting_values = {}