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

CURA-4284 fix relationship dependencies in per object settings

Browse source
This commit is contained in:
ChrisTerBeke 2017-09-11 10:56:34 +02:00
parent 5bb09d73fc
commit 5c30658012
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -328,12 +328,15 @@ class StartSliceJob(Job):
top_of_stack = stack.getTop() # Cache for efficiency. top_of_stack = stack.getTop() # Cache for efficiency.
changed_setting_keys = set(top_of_stack.getAllKeys()) changed_setting_keys = set(top_of_stack.getAllKeys())
# Add all relations to changed settings as well.
for key in top_of_stack.getAllKeys(): for key in top_of_stack.getAllKeys():
instance = top_of_stack.getInstance(key) instance = top_of_stack.getInstance(key)
self._addRelations(changed_setting_keys, instance.definition.relations) self._addRelations(changed_setting_keys, instance.definition.relations)
Job.yieldThread() Job.yieldThread()
# Ensure that the engine is aware what the build extruder is Logger.log("d", "changed_setting_keys=%s", changed_setting_keys)
# Ensure that the engine is aware what the build extruder is.
if stack.getProperty("machine_extruder_count", "value") > 1: if stack.getProperty("machine_extruder_count", "value") > 1:
changed_setting_keys.add("extruder_nr") changed_setting_keys.add("extruder_nr")
@ -344,16 +347,18 @@ class StartSliceJob(Job):
extruder = int(round(float(stack.getProperty(key, "limit_to_extruder")))) extruder = int(round(float(stack.getProperty(key, "limit_to_extruder"))))
# Check if limited to a specific extruder, but not overridden by per-object settings. # Check if limited to a specific extruder, but not overridden by per-object settings.
if extruder >= 0 and key not in top_of_stack.getAllKeys(): if extruder >= 0 and key not in changed_setting_keys:
limited_stack = ExtruderManager.getInstance().getActiveExtruderStacks()[extruder] limited_stack = ExtruderManager.getInstance().getActiveExtruderStacks()[extruder]
else: else:
limited_stack = stack limited_stack = stack
setting.value = str(limited_stack.getProperty(key, "value")).encode("utf-8") setting.value = str(limited_stack.getProperty(key, "value")).encode("utf-8")
Logger.log("d", "key=%s value=%s", key, setting.value)
Job.yieldThread() 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 each other 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
# \param relations list of relation objects that need to be checked. # \param relations list of relation objects that need to be checked.
def _addRelations(self, relations_set, relations): def _addRelations(self, relations_set, relations):