3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Use camelCase for python function definition

Browse source 
CURA-10599

Co-authored-by: Jaime van Kessel <nallath@gmail.com>
This commit is contained in:
Casper Lamboo 2023-06-12 14:35:11 +02:00 • committed by GitHub
parent 731a2d10ed
commit f73154a2c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Machines/MachineNode.py
View file

@ -168,7 +168,7 @@ class MachineNode(ContainerNode):
return self.global_qualities.get(self.preferred_quality_type, next(iter(self.global_qualities.values()))) return self.global_qualities.get(self.preferred_quality_type, next(iter(self.global_qualities.values())))
def is_excluded_material(self, material: MaterialNode) -> bool: def isExcludedMaterial(self, material: MaterialNode) -> bool:
"""Returns whether the material should be excluded from the list of materials.""" """Returns whether the material should be excluded from the list of materials."""
for exclude_material in self.exclude_materials: for exclude_material in self.exclude_materials:
if exclude_material in material["id"]: if exclude_material in material["id"]:

2
cura/Machines/VariantNode.py
View file

@ -60,7 +60,7 @@ class VariantNode(ContainerNode):
materials = list(materials_per_base_file.values()) materials = list(materials_per_base_file.values())
# Filter materials based on the exclude_materials property. # Filter materials based on the exclude_materials property.
filtered_materials = [material for material in materials if not self.machine.is_excluded_material(material)] filtered_materials = [material for material in materials if not self.machine.isExcludedMaterial(material)]
for material in filtered_materials: for material in filtered_materials:
base_file = material["base_file"] base_file = material["base_file"]

4
tests/Machines/TestVariantNode.py
View file

@ -46,7 +46,7 @@ def getInstanceContainerSideEffect(*args, **kwargs):
def machine_node(): def machine_node():
mocked_machine_node = MagicMock() mocked_machine_node = MagicMock()
mocked_machine_node.container_id = "machine_1" mocked_machine_node.container_id = "machine_1"
mocked_machine_node.is_excluded_material = MagicMock(return_value=False) mocked_machine_node.isExcludedMaterial = MagicMock(return_value=False)
mocked_machine_node.preferred_material = "preferred_material" mocked_machine_node.preferred_material = "preferred_material"
return mocked_machine_node return mocked_machine_node
@ -96,7 +96,7 @@ def test_variantNodeInit(container_registry, machine_node):
def test_variantNodeInit_excludedMaterial(container_registry, machine_node): def test_variantNodeInit_excludedMaterial(container_registry, machine_node):
machine_node.exclude_materials = ["material_1"] machine_node.exclude_materials = ["material_1"]
machine_node.is_excluded_material = MagicMock(side_effect=lambda material: material["id"] == "material_1") machine_node.isExcludedMaterial = MagicMock(side_effect=lambda material: material["id"] == "material_1")
node = createVariantNode("variant_1", machine_node, container_registry) node = createVariantNode("variant_1", machine_node, container_registry)
assert "material_1" not in node.materials assert "material_1" not in node.materials