From f82753b766fafcdf2e082a2c20e5bc2dd5a9a6f6 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Tue, 2 Jan 2018 09:39:20 +0000 Subject: [PATCH 1/2] Move optimize_wall_printing_order from experimental section to shell. Still not enabled by default yet but perhaps in the future after it has been tested more it will be. --- resources/definitions/fdmprinter.def.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 17f8b6826f..141bb48f18 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1168,6 +1168,14 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, + "optimize_wall_printing_order": + { + "label": "Optimize Wall Printing Order", + "description": "Optimize the order in which walls are printed so as to reduce the number of retractions and the distance travelled. Most parts will benefit from this being enabled but some may actually take longer so please compare the print time estimates with and without optimization.", + "type": "bool", + "default_value": false, + "settable_per_mesh": true + }, "outer_inset_first": { "label": "Outer Before Inner Walls", @@ -5216,14 +5224,6 @@ "description": "experimental!", "children": { - "optimize_wall_printing_order": - { - "label": "Optimize Wall Printing Order", - "description": "Optimize the order in which walls are printed so as to reduce the number of retractions and the distance travelled. Most parts will benefit from this being enabled but some may actually take longer so please compare the print time estimates with and without optimization.", - "type": "bool", - "default_value": false, - "settable_per_mesh": true - }, "support_skip_some_zags": { "label": "Break Up Support In Chunks", From 1796a182fac58692ef52c4bb3082dfd80fe61c9f Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Thu, 18 Jan 2018 11:54:30 +0100 Subject: [PATCH 2/2] CURA-4525 fix crashing cura due to empty build plate --- .../UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py index 9289981d64..548a350a57 100644 --- a/plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py @@ -286,7 +286,10 @@ class NetworkClusterPrinterOutputDevice(NetworkPrinterOutputDevice.NetworkPrinte gcode_list = getattr(Application.getInstance().getController().getScene(), "gcode_dict")[output_build_plate_number] if not gcode_list: # Empty build plate Logger.log("d", "Skipping empty job (build plate number %d).", output_build_plate_number) - return self.sendPrintJob() + if self._job_list: + return self.sendPrintJob() + else: + return self._send_gcode_start = time.time() Logger.log("d", "Sending print job [%s] to host, build plate [%s]..." % (file_name, output_build_plate_number))