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

Fixed setting visibility if a parent setting is not settable per extruder but it's relations are

Browse source 
This fix also removes the hack to ensure that use_support was set correctly.
Fixes CURA-2202
This commit is contained in:
Jaime van Kessel 2016-08-29 13:43:42 +02:00
parent 120e3f156a
commit 3d41e25a4e
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cura/Settings/MachineManager.py
View file

@ -8,6 +8,8 @@ from UM.Application import Application
from UM.Preferences import Preferences from UM.Preferences import Preferences
from UM.Logger import Logger from UM.Logger import Logger
from UM.Settings.SettingRelation import RelationType
import UM.Settings import UM.Settings
from cura.PrinterOutputDevice import PrinterOutputDevice from cura.PrinterOutputDevice import PrinterOutputDevice
@ -240,15 +242,19 @@ class MachineManager(QObject):
def _onPropertyChanged(self, key, property_name): def _onPropertyChanged(self, key, property_name):
if property_name == "value": if property_name == "value":
# If a setting is not settable per extruder but at the same time settable per mesh, the engine needs a value in the extruder stack # If a setting is not settable per extruder, but "has enabled relations" that are settable per extruder
# This is mainly the case for the "support_enable" setting. # we need to copy the value to global, so that the front-end displays the right settings.
if self._active_container_stack.getProperty(key, "settable_per_mesh") and not self._active_container_stack.getProperty(key, "settable_per_extruder"): if not self._active_container_stack.getProperty(key, "settable_per_extruder"):
if self._active_container_stack and self._global_container_stack.getProperty("machine_extruder_count", "value") > 1: relations = self._global_container_stack.getBottom()._getDefinition(key).relations
for relation in filter(lambda r: r.role == "enabled" and r.type == RelationType.RequiredByTarget, relations):
# Target setting is settable per extruder
if self._active_container_stack.getProperty(relation.target.key, "settable_per_extruder"):
new_value = self._global_container_stack.getProperty(key, "value") new_value = self._global_container_stack.getProperty(key, "value")
stacks = [stack for stack in ExtruderManager.getInstance().getMachineExtruders(self._global_container_stack.getId())] stacks = [stack for stack in ExtruderManager.getInstance().getMachineExtruders(self._global_container_stack.getId())]
for extruder_stack in stacks: for extruder_stack in stacks:
if extruder_stack.getProperty(key, "value") != new_value: if extruder_stack.getProperty(key, "value") != new_value:
extruder_stack.getTop().setProperty(key, "value", new_value) extruder_stack.getTop().setProperty(key, "value", new_value)
break
if property_name == "validationState": if property_name == "validationState":
if self._active_stack_valid: if self._active_stack_valid: