Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework

cura/ExtruderManager.py

@@ -66,6 +66,14 @@ class ExtruderManager(QObject):
         self._active_extruder_index = index
         self.activeExtruderChanged.emit()
 
+    def getActiveExtruderStack(self):
+        try:
+            return self._extruder_trains[UM.Application.getInstance().getGlobalContainerStack().getBottom().getId()][str(self._active_extruder_index)]
+        except AttributeError:
+            return None
+        except KeyError:
+            return None
+
     ##  Adds all extruders of a specific machine definition to the extruder
     #   manager.
     #

cura/MachineManagerModel.py

@@ -304,6 +304,10 @@ class MachineManagerModel(QObject):
             new_name = self._createUniqueName("quality", containers[0].getName(), new_name,
                                               catalog.i18nc("@label", "Custom profile"))
 
+            if containers[0].getName() == new_name:
+                # Nothing to do.
+                return
+
             # As we also want the id of the container to be changed (so that profile name is the name of the file
             # on disk. We need to create a new instance and remove it (so the old file of the container is removed)
             # If we don't do that, we might get duplicates & other weird issues.

plugins/CuraEngineBackend/CuraEngineBackend.py

@@ -12,6 +12,8 @@ from UM.PluginRegistry import PluginRegistry
 from UM.Resources import Resources
 from UM.Settings.Validator import ValidatorState #To find if a setting is in an error state. We can't slice then.
 
+from cura.ExtruderManager import ExtruderManager
+
 from cura.OneAtATimeIterator import OneAtATimeIterator
 from . import ProcessSlicedLayersJob
 from . import ProcessGCodeJob
@@ -59,6 +61,10 @@ class CuraEngineBackend(Backend):
         Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged)
         self._onGlobalStackChanged()
 
+        self._active_extruder_stack = None
+        ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderChanged)
+        self._onActiveExtruderChanged()
+
         #When you update a setting and other settings get changed through inheritance, many propertyChanged signals are fired.
         #This timer will group them up, and only slice for the last setting changed signal.
         #TODO: Properly group propertyChanged signals by whether they are triggered by the same user interaction.
@@ -367,4 +373,16 @@ class CuraEngineBackend(Backend):
         if self._global_container_stack:
             self._global_container_stack.propertyChanged.connect(self._onSettingChanged) #Note: Only starts slicing when the value changed.
             self._global_container_stack.containersChanged.connect(self._onChanged)
+            self._onActiveExtruderChanged()
             self._onChanged()
+
+    def _onActiveExtruderChanged(self):
+        if self._active_extruder_stack:
+            self._active_extruder_stack.propertyChanged.disconnect(self._onSettingChanged)
+            self._active_extruder_stack.containersChanged.disconnect(self._onChanged)
+
+        self._active_extruder_stack = ExtruderManager.getInstance().getActiveExtruderStack()
+        if self._active_extruder_stack:
+            self._active_extruder_stack.propertyChanged.connect(self._onSettingChanged)  # Note: Only starts slicing when the value changed.
+            self._active_extruder_stack.containersChanged.connect(self._onChanged)
+            self._onChanged()