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/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg

@@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.5

resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg

@@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 35)
 speed_wall_x = =math.ceil(speed_print * 30 / 35)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.5

resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg

@@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_line_distance = 2.85
 support_pattern = lines
 support_xy_distance = 0.6

resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg

@@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 35)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_line_distance = 2.85
 support_pattern = lines
 support_xy_distance = 0.6

resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg

@@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg

@@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg

@@ -35,7 +35,7 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =speed_print
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2

resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg

@@ -35,7 +35,7 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =speed_print
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2

resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg

@@ -34,7 +34,7 @@ speed_travel = 150
 speed_wall = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2

resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg

@@ -33,7 +33,7 @@ speed_travel = 150
 speed_wall = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2

resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg

@@ -38,7 +38,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_bottom_distance = 0.55
 support_enable = True
-support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_top_distance = 0.55
 support_xy_distance = 0.7

resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg

@@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 55)
 speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_xy_distance = 0.7
 support_z_distance = =layer_height * 2

resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg

@@ -37,7 +37,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_bottom_distance = 0.65
 support_enable = True
-support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_top_distance = 0.5
 support_xy_distance = 0.75

resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg

@@ -37,7 +37,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_bottom_distance = 0.65
 support_enable = True
-support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_top_distance = 0.5
 support_xy_distance = 0.75

resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg

@@ -31,7 +31,7 @@ raft_surface_line_width = 0.2
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.19
 wall_thickness = 0.88

resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg

@@ -31,7 +31,7 @@ raft_surface_line_width = 0.2
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.19
 wall_thickness = 0.88

resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg

@@ -32,7 +32,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45)
 speed_wall_x = =math.ceil(speed_print * 30 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.19
 wall_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg

@@ -32,7 +32,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45)
 speed_wall_x = =math.ceil(speed_print * 30 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.19
 wall_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg

@@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_line_distance = 3.5333
 support_pattern = lines
 support_z_distance = 0.21

resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg

@@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_line_distance = 3.5333
 support_pattern = lines
 support_z_distance = 0.21

resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg

@@ -31,7 +31,7 @@ speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 2.0

resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg

@@ -31,7 +31,7 @@ speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg

@@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 40)
 speed_wall_x = =math.ceil(speed_print * 38 / 40)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg

@@ -33,7 +33,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =math.ceil(speed_print * 35 / 40)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_xy_distance = 0.65
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg

@@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_xy_distance = 0.7
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2