3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-02-11 03:09:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Make MaterialManager patch less hardcoded

Browse source
This commit is contained in:
fieldOfView 2018-05-23 09:39:54 +02:00
parent dbddc3cac2
commit 59a3476e3c
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/BlackBeltPlugin/MaterialManagerPatches.py
View file

@ -13,6 +13,8 @@ class MaterialManagerPatches():
#
# Return a dict with all root material IDs (k) and ContainerNodes (v) that's suitable for the given setup.
#
# Copied verbatim from MaterialManager.getAvailableMaterials, with a minor patch to limit shown materials
# if they are so specified in the machine definition
def getAvailableMaterials(self, machine_definition: "DefinitionContainer", extruder_variant_name: Optional[str],
diameter: float) -> dict:
# round the diameter to get the approximate diameter
@ -39,12 +41,18 @@ class MaterialManagerPatches():
# 3. generic material (for fdmprinter)
machine_exclude_materials = machine_definition.getMetaDataEntry("exclude_materials", [])
### START PATCH
machine_limit_materials = machine_definition.getMetaDataEntry("limit_materials", [])
### END PATCH
material_id_metadata_dict = dict()
for node in nodes_to_check:
if node is not None:
for material_id, node in node.material_map.items():
if machine_definition_id == "blackbelt" and material_id not in ["generic_pla_175", "blackbelt_ht", "blackbelt_ngen"]:
### START PATCH
if machine_limit_materials and material_id not in machine_limit_materials:
continue
### END PATCH
fallback_id = self._material_manager.getFallbackMaterialIdByMaterialType(node.metadata["material"])
if fallback_id in machine_exclude_materials:

1
resources/definitions/blackbelt.def.json
View file

@ -20,6 +20,7 @@
"has_machine_quality": true,
"has_machine_materials": true,
"preferred_material": "blackbelt_ngen",
"limit_materials": ["generic_pla_175", "blackbelt_ngen", "blackbelt_ht"],
"has_variants": true,
"preferred_variant_name": "0.4 mm, 45°",
"variants_id_pattern": "{definition_id}_{term}_{term}",