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

Rename to comptabileMaterialDiameter

Browse source 
CURA-5834

This property returns the material diameter an extruder is compatible
with, so this makes it more clear.
This commit is contained in:
Lipu Fei 2018-10-19 11:36:11 +02:00
parent afa3e62dc1
commit ea10d5e608
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Settings/ExtruderStack.py
View file

@ -70,7 +70,7 @@ class ExtruderStack(CuraContainerStack):
# If the machine has no requirement for the diameter, -1 is returned. # If the machine has no requirement for the diameter, -1 is returned.
# \return The filament diameter for the printer # \return The filament diameter for the printer
@property @property
def materialDiameter(self) -> float: def comptabileMaterialDiameter(self) -> float:
context = PropertyEvaluationContext(self) context = PropertyEvaluationContext(self)
context.context["evaluate_from_container_index"] = _ContainerIndexes.Variant context.context["evaluate_from_container_index"] = _ContainerIndexes.Variant
@ -86,7 +86,7 @@ class ExtruderStack(CuraContainerStack):
# \return The approximate filament diameter for the printer # \return The approximate filament diameter for the printer
@pyqtProperty(float) @pyqtProperty(float)
def approximateMaterialDiameter(self) -> float: def approximateMaterialDiameter(self) -> float:
return round(float(self.materialDiameter)) return round(float(self.comptabileMaterialDiameter))
## Overridden from ContainerStack ## Overridden from ContainerStack
# #

2
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -926,7 +926,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
build_plate_id = global_stack.variant.getId() build_plate_id = global_stack.variant.getId()
# get material diameter of this extruder # get material diameter of this extruder
machine_material_diameter = extruder_stack.materialDiameter machine_material_diameter = extruder_stack.comptabileMaterialDiameter
material_node = material_manager.getMaterialNode(global_stack.definition.getId(), material_node = material_manager.getMaterialNode(global_stack.definition.getId(),
extruder_stack.variant.getName(), extruder_stack.variant.getName(),
build_plate_id, build_plate_id,