From ae00fc2a7eca8c7754dc29031937890590ba81fe Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Tue, 27 Feb 2018 15:15:04 +0100 Subject: [PATCH] CURA-4606 change activeQualityLayerHeight to use self._current_quality(_changes)_group --- cura/Settings/MachineManager.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 627e7661ba..5abd5d4649 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -472,21 +472,17 @@ class MachineManager(QObject): def activeQualityLayerHeight(self) -> float: if not self._global_container_stack: return 0 - - quality_changes = self._global_container_stack.qualityChanges - if quality_changes: - value = self._global_container_stack.getRawProperty("layer_height", "value", skip_until_container = quality_changes.getId()) + if self._current_quality_changes_group: + value = self._global_container_stack.getRawProperty("layer_height", "value", skip_until_container = self._global_container_stack.qualityChanges.getId()) if isinstance(value, SettingFunction): value = value(self._global_container_stack) return value - quality = self._global_container_stack.quality - if quality: - value = self._global_container_stack.getRawProperty("layer_height", "value", skip_until_container = quality.getId()) + elif self._current_quality_group: + value = self._global_container_stack.getRawProperty("layer_height", "value", skip_until_container = self._global_container_stack.quality.getId()) if isinstance(value, SettingFunction): value = value(self._global_container_stack) return value - - return 0 # No quality profile. + return 0 @pyqtProperty(str, notify = activeVariantChanged) def globalVariantName(self) -> str: