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

Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler

Browse source
This commit is contained in:
Jaime van Kessel 2016-11-21 13:45:04 +01:00
commit aca8110edd
19 changed files with 112 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -165,7 +165,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
machine_container_map = {}
machine_nozzle_map = {}
all_containers = registry.findInstanceContainers(GUID = self.getMetaDataEntry("GUID"))
all_containers = registry.findInstanceContainers(GUID = self.getMetaDataEntry("GUID"), base_file = self._id)
for container in all_containers:
definition_id = container.getDefinition().id
if definition_id == "fdmprinter":
@ -209,7 +209,17 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
if not variant_containers:
continue
builder.start("hotend", { "id": variant_containers[0].getName() })
builder.start("hotend", {"id": variant_containers[0].getName()})
# Compatible is a special case, as it's added as a meta data entry (instead of an instance).
compatible = hotend.getMetaDataEntry("compatible")
if compatible is not None:
builder.start("setting", {"key": "hardware compatible"})
if compatible:
builder.data("yes")
else:
builder.data("no")
builder.end("setting")
for instance in hotend.findInstances():
if container.getInstance(instance.definition.key) and container.getProperty(instance.definition.key, "value") == instance.value: