Merge branch 'master' into CURA-8212_Add_version_upgrader_for_two_trees_definitions

resources/qml/Preferences/SettingVisibilityPage.qml

@@ -166,7 +166,7 @@ UM.PreferencesPage
                 {
                     id: loader
 
-                    width: parent.width
+                    width: settingsListView.width
                     height: model.type != undefined ? UM.Theme.getSize("section").height : 0
 
                     property var definition: model

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_A.inst.cfg

@@ -0,0 +1,62 @@
+[general]
+version = 4
+name = A
+definition = strateo3d
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = a
+weight = 1
+material = emotiontech_copa	
+variant = Standard 0.4
+
+[values]
+layer_height_0 = =round(0.5*machine_nozzle_size, 2)
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
+wall_0_wipe_dist = =machine_nozzle_size/2
+wall_line_count = 3
+speed_print = 35
+speed_wall = =math.ceil(speed_print * 35/50)
+speed_wall_0 = =math.ceil(speed_wall * 30/35)
+speed_topbottom = =math.ceil(speed_print * 35/50)
+speed_layer_0 = =math.ceil(speed_print * 20/50)
+speed_slowdown_layers = 2
+cool_fan_enabled = True
+cool_fan_speed = 20
+cool_fan_speed_max = 80
+cool_min_layer_time_fan_speed_max = 20
+cool_min_layer_time = 2
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_min_speed = 2
+cool_lift_head = True
+support_angle = 45
+material_print_temperature = =default_material_print_temperature
+material_print_temperature_layer_0 = =default_material_print_temperature + 5
+material_initial_print_temperature = =default_material_print_temperature
+material_final_print_temperature = =default_material_print_temperature
+material_flow = 91
+skin_material_flow = 92
+retraction_extra_prime_amount = 0.1
+retraction_min_travel = =3*line_width
+retraction_hop_only_when_collides = True
+skin_overlap = 10
+support_z_distance = =layer_height*2
+support_bottom_distance = =support_z_distance*0.5
+support_xy_distance = =line_width * 1.7
+support_xy_distance_overhang = =wall_line_width_0
+support_offset = 1
+support_interface_density = 100
+prime_tower_enable = True
+bridge_settings_enabled = True
+bridge_wall_coast = 50
+bridge_wall_speed = 8
+bridge_wall_material_flow = 50
+bridge_skin_speed = 8
+bridge_skin_material_flow = 60
+bridge_skin_density = 80
+bridge_fan_speed = 80
+meshfix_maximum_resolution = 0.5
+meshfix_maximum_deviation = 0.04

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_B.inst.cfg

@@ -0,0 +1,62 @@
+[general]
+version = 4
+name = B
+definition = strateo3d
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = b
+weight = 0
+material = emotiontech_copa
+variant = Standard 0.4
+
+[values]
+layer_height_0 = =round(0.67*machine_nozzle_size, 2)
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
+wall_0_wipe_dist = =machine_nozzle_size/2
+wall_line_count = 3
+speed_print = 35
+speed_wall = =math.ceil(speed_print * 37/55)
+speed_wall_0 = =math.ceil(speed_wall * 33/37)
+speed_topbottom = =math.ceil(speed_print * 37/55)
+speed_layer_0 = =math.ceil(speed_print * 25/55)
+speed_slowdown_layers = 2
+cool_fan_enabled = True
+cool_fan_speed = 20
+cool_fan_speed_max = 80
+cool_min_layer_time_fan_speed_max = 20
+cool_min_layer_time = 2
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_min_speed = 2
+cool_lift_head = True
+support_angle = 60
+material_print_temperature = =default_material_print_temperature
+material_print_temperature_layer_0 = =default_material_print_temperature + 5
+material_initial_print_temperature = =default_material_print_temperature
+material_final_print_temperature = =default_material_print_temperature
+material_flow = 91
+skin_material_flow = 92
+retraction_extra_prime_amount = 0.1
+retraction_min_travel = =3*line_width
+retraction_hop_only_when_collides = True
+skin_overlap = 15
+support_z_distance = =layer_height*2
+support_bottom_distance = =support_z_distance*0.5
+support_xy_distance = =line_width * 1.7
+support_xy_distance_overhang = =wall_line_width_0
+support_offset = 1
+support_interface_density = 100
+prime_tower_enable = True
+bridge_settings_enabled = True
+bridge_wall_coast = 50
+bridge_wall_speed = 8
+bridge_wall_material_flow = 50
+bridge_skin_speed = 8
+bridge_skin_material_flow = 60
+bridge_skin_density = 80
+bridge_fan_speed = 80
+meshfix_maximum_resolution = 0.5
+meshfix_maximum_deviation = 0.04

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_C.inst.cfg

@@ -0,0 +1,62 @@
+[general]
+version = 4
+name = C
+definition = strateo3d
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = c
+weight = -1
+material = emotiontech_copa
+variant = Standard 0.4
+
+[values]
+layer_height_0 = =round(0.75*machine_nozzle_size, 2)
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
+wall_0_wipe_dist = =machine_nozzle_size/2
+wall_line_count = 3
+speed_print = 35
+speed_wall = =math.ceil(speed_print * 40/60)
+speed_wall_0 = =math.ceil(speed_wall * 35/40)
+speed_topbottom = =math.ceil(speed_print * 40/60)
+speed_layer_0 = =math.ceil(speed_print * 30/60)
+speed_slowdown_layers = 2
+cool_fan_enabled = True
+cool_fan_speed = 20
+cool_fan_speed_max = 80
+cool_min_layer_time_fan_speed_max = 20
+cool_min_layer_time = 2
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_min_speed = 2
+cool_lift_head = True
+support_angle = 60
+material_print_temperature = =default_material_print_temperature
+material_print_temperature_layer_0 = =default_material_print_temperature + 5
+material_initial_print_temperature = =default_material_print_temperature
+material_final_print_temperature = =default_material_print_temperature
+material_flow = 91
+skin_material_flow = 92
+retraction_extra_prime_amount = 0.1
+retraction_min_travel = =3*line_width
+retraction_hop_only_when_collides = True
+skin_overlap = 20
+support_z_distance = =layer_height*2
+support_bottom_distance = =support_z_distance*0.5
+support_xy_distance = =line_width * 1.7
+support_xy_distance_overhang = =wall_line_width_0
+support_offset = 1
+support_interface_density = 100
+prime_tower_enable = True
+bridge_settings_enabled = True
+bridge_wall_coast = 50
+bridge_wall_speed = 8
+bridge_wall_material_flow = 50
+bridge_skin_speed = 8
+bridge_skin_material_flow = 60
+bridge_skin_density = 80
+bridge_fan_speed = 80
+meshfix_maximum_resolution = 0.5
+meshfix_maximum_deviation = 0.04

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_A.inst.cfg

@@ -0,0 +1,61 @@
+[general]
+version = 4
+name = A
+definition = strateo3d
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = a
+weight = 1
+material = emotiontech_pc
+variant = Standard 0.4
+
+[values]
+layer_height_0 = =round(0.5*machine_nozzle_size, 2)
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
+wall_0_wipe_dist = =machine_nozzle_size/2
+speed_print = 35
+speed_wall = =math.ceil(speed_print * 35/50)
+speed_wall_0 = =math.ceil(speed_wall * 30/35)
+speed_topbottom = =math.ceil(speed_print * 35/50)
+speed_layer_0 = =math.ceil(speed_print * 20/50)
+speed_slowdown_layers = 2
+cool_fan_enabled = True
+cool_fan_speed = 10
+cool_fan_speed_max = 10
+cool_min_layer_time_fan_speed_max = 20
+cool_min_layer_time = 2
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_min_speed = 12
+support_angle = 60
+cool_lift_head = true
+material_print_temperature = 260
+material_print_temperature_layer_0 = 265
+material_flow = 88
+wall_line_count = 3
+retraction_extra_prime_amount = 0.1
+retraction_speed = 30
+retraction_min_travel = =3*line_width
+retraction_hop_only_when_collides = True
+skin_overlap = 10
+support_z_distance = =layer_height
+support_bottom_distance = =support_z_distance*0.5
+support_xy_distance = =line_width * 1.7
+support_xy_distance_overhang = =wall_line_width_0
+support_offset = 1
+support_interface_density = 100
+prime_tower_enable = True
+adhesion_type = brim
+
+bridge_settings_enabled = True
+bridge_wall_coast = 50
+bridge_wall_speed = 12
+bridge_wall_material_flow = 50
+bridge_skin_speed = 12.5
+bridge_skin_material_flow = 100
+bridge_skin_density = 80
+bridge_fan_speed = 100
+

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_B.inst.cfg

@@ -0,0 +1,61 @@
+[general]
+version = 4
+name = B
+definition = strateo3d
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = b
+weight = 0
+material = emotiontech_pc
+variant = Standard 0.4
+
+[values]
+layer_height_0 = =round(0.67*machine_nozzle_size, 2)
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
+wall_0_wipe_dist = =machine_nozzle_size/2
+speed_print = 35
+speed_wall = =math.ceil(speed_print * 37/55)
+speed_wall_0 = =math.ceil(speed_wall * 33/37)
+speed_topbottom = =math.ceil(speed_print * 37/55)
+speed_layer_0 = =math.ceil(speed_print * 25/55)
+speed_slowdown_layers = 2
+cool_fan_enabled = True
+cool_fan_speed = 10
+cool_fan_speed_max = 10
+cool_min_layer_time_fan_speed_max = 20
+cool_min_layer_time = 2
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_min_speed = 12
+cool_lift_head = true
+support_angle = 60
+material_print_temperature = 270
+material_print_temperature_layer_0 = 275
+material_flow = 88
+wall_line_count = 3
+retraction_speed = 30
+retraction_extra_prime_amount = 0.1
+retraction_min_travel = =3*line_width
+retraction_hop_only_when_collides = True
+skin_overlap = 15
+support_z_distance = =layer_height
+support_bottom_distance = =support_z_distance*0.5
+support_xy_distance = =line_width * 1.7
+support_xy_distance_overhang = =wall_line_width_0
+support_offset = 1
+support_interface_density = 100
+prime_tower_enable = True
+
+adhesion_type = brim
+
+bridge_settings_enabled = True
+bridge_wall_coast = 50
+bridge_wall_speed = 12
+bridge_wall_material_flow = 50
+bridge_skin_speed = 12.5
+bridge_skin_material_flow = 100
+bridge_skin_density = 80
+bridge_fan_speed = 100

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_C.inst.cfg

@@ -0,0 +1,61 @@
+[general]
+version = 4
+name = C
+definition = strateo3d
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = c
+weight = -1
+material = emotiontech_pc
+variant = Standard 0.4
+
+[values]
+layer_height_0 = =round(0.75*machine_nozzle_size, 2)
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
+wall_0_wipe_dist = =machine_nozzle_size/2
+speed_print = 35
+speed_wall = =math.ceil(speed_print * 40/60)
+speed_wall_0 = =math.ceil(speed_wall * 35/40)
+speed_topbottom = =math.ceil(speed_print * 40/60)
+speed_layer_0 = =math.ceil(speed_print * 30/60)
+speed_slowdown_layers = 2
+cool_fan_enabled = True
+cool_fan_speed = 10
+cool_fan_speed_max = 10
+cool_min_layer_time_fan_speed_max = 20
+cool_min_layer_time = 2
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_min_speed = 12
+support_angle = 60
+cool_lift_head = true
+material_print_temperature = 270
+material_print_temperature_layer_0 = 275
+material_flow = 88
+wall_line_count = 3
+retraction_speed = 30
+retraction_extra_prime_amount = 0.1
+retraction_min_travel = =3*line_width
+retraction_hop_only_when_collides = True
+skin_overlap = 20
+support_z_distance = =layer_height
+support_bottom_distance = =support_z_distance*0.5
+support_xy_distance = =line_width * 1.7
+support_xy_distance_overhang = =wall_line_width_0
+support_offset = 1
+support_interface_density = 100
+prime_tower_enable = True
+
+adhesion_type = brim
+
+bridge_settings_enabled = True
+bridge_wall_coast = 50
+bridge_wall_speed = 12
+bridge_wall_material_flow = 50
+bridge_skin_speed = 12.5
+bridge_skin_material_flow = 100
+bridge_skin_density = 80
+bridge_fan_speed = 100

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_A.inst.cfg

@@ -0,0 +1,55 @@
+[general]
+version = 4
+name = A
+definition = strateo3d
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = a
+weight = 1
+material = emotiontech_pla_hr_870
+variant = Standard 0.4
+
+[values]
+layer_height_0 = =round(0.5*machine_nozzle_size, 2)
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
+wall_0_wipe_dist = =machine_nozzle_size/2
+wall_line_count = 3
+speed_print = 30
+speed_wall = =math.ceil(speed_print * 35/50)
+speed_wall_0 = =math.ceil(speed_wall * 30/35)
+speed_topbottom = =math.ceil(speed_print * 35/50)
+speed_layer_0 = =math.ceil(speed_print * 20/50)
+speed_slowdown_layers = 2
+cool_fan_enabled = True
+cool_fan_speed = 100
+cool_fan_speed_max = 100
+cool_min_layer_time_fan_speed_max = 20
+cool_min_layer_time = 2
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_min_speed = 4
+support_angle = 65
+material_print_temperature = =default_material_print_temperature + 5
+material_print_temperature_layer_0 = =default_material_print_temperature + 10
+material_initial_print_temperature = =default_material_print_temperature + 5
+material_final_print_temperature = =default_material_print_temperature + 5
+material_flow = 91
+skin_material_flow = 92
+retraction_amount = 2
+retraction_extra_prime_amount = 0.1
+retraction_min_travel = =3*line_width
+retraction_hop_only_when_collides = True
+skin_overlap = 10
+support_z_distance = =layer_height*2
+support_bottom_distance = =support_z_distance*0.5
+support_xy_distance = =line_width * 1.7
+support_xy_distance_overhang = =wall_line_width_0
+support_offset = 1
+support_interface_density = 100
+prime_tower_enable = True
+meshfix_maximum_resolution = 0.5
+meshfix_maximum_deviation = 0.04
+cool_lift_head = True

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_B.inst.cfg

@@ -0,0 +1,54 @@
+[general]
+version = 4
+name = B
+definition = strateo3d
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = b
+weight = 0
+material = emotiontech_pla_hr_870
+variant = Standard 0.4
+
+[values]
+layer_height_0 = =round(0.67*machine_nozzle_size, 2)
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
+wall_0_wipe_dist = =machine_nozzle_size/2
+speed_print = 40
+speed_wall = =math.ceil(speed_print * 37/55)
+speed_wall_0 = =math.ceil(speed_wall * 33/37)
+speed_topbottom = =math.ceil(speed_print * 37/55)
+speed_layer_0 = =math.ceil(speed_print * 25/55)
+speed_slowdown_layers = 2
+cool_fan_enabled = True
+cool_fan_speed = 100
+cool_fan_speed_max = 100
+cool_min_layer_time_fan_speed_max = 20
+cool_min_layer_time = 2
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_min_speed = 4
+support_angle = 60
+material_print_temperature = =default_material_print_temperature
+material_print_temperature_layer_0 = =default_material_print_temperature + 5
+material_initial_print_temperature = =default_material_print_temperature
+material_final_print_temperature = =default_material_print_temperature
+material_flow = 91
+skin_material_flow = 92
+retraction_amount = 2
+retraction_extra_prime_amount = 0.1
+retraction_min_travel = =3*line_width
+retraction_hop_only_when_collides = True
+skin_overlap = 15
+support_z_distance = =layer_height*2
+support_bottom_distance = =support_z_distance*0.5
+support_xy_distance = =line_width * 1.7
+support_xy_distance_overhang = =wall_line_width_0
+support_offset = 1
+support_interface_density = 100
+prime_tower_enable = True
+meshfix_maximum_resolution = 0.5
+meshfix_maximum_deviation = 0.04
+cool_lift_head = True

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_C.inst.cfg

@@ -0,0 +1,54 @@
+[general]
+version = 4
+name = C
+definition = strateo3d
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = c
+weight = -1
+material = emotiontech_pla_hr_870
+variant = Standard 0.4
+
+[values]
+layer_height_0 = =round(0.75*machine_nozzle_size, 2)
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
+wall_0_wipe_dist = =machine_nozzle_size/2
+speed_print = 40
+speed_wall = =math.ceil(speed_print * 40/60)
+speed_wall_0 = =math.ceil(speed_wall * 35/40)
+speed_topbottom = =math.ceil(speed_print * 40/60)
+speed_layer_0 = =math.ceil(speed_print * 30/60)
+speed_slowdown_layers = 2
+cool_fan_enabled = True
+cool_fan_speed = 100
+cool_fan_speed_max = 100
+cool_min_layer_time_fan_speed_max = 20
+cool_min_layer_time = 2
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_min_speed = 4
+support_angle = 55
+material_print_temperature = =default_material_print_temperature
+material_print_temperature_layer_0 = =default_material_print_temperature + 5
+material_initial_print_temperature = =default_material_print_temperature
+material_final_print_temperature = =default_material_print_temperature
+material_flow = 91
+skin_material_flow = 92
+retraction_amount = 2
+retraction_extra_prime_amount = 0.1
+retraction_min_travel = =3*line_width
+retraction_hop_only_when_collides = True
+skin_overlap = 20
+support_z_distance = =layer_height*2
+support_bottom_distance = =support_z_distance*0.5
+support_xy_distance = =line_width * 1.7
+support_xy_distance_overhang = =wall_line_width_0
+support_offset = 1
+support_interface_density = 100
+prime_tower_enable = True
+meshfix_maximum_resolution = 0.5
+meshfix_maximum_deviation = 0.04
+cool_lift_head = True