JSON+profiles: removed shell thickness as a whole (CURA-1309)

resources/machines/RigidBot.json

@@ -37,7 +37,6 @@
 
     "overrides": { 
         "layer_height": { "default": 0.2 },
-        "shell_thickness": { "default": 0.8 },
         "wall_thickness": { "default": 0.8 },
         "top_bottom_thickness": { "default": 0.3, "visible": true },
         "material_print_temperature": { "default": 195, "visible": true },

resources/machines/RigidBotBig.json

@@ -35,7 +35,6 @@
 
     "overrides": { 
         "layer_height": { "default": 0.2 },
-        "shell_thickness": { "default": 0.8},
         "wall_thickness": { "default": 0.8 },
         "top_bottom_thickness": { "default": 0.3, "visible": true },
         "material_print_temperature": { "default": 195, "visible": true },

resources/machines/bq_hephestos.json

@@ -40,7 +40,6 @@
     "overrides": {
         "layer_height": { "default": 0.2 },
         "layer_height_0": { "default": 0.2, "visible": false },
-        "shell_thickness": { "default": 1.0 },
         "wall_thickness": { "default": 1.0, "visible": false },
         "top_bottom_thickness": { "default": 1.0, "visible": false},
         "bottom_thickness": { "default": 1.0, "visible": false },

resources/machines/bq_hephestos_2.json

@@ -43,7 +43,6 @@
         "material_diameter": { "default": 1.75 },
         "layer_height": { "default": 0.2 },
         "layer_height_0": { "default": 0.2, "visible": true },
-        "shell_thickness": { "default": 1.2 },
         "wall_line_count": { "default": 3, "visible": false },
         "wall_thickness": { "default": 1.2, "visible": false },
         "top_bottom_thickness": { "default": 1.2, "visible": false },

resources/machines/bq_hephestos_xl.json

@@ -40,7 +40,6 @@
     "overrides": {
         "layer_height": { "default": 0.2 },
         "layer_height_0": { "default": 0.2, "visible": false },
-        "shell_thickness": { "default": 1.0 },
         "wall_thickness": { "default": 1.0, "visible": false },
         "top_bottom_thickness": { "default": 1.0, "visible": false},
         "bottom_thickness": { "default": 1.0, "visible": false },

resources/machines/bq_witbox.json

@@ -40,7 +40,6 @@
     "overrides": {
         "layer_height": { "default": 0.2 },
         "layer_height_0": { "default": 0.2, "visible": false },
-        "shell_thickness": { "default": 1.0 },
         "wall_thickness": { "default": 1.0, "visible": false },
         "top_bottom_thickness": { "default": 1.0, "visible": false},
         "bottom_thickness": { "default": 1.0, "visible": false },

resources/machines/bq_witbox_2.json

@@ -43,7 +43,6 @@
         "material_diameter": { "default": 1.75 },
         "layer_height": { "default": 0.2 },
         "layer_height_0": { "default": 0.2, "visible": true },
-        "shell_thickness": { "default": 1.2 },
         "wall_line_count": { "default": 3, "visible": false },
         "wall_thickness": { "default": 1.2, "visible": false },
         "top_bottom_thickness": { "default": 1.2, "visible": false },

resources/machines/fdmprinter.json

@@ -340,92 +340,78 @@
             "visible": true,
             "icon": "category_shell",
             "settings": {
-                "shell_thickness": {
+                "wall_thickness": {
-                    "label": "Shell Thickness",
+                    "label": "Wall Thickness",
-                    "description": "The thickness of the outside shell in the horizontal and vertical direction. This is used in combination with the nozzle size to define the number of perimeter lines and the thickness of those perimeter lines. This is also used to define the number of solid top and bottom layers.",
+                    "description": "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls.",
                     "unit": "mm",
-                    "type": "float",
                     "default": 0.8,
                     "min_value": "0",
-                    "min_value_warning": "0.2",
+                    "min_value_warning": "line_width",
-                    "max_value_warning": "5",
+                    "max_value_warning": "5 * line_width",
-                    "visible": false,
+                    "type": "float",
-                    "enabled": "False",
+                    "visible": true,
                     "children": {
-                        "wall_thickness": {
+                        "wall_line_count": {
-                            "label": "Wall Thickness",
+                            "label": "Wall Line Count",
-                            "description": "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls.",
+                            "description": "The number of walls. When calculated by the wall thickness, this value is rounded to a whole number.",
+                            "default": 2,
+                            "min_value": "0",   
+                            "type": "int",
+                            "visible": false,
+                            "inherit_function": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1)"
+                        }
+                    }
+                },
+                "top_bottom_thickness": {
+                    "label": "Top/Bottom Thickness",
+                    "description": " The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.",
+                    "unit": "mm",
+                    "default": 0.8,
+                    "min_value": "0",
+                    "max_value": "5",
+                    "min_value_warning": "0.6",
+                    "type": "float",
+                    "visible": true,
+                    "children": {
+                        "top_thickness": {
+                            "label": "Top Thickness",
+                            "description": "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers.",
                             "unit": "mm",
                             "default": 0.8,
                             "min_value": "0",
-                            "min_value_warning": "line_width",
+                            "max_value_warning": "100",
-                            "max_value_warning": "5 * line_width",
                             "type": "float",
-                            "visible": true,
+                            "visible": false,
                             "children": {
-                                "wall_line_count": {
+                                "top_layers": {
-                                    "label": "Wall Line Count",
+                                    "label": "Top Layers",
-                                    "description": "The number of walls. When calculated by the wall thickness, this value is rounded to a whole number.",
+                                    "description": "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number.",
-                                    "default": 2,
+                                    "default": 8,
-                                    "min_value": "0",   
+                                    "min_value": "0",
+                                    "max_value_warning": "100",
                                     "type": "int",
                                     "visible": false,
-                                    "inherit_function": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1)"
+                                    "inherit_function": "0 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)"
                                 }
                             }
                         },
-                        "top_bottom_thickness": {
+                        "bottom_thickness": {
-                            "label": "Top/Bottom Thickness",
+                            "label": "Bottom Thickness",
-                            "description": " The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.",
+                            "description": "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers.",
                             "unit": "mm",
-                            "default": 0.8,
+                            "default": 0.6,
                             "min_value": "0",
-                            "max_value": "5",
-                            "min_value_warning": "0.6",
                             "type": "float",
-                            "visible": true,
+                            "visible": false,
                             "children": {
-                                "top_thickness": {
+                                "bottom_layers": {
-                                    "label": "Top Thickness",
+                                    "label": "Bottom Layers",
-                                    "description": "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers.",
+                                    "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.",
-                                    "unit": "mm",
-                                    "default": 0.8,
                                     "min_value": "0",
-                                    "max_value_warning": "100",
+                                    "default": 6,
-                                    "type": "float",
+                                    "type": "int",
                                     "visible": false,
-                                    "children": {
+                                    "inherit_function": "999999 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)"
-                                        "top_layers": {
-                                            "label": "Top Layers",
-                                            "description": "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number.",
-                                            "default": 8,
-                                            "min_value": "0",
-                                            "max_value_warning": "100",
-                                            "type": "int",
-                                            "visible": false,
-                                            "inherit_function": "0 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)"
-                                        }
-                                    }
-                                },
-                                "bottom_thickness": {
-                                    "label": "Bottom Thickness",
-                                    "description": "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers.",
-                                    "unit": "mm",
-                                    "default": 0.6,
-                                    "min_value": "0",
-                                    "type": "float",
-                                    "visible": false,
-                                    "children": {
-                                        "bottom_layers": {
-                                            "label": "Bottom Layers",
-                                            "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.",
-                                            "min_value": "0",
-                                            "default": 6,
-                                            "type": "int",
-                                            "visible": false,
-                                            "inherit_function": "999999 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)"
-                                        }
-                                    }
                                 }
                             }
                         }

resources/machines/innovo-inventor.json

@@ -30,7 +30,6 @@
 
     "overrides": {
         "layer_height": { "default": 0.15},
-        "shell_thickness": { "default": 0.8},
         "wall_thickness": { "default": 0.8},
         "top_bottom_thickness": { "default": 0.3, "visible": true},
         "material_print_temperature": { "default": 215, "visible": true},

resources/profiles/general/Low+Quality.cfg

@@ -10,6 +10,6 @@ cool_min_layer_time = 3
 speed_wall_0 = 40
 speed_wall_x = 80
 speed_infill = 100
-shell_thickness = 1
+wall_thickness = 1
 speed_topbottom = 30
 

resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile

@@ -10,7 +10,7 @@ weight = -2
 line_width = 0.22
 layer_height = 0.06
 layer_height_0 = 0.15
-shell_thickness = 0.88
+wall_thickness = 0.88
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 retraction_amount = 6

resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile

@@ -10,7 +10,7 @@ weight = -1
 line_width = 0.35
 layer_height = 0.15
 layer_height_0 = 0.26
-shell_thickness = 0.7
+wall_thickness = 0.7
 top_bottom_thickness = 0.6
 infill_sparse_density = 18
 retraction_amount = 5.5

resources/profiles/ultimaker2+/pla_0.4_high.curaprofile

@@ -10,7 +10,7 @@ weight = -3
 line_width = 0.35
 layer_height = 0.06
 layer_height_0 = 0.26
-shell_thickness = 1.05
+wall_thickness = 1.05
 top_bottom_thickness = 0.84
 infill_sparse_density = 22
 retraction_amount = 5.5

resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile

@@ -9,7 +9,7 @@ weight = -2
 [settings]
 line_width = 0.35
 layer_height_0 = 0.26
-shell_thickness = 1.05
+wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
 retraction_amount = 5.5

resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile

@@ -10,7 +10,7 @@ weight = -4
 line_width = 0.35
 layer_height = 0.04
 layer_height_0 = 0.26
-shell_thickness = 1.4
+wall_thickness = 1.4
 top_bottom_thickness = 1.12
 infill_sparse_density = 25
 retraction_amount = 5.5

resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile

@@ -10,7 +10,7 @@ weight = -2
 line_width = 0.53
 layer_height = 0.15
 layer_height_0 = 0.4
-shell_thickness = 1.59
+wall_thickness = 1.59
 top_bottom_thickness = 1.2
 retraction_amount = 6
 speed_print = 25

resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile

@@ -10,7 +10,7 @@ weight = -2
 line_width = 0.7
 layer_height = 0.2
 layer_height_0 = 0.5
-shell_thickness = 2.1
+wall_thickness = 2.1
 top_bottom_thickness = 1.6
 infill_sparse_density = 20
 retraction_amount = 6

resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile

@@ -9,7 +9,7 @@ weight = -2
 line_width = 0.22
 layer_height = 0.06
 layer_height_0 = 0.15
-shell_thickness = 0.88
+wall_thickness = 0.88
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 infill_overlap = 0.022

resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile

@@ -9,7 +9,7 @@ weight = -1
 line_width = 0.35
 layer_height = 0.15
 layer_height_0 = 0.26
-shell_thickness = 0.7
+wall_thickness = 0.7
 top_bottom_thickness = 0.6
 infill_sparse_density = 18
 infill_overlap = 0.035

resources/profiles/ultimaker2_olsson/0.4_high.curaprofile

@@ -9,7 +9,7 @@ weight = -3
 line_width = 0.35
 layer_height = 0.06
 layer_height_0 = 0.26
-shell_thickness = 1.05
+wall_thickness = 1.05
 top_bottom_thickness = 0.84
 infill_sparse_density = 22
 infill_overlap = 0.035

resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile

@@ -9,7 +9,7 @@ weight = -2
 line_width = 0.35
 layer_height = 0.1
 layer_height_0 = 0.26
-shell_thickness = 1.05
+wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_overlap = 0.035
 retraction_amount = 5.5

resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile

@@ -9,7 +9,7 @@ weight = -4
 line_width = 0.35
 layer_height = 0.04
 layer_height_0 = 0.26
-shell_thickness = 1.4
+wall_thickness = 1.4
 top_bottom_thickness = 1.12
 infill_sparse_density = 25
 infill_overlap = 0.035

resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile

@@ -9,7 +9,7 @@ weight = -2
 line_width = 0.53
 layer_height = 0.15
 layer_height_0 = 0.4
-shell_thickness = 1.59
+wall_thickness = 1.59
 top_bottom_thickness = 1.2
 infill_overlap = 0.053
 retraction_amount = 6

resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile

@@ -9,7 +9,7 @@ weight = -2
 line_width = 0.7
 layer_height = 0.2
 layer_height_0 = 0.5
-shell_thickness = 2.1
+wall_thickness = 2.1
 top_bottom_thickness = 1.6
 infill_sparse_density = 20
 infill_overlap = 0.07