3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Profile menu now correctly marks active qualties as checked

Browse source 
CURA-3497
This commit is contained in:
Jaime van Kessel 2017-05-03 13:13:09 +02:00
parent d83b4daf78
commit 9a46a24b19
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/Settings/MachineManager.py
View file

@ -573,7 +573,7 @@ class MachineManager(QObject):
def activeQualityName(self): def activeQualityName(self):
if self._active_container_stack and self._global_container_stack: if self._active_container_stack and self._global_container_stack:
quality = self._global_container_stack.qualityChanges quality = self._global_container_stack.qualityChanges
if quality and quality != self._empty_quality_changes_container: if quality and not isinstance(quality, type(self._empty_quality_changes_container)):
return quality.getName() return quality.getName()
quality = self._active_container_stack.quality quality = self._active_container_stack.quality
if quality: if quality:
@ -584,7 +584,7 @@ class MachineManager(QObject):
def activeQualityId(self): def activeQualityId(self):
if self._active_container_stack: if self._active_container_stack:
quality = self._active_container_stack.qualityChanges quality = self._active_container_stack.qualityChanges
if quality and quality != self._empty_quality_changes_container: if quality and not isinstance(quality, type(self._empty_quality_changes_container)):
return quality.getId() return quality.getId()
quality = self._active_container_stack.quality quality = self._active_container_stack.quality
if quality: if quality:
@ -595,7 +595,7 @@ class MachineManager(QObject):
def globalQualityId(self): def globalQualityId(self):
if self._global_container_stack: if self._global_container_stack:
quality = self._global_container_stack.qualityChanges quality = self._global_container_stack.qualityChanges
if quality and quality != self._empty_quality_changes_container: if quality and not isinstance(quality, type(self._empty_quality_changes_container)):
return quality.getId() return quality.getId()
quality = self._global_container_stack.quality quality = self._global_container_stack.quality
if quality: if quality:
@ -637,7 +637,7 @@ class MachineManager(QObject):
def activeQualityChangesId(self): def activeQualityChangesId(self):
if self._active_container_stack: if self._active_container_stack:
changes = self._active_container_stack.qualityChanges changes = self._active_container_stack.qualityChanges
if changes: if changes and changes.getId() != "empty":
return changes.getId() return changes.getId()
return "" return ""