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

Fix typo in the getCompatibleMaterialDiameter function.

Browse source 
Contributes to CURA-5834.
This commit is contained in:
Diego Prado Gesto 2018-10-23 10:25:13 +02:00
parent ea9aa2c777
commit 94ef0b92fe
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/Settings/ExtruderStack.py
View file

@ -71,7 +71,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
def getComptabileMaterialDiameter(self) -> float: def getCompatibleMaterialDiameter(self) -> float:
context = PropertyEvaluationContext(self) context = PropertyEvaluationContext(self)
context.context["evaluate_from_container_index"] = _ContainerIndexes.Variant context.context["evaluate_from_container_index"] = _ContainerIndexes.Variant
@ -79,7 +79,7 @@ class ExtruderStack(CuraContainerStack):
def setCompatibleMaterialDiameter(self, value: float) -> None: def setCompatibleMaterialDiameter(self, value: float) -> None:
old_approximate_diameter = self.getApproximateMaterialDiameter() old_approximate_diameter = self.getApproximateMaterialDiameter()
if self.getComptabileMaterialDiameter() != value: if self.getCompatibleMaterialDiameter() != value:
self.definitionChanges.setProperty("material_diameter", "value", value) self.definitionChanges.setProperty("material_diameter", "value", value)
self.compatibleMaterialDiameterChanged.emit() self.compatibleMaterialDiameterChanged.emit()
@ -88,7 +88,7 @@ class ExtruderStack(CuraContainerStack):
self.approximateMaterialDiameterChanged.emit() self.approximateMaterialDiameterChanged.emit()
compatibleMaterialDiameter = pyqtProperty(float, fset = setCompatibleMaterialDiameter, compatibleMaterialDiameter = pyqtProperty(float, fset = setCompatibleMaterialDiameter,
fget = getComptabileMaterialDiameter, fget = getCompatibleMaterialDiameter,
notify = compatibleMaterialDiameterChanged) notify = compatibleMaterialDiameterChanged)
approximateMaterialDiameterChanged = pyqtSignal() approximateMaterialDiameterChanged = pyqtSignal()
@ -102,7 +102,7 @@ class ExtruderStack(CuraContainerStack):
# #
# \return The approximate filament diameter for the printer # \return The approximate filament diameter for the printer
def getApproximateMaterialDiameter(self) -> float: def getApproximateMaterialDiameter(self) -> float:
return round(self.getComptabileMaterialDiameter()) return round(self.getCompatibleMaterialDiameter())
approximateMaterialDiameter = pyqtProperty(float, fget = getApproximateMaterialDiameter, approximateMaterialDiameter = pyqtProperty(float, fget = getApproximateMaterialDiameter,
notify = approximateMaterialDiameterChanged) notify = approximateMaterialDiameterChanged)

2
cura/Settings/MachineManager.py
View file

@ -1276,7 +1276,7 @@ class MachineManager(QObject):
if extruder.variant.getId() != self._empty_variant_container.getId(): if extruder.variant.getId() != self._empty_variant_container.getId():
current_nozzle_name = extruder.variant.getMetaDataEntry("name") current_nozzle_name = extruder.variant.getMetaDataEntry("name")
material_diameter = extruder.getComptabileMaterialDiameter() material_diameter = extruder.getCompatibleMaterialDiameter()
candidate_materials = self._material_manager.getAvailableMaterials( candidate_materials = self._material_manager.getAvailableMaterials(
self._global_container_stack.definition, self._global_container_stack.definition,
current_nozzle_name, current_nozzle_name,

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.comptabileMaterialDiameter machine_material_diameter = extruder_stack.getCompatibleMaterialDiameter()
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,

10
plugins/MachineSettingsAction/MachineSettingsAction.qml
View file

@ -410,7 +410,7 @@ Cura.MachineAction
} }
function setValueFunction(value) function setValueFunction(value)
{ {
Cura.MachineManager.activeStack.compatibleMaterialDiameter = value; Cura.MachineManager.activeStack.compatibleMaterialDiameter = value
} }
property bool isExtruderSetting: true property bool isExtruderSetting: true
} }
@ -634,19 +634,19 @@ Cura.MachineAction
// are available. // are available.
if (_setValueFunction !== undefined) if (_setValueFunction !== undefined)
{ {
_setValueFunction(text); _setValueFunction(text)
} }
else else
{ {
propertyProvider.setPropertyValue("value", text); propertyProvider.setPropertyValue("value", text)
} }
if(_forceUpdateOnChange) if(_forceUpdateOnChange)
{ {
manager.forceUpdate(); manager.forceUpdate()
} }
if(_afterOnEditingFinished) if(_afterOnEditingFinished)
{ {
_afterOnEditingFinished(); _afterOnEditingFinished()
} }
} }
} }