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

Create extruder train for each train in a machine

Browse source 
We had the functionality, but this function was not yet called!

Contributes to issues CURA-1278 and CURA-340.
This commit is contained in:
Ghostkeeper 2016-06-06 14:17:00 +02:00
parent 927d33145f
commit d1be5b6c02
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cura/ExtruderManager.py
View file

@ -79,14 +79,14 @@ class ExtruderManager(QObject):
self._extruder_trains[machine_id][extruder_train.getMetaDataEntry("position")] = extruder_train.getId() self._extruder_trains[machine_id][extruder_train.getMetaDataEntry("position")] = extruder_train.getId()
self.extrudersChanged.emit() self.extrudersChanged.emit()
def createExtruderTrain(self, definition, extruder_id): def createExtruderTrain(self, extruder_definition, machine_definition, extruder_id):
container_registry = UM.Settings.ContainerRegistry.getInstance() container_registry = UM.Settings.ContainerRegistry.getInstance()
#Create a container stack for this extruder. #Create a container stack for this extruder.
name = self._uniqueName(extruder_id) name = self._uniqueName(extruder_id)
container_stack = UM.Settings.ContainerStack(name) container_stack = UM.Settings.ContainerStack(name)
container_stack.addMetaDataEntry("type", "extruder_train") container_stack.addMetaDataEntry("type", "extruder_train")
container_stack.addContainer(definition) container_stack.addContainer(extruder_definition)
""" """
Yes, I'm committing this code which needs to be transformed to work later. Yes, I'm committing this code which needs to be transformed to work later.
@ -136,6 +136,7 @@ class ExtruderManager(QObject):
#Add an empty user profile. #Add an empty user profile.
user_profile = UM.Settings.InstanceContainer(name + "_current_settings") user_profile = UM.Settings.InstanceContainer(name + "_current_settings")
user_profile.addMetaDataEntry("type", "user") user_profile.addMetaDataEntry("type", "user")
user_profile.setDefinition(machine_definition)
container_stack.addContainer(user_profile) container_stack.addContainer(user_profile)
container_registry.addContainer(user_profile) container_registry.addContainer(user_profile)

12
cura/MachineManagerModel.py
View file

@ -9,7 +9,7 @@ from UM.Logger import Logger
import UM.Settings import UM.Settings
from UM.Settings.Validator import ValidatorState from UM.Settings.Validator import ValidatorState
from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.InstanceContainer import InstanceContainer
from . import ExtruderManager
class MachineManagerModel(QObject): class MachineManagerModel(QObject):
def __init__(self, parent = None): def __init__(self, parent = None):
@ -133,7 +133,15 @@ class MachineManagerModel(QObject):
new_global_stack.addContainer(quality_instance_container) new_global_stack.addContainer(quality_instance_container)
new_global_stack.addContainer(current_settings_instance_container) new_global_stack.addContainer(current_settings_instance_container)
## Check if the machine has extruder trains for position, extruder_train_id in definitions.getMetaDataEntry("machine_extruder_trains", default = {}).items():
extruder_definition = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id = extruder_train_id)
if extruder_definition:
extruder_definition = extruder_definition[0]
else:
Logger.log("w", "Machine %s references an extruder with ID %s, which doesn't exist.", definition.getName(), extruder_train_id)
continue
ExtruderManager.getInstance().createExtruderTrain(extruder_definition, definition, extruder_train_id)
Application.getInstance().setGlobalContainerStack(new_global_stack) Application.getInstance().setGlobalContainerStack(new_global_stack)
# Create a name that is not empty and unique # Create a name that is not empty and unique