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

Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1

Browse Source
This commit is contained in:
Jaime van Kessel 2019-04-24 16:03:42 +02:00
commit 46403a0fde
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml
View File

@ -158,14 +158,9 @@ Item
spacing: 6 // TODO: Theme!
visible: printJob
Repeater
MonitorPrinterPill
{
id: compatiblePills
delegate: MonitorPrinterPill
{
text: modelData
}
model: printJob ? printJob.compatibleMachineFamilies : []
text: printJob.configuration.printerType
}
}
}

1
plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py
View File

@ -535,6 +535,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
extruder.setMaterial(self._createMaterialOutputModel(extruder_data.get("material", {})))
configuration.setExtruderConfigurations(extruders)
configuration.setPrinterType(data.get("machine_variant", ""))
print_job.updateConfiguration(configuration)
print_job.setCompatibleMachineFamilies(data.get("compatible_machine_families", []))
print_job.stateChanged.connect(self._printJobStateChanged)