From 9528791a79305778071d34c5a1a7fdc6160e7101 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Tue, 30 Jun 2020 12:26:03 +0200 Subject: [PATCH 1/4] Value of skin_outline_count reverts to 0 when concentric top/bottom used Part of CURA-6684 --- resources/definitions/fdmprinter.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8483b7a9cb..ba4eb6200c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1510,11 +1510,12 @@ { "label": "Extra Skin Wall Count", "description": "Replaces the outermost part of the top/bottom pattern with a number of concentric lines. Using one or two lines improves roofs that start on infill material.", + "value": "0 if top_bottom_pattern == 'concentric' else 1", "default_value": 1, "minimum_value": "0", "maximum_value_warning": "10", "type": "int", - "enabled": "top_layers > 0 or bottom_layers > 0", + "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, From 862e459f528fca37cf0823ff31866db531c2a1a6 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Tue, 30 Jun 2020 13:44:27 +0200 Subject: [PATCH 2/4] skin_outline_count is now determined with equation in default_value Failed on test `test_validateOverridingDefaultValue` previously. Part of CURA-6684 --- resources/definitions/fdmprinter.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ba4eb6200c..99236f7b7d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1510,8 +1510,7 @@ { "label": "Extra Skin Wall Count", "description": "Replaces the outermost part of the top/bottom pattern with a number of concentric lines. Using one or two lines improves roofs that start on infill material.", - "value": "0 if top_bottom_pattern == 'concentric' else 1", - "default_value": 1, + "default_value": "0 if top_bottom_pattern == 'concentric' else 1", "minimum_value": "0", "maximum_value_warning": "10", "type": "int", From 053c05b956c6ef6b263fd741921c9ba6973f2537 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Tue, 30 Jun 2020 14:29:09 +0200 Subject: [PATCH 3/4] skin_outline_count function is moved from default_value to value field Rolledback previous commit Part of CURA-6684 --- resources/definitions/fdmprinter.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 99236f7b7d..ba4eb6200c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1510,7 +1510,8 @@ { "label": "Extra Skin Wall Count", "description": "Replaces the outermost part of the top/bottom pattern with a number of concentric lines. Using one or two lines improves roofs that start on infill material.", - "default_value": "0 if top_bottom_pattern == 'concentric' else 1", + "value": "0 if top_bottom_pattern == 'concentric' else 1", + "default_value": 1, "minimum_value": "0", "maximum_value_warning": "10", "type": "int", From a2a6e8b3e965890c4a189cbe38af869a0d406b96 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Tue, 30 Jun 2020 14:30:38 +0200 Subject: [PATCH 4/4] skin_outline_count default_value changed to value Since the top container defines a default_value and a value Part of CURA-6684 --- resources/definitions/skriware_2.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index ab5532db81..2554689be4 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -447,7 +447,7 @@ "value": "5" }, "skin_outline_count": { - "default_value": 0 + "value": 0 }, "skirt_brim_speed": { "value": "10.0"