mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-12 02:29:02 +08:00
Improve unhappy flow
CURA-11536
This commit is contained in:
parent
fe440a6643
commit
5da4dfcb70
@ -111,6 +111,7 @@ class GcodeStartEndFormatter(Formatter):
|
|||||||
if extruder_nr in self._all_extruder_settings:
|
if extruder_nr in self._all_extruder_settings:
|
||||||
additional_variables = self._all_extruder_settings[extruder_nr]
|
additional_variables = self._all_extruder_settings[extruder_nr]
|
||||||
else:
|
else:
|
||||||
|
Logger.warning(f"Extruder {extruder_nr} does not exist, using global settings")
|
||||||
additional_variables = self._all_extruder_settings["-1"]
|
additional_variables = self._all_extruder_settings["-1"]
|
||||||
|
|
||||||
# Add the arguments and keyword arguments to the additional settings. These
|
# Add the arguments and keyword arguments to the additional settings. These
|
||||||
@ -125,6 +126,9 @@ class GcodeStartEndFormatter(Formatter):
|
|||||||
container_stack = CuraApplication.getInstance().getGlobalContainerStack()
|
container_stack = CuraApplication.getInstance().getGlobalContainerStack()
|
||||||
else:
|
else:
|
||||||
container_stack = ExtruderManager.getInstance().getExtruderStack(extruder_nr)
|
container_stack = ExtruderManager.getInstance().getExtruderStack(extruder_nr)
|
||||||
|
if not container_stack:
|
||||||
|
Logger.warning(f"Extruder {extruder_nr} does not exist, using global settings")
|
||||||
|
container_stack = CuraApplication.getInstance().getGlobalContainerStack()
|
||||||
|
|
||||||
setting_function = SettingFunction(expression)
|
setting_function = SettingFunction(expression)
|
||||||
value = setting_function(container_stack, additional_variables=additional_variables)
|
value = setting_function(container_stack, additional_variables=additional_variables)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user