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

CURA-4400 when enabling / disabling extruder, remove user changes that are no longer enabled

Browse source
This commit is contained in:
Jack Ha 2018-03-06 09:45:32 +01:00
parent 7fd0a9b98b
commit 00a173b1bf
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cura/Settings/MachineManager.py
View file

@ -701,16 +701,22 @@ class MachineManager(QObject):
# reset all extruder number settings whose value is no longer valid # reset all extruder number settings whose value is no longer valid
for setting_instance in self._global_container_stack.userChanges.findInstances(): for setting_instance in self._global_container_stack.userChanges.findInstances():
setting_key = setting_instance.definition.key setting_key = setting_instance.definition.key
enabled = self._global_container_stack.getProperty(setting_key, "enabled")
if not enabled:
self._global_container_stack.userChanges.removeInstance(setting_key)
Logger.log("d", "Reset setting [%s] because the setting is no longer enabled", setting_key)
continue
if not self._global_container_stack.getProperty(setting_key, "type") in ("extruder", "optional_extruder"): if not self._global_container_stack.getProperty(setting_key, "type") in ("extruder", "optional_extruder"):
continue continue
old_value = self._global_container_stack.userChanges.getProperty(setting_key, "value") old_value = self._global_container_stack.userChanges.getProperty(setting_key, "value")
if int(old_value) >= extruder_count: if int(old_value) >= extruder_count:
self._global_container_stack.userChanges.removeInstance(setting_key) self._global_container_stack.userChanges.removeInstance(setting_key)
Logger.log("d", "Reset [%s] because its old value [%s] is no longer valid", setting_key, old_value) Logger.log("d", "Reset setting [%s] because its old value [%s] is no longer valid", setting_key, old_value)
if not self._global_container_stack.extruders[str(old_value)].isEnabled: if not self._global_container_stack.extruders[str(old_value)].isEnabled:
self._global_container_stack.userChanges.removeInstance(setting_key) self._global_container_stack.userChanges.removeInstance(setting_key)
Logger.log("d", "Reset [%s] because its old value [%s] is no longer valid (2)", setting_key, old_value) Logger.log("d", "Reset setting [%s] because its old value [%s] is no longer valid (2)", setting_key, old_value)
## Set the amount of extruders on the active machine (global stack) ## Set the amount of extruders on the active machine (global stack)
# \param extruder_count int the number of extruders to set # \param extruder_count int the number of extruders to set
@ -804,8 +810,7 @@ class MachineManager(QObject):
extruder.setEnabled(enabled) extruder.setEnabled(enabled)
self.updateDefaultExtruder() self.updateDefaultExtruder()
self.updateNumberExtrudersEnabled() self.updateNumberExtrudersEnabled()
if enabled == False: self.correctExtruderSettings()
self.correctExtruderSettings()
self.extruderChanged.emit() self.extruderChanged.emit()
# update items in SettingExtruder # update items in SettingExtruder
ExtruderManager.getInstance().extrudersChanged.emit(self._global_container_stack.getId()) ExtruderManager.getInstance().extrudersChanged.emit(self._global_container_stack.getId())