3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 05:07:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Optimize overridden calculated settings computation"

Browse source 
This reverts commit 42b72f81bb.
This commit is contained in:
Erwan MATHIEU 2024-03-14 16:02:35 +01:00
parent e4b0a42681
commit 8308b640ca
1 changed files with 13 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

45
cura/Settings/SettingInheritanceManager.py
View file

@ -32,7 +32,6 @@ class SettingInheritanceManager(QObject):
self._global_container_stack = None # type: Optional[ContainerStack] self._global_container_stack = None # type: Optional[ContainerStack]
self._settings_with_inheritance_warning = [] # type: List[str] self._settings_with_inheritance_warning = [] # type: List[str]
self._active_container_stack = None # type: Optional[ExtruderStack] self._active_container_stack = None # type: Optional[ExtruderStack]
self._active_containers = [] # type: List[ContainerInterface]
self._update_timer = QTimer() self._update_timer = QTimer()
self._update_timer.setInterval(500) self._update_timer.setInterval(500)
@ -102,7 +101,6 @@ class SettingInheritanceManager(QObject):
new_active_stack = ExtruderManager.getInstance().getActiveExtruderStack() new_active_stack = ExtruderManager.getInstance().getActiveExtruderStack()
if not new_active_stack: if not new_active_stack:
self._active_container_stack = None self._active_container_stack = None
self._active_containers = []
return return
if new_active_stack != self._active_container_stack: # Check if changed if new_active_stack != self._active_container_stack: # Check if changed
@ -116,13 +114,6 @@ class SettingInheritanceManager(QObject):
self._active_container_stack.containersChanged.connect(self._onContainersChanged) self._active_container_stack.containersChanged.connect(self._onContainersChanged)
self._update_timer.start() # Ensure that the settings_with_inheritance_warning list is populated. self._update_timer.start() # Ensure that the settings_with_inheritance_warning list is populated.
## Mash all containers for all the stacks together.
self._active_containers = []
stack = self._active_container_stack
while stack:
self._active_containers.extend(stack.getContainers())
stack = stack.getNextStack()
def _onPropertyChanged(self, key: str, property_name: str) -> None: def _onPropertyChanged(self, key: str, property_name: str) -> None:
if (property_name == "value" or property_name == "enabled") and self._global_container_stack: if (property_name == "value" or property_name == "enabled") and self._global_container_stack:
definitions = self._global_container_stack.definition.findDefinitions(key = key) # type: List["SettingDefinition"] definitions = self._global_container_stack.definition.findDefinitions(key = key) # type: List["SettingDefinition"]
@ -180,6 +171,7 @@ class SettingInheritanceManager(QObject):
def _settingIsOverwritingInheritance(self, key: str, stack: ContainerStack = None) -> bool: def _settingIsOverwritingInheritance(self, key: str, stack: ContainerStack = None) -> bool:
"""Check if a setting has an inheritance function that is overwritten""" """Check if a setting has an inheritance function that is overwritten"""
has_setting_function = False
if not stack: if not stack:
stack = self._active_container_stack stack = self._active_container_stack
if not stack: # No active container stack yet! if not stack: # No active container stack yet!
@ -187,6 +179,9 @@ class SettingInheritanceManager(QObject):
if self._active_container_stack is None: if self._active_container_stack is None:
return False return False
all_keys = self._active_container_stack.getAllKeys()
containers = [] # type: List[ContainerInterface]
has_user_state = stack.getProperty(key, "state") == InstanceState.User has_user_state = stack.getProperty(key, "state") == InstanceState.User
"""Check if the setting has a user state. If not, it is never overwritten.""" """Check if the setting has a user state. If not, it is never overwritten."""
@ -194,13 +189,6 @@ class SettingInheritanceManager(QObject):
if not has_user_state: if not has_user_state:
return False return False
return self._userSettingIsOverwritingInheritance(key, stack, self._active_container_stack.getAllKeys())
def _userSettingIsOverwritingInheritance(self, key: str, stack: ContainerStack, all_keys) -> bool:
"""Check if a setting has an inheritance function that is overwritten"""
has_setting_function = False
# If a setting is not enabled, don't label it as overwritten (It's never visible anyway). # If a setting is not enabled, don't label it as overwritten (It's never visible anyway).
if not stack.getProperty(key, "enabled"): if not stack.getProperty(key, "enabled"):
return False return False
@ -211,8 +199,12 @@ class SettingInheritanceManager(QObject):
if user_container and isinstance(user_container.getProperty(key, "value"), SettingFunction): if user_container and isinstance(user_container.getProperty(key, "value"), SettingFunction):
return False return False
## Mash all containers for all the stacks together.
while stack:
containers.extend(stack.getContainers())
stack = stack.getNextStack()
has_non_function_value = False has_non_function_value = False
for container in self._active_containers: for container in containers:
try: try:
value = container.getProperty(key, "value") value = container.getProperty(key, "value")
except AttributeError: except AttributeError:
@ -235,7 +227,6 @@ class SettingInheritanceManager(QObject):
if has_setting_function: if has_setting_function:
break # There is a setting function somewhere, stop looking deeper. break # There is a setting function somewhere, stop looking deeper.
return has_setting_function and has_non_function_value return has_setting_function and has_non_function_value
def _update(self) -> None: def _update(self) -> None:
@ -246,20 +237,10 @@ class SettingInheritanceManager(QObject):
return return
# Check all setting keys that we know of and see if they are overridden. # Check all setting keys that we know of and see if they are overridden.
if self._active_container_stack: for setting_key in self._global_container_stack.getAllKeys():
all_keys = self._active_container_stack.getAllKeys() override = self._settingIsOverwritingInheritance(setting_key)
if override:
# Get user settings from all stacks self._settings_with_inheritance_warning.append(setting_key)
user_settings_keys = set()
stack = self._active_container_stack
while stack:
user_settings_keys.update(stack.userChanges.getAllKeys())
stack = stack.getNextStack()
for setting_key in user_settings_keys:
override = self._userSettingIsOverwritingInheritance(setting_key, self._active_container_stack, all_keys)
if override:
self._settings_with_inheritance_warning.append(setting_key)
# Check all the categories if any of their children have their inheritance overwritten. # Check all the categories if any of their children have their inheritance overwritten.
for category in self._global_container_stack.definition.findDefinitions(type = "category"): for category in self._global_container_stack.definition.findDefinitions(type = "category"):