From 8cc4063160101e5242f783316d67cb47a5e16da5 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 12 Oct 2018 12:11:30 +0200 Subject: [PATCH 1/4] feat: option to specify the very bottom thickness --- resources/definitions/fdmprinter.def.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index efa6b9a78c..83c0b88088 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1176,6 +1176,18 @@ "value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true + }, + "initial_bottom_layers": + { + "label": "Initial Bottom Layers", + "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.", + "minimum_value": "0", + "minimum_value_warning": "2", + "default_value": 6, + "type": "int", + "value": "bottom_layers", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true } } } From c7a6fa4a006eb8a56c48f9f2eeafddc6603c63c0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 18 Oct 2019 11:59:21 +0200 Subject: [PATCH 2/4] Remove fixed override of prime tower position Now it uses the calculated value from fdm_printer, which is way smarter about it --- resources/definitions/ultimaker_s5.def.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index dfa8da5397..7eb37d0614 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -70,8 +70,6 @@ "extruder_prime_pos_abs": { "default_value": true }, "machine_start_gcode": { "default_value": "" }, "machine_end_gcode": { "default_value": "" }, - "prime_tower_position_x": { "value": "345" }, - "prime_tower_position_y": { "value": "222.5" }, "prime_blob_enable": { "enabled": true, "default_value": false }, "speed_travel": From 15bdf0fa1c16ae3f45c97c7ef91fa3c97787e38d Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 18 Oct 2019 14:00:16 +0200 Subject: [PATCH 3/4] Change the description of 'Initial Bottom Layers'. part of CURA-5918 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8f115c2ed2..5f43cb0bfd 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1194,7 +1194,7 @@ "initial_bottom_layers": { "label": "Initial Bottom Layers", - "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.", + "description": "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number.", "minimum_value": "0", "minimum_value_warning": "2", "default_value": 6, From 25d76aee5ac19d36ce9485be019575b77dbe08ad Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 18 Oct 2019 14:46:44 +0200 Subject: [PATCH 4/4] Workaround: Make the type-checker understand what's going on. --- plugins/CuraEngineBackend/StartSliceJob.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 94f6d3edfa..29a6d8ff30 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -107,7 +107,8 @@ class StartSliceJob(Job): return False # if there are no per-object settings we don't need to check the other settings here - if stack.getTop() is None or not stack.getTop().getAllKeys(): + stack_top = stack.getTop() + if stack_top is None or not stack_top.getAllKeys(): return False for key in stack.getAllKeys():