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

Move creating extruder manager logic to ExtruderManager

Browse source 
This logic was both in Extruder.py and in MachineManagerModel.py due to a planning mishap.

Contributes to issues CURA-1278 and CURA-340.
This commit is contained in:
Ghostkeeper 2016-06-06 13:41:49 +02:00
parent 79c37d667e
commit 927d33145f
6 changed files with 109 additions and 279 deletions
Download patch file Download diff file Expand all files Collapse all files

31
cura/MachineManagerModel.py
View file

@ -46,20 +46,9 @@ class MachineManagerModel(QObject):
activeVariantChanged = pyqtSignal()
activeQualityChanged = pyqtSignal()
activeExtruderChanged = pyqtSignal()
globalValueChanged = pyqtSignal() # Emitted whenever a value inside global container is changed.
globalValidationChanged = pyqtSignal() # Emitted whenever a validation inside global container is changed.
@pyqtProperty(str, notify=activeExtruderChanged)
def activeExtruderStackId(self):
return self.extrudersIds[str(self._active_extruder_index)]
@pyqtSlot(int)
def setActiveExtruderIndex(self, index):
self._active_extruder_index = index
self.activeExtruderChanged.emit()
@pyqtProperty("QVariantMap", notify = globalContainerChanged)
def extrudersIds(self):
## Find all extruders that reference the new stack
@ -145,26 +134,6 @@ class MachineManagerModel(QObject):
new_global_stack.addContainer(current_settings_instance_container)
## Check if the machine has extruder trains
extruder_trains = definition.getMetaDataEntry("machine_extruder_trains", {})
for extruder in extruder_trains:
extruder_train_stack = UM.Settings.ContainerStack(name + "_extruder_" + extruder)
extruder_train_stack.addMetaDataEntry("type", "extruder")
extruder_train_stack.addMetaDataEntry("machine", name) # What global stack is this extruder linked with?
extruder_train_stack.addMetaDataEntry("position", extruder) # What is the position of the extruder (as defined by machine definition)
extruder_definitions = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id=extruder_trains[extruder])
if extruder_definitions:
extruder_train_stack.addContainer(extruder_definitions[0])
current_settings_container_extruder = UM.Settings.InstanceContainer(extruder_train_stack.getName() + "_current_settings")
current_settings_container_extruder.addMetaDataEntry("machine", name)
current_settings_container_extruder.addMetaDataEntry("type", "user")
current_settings_container_extruder.setDefinition(definition)
UM.Settings.ContainerRegistry.getInstance().addContainer(current_settings_container_extruder)
extruder_train_stack.addContainer(current_settings_container_extruder)
extruder_train_stack.setNextStack(new_global_stack)
UM.Settings.ContainerRegistry.getInstance().addContainer(extruder_train_stack)
else:
Logger.log("W", "Unable to find definition for extruder")
Application.getInstance().setGlobalContainerStack(new_global_stack)
# Create a name that is not empty and unique