From f576e07c1161fb58b5bd99b12390f4a7cce6ea61 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 20 Oct 2020 09:49:11 +0200 Subject: [PATCH 1/2] Add "preparing" status in monitor page CURA-7745 --- .../UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index daa1eab1c7..05ad8d9929 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -359,6 +359,10 @@ Item { return catalog.i18nc("@label:status", "Idle") } + if (!printer.activePrintJob && printer.state == "pre_print") + { + return catalog.i18nc("@label:status", "Preparing...") + } if (!printer.activePrintJob && printer.state == "printing") { // The print job isn't quite updated yet. From 12aa1144835b47f7d390682a1ffc43761086642a Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Wed, 21 Oct 2020 15:31:34 +0200 Subject: [PATCH 2/2] Surround the addition the convexHull with try-except when loading a 3mf The buildplate meshes can be in .3mf format. When Cura is loading a printer, it may try to load its mesh from a 3mf file. At the moment cura is starting up there is no build volume yet, so adding a convexHull to the printer's 3mf buildplate mesh is not possible. By surrounding the addition of the convexHull with a try-except, loading of 3mf buildplate meshes on startup doesn't cause issues. Fixes https://github.com/Ultimaker/Cura/issues/8585 --- plugins/3MFReader/ThreeMFReader.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index c9e3689a0d..2e3f5630c1 100755 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -109,7 +109,10 @@ class ThreeMFReader(MeshReader): um_node = CuraSceneNode() # This adds a SettingOverrideDecorator um_node.addDecorator(BuildPlateDecorator(active_build_plate)) - um_node.addDecorator(ConvexHullDecorator()) + try: + um_node.addDecorator(ConvexHullDecorator()) + except: + pass um_node.setName(node_name) um_node.setId(node_id) transformation = self._createMatrixFromTransformationString(savitar_node.getTransformation())