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

LegacyUM3 now correctly gets material set

Browse source 
CL-541
This commit is contained in:
Jaime van Kessel 2017-11-21 16:26:17 +01:00
parent e3d07f1806
commit d8b12be5e4
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py
View file

@ -1,8 +1,10 @@
from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel
from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
from UM.Logger import Logger from UM.Logger import Logger
from UM.Settings.ContainerRegistry import ContainerRegistry
from PyQt5.QtNetwork import QNetworkRequest from PyQt5.QtNetwork import QNetworkRequest
@ -70,10 +72,28 @@ class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice):
for index in range(0, self._number_of_extruders): for index in range(0, self._number_of_extruders):
temperatures = result["heads"][0]["extruders"][index]["hotend"]["temperature"] temperatures = result["heads"][0]["extruders"][index]["hotend"]["temperature"]
printer.extruders[index].updateTargetHotendTemperature(temperatures["target"]) extruder = printer.extruders[index]
printer.extruders[index].updateHotendTemperature(temperatures["current"]) extruder.updateTargetHotendTemperature(temperatures["target"])
extruder.updateHotendTemperature(temperatures["current"])
# TODO: Set active material material_guid = result["heads"][0]["extruders"][index]["active_material"]["guid"]
if extruder.activeMaterial is None or extruder.activeMaterial.guid != material_guid:
# Find matching material (as we need to set brand, type & color)
containers = ContainerRegistry.getInstance().findInstanceContainers(type="material",
GUID=material_guid)
if containers:
color = containers[0].getMetaDataEntry("color_code")
brand = containers[0].getMetaDataEntry("brand")
material_type = containers[0].getMetaDataEntry("material")
else:
# Unknown material.
color = "#00000000"
brand = "Unknown"
material_type = "Unknown"
material = MaterialOutputModel(guid=material_guid, type=material_type,
brand=brand, color=color)
extruder.updateActiveMaterial(material)
try: try:
hotend_id = result["heads"][0]["extruders"][index]["hotend"]["id"] hotend_id = result["heads"][0]["extruders"][index]["hotend"]["id"]

2
resources/qml/PrinterOutput/ExtruderBox.qml
View file

@ -136,7 +136,7 @@ Item
Label //Material name. Label //Material name.
{ {
id: materialName id: materialName
text: extruderModel.activeMaterial != null ? extruderModel.activeMaterial.name : "" text: extruderModel.activeMaterial != null ? extruderModel.activeMaterial.type : ""
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
anchors.left: materialColor.right anchors.left: materialColor.right