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

Fix showing correct quality changes in dropdown list after upgrading - CURA-4482

Browse Source
This commit is contained in:
ChrisTerBeke 2017-11-22 10:48:21 +01:00
parent f8fe6cd455
commit 532cfd8404
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cura/Settings/CuraContainerRegistry.py
View File

@ -449,6 +449,12 @@ class CuraContainerRegistry(ContainerRegistry):
extruder_stack.setVariantById(variant_id) extruder_stack.setVariantById(variant_id)
extruder_stack.setMaterialById("default") extruder_stack.setMaterialById("default")
extruder_stack.setQualityById("default") extruder_stack.setQualityById("default")
quality_changes_id = "default"
if machine.qualityChanges.getId() != "empty_quality_changes":
extruder_quality_changes_container = self.findInstanceContainers(name = machine.qualityChanges.getName(), extruder = extruder_id)
if extruder_quality_changes_container:
quality_changes_id = extruder_quality_changes_container[0].getId()
extruder_stack.setQualityChangesById(quality_changes_id)
self.addContainer(extruder_stack) self.addContainer(extruder_stack)

12
cura/Settings/MachineManager.py
View File

@ -620,11 +620,9 @@ class MachineManager(QObject):
@pyqtProperty(str, notify=activeQualityChanged) @pyqtProperty(str, notify=activeQualityChanged)
def activeQualityId(self) -> str: def activeQualityId(self) -> str:
if self._active_container_stack: if self._active_container_stack:
quality = self._active_container_stack.qualityChanges
if quality and not isinstance(quality, type(self._empty_quality_changes_container)):
return quality.getId()
quality = self._active_container_stack.quality quality = self._active_container_stack.quality
if quality: quality_changes = self._active_container_stack.qualityChanges
if quality and quality_changes and isinstance(quality_changes, type(self._empty_quality_changes_container)) and not isinstance(quality, type(self._empty_quality_container)):
return quality.getId() return quality.getId()
return "" return ""
@ -690,9 +688,9 @@ class MachineManager(QObject):
@pyqtProperty(str, notify = activeQualityChanged) @pyqtProperty(str, notify = activeQualityChanged)
def activeQualityChangesId(self) -> str: def activeQualityChangesId(self) -> str:
if self._active_container_stack: if self._active_container_stack:
changes = self._active_container_stack.qualityChanges quality_changes = self._active_container_stack.qualityChanges
if changes and changes.getId() != "empty": if quality_changes and not isinstance(quality_changes, type(self._empty_quality_changes_container)):
return changes.getId() return quality_changes.getId()
return "" return ""
## Check if a container is read_only ## Check if a container is read_only