3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-03 12:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Keep the same material and quality when switching nozzle or material

Browse source 
CURA-333
This commit is contained in:
fieldOfView 2016-06-21 17:19:15 +02:00
parent 92905ada34
commit 5d8a9a2cda
1 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cura/MachineManagerModel.py
View file

@ -376,11 +376,16 @@ class MachineManagerModel(QObject):
return return
old_material = self._active_container_stack.findContainer({"type":"material"}) old_material = self._active_container_stack.findContainer({"type":"material"})
old_quality = self._active_container_stack.findContainer({"type": "quality"})
if old_material: if old_material:
material_index = self._active_container_stack.getContainerIndex(old_material) material_index = self._active_container_stack.getContainerIndex(old_material)
self._active_container_stack.replaceContainer(material_index, containers[0]) self._active_container_stack.replaceContainer(material_index, containers[0])
self.setActiveQuality(self._updateQualityContainer(self._active_container_stack.getBottom(), containers[0]).id) preferred_quality_name = None
if old_quality:
preferred_quality_name = old_quality.getName()
self.setActiveQuality(self._updateQualityContainer(self._global_container_stack.getBottom(), containers[0], preferred_quality_name).id)
@pyqtSlot(str) @pyqtSlot(str)
def setActiveVariant(self, variant_id): def setActiveVariant(self, variant_id):
@ -389,11 +394,16 @@ class MachineManagerModel(QObject):
return return
old_variant = self._active_container_stack.findContainer({"type": "variant"}) old_variant = self._active_container_stack.findContainer({"type": "variant"})
old_material = self._active_container_stack.findContainer({"type": "material"})
if old_variant: if old_variant:
variant_index = self._active_container_stack.getContainerIndex(old_variant) variant_index = self._active_container_stack.getContainerIndex(old_variant)
self._active_container_stack.replaceContainer(variant_index, containers[0]) self._active_container_stack.replaceContainer(variant_index, containers[0])
self.setActiveMaterial(self._updateMaterialContainer(self._active_container_stack.getBottom(), containers[0]).id) preferred_material = None
if old_material:
preferred_material = old_material.getId()
self.setActiveMaterial(self._updateMaterialContainer(self._global_container_stack.getBottom(), containers[0], preferred_material).id)
@pyqtSlot(str) @pyqtSlot(str)
def setActiveQuality(self, quality_id): def setActiveQuality(self, quality_id):
@ -503,7 +513,7 @@ class MachineManagerModel(QObject):
return self._empty_variant_container return self._empty_variant_container
def _updateMaterialContainer(self, definition, variant_container = None): def _updateMaterialContainer(self, definition, variant_container = None, preferred_material = None):
if not definition.getMetaDataEntry("has_materials"): if not definition.getMetaDataEntry("has_materials"):
return self._empty_material_container return self._empty_material_container
@ -517,7 +527,8 @@ class MachineManagerModel(QObject):
else: else:
search_criteria["definition"] = "fdmprinter" search_criteria["definition"] = "fdmprinter"
preferred_material = definition.getMetaDataEntry("preferred_material") if not preferred_material:
preferred_material = definition.getMetaDataEntry("preferred_material")
if preferred_material: if preferred_material:
search_criteria["id"] = preferred_material search_criteria["id"] = preferred_material
@ -527,7 +538,7 @@ class MachineManagerModel(QObject):
return self._empty_material_container return self._empty_material_container
def _updateQualityContainer(self, definition, material_container = None): def _updateQualityContainer(self, definition, material_container = None, preferred_quality_name = None):
search_criteria = { "type": "quality" } search_criteria = { "type": "quality" }
if definition.getMetaDataEntry("has_machine_quality"): if definition.getMetaDataEntry("has_machine_quality"):
@ -538,9 +549,12 @@ class MachineManagerModel(QObject):
else: else:
search_criteria["definition"] = "fdmprinter" search_criteria["definition"] = "fdmprinter"
preferred_quality = definition.getMetaDataEntry("preferred_quality") if preferred_quality_name:
if preferred_quality: search_criteria["name"] = preferred_quality_name
search_criteria["id"] = preferred_quality else:
preferred_quality = definition.getMetaDataEntry("preferred_quality")
if preferred_quality:
search_criteria["id"] = preferred_quality
containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(**search_criteria) containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(**search_criteria)
if containers: if containers: