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

Revert "Fix filtering of variants and materials by definition instead of by machine"

Browse Source 
This reverts commit 623b8f276e8c74023aad1592fc16bf98d50da1d5.
This commit is contained in:
fieldOfView 2016-06-16 15:08:05 +02:00
parent f2819cb9b0
commit a5424fa207
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cura/ExtruderManager.py
View File

@ -140,7 +140,7 @@ class ExtruderManager(QObject):
variant = container_registry.getEmptyInstanceContainer() variant = container_registry.getEmptyInstanceContainer()
if machine_definition.getMetaDataEntry("has_variants"): if machine_definition.getMetaDataEntry("has_variants"):
#First add any variant. Later, overwrite with preference if the preference is valid. #First add any variant. Later, overwrite with preference if the preference is valid.
variants = container_registry.findInstanceContainers(definition = machine_id, type = "variant") variants = container_registry.findInstanceContainers(machine = machine_id, type = "variant")
if len(variants) >= 1: if len(variants) >= 1:
variant = variants[0] variant = variants[0]
preferred_variant_id = machine_definition.getMetaDataEntry("preferred_variant") preferred_variant_id = machine_definition.getMetaDataEntry("preferred_variant")
@ -158,9 +158,9 @@ class ExtruderManager(QObject):
if machine_definition.getMetaDataEntry("has_materials"): if machine_definition.getMetaDataEntry("has_materials"):
#First add any material. Later, overwrite with preference if the preference is valid. #First add any material. Later, overwrite with preference if the preference is valid.
if machine_definition.getMetaDataEntry("has_variant_materials", default = "False") == "True": if machine_definition.getMetaDataEntry("has_variant_materials", default = "False") == "True":
materials = container_registry.findInstanceContainers(type = "material", definition = machine_id, variant = variant.getId()) materials = container_registry.findInstanceContainers(type = "material", machine = machine_id, variant = variant.getId())
else: else:
materials = container_registry.findInstanceContainers(type = "material", definition = machine_id) materials = container_registry.findInstanceContainers(type = "material", machine = machine_id)
if len(materials) >= 1: if len(materials) >= 1:
material = materials[0] material = materials[0]
preferred_material_id = machine_definition.getMetaDataEntry("preferred_material") preferred_material_id = machine_definition.getMetaDataEntry("preferred_material")