GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 21:05:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

a bit of cleaning in printing steps

Browse Source
This commit is contained in:
supermerill 2020-09-30 22:59:46 +02:00
parent 14c7a8ad7f
commit c3e752529e
2 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/Print.cpp
View File

@ -79,7 +79,6 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
"bridge_acceleration", "bridge_acceleration",
"bridge_fan_speed", "bridge_fan_speed",
"colorprint_heights", "colorprint_heights",
"top_fan_speed",
"complete_objects_sort", "complete_objects_sort",
"cooling", "cooling",
"default_acceleration", "default_acceleration",
@ -111,6 +110,7 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
"first_layer_flow_ratio", "first_layer_flow_ratio",
"first_layer_speed", "first_layer_speed",
"first_layer_infill_speed", "first_layer_infill_speed",
"gap_fill_speed",
"gcode_comments", "gcode_comments",
"gcode_label_objects", "gcode_label_objects",
"infill_acceleration", "infill_acceleration",
@ -154,8 +154,10 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
"standby_temperature_delta", "standby_temperature_delta",
"start_gcode", "start_gcode",
"start_filament_gcode", "start_filament_gcode",
"thin_walls_speed",
"time_estimation_compensation", "time_estimation_compensation",
"toolchange_gcode", "toolchange_gcode",
"top_fan_speed",
"threads", "threads",
"travel_speed", "travel_speed",
"use_firmware_retraction", "use_firmware_retraction",

77
src/libslic3r/PrintObject.cpp
View File

@ -610,30 +610,27 @@ bool PrintObject::invalidate_state_by_config_options(const std::vector<t_config_
std::vector<PrintObjectStep> steps; std::vector<PrintObjectStep> steps;
bool invalidated = false; bool invalidated = false;
for (const t_config_option_key &opt_key : opt_keys) { for (const t_config_option_key &opt_key : opt_keys) {
if ( opt_key == "perimeters" if (
|| opt_key == "extra_perimeters" opt_key == "gap_fill"
|| opt_key == "extra_perimeters_odd_layers" || opt_key == "gap_fill_min_area"
|| opt_key == "gap_fill" || opt_key == "only_one_perimeter_top"
|| opt_key == "gap_fill_speed"
|| opt_key == "overhangs" || opt_key == "overhangs"
|| opt_key == "overhangs_width" || opt_key == "overhangs_width"
|| opt_key == "overhangs_reverse" || opt_key == "overhangs_reverse"
|| opt_key == "overhangs_reverse_threshold" || opt_key == "overhangs_reverse_threshold"
|| opt_key == "first_layer_extrusion_width"
|| opt_key == "perimeter_extrusion_width" || opt_key == "perimeter_extrusion_width"
|| opt_key == "infill_overlap" || opt_key == "infill_overlap"
|| opt_key == "thin_perimeters" || opt_key == "thin_perimeters"
|| opt_key == "thin_perimeters_all"
|| opt_key == "thin_walls" || opt_key == "thin_walls"
|| opt_key == "thin_walls_min_width" || opt_key == "thin_walls_min_width"
|| opt_key == "thin_walls_overlap" || opt_key == "thin_walls_overlap"
|| opt_key == "external_perimeters_first" || opt_key == "external_perimeters_first"
|| opt_key == "external_perimeters_vase"
|| opt_key == "external_perimeters_nothole"
|| opt_key == "external_perimeters_hole" || opt_key == "external_perimeters_hole"
|| opt_key == "external_perimeters_nothole"
|| opt_key == "external_perimeters_vase"
|| opt_key == "perimeter_loop" || opt_key == "perimeter_loop"
|| opt_key == "perimeter_loop_seam" || opt_key == "perimeter_loop_seam") {
|| opt_key == "only_one_perimeter_top"
|| opt_key == "no_perimeter_unsupported_algo") {
steps.emplace_back(posPerimeters); steps.emplace_back(posPerimeters);
} else if ( } else if (
opt_key == "layer_height" opt_key == "layer_height"
@ -684,24 +681,25 @@ bool PrintObject::invalidate_state_by_config_options(const std::vector<t_config_
|| opt_key == "support_material_solid_first_layer") { || opt_key == "support_material_solid_first_layer") {
steps.emplace_back(posSupportMaterial); steps.emplace_back(posSupportMaterial);
} else if ( } else if (
opt_key == "interface_shells" opt_key == "bottom_solid_layers"
|| opt_key == "infill_only_where_needed"
|| opt_key == "infill_every_layers"
|| opt_key == "solid_infill_every_layers"
|| opt_key == "infill_dense"
|| opt_key == "infill_not_connected"
|| opt_key == "infill_dense_algo"
|| opt_key == "bottom_solid_layers"
|| opt_key == "bottom_solid_min_thickness" || opt_key == "bottom_solid_min_thickness"
|| opt_key == "top_solid_layers"
|| opt_key == "top_solid_min_thickness"
|| opt_key == "solid_infill_below_area"
|| opt_key == "infill_extruder"
|| opt_key == "solid_infill_extruder"
|| opt_key == "infill_extrusion_width"
|| opt_key == "ensure_vertical_shell_thickness"
|| opt_key == "bridged_infill_margin" || opt_key == "bridged_infill_margin"
|| opt_key == "bridge_angle") { || opt_key == "bridge_angle"
|| opt_key == "ensure_vertical_shell_thickness"
|| opt_key == "fill_density"
|| opt_key == "interface_shells"
|| opt_key == "infill_extruder"
|| opt_key == "infill_extrusion_width"
|| opt_key == "infill_every_layers"
|| opt_key == "infill_dense"
|| opt_key == "infill_dense_algo"
|| opt_key == "infill_not_connected"
|| opt_key == "infill_only_where_needed"
|| opt_key == "solid_infill_below_area"
|| opt_key == "solid_infill_extruder"
|| opt_key == "solid_infill_every_layers"
|| opt_key == "top_solid_layers"
|| opt_key == "top_solid_min_thickness") {
steps.emplace_back(posPrepareInfill); steps.emplace_back(posPrepareInfill);
} else if ( } else if (
opt_key == "top_fill_pattern" opt_key == "top_fill_pattern"
@ -718,8 +716,15 @@ bool PrintObject::invalidate_state_by_config_options(const std::vector<t_config_
|| opt_key == "first_layer_extrusion_width") { || opt_key == "first_layer_extrusion_width") {
steps.emplace_back(posInfill); steps.emplace_back(posInfill);
} else if ( } else if (
opt_key == "fill_density" opt_key == "extra_perimeters"
|| opt_key == "extra_perimeters_odd_layers"
|| opt_key == "external_infill_margin" || opt_key == "external_infill_margin"
|| opt_key == "external_perimeter_overlap"
|| opt_key == "first_layer_extrusion_width"
|| opt_key == "gap_fill_overlap"
|| opt_key == "no_perimeter_unsupported_algo"
|| opt_key == "perimeters"
|| opt_key == "perimeter_overlap"
|| opt_key == "solid_infill_extrusion_width") { || opt_key == "solid_infill_extrusion_width") {
steps.emplace_back(posPerimeters); steps.emplace_back(posPerimeters);
steps.emplace_back(posPrepareInfill); steps.emplace_back(posPrepareInfill);
@ -737,19 +742,21 @@ bool PrintObject::invalidate_state_by_config_options(const std::vector<t_config_
steps.emplace_back(posSupportMaterial); steps.emplace_back(posSupportMaterial);
//} //}
} else if ( } else if (
opt_key == "seam_position" opt_key == "bridge_speed"
|| opt_key == "seam_travel"
|| opt_key == "seam_preferred_direction"
|| opt_key == "seam_preferred_direction_jitter"
|| opt_key == "support_material_speed"
|| opt_key == "support_material_interface_speed"
|| opt_key == "bridge_speed"
|| opt_key == "external_perimeter_speed" || opt_key == "external_perimeter_speed"
|| opt_key == "external_perimeters_vase" || opt_key == "external_perimeters_vase"
|| opt_key == "gap_fill_speed"
|| opt_key == "infill_speed" || opt_key == "infill_speed"
|| opt_key == "perimeter_speed" || opt_key == "perimeter_speed"
|| opt_key == "seam_position"
|| opt_key == "seam_preferred_direction"
|| opt_key == "seam_preferred_direction_jitter"
|| opt_key == "seam_travel"
|| opt_key == "small_perimeter_speed" || opt_key == "small_perimeter_speed"
|| opt_key == "solid_infill_speed" || opt_key == "solid_infill_speed"
|| opt_key == "support_material_interface_speed"
|| opt_key == "support_material_speed"
|| opt_key == "thin_walls_speed"
|| opt_key == "top_solid_infill_speed") { || opt_key == "top_solid_infill_speed") {
invalidated |= m_print->invalidate_step(psGCodeExport); invalidated |= m_print->invalidate_step(psGCodeExport);
} else if ( } else if (