GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 19:05:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

CURA-4923 fix handle setting function in material_diameter

Browse Source
This commit is contained in:
Jack Ha 2018-02-07 11:27:02 +01:00
parent a460804bbe
commit 3a88c1ee88
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cura/Settings/ExtruderManager.py
View File

@ -519,13 +519,19 @@ class ExtruderManager(QObject):
material_diameter = 0 material_diameter = 0
material_approximate_diameter = str(round(material_diameter)) material_approximate_diameter = str(round(material_diameter))
machine_diameter = extruder_stack.definitionChanges.getProperty("material_diameter", "value") material_diameter = extruder_stack.definitionChanges.getProperty("material_diameter", "value")
if not machine_diameter: setting_provider = extruder_stack
if not material_diameter:
if extruder_stack.definition.hasProperty("material_diameter", "value"): if extruder_stack.definition.hasProperty("material_diameter", "value"):
machine_diameter = extruder_stack.definition.getProperty("material_diameter", "value") material_diameter = extruder_stack.definition.getProperty("material_diameter", "value")
else: else:
machine_diameter = global_stack.definition.getProperty("material_diameter", "value") material_diameter = global_stack.definition.getProperty("material_diameter", "value")
machine_approximate_diameter = str(round(machine_diameter)) setting_provider = global_stack
if isinstance(material_diameter, SettingFunction):
material_diameter = material_diameter(setting_provider)
machine_approximate_diameter = str(round(material_diameter))
if material_approximate_diameter != machine_approximate_diameter: if material_approximate_diameter != machine_approximate_diameter:
Logger.log("i", "The the currently active material(s) do not match the diameter set for the printer. Finding alternatives.") Logger.log("i", "The the currently active material(s) do not match the diameter set for the printer. Finding alternatives.")