diff --git a/cura/MachineManagerModel.py b/cura/MachineManagerModel.py
index 7aa99e1b09..e5c2989362 100644
--- a/cura/MachineManagerModel.py
+++ b/cura/MachineManagerModel.py
@@ -4,6 +4,7 @@
from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal
from UM.Application import Application
from UM.Preferences import Preferences
+from UM.Logger import Logger
import UM.Settings
from UM.Settings.Validator import ValidatorState
@@ -51,6 +52,7 @@ class MachineManagerModel(QObject):
active_machine_id = Preferences.getInstance().getValue("cura/active_machine")
+ self._printer_output_devices = []
Application.getInstance().getOutputDeviceManager().outputDevicesChanged.connect(self._onOutputDevicesChanged)
if active_machine_id != "":
@@ -72,8 +74,52 @@ class MachineManagerModel(QObject):
outputDevicesChanged = pyqtSignal()
def _onOutputDevicesChanged(self):
+ for printer_output_device in self._printer_output_devices:
+ printer_output_device.hotendIdChanged.disconnect(self._onHotendIdChanged)
+ printer_output_device.materialIdChanged.disconnect(self._onMaterialIdChanged)
+
+ self._printer_output_devices.clear()
+
+ for printer_output_device in Application.getInstance().getOutputDeviceManager().getOutputDevices():
+ if isinstance(printer_output_device, PrinterOutputDevice):
+ self._printer_output_devices.append(printer_output_device)
+ printer_output_device.hotendIdChanged.connect(self._onHotendIdChanged)
+ printer_output_device.materialIdChanged.connect(self._onMaterialIdChanged)
+
self.outputDevicesChanged.emit()
+ @pyqtProperty("QVariantList", notify = outputDevicesChanged)
+ def printerOutputDevices(self):
+ return self._printer_output_devices
+
+ def _onHotendIdChanged(self, index, hotend_id):
+ if not self._global_container_stack:
+ return
+
+ containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "variant", definition = self._global_container_stack.getBottom().getId(), name = hotend_id)
+ if containers:
+ Logger.log("d", "Setting hotend variant of hotend %d to %s" % (index, containers[0].getId()))
+ ExtruderManager.ExtruderManager.getInstance().setActiveExtruderIndex(index)
+ self.setActiveVariant(containers[0].getId())
+
+ def _onMaterialIdChanged(self, index, material_id):
+ # TODO: fix this
+ if not self._global_container_stack:
+ return
+
+ definition_id = "fdmprinter"
+ if self._global_container_stack.getMetaDataEntry("has_machine_materials", False):
+ definition_id = self._global_container_stack.getBottom().getId()
+
+ containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "material", definition = definition_id, GUID = material_id)
+ if containers:
+ Logger.log("d", "Setting material of hotend %d to %s" % (index, containers[0].getId()))
+ ExtruderManager.ExtruderManager.getInstance().setActiveExtruderIndex(index)
+ self.setActiveMaterial(containers[0].getId())
+ else:
+ Logger.log("w", "No material definition found for printer definition %s and GUID %s" % (definition_id, material_id))
+
+
def _onGlobalPropertyChanged(self, key, property_name):
if property_name == "value":
self.globalValueChanged.emit()
@@ -165,9 +211,6 @@ class MachineManagerModel(QObject):
Application.getInstance().setGlobalContainerStack(new_global_stack)
- @pyqtProperty("QVariantList", notify = outputDevicesChanged)
- def printerOutputDevices(self):
- return [printer_output_device for printer_output_device in Application.getInstance().getOutputDeviceManager().getOutputDevices() if isinstance(printer_output_device, PrinterOutputDevice)]
## Create a name that is not empty and unique
# \param container_type \type{string} Type of the container (machine, quality, ...)
diff --git a/cura/PrinterOutputDevice.py b/cura/PrinterOutputDevice.py
index 7f6e51e1fd..212ed86ab3 100644
--- a/cura/PrinterOutputDevice.py
+++ b/cura/PrinterOutputDevice.py
@@ -24,6 +24,8 @@ class PrinterOutputDevice(QObject, OutputDevice):
self._num_extruders = 1
self._hotend_temperatures = [0] * self._num_extruders
self._target_hotend_temperatures = [0] * self._num_extruders
+ self._material_ids = [""] * self._num_extruders
+ self._hotend_ids = [""] * self._num_extruders
self._progress = 0
self._head_x = 0
self._head_y = 0
@@ -57,6 +59,12 @@ class PrinterOutputDevice(QObject, OutputDevice):
# Signal to be emitted when head position is changed (x,y,z)
headPositionChanged = pyqtSignal()
+ # Signal to be emitted when either of the material ids is changed
+ materialIdChanged = pyqtSignal(int, str, arguments = ["index", "id"])
+
+ # Signal to be emitted when either of the hotend ids is changed
+ hotendIdChanged = pyqtSignal(int, str, arguments = ["index", "id"])
+
# Signal that is emitted every time connection state is changed.
# it also sends it's own device_id (for convenience sake)
connectionStateChanged = pyqtSignal(str)
@@ -212,6 +220,34 @@ class PrinterOutputDevice(QObject, OutputDevice):
self._hotend_temperatures[index] = temperature
self.hotendTemperaturesChanged.emit()
+ @pyqtProperty("QVariantList", notify = materialIdChanged)
+ def materialIds(self):
+ return self._material_ids
+
+ ## Protected setter for the current material id.
+ # /param index Index of the extruder
+ # /param material_id id of the material
+ def _setMaterialId(self, index, material_id):
+ if material_id and material_id != "" and material_id != self._material_ids[index]:
+ Logger.log("d", "Setting material id of hotend %d to %s" % (index, material_id))
+ self._material_ids[index] = material_id
+ self.materialIdChanged.emit(index, material_id)
+
+
+ @pyqtProperty("QVariantList", notify = hotendIdChanged)
+ def hotendIds(self):
+ return self._hotend_ids
+
+ ## Protected setter for the current hotend id.
+ # /param index Index of the extruder
+ # /param hotend_id id of the hotend
+ def _setHotendId(self, index, hotend_id):
+ if hotend_id and hotend_id != "" and hotend_id != self._hotend_ids[index]:
+ Logger.log("d", "Setting hotend id of hotend %d to %s" % (index, hotend_id))
+ self._hotend_ids[index] = hotend_id
+ self.hotendIdChanged.emit(index, hotend_id)
+
+
## Attempt to establish connection
def connect(self):
raise NotImplementedError("connect needs to be implemented")
diff --git a/resources/materials/generic_abs.xml.fdm_material b/resources/materials/generic_abs.xml.fdm_material
index 654b06d221..82b2f1f963 100644
--- a/resources/materials/generic_abs.xml.fdm_material
+++ b/resources/materials/generic_abs.xml.fdm_material
@@ -9,7 +9,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
ABS
Generic
- 506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9
+ 60636bb4-518f-42e7-8237-fe77b194ebe0
0
#FF0000
diff --git a/resources/materials/generic_cpe.xml.fdm_material b/resources/materials/generic_cpe.xml.fdm_material
index bbe6e328d2..8ac4dd8c71 100644
--- a/resources/materials/generic_cpe.xml.fdm_material
+++ b/resources/materials/generic_cpe.xml.fdm_material
@@ -9,7 +9,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
CPE
Generic
- 506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9
+ 12f41353-1a33-415e-8b4f-a775a6c70cc6
0
#0000FF
diff --git a/resources/materials/generic_pla.xml.fdm_material b/resources/materials/generic_pla.xml.fdm_material
index 40432d5849..2f8fa165cf 100644
--- a/resources/materials/generic_pla.xml.fdm_material
+++ b/resources/materials/generic_pla.xml.fdm_material
@@ -9,7 +9,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
PLA
Generic
- 506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9
+ 86a89ceb-4159-47f6-ab97-e9953803d70f
0
#00FF00