3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 03:07:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Handle materials which don't have any quality profiles of their own. Moved the quality_type computation code into the QualityManager.

Browse source 
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
This commit is contained in:
Simon Edwards 2016-09-29 16:30:35 +02:00
parent f909ffca2e
commit cd45ef496b
3 changed files with 94 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

38
cura/Settings/ProfilesModel.py
View file

@ -3,8 +3,8 @@
from UM.Application import Application
from UM.Settings.Models.InstanceContainersModel import InstanceContainersModel
from UM.Settings.ContainerRegistry import ContainerRegistry
from cura.QualityManager import QualityManager
from cura.Settings.ExtruderManager import ExtruderManager
## QML Model for listing the current list of valid quality profiles.
@ -28,36 +28,18 @@ class ProfilesModel(InstanceContainersModel):
extruder_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()
if extruder_stacks:
# Multi-extruder machine detected.
# Determine the common set of quality types which can be
# applied to all of the materials for this machine.
quality_type_dict = self.__fetchQualityTypeDictForStack(extruder_stacks[0], global_machine_definition)
common_quality_types = set(quality_type_dict.keys())
for stack in extruder_stacks[1:]:
next_quality_type_dict = self.__fetchQualityTypeDictForStack(stack, global_machine_definition)
common_quality_types.intersection_update(set(next_quality_type_dict.keys()))
return [quality_type_dict[quality_type] for quality_type in common_quality_types]
materials = [stack.findContainer(type="material") for stack in extruder_stacks]
else:
# Machine with one extruder.
quality_type_dict = self.__fetchQualityTypeDictForStack(global_container_stack, global_machine_definition)
return list(quality_type_dict.values())
return []
def __fetchQualityTypeDictForStack(self, stack, global_machine_definition):
criteria = {"type": "quality" }
if global_machine_definition.getMetaDataEntry("has_machine_quality", False):
criteria["definition"] = global_machine_definition.getId()
if global_machine_definition.getMetaDataEntry("has_materials", False):
material = stack.findContainer(type="material")
criteria["material"] = material.getId()
else:
criteria["definition"] = "fdmprinter"
qualities = ContainerRegistry.getInstance().findInstanceContainers(**criteria)
materials = [global_container_stack.findContainer(type="material")]
quality_types = QualityManager.getInstance().findAllQualityTypesForMachineAndMaterials(global_machine_definition,
materials)
# Map the list of quality_types to InstanceContainers
qualities = QualityManager.getInstance().findAllQualitiesForMachineMaterial(global_machine_definition,
materials[0])
quality_type_dict = {}
for quality in qualities:
quality_type_dict[quality.getMetaDataEntry("quality_type")] = quality
return quality_type_dict
return [quality_type_dict[quality_type] for quality_type in quality_types]