diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 857aafb567..b40b65358b 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -107,7 +107,7 @@ from cura.Settings.MaterialSettingsVisibilityHandler import MaterialSettingsVisi from cura.Settings.ContainerManager import ContainerManager from cura.Settings.SidebarCustomMenuItemsModel import SidebarCustomMenuItemsModel import cura.Settings.cura_empty_instance_containers -from cura.Settings.CustomSettingFunctions import CustomSettingFunctions +from cura.Settings.CuraFormulaFunctions import CuraFormulaFunctions from cura.ObjectsModel import ObjectsModel @@ -175,7 +175,7 @@ class CuraApplication(QtApplication): self._single_instance = None - self._custom_setting_functions = None + self._cura_formula_functions = None self._cura_package_manager = None @@ -320,7 +320,7 @@ class CuraApplication(QtApplication): # Adds custom property types, settings types, and extra operators (functions) that need to be registered in # SettingDefinition and SettingFunction. def __initializeSettingDefinitionsAndFunctions(self): - self._custom_setting_functions = CustomSettingFunctions(self) + self._cura_formula_functions = CuraFormulaFunctions(self) # Need to do this before ContainerRegistry tries to load the machines SettingDefinition.addSupportedProperty("settable_per_mesh", DefinitionPropertyType.Any, default = True, read_only = True) @@ -342,10 +342,10 @@ class CuraApplication(QtApplication): SettingDefinition.addSettingType("optional_extruder", None, str, None) SettingDefinition.addSettingType("[int]", None, str, None) - SettingFunction.registerOperator("extruderValue", self._custom_setting_functions.getValueInExtruder) - SettingFunction.registerOperator("extruderValues", self._custom_setting_functions.getValuesInAllExtruders) - SettingFunction.registerOperator("resolveOrValue", self._custom_setting_functions.getResolveOrValue) - SettingFunction.registerOperator("defaultExtruderPosition", self._custom_setting_functions.getDefaultExtruderPosition) + SettingFunction.registerOperator("extruderValue", self._cura_formula_functions.getValueInExtruder) + SettingFunction.registerOperator("extruderValues", self._cura_formula_functions.getValuesInAllExtruders) + SettingFunction.registerOperator("resolveOrValue", self._cura_formula_functions.getResolveOrValue) + SettingFunction.registerOperator("defaultExtruderPosition", self._cura_formula_functions.getDefaultExtruderPosition) # Adds all resources and container related resources. def __addAllResourcesAndContainerResources(self) -> None: @@ -809,8 +809,8 @@ class CuraApplication(QtApplication): def getSettingVisibilityPresetsModel(self, *args) -> SettingVisibilityPresetsModel: return self._setting_visibility_presets_model - def getCustomSettingFunctions(self, *args) -> CustomSettingFunctions: - return self._custom_setting_functions + def getCuraFormulaFunctions(self, *args) -> "CuraFormulaFunctions": + return self._cura_formula_functions def getMachineErrorChecker(self, *args) -> MachineErrorChecker: return self._machine_error_checker diff --git a/cura/Settings/CustomSettingFunctions.py b/cura/Settings/CuraFormulaFunctions.py similarity index 95% rename from cura/Settings/CustomSettingFunctions.py rename to cura/Settings/CuraFormulaFunctions.py index 5951ac1e73..1db01857f8 100644 --- a/cura/Settings/CustomSettingFunctions.py +++ b/cura/Settings/CuraFormulaFunctions.py @@ -12,10 +12,10 @@ if TYPE_CHECKING: # -# This class contains all Cura-related custom setting functions. Some functions requires information such as the -# currently active machine, so this is made into a class instead of standalone functions. +# This class contains all Cura-related custom functions that can be used in formulas. Some functions requires +# information such as the currently active machine, so this is made into a class instead of standalone functions. # -class CustomSettingFunctions: +class CuraFormulaFunctions: def __init__(self, application: "CuraApplication") -> None: self._application = application diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 86ee546240..ee5cf93fab 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -373,7 +373,7 @@ class ExtruderManager(QObject): # \return String representing the extruder values @pyqtSlot(str, result="QVariant") def getInstanceExtruderValues(self, key: str) -> List: - return self._application.getCustomSettingFunctions().getValuesInAllExtruders(key) + return self._application.getCuraFormulaFunctions().getValuesInAllExtruders(key) ## Get the resolve value or value for a given key # diff --git a/cura/Settings/UserChangesModel.py b/cura/Settings/UserChangesModel.py index d2ea84f79d..9a26e5607e 100644 --- a/cura/Settings/UserChangesModel.py +++ b/cura/Settings/UserChangesModel.py @@ -42,7 +42,7 @@ class UserChangesModel(ListModel): def _update(self): application = Application.getInstance() machine_manager = application.getMachineManager() - custom_setting_functions = application.getCustomSettingFunctions() + cura_formula_functions = application.getCuraFormulaFunctions() item_dict = OrderedDict() item_list = [] @@ -77,7 +77,7 @@ class UserChangesModel(ListModel): # Override "getExtruderValue" with "getDefaultExtruderValue" so we can get the default values user_changes = containers.pop(0) - default_value_resolve_context = custom_setting_functions.createContextForDefaultValueEvaluation(stack) + default_value_resolve_context = cura_formula_functions.createContextForDefaultValueEvaluation(stack) for setting_key in user_changes.getAllKeys(): original_value = None