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

Merge pull request #1530 from Ultimaker/bugfix_CURA-3507_more-robust-quality-lookup

Browse Source 
CURA-3507 Make quality lookup more robust
This commit is contained in:
jack 2017-03-13 10:26:15 +01:00 committed by GitHub
commit 7b9ea1073c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cura/Settings/MachineManager.py
View File

@ -731,8 +731,11 @@ class MachineManager(QObject):
else: else:
self._material_incompatible_message.hide() self._material_incompatible_message.hide()
new_quality_id = old_quality.getId() quality_type = None
quality_type = old_quality.getMetaDataEntry("quality_type") new_quality_id = None
if old_quality:
new_quality_id = old_quality.getId()
quality_type = old_quality.getMetaDataEntry("quality_type")
if old_quality_changes: if old_quality_changes:
quality_type = old_quality_changes.getMetaDataEntry("quality_type") quality_type = old_quality_changes.getMetaDataEntry("quality_type")
new_quality_id = old_quality_changes.getId() new_quality_id = old_quality_changes.getId()
@ -740,9 +743,11 @@ class MachineManager(QObject):
# See if the requested quality type is available in the new situation. # See if the requested quality type is available in the new situation.
machine_definition = self._active_container_stack.getBottom() machine_definition = self._active_container_stack.getBottom()
quality_manager = QualityManager.getInstance() quality_manager = QualityManager.getInstance()
candidate_quality = quality_manager.findQualityByQualityType(quality_type, candidate_quality = None
quality_manager.getWholeMachineDefinition(machine_definition), if quality_type:
[material_container]) candidate_quality = quality_manager.findQualityByQualityType(quality_type,
quality_manager.getWholeMachineDefinition(machine_definition),
[material_container])
if not candidate_quality or candidate_quality.getId() == "empty_quality": if not candidate_quality or candidate_quality.getId() == "empty_quality":
# Fall back to a quality # Fall back to a quality
new_quality = quality_manager.findQualityByQualityType(None, new_quality = quality_manager.findQualityByQualityType(None,