3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Use metadata to determine what materials/qualities to use when adding a machine

Browse source 
Contributes to CURA-1612
This commit is contained in:
Arjen Hiemstra 2016-06-02 08:07:04 +02:00
parent eaea940aa2
commit 123af4e3e4
1 changed files with 64 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

97
cura/MachineManagerModel.py
View file

@ -1,11 +1,13 @@
import re
from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal
from UM.Application import Application from UM.Application import Application
from UM.Preferences import Preferences from UM.Preferences import Preferences
from UM.Logger import Logger
import UM.Settings import UM.Settings
import re
class MachineManagerModel(QObject): class MachineManagerModel(QObject):
def __init__(self, parent = None): def __init__(self, parent = None):
@ -74,43 +76,48 @@ class MachineManagerModel(QObject):
empty_container = UM.Settings.ContainerRegistry.getInstance().getEmptyInstanceContainer() empty_container = UM.Settings.ContainerRegistry.getInstance().getEmptyInstanceContainer()
variants = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "variant", definition = definition.id)
if variants:
new_global_stack.addMetaDataEntry("has_variants", True)
preferred_variant_id = definitions[0].getMetaDataEntry("preferred_variant")
variant_instance_container = empty_container variant_instance_container = empty_container
if preferred_variant_id: if definition.getMetaDataEntry("has_variants"):
preferred_variant_id = preferred_variant_id.lower() variant_instance_container = self._getPreferredContainer(definition, "preferred_variant", empty_container)
container = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = preferred_variant_id)
if container:
variant_instance_container = container[0]
if variants and variant_instance_container == empty_container: if variant_instance_container == empty_container:
variant_instance_container = variants[0] variants = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "variant", definition = definition.id)
if variants:
variant_instance_container = variants[0]
materials = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "material", definition = definition.id) if variant_instance_container == empty_container:
if materials: Logger.log("w", "Machine %s defines it has variants but no variants found", definition.id)
new_global_stack.addMetaDataEntry("has_materials", True)
preferred_material_id = definitions[0].getMetaDataEntry("preferred_material")
material_instance_container = empty_container material_instance_container = empty_container
if preferred_material_id: if definition.getMetaDataEntry("has_materials"):
preferred_material_id = preferred_material_id.lower() material_instance_container = self._getPreferredContainer(definition, "preferred_material", empty_container)
container = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = preferred_material_id)
if container:
material_instance_container = container[0]
if materials and material_instance_container == empty_container: if material_instance_container == empty_container:
material_instance_container = materials[0] materials = None
if definition.getMetaDataEntry("has_machine_materials"):
if variant_instance_container != empty_container:
materials = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "material", definition = definition.id, variant = variant_instance_container.id)
else:
materials = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "material", definition = definition.id)
else:
materials = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "material", definition = "fdmprinter")
preferred_quality_id = definitions[0].getMetaDataEntry("preferred_quality") if materials:
quality_instance_container = empty_container material_instance_container = materials[0]
if preferred_quality_id:
preferred_quality_id = preferred_quality_id.lower() quality_instance_container = self._getPreferredContainer(definition, "preferred_quality", empty_container)
container = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = preferred_quality_id)
if container: if quality_instance_container == empty_container:
quality_instance_container = container[0] if definition.getMetaDataEntry("has_machine_quality"):
if material_instance_container:
qualities = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "quality", definition = definition.id, material = material_instance_container.id)
else:
qualities = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "quality", definition = definition.id)
else:
qualities = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "quality", definition = "fdmprinter")
if qualities:
quality_instance_container = qualities[0]
current_settings_instance_container = UM.Settings.InstanceContainer(name + "_current_settings") current_settings_instance_container = UM.Settings.InstanceContainer(name + "_current_settings")
current_settings_instance_container.addMetaDataEntry("machine", name) current_settings_instance_container.addMetaDataEntry("machine", name)
@ -277,16 +284,40 @@ class MachineManagerModel(QObject):
@pyqtProperty(bool, notify = globalContainerChanged) @pyqtProperty(bool, notify = globalContainerChanged)
def hasMaterials(self): def hasMaterials(self):
if self._global_container_stack: if self._global_container_stack:
return self._global_container_stack.getMetaDataEntry("has_materials", False) return bool(self._global_container_stack.getMetaDataEntry("has_materials", False))
return False return False
@pyqtProperty(bool, notify = globalContainerChanged) @pyqtProperty(bool, notify = globalContainerChanged)
def hasVariants(self): def hasVariants(self):
if self._global_container_stack: if self._global_container_stack:
return self._global_container_stack.getMetaDataEntry("has_variants", False) return bool(self._global_container_stack.getMetaDataEntry("has_variants", False))
return False return False
@pyqtProperty(bool, notify = globalContainerChanged)
def filterMaterialsByMachine(self):
if self._global_container_stack:
return bool(self._global_container_stack.getMetaDataEntry("has_machine_materials", False))
return False
@pyqtProperty(bool, notify = globalContainerChanged)
def filterQualityByMachine(self):
if self._global_container_stack:
return bool(self._global_container_stack.getMetaDataEntry("has_machine_quality", False))
return False
def _getPreferredContainer(self, definition, property_name, default_container):
preferred_id = definition.getMetaDataEntry(property_name)
if preferred_id:
preferred_variant_id = preferred_variant_id.lower()
container = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = preferred_variant_id)
if container:
return container[0]
return default_container
def createMachineManagerModel(engine, script_engine): def createMachineManagerModel(engine, script_engine):
return MachineManagerModel() return MachineManagerModel()