GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-03 16:15:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add a "Current Settings" instance container to the stack on stack creation

Browse Source
This commit is contained in:
Arjen Hiemstra 2016-05-16 18:11:51 +02:00
parent 08afad8973
commit efdf1d78d1
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cura/MachineManagerModel.py
View File

@ -1,12 +1,10 @@
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.Settings.ContainerRegistry import ContainerRegistry
from UM.Settings.ContainerStack import ContainerStack
from UM.Settings.InstanceContainer import InstanceContainer
from UM.Preferences import Preferences from UM.Preferences import Preferences
import UM.Settings
class MachineManagerModel(QObject): class MachineManagerModel(QObject):
def __init__(self, parent = None): def __init__(self, parent = None):
super().__init__(parent) super().__init__(parent)
@ -43,36 +41,42 @@ class MachineManagerModel(QObject):
@pyqtSlot(str) @pyqtSlot(str)
def setActiveMachine(self, stack_id): def setActiveMachine(self, stack_id):
containers = ContainerRegistry.getInstance().findContainerStacks(id = stack_id) containers = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = stack_id)
if containers: if containers:
Application.getInstance().setGlobalContainerStack(containers[0]) Application.getInstance().setGlobalContainerStack(containers[0])
@pyqtSlot(str, str) @pyqtSlot(str, str)
def addMachine(self,name, definition_id): def addMachine(self,name, definition_id):
definitions = ContainerRegistry.getInstance().findDefinitionContainers(id=definition_id) definitions = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id=definition_id)
if definitions: if definitions:
new_global_stack = ContainerStack(name) new_global_stack = UM.Settings.ContainerStack(name)
new_global_stack.addMetaDataEntry("type", "machine") new_global_stack.addMetaDataEntry("type", "machine")
ContainerRegistry.getInstance().addContainer(new_global_stack) UM.Settings.ContainerRegistry.getInstance().addContainer(new_global_stack)
## DEBUG CODE ## DEBUG CODE
material_instance_container = InstanceContainer("test_material") material_instance_container = UM.Settings.InstanceContainer("test_material")
material_instance_container.addMetaDataEntry("type", "material") material_instance_container.addMetaDataEntry("type", "material")
material_instance_container.setDefinition(definitions[0]) material_instance_container.setDefinition(definitions[0])
variant_instance_container = InstanceContainer("test_variant") variant_instance_container = UM.Settings.InstanceContainer("test_variant")
variant_instance_container.addMetaDataEntry("type", "variant") variant_instance_container.addMetaDataEntry("type", "variant")
variant_instance_container.setDefinition(definitions[0]) variant_instance_container.setDefinition(definitions[0])
quality_instance_container = InstanceContainer(name + "_quality") quality_instance_container = UM.Settings.InstanceContainer(name + "_quality")
current_settings_instance_container = InstanceContainer(name + "_current_settings") UM.Settings.ContainerRegistry.getInstance().addContainer(material_instance_container)
ContainerRegistry.getInstance().addContainer(material_instance_container) UM.Settings.ContainerRegistry.getInstance().addContainer(variant_instance_container)
ContainerRegistry.getInstance().addContainer(variant_instance_container)
current_settings_instance_container = UM.Settings.InstanceContainer(name + "_current_settings")
current_settings_instance_container.addMetaDataEntry("machine", name)
current_settings_instance_container.setDefinition(definitions[0])
UM.Settings.ContainerRegistry.getInstance().addContainer(current_settings_instance_container)
# If a definition is found, its a list. Should only have one item. # If a definition is found, its a list. Should only have one item.
new_global_stack.addContainer(definitions[0]) new_global_stack.addContainer(definitions[0])
new_global_stack.addContainer(material_instance_container) new_global_stack.addContainer(material_instance_container)
new_global_stack.addContainer(variant_instance_container) new_global_stack.addContainer(variant_instance_container)
new_global_stack.addContainer(current_settings_instance_container)
Application.getInstance().setGlobalContainerStack(new_global_stack) Application.getInstance().setGlobalContainerStack(new_global_stack)
@pyqtProperty(str, notify = globalContainerChanged) @pyqtProperty(str, notify = globalContainerChanged)
@ -97,7 +101,7 @@ class MachineManagerModel(QObject):
@pyqtSlot(str) @pyqtSlot(str)
def setActiveMaterial(self, material_id): def setActiveMaterial(self, material_id):
containers = ContainerRegistry.getInstance().findInstanceContainers(id=material_id) containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id=material_id)
old_material = Application.getInstance().getGlobalContainerStack().findContainer({"type":"material"}) old_material = Application.getInstance().getGlobalContainerStack().findContainer({"type":"material"})
if old_material: if old_material:
material_index = Application.getInstance().getGlobalContainerStack().getContainerIndex(old_material) material_index = Application.getInstance().getGlobalContainerStack().getContainerIndex(old_material)
@ -105,7 +109,7 @@ class MachineManagerModel(QObject):
@pyqtSlot(str) @pyqtSlot(str)
def setActiveVariant(self, variant_id): def setActiveVariant(self, variant_id):
containers = ContainerRegistry.getInstance().findInstanceContainers(id=variant_id) containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id=variant_id)
old_variant = Application.getInstance().getGlobalContainerStack().findContainer({"type": "variant"}) old_variant = Application.getInstance().getGlobalContainerStack().findContainer({"type": "variant"})
if old_variant: if old_variant:
variant_index = Application.getInstance().getGlobalContainerStack().getContainerIndex(old_variant) variant_index = Application.getInstance().getGlobalContainerStack().getContainerIndex(old_variant)
@ -126,7 +130,7 @@ class MachineManagerModel(QObject):
@pyqtSlot(str, str) @pyqtSlot(str, str)
def renameMachine(self, machine_id, new_name): def renameMachine(self, machine_id, new_name):
containers = ContainerRegistry.getInstance().findContainerStacks(id = machine_id) containers = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = machine_id)
if containers: if containers:
containers[0].setName(new_name) containers[0].setName(new_name)
@ -136,7 +140,7 @@ class MachineManagerModel(QObject):
@pyqtSlot(str) @pyqtSlot(str)
def removeMachine(self, machine_id): def removeMachine(self, machine_id):
ContainerRegistry.getInstance().removeContainer(machine_id) UM.Settings.ContainerRegistry.getInstance().removeContainer(machine_id)
@pyqtProperty(bool) @pyqtProperty(bool)
def hasMaterials(self): def hasMaterials(self):
@ -150,6 +154,5 @@ class MachineManagerModel(QObject):
# We should implement this properly when it's clear how a machine notifies us if it can handle variants # We should implement this properly when it's clear how a machine notifies us if it can handle variants
return True return True
def createMachineManagerModel(engine, script_engine): def createMachineManagerModel(engine, script_engine):
return MachineManagerModel() return MachineManagerModel()