From 6f762c676ec39a2c1a294cb4a3e856f7e3373bba Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Tue, 23 Apr 2019 14:38:07 +0200 Subject: [PATCH 1/2] Set the printer type on printer configuration No idea why we didn't already do this Contributes to CL-1055 --- plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py index d2e18fcb75..3f3cd4cdd6 100644 --- a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py @@ -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) From 213a8fa6f3b293cb16a05541483d2bde9e646928 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Tue, 23 Apr 2019 14:40:03 +0200 Subject: [PATCH 2/2] Don't use compatible machien families for pills Contriutes to CL-1055 --- .../resources/qml/MonitorPrintJobCard.qml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml index a23b8ab0d3..b9156c02aa 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml @@ -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 } } }