Browse Source

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

Jaime van Kessel 5 years ago
parent
commit
46403a0fde

+ 2 - 7
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
                     }
                 }
             }

+ 1 - 0
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)