Take support_enable into account when evaluating support_structure.

Unsure whether this is necessary, but we decided to do this to make
the evaluation logically equivalent to the existing code currently
in master.

CURA-6711

resources/definitions/fdmprinter.def.json

@@ -4232,7 +4232,7 @@
                     "minimum_value_warning": "1 if support_pattern == 'concentric' else 0",
                     "maximum_value_warning": "0 if (support_skip_some_zags and support_pattern == 'zigzag') else 3",
                     "type": "int",
-                    "value": "1 if support_structure=='tree' else (1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0)",
+                    "value": "1 if support_enable and support_structure == 'tree' else (1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0)",
                     "enabled": "support_enable or support_meshes_present",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
@@ -4270,7 +4270,7 @@
                     "minimum_value": "0",
                     "maximum_value_warning": "100",
                     "default_value": 15,
-                    "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15",
+                    "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15",
                     "enabled": "support_enable or support_meshes_present",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,

resources/definitions/maker_starter.def.json

@@ -81,7 +81,7 @@
             "default_value": "ZigZag"
         },
         "support_infill_rate": {
-            "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15"
+            "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15"
         },
         "adhesion_type": {
             "default_value": "raft"

resources/definitions/renkforce_rf100.def.json

@@ -201,7 +201,7 @@
             "value": "False"
         },
         "support_infill_rate": {
-            "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15"
+            "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15"
         },
         "support_line_width": {
             "value": "0.6"

resources/definitions/renkforce_rf100_v2.def.json

@@ -201,7 +201,7 @@
             "value": "False"
         },
         "support_infill_rate": {
-            "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15"
+            "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15"
         },
         "support_line_width": {
             "value": "0.6"

resources/definitions/renkforce_rf100_xl.def.json

@@ -189,7 +189,7 @@
             "value": "False"
         },
         "support_infill_rate": {
-            "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15"
+            "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15"
         },
         "support_line_width": {
             "value": "0.6"

resources/definitions/winbo_dragonl4.def.json

@@ -124,7 +124,7 @@
         "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" },
         "support_bottom_pattern": { "value": "'zigzag'" },
         "support_connect_zigzags": { "value": "False" },
-        "support_infill_rate": { "value": "8 if support_structure=='normal' else 0 if support_structure=='tree' else 8" },
+        "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" },
         "support_interface_density": { "value": "80" },
         "support_interface_enable": { "value": "True" },
         "support_interface_height": { "value": "0.5" },

resources/definitions/winbo_mini2.def.json

@@ -124,7 +124,7 @@
         "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" },
         "support_bottom_pattern": { "value": "'zigzag'" },
         "support_connect_zigzags": { "value": "False" },
-        "support_infill_rate": { "value": "8 if support_structure=='normal' else 0 if support_structure=='tree' else 8" },
+        "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" },
         "support_interface_density": { "value": "80" },
         "support_interface_enable": { "value": "True" },
         "support_interface_height": { "value": "0.5" },

resources/definitions/winbo_superhelper105.def.json

@@ -113,7 +113,7 @@
         "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" },
         "support_bottom_pattern": { "value": "'zigzag'" },
         "support_connect_zigzags": { "value": "False" },
-        "support_infill_rate": { "value": "8 if support_structure=='normal' else 0 if support_structure=='tree' else 8" },
+        "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" },
         "support_interface_density": { "value": "80" },
         "support_interface_enable": { "value": "True" },
         "support_interface_height": { "value": "0.5" },

resources/quality/katihal/alya3dp_normal.inst.cfg

@@ -44,7 +44,7 @@ support_top_distance = 0.15
 support_z_distance = 0.25
 support_bottom_distance = 0.15
 support_brim_width = 6
-support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15
+support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15
 support_line_distance = 1.7
 support_line_width = 0.25
 support_initial_layer_line_distance = 2.7

resources/quality/katihal/alyanx3dp_normal.inst.cfg

@@ -44,7 +44,7 @@ support_top_distance = 0.15
 support_z_distance = 0.25
 support_bottom_distance = 0.15
 support_brim_width = 6
-support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15
+support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15
 support_line_distance = 1.7
 support_line_width = 0.25
 support_initial_layer_line_distance = 2.7