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

Revert "Commented out 2 lines of code that caused issues with reset"

Browse source 
This reverts commit 568d30d17b. Turned out this causes recursion issue when changing materials
This commit is contained in:
Jaime van Kessel 2016-07-22 09:33:44 +02:00
parent 7e48b6ad4c
commit 8307dba643
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cura/Settings/MachineManager.py
View file

@ -199,7 +199,6 @@ class MachineManager(QObject):
def _onGlobalPropertyChanged(self, key, property_name): def _onGlobalPropertyChanged(self, key, property_name):
if property_name == "value": if property_name == "value":
self.globalValueChanged.emit() self.globalValueChanged.emit()
if self._active_container_stack and self._active_container_stack != self._global_container_stack: if self._active_container_stack and self._active_container_stack != self._global_container_stack:
@ -212,6 +211,7 @@ class MachineManager(QObject):
if not self._global_container_stack.getProperty(key, "settable_per_extruder"): if not self._global_container_stack.getProperty(key, "settable_per_extruder"):
new_value = self._active_container_stack.getProperty(key, "value") new_value = self._active_container_stack.getProperty(key, "value")
active_stack_has_user_value = self._active_container_stack.getTop().getInstance(key) != None active_stack_has_user_value = self._active_container_stack.getTop().getInstance(key) != None
for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(self._global_container_stack.getId()): for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(self._global_container_stack.getId()):
if extruder_stack != self._active_container_stack: if extruder_stack != self._active_container_stack:
if active_stack_has_user_value: if active_stack_has_user_value:
@ -220,16 +220,15 @@ class MachineManager(QObject):
# Remove from the value from the other stacks as well, unless the # Remove from the value from the other stacks as well, unless the
# top value from the other stacklevels is different than the new value # top value from the other stacklevels is different than the new value
for container in extruder_stack.getContainers(): for container in extruder_stack.getContainers():
# Commented out this line for a bit. Don't know why it's here, but it is causing if container == extruder_stack.getTop():
# issues with reset button. continue
#if container == extruder_stack.getTop():
# continue
if container.__class__ == UM.Settings.InstanceContainer and container.getInstance(key) != None: if container.__class__ == UM.Settings.InstanceContainer and container.getInstance(key) != None:
if container.getProperty(key, "value") != new_value: if container.getProperty(key, "value") != new_value:
extruder_stack.getTop().setProperty(key, "value", new_value) extruder_stack.getTop().setProperty(key, "value", new_value)
else: else:
extruder_stack.getTop().removeInstance(key) extruder_stack.getTop().removeInstance(key)
break break
if self._global_container_stack.getProperty(key, "value") != new_value: if self._global_container_stack.getProperty(key, "value") != new_value:
self._global_container_stack.getTop().setProperty(key, "value", new_value) self._global_container_stack.getTop().setProperty(key, "value", new_value)