Merge remote-tracking branch 'origin/master' into refactoring_machine_manager

2025-07-21 21:58:01 -06:00 · 2018-03-02 09:55:14 +01:00 · 2018-03-02 09:55:14 +01:00 · 93190dde9b
commit 93190dde9b
parent 844a597e08 1743954ef7
8 changed files with 189 additions and 190 deletions
--- a/resources/definitions/dagoma_discoeasy200.def.json
+++ b/resources/definitions/dagoma_discoeasy200.def.json
@ -50,7 +50,7 @@
            "default_value": 60
        },
        "speed_travel": {
-            "default_value": 100
+            "value": "100"
        },
        "retraction_amount": {
            "default_value": 3.5
--- a/resources/definitions/dagoma_neva.def.json
+++ b/resources/definitions/dagoma_neva.def.json
@ -42,7 +42,7 @@
            "default_value": "elliptic"
        },
        "machine_gcode_flavor": {
-            "default_value": "RepRap"
+            "default_value": "RepRap (RepRap)"
        },
        "machine_start_gcode": {
            "default_value": ";Gcode by Cura\nG90\nG28\nM109 S100\nG29\nM104 S{material_print_temperature_layer_0}\nG0 X0 Y-85\nG0 Z0.26\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n"
--- a/resources/preset_setting_visibility_groups/advanced.cfg
+++ b/resources/preset_setting_visibility_groups/advanced.cfg
@ -8,120 +8,71 @@ weight = 2
 layer_height
 layer_height_0
 line_width
+wall_line_width
+wall_line_width_0
+wall_line_width_x
+skin_line_width
+infill_line_width
+initial_layer_line_width_factor

 [shell]
 wall_extruder_nr
+wall_0_extruder_nr
+wall_x_extruder_nr
 wall_thickness
-wall_0_wipe_dist
-roofing_extruder_nr
-roofing_layer_count
+wall_line_count
 top_bottom_extruder_nr
 top_bottom_thickness
-top_bottom_pattern
-top_bottom_pattern_0
-skin_angles
-wall_0_inset
+top_thickness
+top_layers
+bottom_thickness
+bottom_layers
 optimize_wall_printing_order
-outer_inset_first
-alternate_extra_perimeter
-travel_compensate_overlapping_walls_enabled
 fill_perimeter_gaps
-filter_out_tiny_gaps
-fill_outline_gaps
 xy_offset
-xy_offset_layer_0
-z_seam_type
-z_seam_x
-z_seam_y
-z_seam_corner
-z_seam_relative
-skin_no_small_gaps_heuristic
-skin_outline_count
 ironing_enabled
-ironing_only_highest_layer
-ironing_pattern
-ironing_line_spacing
-ironing_flow
-ironing_inset
-speed_ironing
-acceleration_ironing
-jerk_ironing

 [infill]
 infill_extruder_nr
 infill_sparse_density
+infill_line_distance
 infill_pattern
-zig_zaggify_infill
-infill_angles
-infill_offset_x
-infill_offset_y
-sub_div_rad_add
 infill_overlap
-skin_overlap
-infill_wipe_dist
 infill_sparse_thickness
 gradual_infill_steps
-gradual_infill_step_height
-infill_before_walls
-min_infill_area
-skin_preshrink
-expand_skins_expand_distance
-max_skin_angle_for_expansion

 [material]
-default_material_print_temperature
 material_print_temperature
 material_print_temperature_layer_0
 material_initial_print_temperature
 material_final_print_temperature
-material_extrusion_cool_down_speed
-default_material_bed_temperature
 material_bed_temperature
 material_bed_temperature_layer_0
-material_diameter
-material_adhesion_tendency
-material_surface_energy
-material_flow
 retraction_enable
 retract_at_layer_change
 retraction_amount
 retraction_speed
-retraction_extra_prime_amount
-retraction_min_travel
-retraction_count_max
-retraction_extrusion_window
 material_standby_temperature
-switch_extruder_retraction_amount
-switch_extruder_retraction_speeds

 [speed]
 speed_print
+speed_infill
+speed_wall
+speed_wall_0
+speed_wall_x
+speed_topbottom
+speed_support
+speed_prime_tower
 speed_travel
 speed_layer_0
 skirt_brim_speed
-max_feedrate_z_override
-speed_slowdown_layers
-speed_equalize_flow_enabled
-speed_equalize_flow_max
 acceleration_enabled
-acceleration_print
-acceleration_travel
-acceleration_layer_0
-acceleration_skirt_brim
 jerk_enabled
-jerk_print
-jerk_travel
-jerk_layer_0
-jerk_skirt_brim

 [travel]
 retraction_combing
-travel_retract_before_outer_wall
 travel_avoid_other_parts
 travel_avoid_distance
-start_layers_at_same_position
-layer_start_x
-layer_start_y
 retraction_hop_enabled
 retraction_hop_only_when_collides
 retraction_hop
@ -130,9 +81,12 @@ retraction_hop_after_extruder_switch
 [cooling]
 cool_fan_enabled
 cool_fan_speed
+cool_fan_speed_min
+cool_fan_speed_max
 cool_min_layer_time_fan_speed_max
 cool_fan_speed_0
 cool_fan_full_at_height
+cool_fan_full_layer
 cool_min_layer_time
 cool_min_speed
 cool_lift_head
@ -140,115 +94,45 @@ cool_lift_head
 [support]
 support_enable
 support_extruder_nr
+support_infill_extruder_nr
+support_extruder_nr_layer_0
+support_interface_extruder_nr
 support_type
 support_angle
 support_pattern
-support_connect_zigzags
 support_infill_rate
-support_z_distance
-support_xy_distance
-support_xy_overrides_z
-support_xy_distance_overhang
-support_bottom_stair_step_height
-support_bottom_stair_step_width
-support_join_distance
 support_offset
 support_infill_sparse_thickness
 gradual_support_infill_steps
 gradual_support_infill_step_height
 support_interface_enable
-support_interface_height
-support_interface_skip_height
-support_interface_density
-support_interface_pattern
-support_use_towers
-support_tower_diameter
-support_minimal_diameter
-support_tower_roof_angle
-support_mesh_drop_down
+support_roof_enable
+support_bottom_enable

 [platform_adhesion]
 prime_blob_enable
-extruder_prime_pos_x
-extruder_prime_pos_y
 adhesion_type
 adhesion_extruder_nr
 skirt_line_count
-skirt_gap
-skirt_brim_minimal_length
 brim_width
+brim_line_count
 brim_outside_only
-raft_margin
-raft_smoothing
-raft_airgap
-layer_0_z_overlap
-raft_surface_layers
-raft_surface_thickness
-raft_surface_line_width
-raft_surface_line_spacing
-raft_interface_thickness
-raft_interface_line_width
-raft_interface_line_spacing
-raft_base_thickness
-raft_base_line_width
-raft_base_line_spacing
-raft_speed
-raft_acceleration
-raft_jerk
-raft_fan_speed

 [dual]
 prime_tower_enable
-prime_tower_size
-prime_tower_min_volume
 prime_tower_position_x
 prime_tower_position_y
-prime_tower_flow
-prime_tower_wipe_enabled
-dual_pre_wipe
 prime_tower_purge_volume
-ooze_shield_enabled
-ooze_shield_angle
-ooze_shield_dist

 [meshfix]
-meshfix_union_all
-meshfix_union_all_remove_holes
-meshfix_extensive_stitching
-meshfix_keep_open_polygons
-multiple_mesh_overlap
-carve_multiple_volumes
-alternate_carve_order
-remove_empty_first_layers

 [blackmagic]
 print_sequence
-infill_mesh
-infill_mesh_order
-cutting_mesh
-mold_enabled
-mold_width
-mold_roof_height
-mold_angle
-support_mesh
-anti_overhang_mesh
 magic_mesh_surface_mode
 magic_spiralize
 smooth_spiralized_contours
-relative_extrusion

 [experimental]
-infill_enable_travel_optimization
-material_flow_dependent_temperature
-material_flow_temp_graph
-meshfix_maximum_resolution
-roofing_angles
-roofing_pattern
-slicing_tolerance
-support_tree_angle
-support_tree_branch_diameter
-support_tree_branch_diameter_angle
-support_tree_branch_distance
-support_tree_collision_resolution
-support_tree_enable
-support_tree_wall_thickness
+conical_overhang_enabled
+support_conical_enabled
+adaptive_layer_height_enabled
--- a/resources/preset_setting_visibility_groups/basic.cfg
+++ b/resources/preset_setting_visibility_groups/basic.cfg
@ -9,30 +9,28 @@ layer_height

 [shell]
 wall_thickness
+wall_line_count
 top_bottom_thickness
-z_seam_x
-z_seam_y
+top_thickness
+top_layers
+bottom_thickness
+bottom_layers
+xy_offset

 [infill]
 infill_sparse_density
-gradual_infill_steps
+infill_pattern

 [material]
 material_print_temperature
 material_bed_temperature
-material_diameter
-material_flow
 retraction_enable

 [speed]
 speed_print
-speed_travel
-acceleration_print
-acceleration_travel
-jerk_print
-jerk_travel

 [travel]
+retraction_hop_enabled

 [cooling]
 cool_fan_enabled
@ -41,26 +39,20 @@ cool_fan_enabled
 support_enable
 support_extruder_nr
 support_type
+support_angle

 [platform_adhesion]
+prime_blob_enable
 adhesion_type
 adhesion_extruder_nr
-brim_width
-raft_airgap
-layer_0_z_overlap
-raft_surface_layers

 [dual]
 prime_tower_enable
-prime_tower_size
 prime_tower_position_x
 prime_tower_position_y

 [meshfix]

 [blackmagic]
-print_sequence
-infill_mesh
-cutting_mesh

 [experimental]
--- a/resources/preset_setting_visibility_groups/expert.cfg
+++ b/resources/preset_setting_visibility_groups/expert.cfg
@ -8,15 +8,33 @@ weight = 3
 layer_height
 layer_height_0
 line_width
+wall_line_width
+wall_line_width_0
+wall_line_width_x
+skin_line_width
+infill_line_width
+skirt_brim_line_width
+support_line_width
+support_interface_line_width
+support_roof_line_width
+support_bottom_line_width
+prime_tower_line_width
+initial_layer_line_width_factor

 [shell]
 wall_extruder_nr
+wall_0_extruder_nr
+wall_x_extruder_nr
 wall_thickness
+wall_line_count
 wall_0_wipe_dist
-roofing_extruder_nr
 roofing_layer_count
 top_bottom_extruder_nr
 top_bottom_thickness
+top_thickness
+top_layers
+bottom_thickness
+bottom_layers
 top_bottom_pattern
 top_bottom_pattern_0
 skin_angles
@ -25,6 +43,8 @@ optimize_wall_printing_order
 outer_inset_first
 alternate_extra_perimeter
 travel_compensate_overlapping_walls_enabled
+travel_compensate_overlapping_walls_0_enabled
+travel_compensate_overlapping_walls_x_enabled
 fill_perimeter_gaps
 filter_out_tiny_gaps
 fill_outline_gaps
@ -50,6 +70,7 @@ jerk_ironing
 [infill]
 infill_extruder_nr
 infill_sparse_density
+infill_line_distance
 infill_pattern
 zig_zaggify_infill
 infill_angles
@ -57,7 +78,9 @@ infill_offset_x
 infill_offset_y
 sub_div_rad_add
 infill_overlap
+infill_overlap_mm
 skin_overlap
+skin_overlap_mm
 infill_wipe_dist
 infill_sparse_thickness
 gradual_infill_steps
@ -65,8 +88,13 @@ gradual_infill_step_height
 infill_before_walls
 min_infill_area
 skin_preshrink
+top_skin_preshrink
+bottom_skin_preshrink
 expand_skins_expand_distance
+top_skin_expand_distance
+bottom_skin_expand_distance
 max_skin_angle_for_expansion
+min_skin_width_for_expansion

 [material]
 default_material_print_temperature
@ -75,7 +103,6 @@ material_print_temperature_layer_0
 material_initial_print_temperature
 material_final_print_temperature
 material_extrusion_cool_down_speed
-default_material_bed_temperature
 material_bed_temperature
 material_bed_temperature_layer_0
 material_diameter
@ -86,6 +113,8 @@ retraction_enable
 retract_at_layer_change
 retraction_amount
 retraction_speed
+retraction_retract_speed
+retraction_prime_speed
 retraction_extra_prime_amount
 retraction_min_travel
 retraction_count_max
@ -93,11 +122,25 @@ retraction_extrusion_window
 material_standby_temperature
 switch_extruder_retraction_amount
 switch_extruder_retraction_speeds
+switch_extruder_retraction_speed
+switch_extruder_prime_speed

 [speed]
 speed_print
+speed_infill
+speed_wall
+speed_wall_0
+speed_wall_x
+speed_roofing
+speed_topbottom
+speed_support
+speed_support_infill
+speed_support_interface
+speed_prime_tower
 speed_travel
 speed_layer_0
+speed_print_layer_0
+speed_travel_layer_0
 skirt_brim_speed
 max_feedrate_z_override
 speed_slowdown_layers
@ -105,13 +148,37 @@ speed_equalize_flow_enabled
 speed_equalize_flow_max
 acceleration_enabled
 acceleration_print
+acceleration_infill
+acceleration_wall
+acceleration_wall_0
+acceleration_wall_x
+acceleration_roofing
+acceleration_topbottom
+acceleration_support
+acceleration_support_infill
+acceleration_support_interface
+acceleration_prime_tower
 acceleration_travel
 acceleration_layer_0
+acceleration_print_layer_0
+acceleration_travel_layer_0
 acceleration_skirt_brim
 jerk_enabled
 jerk_print
+jerk_infill
+jerk_wall
+jerk_wall_0
+jerk_wall_x
+jerk_roofing
+jerk_topbottom
+jerk_support
+jerk_support_infill
+jerk_support_interface
+jerk_prime_tower
 jerk_travel
 jerk_layer_0
+jerk_print_layer_0
+jerk_travel_layer_0
 jerk_skirt_brim

 [travel]
@ -130,9 +197,12 @@ retraction_hop_after_extruder_switch
 [cooling]
 cool_fan_enabled
 cool_fan_speed
+cool_fan_speed_min
+cool_fan_speed_max
 cool_min_layer_time_fan_speed_max
 cool_fan_speed_0
 cool_fan_full_at_height
+cool_fan_full_layer
 cool_min_layer_time
 cool_min_speed
 cool_lift_head
@ -140,12 +210,20 @@ cool_lift_head
 [support]
 support_enable
 support_extruder_nr
+support_infill_extruder_nr
+support_extruder_nr_layer_0
+support_interface_extruder_nr
+support_roof_extruder_nr
+support_bottom_extruder_nr
 support_type
 support_angle
 support_pattern
 support_connect_zigzags
 support_infill_rate
+support_line_distance
 support_z_distance
+support_top_distance
+support_bottom_distance
 support_xy_distance
 support_xy_overrides_z
 support_xy_distance_overhang
@ -157,9 +235,15 @@ support_infill_sparse_thickness
 gradual_support_infill_steps
 gradual_support_infill_step_height
 support_interface_enable
+support_roof_enable
+support_bottom_enable
 support_interface_height
+support_roof_height
+support_bottom_height
 support_interface_skip_height
 support_interface_density
+support_roof_density
+support_bottom_density
 support_interface_pattern
 support_use_towers
 support_tower_diameter
@ -169,19 +253,17 @@ support_mesh_drop_down

 [platform_adhesion]
 prime_blob_enable
-extruder_prime_pos_x
-extruder_prime_pos_y
 adhesion_type
 adhesion_extruder_nr
 skirt_line_count
 skirt_gap
 skirt_brim_minimal_length
 brim_width
+brim_line_count
 brim_outside_only
 raft_margin
 raft_smoothing
 raft_airgap
-layer_0_z_overlap
 raft_surface_layers
 raft_surface_thickness
 raft_surface_line_width
@ -201,6 +283,7 @@ raft_fan_speed
 prime_tower_enable
 prime_tower_size
 prime_tower_min_volume
+prime_tower_wall_thickness
 prime_tower_position_x
 prime_tower_position_y
 prime_tower_flow
@ -238,8 +321,25 @@ smooth_spiralized_contours
 relative_extrusion

 [experimental]
+support_tree_enable
+support_tree_angle
+support_tree_branch_distance
+support_tree_branch_diameter
+support_tree_branch_diameter_angle
+support_tree_collision_resolution
+support_tree_wall_thickness
+support_tree_wall_count
+slicing_tolerance
+roofing_line_width
+roofing_pattern
+roofing_angles
+infill_enable_travel_optimization
+material_flow_dependent_temperature
+material_flow_temp_graph
+meshfix_maximum_resolution
 support_skip_some_zags
 support_skip_zag_per_mm
+support_zag_skip_count
 draft_shield_enabled
 draft_shield_dist
 draft_shield_height_limitation
@ -267,19 +367,34 @@ infill_hollow
 magic_fuzzy_skin_enabled
 magic_fuzzy_skin_thickness
 magic_fuzzy_skin_point_density
+magic_fuzzy_skin_point_dist
 flow_rate_max_extrusion_offset
 flow_rate_extrusion_offset_factor
-infill_enable_travel_optimization
-material_flow_dependent_temperature
-material_flow_temp_graph
-meshfix_maximum_resolution
-roofing_angles
-roofing_pattern
-slicing_tolerance
-support_tree_angle
-support_tree_branch_diameter
-support_tree_branch_diameter_angle
-support_tree_branch_distance
-support_tree_collision_resolution
-support_tree_enable
-support_tree_wall_thickness
+wireframe_enabled
+wireframe_height
+wireframe_roof_inset
+wireframe_printspeed
+wireframe_printspeed_bottom
+wireframe_printspeed_up
+wireframe_printspeed_down
+wireframe_printspeed_flat
+wireframe_flow
+wireframe_flow_connection
+wireframe_flow_flat
+wireframe_top_delay
+wireframe_bottom_delay
+wireframe_flat_delay
+wireframe_up_half_speed
+wireframe_top_jump
+wireframe_fall_down
+wireframe_drag_along
+wireframe_strategy
+wireframe_straight_before_down
+wireframe_roof_fall_down
+wireframe_roof_drag_along
+wireframe_roof_outer_delay
+wireframe_nozzle_clearance
+adaptive_layer_height_enabled
+adaptive_layer_height_variation
+adaptive_layer_height_variation_step
+adaptive_layer_height_threshold
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@ -477,6 +477,14 @@ UM.MainWindow
                        collapseSidebarAnimation.start();
                    }
                }
+
+                MouseArea
+                {
+                    visible: UM.Controller.activeStage.sidebarComponent != ""
+                    anchors.fill: parent
+                    acceptedButtons: Qt.AllButtons
+                    onWheel: wheel.accepted = true
+                }
            }

            UM.MessageStack
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@ -142,7 +142,7 @@ Item
        TextField
        {
            id: filter;
-
+            height: parent.height
            anchors.left: parent.left
            anchors.right: clearFilterButton.left
            anchors.rightMargin: Math.round(UM.Theme.getSize("sidebar_margin").width)
--- a/tools/check_preset_settings.py
+++ b/tools/check_preset_settings.py