Merge branch '4.1'

resources/definitions/maker_starter.def.json

@@ -132,7 +132,7 @@
             "default_value": "ZigZag"
         },
         "support_infill_rate": {
-            "default_value": 15
+            "value": "15 if support_enable else 0 if support_tree_enable else 15"
         },
         "adhesion_type": {
             "default_value": "raft"

resources/definitions/renkforce_rf100.def.json

@@ -183,7 +183,7 @@
             "value": "False"
         },
         "support_infill_rate": {
-            "value": "15.0"
+            "value": "15 if support_enable else 0 if support_tree_enable else 15"
         },
         "support_pattern": {
             "default_value": "lines"

resources/definitions/winbo_dragonl4.def.json

@@ -126,7 +126,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" },
+        "support_infill_rate": { "value": "8 if support_enable else 0 if support_tree_enable else 8" },
         "support_interface_density": { "value": "80" },
         "support_interface_enable": { "value": "True" },
         "support_interface_height": { "value": "0.5" },

resources/definitions/winbo_mini2.def.json

@@ -126,7 +126,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" },
+        "support_infill_rate": { "value": "8 if support_enable else 0 if support_tree_enable else 8" },
         "support_interface_density": { "value": "80" },
         "support_interface_enable": { "value": "True" },
         "support_interface_height": { "value": "0.5" },

resources/definitions/winbo_superhelper105.def.json

@@ -115,7 +115,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" },
+        "support_infill_rate": { "value": "8 if support_enable else 0 if support_tree_enable else 8" },
         "support_interface_density": { "value": "80" },
         "support_interface_enable": { "value": "True" },
         "support_interface_height": { "value": "0.5" },

resources/qml/ExpandableComponent.qml

@@ -41,6 +41,7 @@ Item
     property alias disabledText: disabledLabel.text
 
     // Defines the alignment of the content with respect of the headerItem, by default to the right
+    // Note that this only has an effect if the panel is draggable
     property int contentAlignment: ExpandableComponent.ContentAlignment.AlignRight
 
     // How much spacing is needed around the contentItem

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
+support_infill_rate = =15 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15
 support_line_distance = 1.7
 support_line_width = 0.25
 support_initial_layer_line_distance = 2.7

resources/quality/katihal/kupido_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
+support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15
 support_line_distance = 1.7
 support_line_width = 0.25
 support_initial_layer_line_distance = 2.7

resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg

@@ -96,7 +96,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = 20
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
 support_infill_angle = 0
 support_brim_enable = True
 support_brim_line_count = 5

resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg

@@ -96,7 +96,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = 15
+support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15
 support_infill_angle = 0
 support_brim_enable = True
 support_brim_line_count = 5

resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg

@@ -96,7 +96,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = 20
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
 support_infill_angle = 0
 support_brim_enable = True
 support_brim_line_count = 5

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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =25 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =25 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =25 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =25 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =25 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =25 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =25 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =25 if support_enable else 0 if support_tree_enable 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
+support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
 support_xy_distance = 0.7
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg

@@ -37,4 +37,4 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = 10
+support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10

resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg

@@ -36,4 +36,4 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = 10
+support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10

resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg

@@ -32,6 +32,6 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = 10
+support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
 top_bottom_thickness = 1
 wall_thickness = 1

resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg

@@ -37,4 +37,4 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = 10
+support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10

resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg

@@ -36,4 +36,4 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = 10
+support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10

resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg

@@ -33,6 +33,6 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = 10
+support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
 top_bottom_thickness = 1
 wall_thickness = 1