|
@@ -451,27 +451,18 @@ class CuraApplication(QtApplication):
|
|
|
|
|
|
@pyqtSlot(str)
|
|
|
def discardOrKeepProfileChangesClosed(self, option):
|
|
|
+ global_stack = self.getGlobalContainerStack()
|
|
|
if option == "discard":
|
|
|
- global_stack = self.getGlobalContainerStack()
|
|
|
- for extruder in self._extruder_manager.getMachineExtruders(global_stack.getId()):
|
|
|
- extruder.getTop().clear()
|
|
|
- global_stack.getTop().clear()
|
|
|
+ for extruder in global_stack.extruders.values():
|
|
|
+ extruder.userChanges.clear()
|
|
|
+ global_stack.userChanges.clear()
|
|
|
|
|
|
# if the user decided to keep settings then the user settings should be re-calculated and validated for errors
|
|
|
# before slicing. To ensure that slicer uses right settings values
|
|
|
elif option == "keep":
|
|
|
- global_stack = self.getGlobalContainerStack()
|
|
|
- for extruder in self._extruder_manager.getMachineExtruders(global_stack.getId()):
|
|
|
- user_extruder_container = extruder.getTop()
|
|
|
- if user_extruder_container:
|
|
|
- user_extruder_container.update()
|
|
|
-
|
|
|
- user_global_container = global_stack.getTop()
|
|
|
- if user_global_container:
|
|
|
- user_global_container.update()
|
|
|
-
|
|
|
- # notify listeners that quality has changed (after user selected discard or keep)
|
|
|
- self.getMachineManager().activeQualityChanged.emit()
|
|
|
+ for extruder in global_stack.extruders.values():
|
|
|
+ extruder.userChanges.update()
|
|
|
+ global_stack.userChanges.update()
|
|
|
|
|
|
@pyqtSlot(int)
|
|
|
def messageBoxClosed(self, button):
|