From c3e752529e01d8d6f2539224ff9e17c831a48417 Mon Sep 17 00:00:00 2001
From: supermerill <merill@free.fr>
Date: Wed, 30 Sep 2020 22:59:46 +0200
Subject: [PATCH] a bit of cleaning in printing steps

---
 src/libslic3r/Print.cpp       |  4 +-
 src/libslic3r/PrintObject.cpp | 77 +++++++++++++++++++----------------
 2 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 49a0a5cbf..25a4b25c4 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -79,7 +79,6 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
         "bridge_acceleration",
         "bridge_fan_speed",
         "colorprint_heights",
-        "top_fan_speed",
         "complete_objects_sort",
         "cooling",
         "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_speed",
         "first_layer_infill_speed",
+        "gap_fill_speed",
         "gcode_comments",
         "gcode_label_objects",
         "infill_acceleration",
@@ -154,8 +154,10 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
         "standby_temperature_delta",
         "start_gcode",
         "start_filament_gcode",
+        "thin_walls_speed",
         "time_estimation_compensation",
         "toolchange_gcode",
+        "top_fan_speed",
         "threads",
         "travel_speed",
         "use_firmware_retraction",
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index 555bb4a02..d97155cd4 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -610,30 +610,27 @@ bool PrintObject::invalidate_state_by_config_options(const std::vector<t_config_
     std::vector<PrintObjectStep> steps;
     bool invalidated = false;
     for (const t_config_option_key &opt_key : opt_keys) {
-        if (   opt_key == "perimeters"
-            || opt_key == "extra_perimeters"
-            || opt_key == "extra_perimeters_odd_layers"
-            || opt_key == "gap_fill"
-            || opt_key == "gap_fill_speed"
+        if ( 
+            opt_key == "gap_fill"
+            || opt_key == "gap_fill_min_area"
+            || opt_key == "only_one_perimeter_top"
             || opt_key == "overhangs"
             || opt_key == "overhangs_width"
             || opt_key == "overhangs_reverse"
             || opt_key == "overhangs_reverse_threshold"
-            || opt_key == "first_layer_extrusion_width"
             || opt_key == "perimeter_extrusion_width"
             || opt_key == "infill_overlap"
             || opt_key == "thin_perimeters"
+            || opt_key == "thin_perimeters_all"
             || opt_key == "thin_walls"
             || opt_key == "thin_walls_min_width"
             || opt_key == "thin_walls_overlap"
             || opt_key == "external_perimeters_first"
-            || opt_key == "external_perimeters_vase"
-            || opt_key == "external_perimeters_nothole"
             || opt_key == "external_perimeters_hole"
+            || opt_key == "external_perimeters_nothole"
+            || opt_key == "external_perimeters_vase"
             || opt_key == "perimeter_loop"
-            || opt_key == "perimeter_loop_seam"
-            || opt_key == "only_one_perimeter_top"
-            || opt_key == "no_perimeter_unsupported_algo") {
+            || opt_key == "perimeter_loop_seam") {
             steps.emplace_back(posPerimeters);
         } else if (
                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") {
             steps.emplace_back(posSupportMaterial);
         } else if (
-               opt_key == "interface_shells"
-            || 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_layers"
             || 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 == "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);
         } else if (
             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") {
             steps.emplace_back(posInfill);
         } else if (
-               opt_key == "fill_density"
+            opt_key == "extra_perimeters"
+            || opt_key == "extra_perimeters_odd_layers"
             || 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") {
             steps.emplace_back(posPerimeters);
             steps.emplace_back(posPrepareInfill);
@@ -737,19 +742,21 @@ bool PrintObject::invalidate_state_by_config_options(const std::vector<t_config_
                 steps.emplace_back(posSupportMaterial);
             //}
         } else if (
-               opt_key == "seam_position"
-            || 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 == "bridge_speed"
             || opt_key == "external_perimeter_speed"
             || opt_key == "external_perimeters_vase"
+            || opt_key == "gap_fill_speed"
             || opt_key == "infill_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 == "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") {
             invalidated |= m_print->invalidate_step(psGCodeExport);
         } else if (