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

Reduce nesting complexity with some pre-checks

Browse source 
There were two pre-checks here, where the main body of the function was indented two deep. Instead, just early-out if the checks fail. This is easier to read and understand.

Found during investigation of CURA-8128.
This commit is contained in:
Ghostkeeper 2021-06-16 12:57:49 +02:00
parent cc6a629d92
commit 31106d13d0
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
1 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py
View file

@ -73,9 +73,13 @@ class PerObjectSettingVisibilityHandler(UM.Settings.Models.SettingVisibilityHand
# Add all instances that are not added, but are in visibility list # Add all instances that are not added, but are in visibility list
for item in visible: for item in visible:
if settings.getInstance(item) is None: # Setting was not added already. if settings.getInstance(item) is not None: # Setting was added already.
continue
definition = self._stack.getSettingDefinition(item) definition = self._stack.getSettingDefinition(item)
if definition: if not definition:
Logger.log("w", f"Unable to add instance ({item}) to per-object visibility because we couldn't find the matching definition.")
continue
new_instance = SettingInstance(definition, settings) new_instance = SettingInstance(definition, settings)
stack_nr = -1 stack_nr = -1
stack = None stack = None
@ -103,8 +107,6 @@ class PerObjectSettingVisibilityHandler(UM.Settings.Models.SettingVisibilityHand
new_instance.resetState() # Ensure that the state is not seen as a user state. new_instance.resetState() # Ensure that the state is not seen as a user state.
settings.addInstance(new_instance) settings.addInstance(new_instance)
visibility_changed = True visibility_changed = True
else:
Logger.log("w", "Unable to add instance (%s) to per-object visibility because we couldn't find the matching definition", item)
if visibility_changed: if visibility_changed:
self.visibilityChanged.emit() self.visibilityChanged.emit()