Skip to content

Commit

Permalink
Use proper method to check for excluded materials
Browse files Browse the repository at this point in the history
  • Loading branch information
wawanbreton committed Aug 15, 2024
1 parent 83fc0b7 commit 1e5fa85
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions cura/Machines/MachineNode.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from cura.Machines.QualityGroup import QualityGroup # To construct groups of quality profiles that belong together.
from cura.Machines.QualityNode import QualityNode
from cura.Machines.VariantNode import VariantNode
from cura.Machines.MaterialNode import MaterialNode
import UM.FlameProfiler


Expand Down Expand Up @@ -168,10 +167,10 @@ def preferredGlobalQuality(self) -> "QualityNode":

return self.global_qualities.get(self.preferred_quality_type, next(iter(self.global_qualities.values())))

def isExcludedMaterial(self, material: MaterialNode) -> bool:
def isExcludedMaterial(self, material_base_file: str) -> bool:
"""Returns whether the material should be excluded from the list of materials."""
for exclude_material in self.exclude_materials:
if exclude_material in material["id"]:
if exclude_material in material_base_file:
return True
return False

Expand Down
4 changes: 2 additions & 2 deletions cura/Machines/VariantNode.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def _loadAll(self) -> None:
materials = list(materials_per_base_file.values())

# Filter materials based on the exclude_materials property.
filtered_materials = [material for material in materials if not self.machine.isExcludedMaterial(material)]
filtered_materials = [material for material in materials if not self.machine.isExcludedMaterial(material["id"])]

for material in filtered_materials:
base_file = material["base_file"]
Expand Down Expand Up @@ -127,7 +127,7 @@ def _materialAdded(self, container: ContainerInterface) -> None:
material_definition = container.getMetaDataEntry("definition")

base_file = container.getMetaDataEntry("base_file")
if base_file in self.machine.exclude_materials:
if self.machine.isExcludedMaterial(base_file):
return # Material is forbidden for this printer.
if base_file not in self.materials: # Completely new base file. Always better than not having a file as long as it matches our set-up.
if material_definition != "fdmprinter" and material_definition != self.machine.container_id:
Expand Down

0 comments on commit 1e5fa85

Please sign in to comment.