GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-11 11:28:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crash when material is unknown

Browse Source 
Fixes CURA-GV
This commit is contained in:
Jaime van Kessel 2020-09-16 16:37:09 +02:00
parent 0029221fd5
commit dd359da1cf
No known key found for this signature in database
GPG Key ID: 3710727397403C91
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cura/Settings/MachineManager.py
View File

@ -369,7 +369,8 @@ class MachineManager(QObject):
material_node = variant_node.materials.get(extruder.material.getMetaDataEntry("base_file")) material_node = variant_node.materials.get(extruder.material.getMetaDataEntry("base_file"))
if material_node is None: if material_node is None:
Logger.log("w", "An extruder has an unknown material, switching it to the preferred material") Logger.log("w", "An extruder has an unknown material, switching it to the preferred material")
self.setMaterialById(extruder.getMetaDataEntry("position"), machine_node.preferred_material) if not self.setMaterialById(extruder.getMetaDataEntry("position"), machine_node.preferred_material):
Logger.log("w", "Failed to switch to %s keeping old material instead", machine_node.preferred_material)
@staticmethod @staticmethod
@ -1452,17 +1453,21 @@ class MachineManager(QObject):
self.updateMaterialWithVariant(None) # Update all materials self.updateMaterialWithVariant(None) # Update all materials
self._updateQualityWithMaterial() self._updateQualityWithMaterial()
@pyqtSlot(str, str) @pyqtSlot(str, str, result = bool)
def setMaterialById(self, position: str, root_material_id: str) -> None: def setMaterialById(self, position: str, root_material_id: str) -> bool:
if self._global_container_stack is None: if self._global_container_stack is None:
return return False
machine_definition_id = self._global_container_stack.definition.id machine_definition_id = self._global_container_stack.definition.id
position = str(position) position = str(position)
extruder_stack = self._global_container_stack.extruderList[int(position)] extruder_stack = self._global_container_stack.extruderList[int(position)]
nozzle_name = extruder_stack.variant.getName() nozzle_name = extruder_stack.variant.getName()
material_node = ContainerTree.getInstance().machines[machine_definition_id].variants[nozzle_name].materials[root_material_id]
self.setMaterial(position, material_node) materials = ContainerTree.getInstance().machines[machine_definition_id].variants[nozzle_name].materials
if root_material_id in materials:
self.setMaterial(position, materials[root_material_id])
return True
return False
@pyqtSlot(str, "QVariant") @pyqtSlot(str, "QVariant")
def setMaterial(self, position: str, container_node, global_stack: Optional["GlobalStack"] = None) -> None: def setMaterial(self, position: str, container_node, global_stack: Optional["GlobalStack"] = None) -> None: