GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 02:19:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added label property to XML profile (as per 1.2 spec)

Browse Source 
CURA-1968
This commit is contained in:
Jaime van Kessel 2016-08-24 15:50:12 +02:00
parent aa28ecca37
commit a904067d7a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View File

@ -117,6 +117,10 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
builder.data(metadata.pop("color_name", "")) builder.data(metadata.pop("color_name", ""))
builder.end("color") builder.end("color")
builder.start("label")
builder.data(self._name)
builder.end("label")
builder.end("name") builder.end("name")
## End Name Block ## End Name Block
@ -235,8 +239,12 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
brand = entry.find("./um:brand", self.__namespaces) brand = entry.find("./um:brand", self.__namespaces)
material = entry.find("./um:material", self.__namespaces) material = entry.find("./um:material", self.__namespaces)
color = entry.find("./um:color", self.__namespaces) color = entry.find("./um:color", self.__namespaces)
label = entry.find("./um:label", self.__namespaces)
self.setName(self._profile_name(material.text, color.text)) if label:
self.setName(label.text)
else:
self.setName(self._profile_name(material.text, color.text))
self.addMetaDataEntry("brand", brand.text) self.addMetaDataEntry("brand", brand.text)
self.addMetaDataEntry("material", material.text) self.addMetaDataEntry("material", material.text)

2
resources/qml/Preferences/MaterialsPage.qml
View File

@ -282,7 +282,6 @@ UM.ManagementPage
{ {
return return
} }
materialProperties.name = currentItem.name; materialProperties.name = currentItem.name;
if(currentItem.metadata != undefined && currentItem.metadata != null) if(currentItem.metadata != undefined && currentItem.metadata != null)
@ -305,6 +304,7 @@ UM.ManagementPage
materialProperties.density = 0.0; materialProperties.density = 0.0;
materialProperties.diameter = 0.0; materialProperties.diameter = 0.0;
} }
} }
} }
} }