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

Reduce indentation by inverting input check

Browse source 
Reads a bit easier.

Contributes to issue CURA-4186.
This commit is contained in:
Ghostkeeper 2017-08-18 15:02:49 +02:00
parent 67cfb064e6
commit 4a788dfbdd
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -1,4 +1,4 @@
# Copyright (c) 2015 Ultimaker B.V. # Copyright (c) 2017 Ultimaker B.V.
# Cura is released under the terms of the AGPLv3 or higher. # Cura is released under the terms of the AGPLv3 or higher.
import numpy import numpy
@ -306,25 +306,26 @@ class StartSliceJob(Job):
# \param message object_lists message to put the per object settings in # \param message object_lists message to put the per object settings in
def _handlePerObjectSettings(self, node, message): def _handlePerObjectSettings(self, node, message):
stack = node.callDecoration("getStack") stack = node.callDecoration("getStack")
# Check if the node has a stack attached to it and the stack has any settings in the top container. if not stack: # Check if the node has a stack attached to it and the stack has any settings in the top container.
if stack: return
# Check all settings for relations, so we can also calculate the correct values for dependant settings.
changed_setting_keys = set(stack.getTop().getAllKeys())
for key in stack.getTop().getAllKeys():
instance = stack.getTop().getInstance(key)
self._addRelations(changed_setting_keys, instance.definition.relations)
Job.yieldThread()
# Ensure that the engine is aware what the build extruder is # Check all settings for relations, so we can also calculate the correct values for dependent settings.
if stack.getProperty("machine_extruder_count", "value") > 1: changed_setting_keys = set(stack.getTop().getAllKeys())
changed_setting_keys.add("extruder_nr") for key in stack.getTop().getAllKeys():
instance = stack.getTop().getInstance(key)
self._addRelations(changed_setting_keys, instance.definition.relations)
Job.yieldThread()
# Get values for all changed settings # Ensure that the engine is aware what the build extruder is
for key in changed_setting_keys: if stack.getProperty("machine_extruder_count", "value") > 1:
setting = message.addRepeatedMessage("settings") changed_setting_keys.add("extruder_nr")
setting.name = key
setting.value = str(stack.getProperty(key, "value")).encode("utf-8") # Get values for all changed settings
Job.yieldThread() for key in changed_setting_keys:
setting = message.addRepeatedMessage("settings")
setting.name = key
setting.value = str(stack.getProperty(key, "value")).encode("utf-8")
Job.yieldThread()
## Recursive function to put all settings that require eachother for value changes in a list ## Recursive function to put all settings that require eachother for value changes in a list
# \param relations_set \type{set} Set of keys (strings) of settings that are influenced # \param relations_set \type{set} Set of keys (strings) of settings that are influenced