Merge branch 'master' of github.com:Ultimaker/Cura

cura/Machines/Models/BrandMaterialsModel.py

@@ -54,9 +54,7 @@ class BrandMaterialsModel(ListModel):
         self._material_manager = CuraApplication.getInstance().getMaterialManager()
 
         self._machine_manager.globalContainerChanged.connect(self._update)
-        self._extruder_manager.activeExtruderChanged.connect(self._update)
         self._material_manager.materialsUpdated.connect(self._update)
-
         self._update()
 
     def setExtruderPosition(self, position: int):

cura/Machines/Models/GenericMaterialsModel.py

@@ -16,9 +16,7 @@ class GenericMaterialsModel(BaseMaterialsModel):
         self._material_manager = CuraApplication.getInstance().getMaterialManager()
 
         self._machine_manager.globalContainerChanged.connect(self._update)
-        self._extruder_manager.activeExtruderChanged.connect(self._update)
         self._material_manager.materialsUpdated.connect(self._update)
-
         self._update()
 
     def _update(self):

cura/Machines/Models/NozzleModel.py

@@ -26,9 +26,7 @@ class NozzleModel(ListModel):
         self._variant_manager = self._application.getVariantManager()
 
         self._machine_manager.globalContainerChanged.connect(self._update)
-        self._machine_manager.activeVariantChanged.connect(self._update)
-        self._machine_manager.activeStackChanged.connect(self._update)
-        self._machine_manager.activeMaterialChanged.connect(self._update)
+        self._update()
 
     def _update(self):
         Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__))

cura/Machines/Models/QualityProfilesDropDownMenuModel.py

@@ -29,7 +29,7 @@ class QualityProfilesDropDownMenuModel(ListModel):
         self.addRoleName(self.QualityTypeRole, "quality_type")
         self.addRoleName(self.LayerHeightRole, "layer_height")
         self.addRoleName(self.LayerHeightUnitRole, "layer_height_unit")
-        self.addRoleName(self.AvailableRole, "available")
+        self.addRoleName(self.AvailableRole, "available") #Whether the quality profile is available in our current nozzle + material.
         self.addRoleName(self.QualityGroupRole, "quality_group")
         self.addRoleName(self.QualityChangesGroupRole, "quality_changes_group")
 

cura/Settings/CuraContainerRegistry.py

@@ -241,7 +241,7 @@ class CuraContainerRegistry(ContainerRegistry):
                         profile.addMetaDataEntry("type", "quality_changes")
                         profile.addMetaDataEntry("definition", global_profile.getMetaDataEntry("definition"))
                         profile.addMetaDataEntry("quality_type", global_profile.getMetaDataEntry("quality_type"))
-                        profile.addMetaDataEntry("extruder", extruder.getId())
+                        profile.addMetaDataEntry("position", "0")
                         profile.setDirty(True)
                         if idx == 0:
                             # move all per-extruder settings to the first extruder's quality_changes
@@ -273,10 +273,11 @@ class CuraContainerRegistry(ContainerRegistry):
                     elif profile_index < len(machine_extruders) + 1:
                         # This is assumed to be an extruder profile
                         extruder_id = machine_extruders[profile_index - 1].definition.getId()
-                        if not profile.getMetaDataEntry("extruder"):
-                            profile.addMetaDataEntry("extruder", extruder_id)
+                        extuder_position = str(profile_index - 1)
+                        if not profile.getMetaDataEntry("position"):
+                            profile.addMetaDataEntry("position", extuder_position)
                         else:
-                            profile.setMetaDataEntry("extruder", extruder_id)
+                            profile.setMetaDataEntry("position", extuder_position)
                         profile_id = (extruder_id + "_" + name_seed).lower().replace(" ", "_")
 
                     else: #More extruders in the imported file than in the machine.