3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix typing and deduplicate fetch_layer_height

Browse source 
CURA-6840
This commit is contained in:
Nino van Hooff 2019-10-04 13:25:58 +02:00
parent 68f334e141
commit 88e0a57374
3 changed files with 49 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

48
cura/Machines/Models/QualityProfilesDropDownMenuModel.py
View file

@ -2,17 +2,12 @@
# Cura is released under the terms of the LGPLv3 or higher.
from PyQt5.QtCore import Qt, QTimer
from typing import TYPE_CHECKING
from UM.Logger import Logger
from UM.Qt.ListModel import ListModel
from UM.Settings.SettingFunction import SettingFunction
import cura.CuraApplication # Imported this way to prevent circular dependencies.
from UM.Logger import Logger
from UM.Qt.ListModel import ListModel
from cura.Machines.ContainerTree import ContainerTree
if TYPE_CHECKING:
from cura.Machines.QualityGroup import QualityGroup
from cura.Machines.Models.MachineModelUtils import fetch_layer_height
#
@ -76,6 +71,12 @@ class QualityProfilesDropDownMenuModel(ListModel):
Logger.log("d", "No active GlobalStack, set quality profile model as empty.")
return
if not self._layer_height_unit:
unit = global_stack.definition.getProperty("layer_height", "unit")
if not unit:
unit = ""
self._layer_height_unit = unit
# Check for material compatibility
if not cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMaterialsCompatible():
Logger.log("d", "No active material compatibility, set quality profile model as empty.")
@ -86,7 +87,7 @@ class QualityProfilesDropDownMenuModel(ListModel):
item_list = []
for quality_group in quality_group_dict.values():
layer_height = self._fetchLayerHeight(quality_group)
layer_height = fetch_layer_height(quality_group)
item = {"name": quality_group.name,
"quality_type": quality_group.quality_type,
@ -102,32 +103,3 @@ class QualityProfilesDropDownMenuModel(ListModel):
item_list = sorted(item_list, key = lambda x: x["layer_height"])
self.setItems(item_list)
def _fetchLayerHeight(self, quality_group: "QualityGroup") -> float:
global_stack = cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMachine
if not self._layer_height_unit:
unit = global_stack.definition.getProperty("layer_height", "unit")
if not unit:
unit = ""
self._layer_height_unit = unit
default_layer_height = global_stack.definition.getProperty("layer_height", "value")
# Get layer_height from the quality profile for the GlobalStack
if quality_group.node_for_global is None:
return float(default_layer_height)
container = quality_group.node_for_global.container
layer_height = default_layer_height
if container and container.hasProperty("layer_height", "value"):
layer_height = container.getProperty("layer_height", "value")
else:
# Look for layer_height in the GlobalStack from material -> definition
container = global_stack.definition
if container and container.hasProperty("layer_height", "value"):
layer_height = container.getProperty("layer_height", "value")
if isinstance(layer_height, SettingFunction):
layer_height = layer_height(global_stack)
return float(layer_height)