Renamed to single loop draft shield

src/libslic3r/GCode.cpp

@@ -3541,11 +3541,11 @@ std::string GCode::generate_skirt(const Print &print,
         // Decide where to start looping:
         // - If it’s the first layer or if we do NOT want a single-wall draft shield,
         //   start from loops.first (all loops).
-        // - Otherwise, if one_wall_draft_shield == true and draft_shield == true (and not the first layer),
+        // - Otherwise, if single_loop_draft_shield == true and draft_shield == true (and not the first layer),
         //   start from loops.second - 1 (just one loop).
-        bool one_wall_draft_shield = print.m_config.one_wall_draft_shield &&
+        bool single_loop_draft_shield = print.m_config.single_loop_draft_shield &&
                                     (print.m_config.draft_shield == dsEnabled);
-        const size_t start_idx = (first_layer || !one_wall_draft_shield)
+        const size_t start_idx = (first_layer || !single_loop_draft_shield)
                                  ? loops.first
                                  : (loops.second - 1);
 
@@ -3565,7 +3565,7 @@ std::string GCode::generate_skirt(const Print &print,
             //FIXME using the support_speed of the 1st object printed.
             gcode += this->extrude_loop(loop, "skirt", m_config.support_speed.value);
             // If we only want a single wall on non-first layers, break now
-            if (!first_layer && one_wall_draft_shield) {
+            if (!first_layer && single_loop_draft_shield) {
                 break;
             }
         }

src/libslic3r/Preset.cpp

@@ -796,7 +796,7 @@ static std::vector<std::string> s_Preset_print_options {
     "inner_wall_speed", "outer_wall_speed", "sparse_infill_speed", "internal_solid_infill_speed",
     "top_surface_speed", "support_speed", "support_object_xy_distance", "support_object_first_layer_gap", "support_interface_speed",
     "bridge_speed", "internal_bridge_speed", "gap_infill_speed", "travel_speed", "travel_speed_z", "initial_layer_speed",
-    "outer_wall_acceleration", "initial_layer_acceleration", "top_surface_acceleration", "default_acceleration", "skirt_type", "skirt_loops", "skirt_speed","min_skirt_length", "skirt_distance", "skirt_start_angle", "skirt_height","one_wall_draft_shield", "draft_shield",
+    "outer_wall_acceleration", "initial_layer_acceleration", "top_surface_acceleration", "default_acceleration", "skirt_type", "skirt_loops", "skirt_speed","min_skirt_length", "skirt_distance", "skirt_start_angle", "skirt_height","single_loop_draft_shield", "draft_shield",
     "brim_width", "brim_object_gap", "brim_type", "brim_ears_max_angle", "brim_ears_detection_length", "enable_support", "support_type", "support_threshold_angle", "support_threshold_overlap","enforce_support_layers",
     "raft_layers", "raft_first_layer_density", "raft_first_layer_expansion", "raft_contact_distance", "raft_expansion",
     "support_base_pattern", "support_base_pattern_spacing", "support_expansion", "support_style",

src/libslic3r/Print.cpp

@@ -228,7 +228,7 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n
             || opt_key == "skirt_speed"
             || opt_key == "skirt_height"
             || opt_key == "min_skirt_length"
-            || opt_key == "one_wall_draft_shield"
+            || opt_key == "single_loop_draft_shield"
             || opt_key == "draft_shield"
             || opt_key == "skirt_distance"
             || opt_key == "skirt_start_angle"

src/libslic3r/PrintConfig.cpp

@@ -4289,8 +4289,8 @@ void PrintConfigDef::init_fff_params()
     def->max = 10000;
     def->set_default_value(new ConfigOptionInt(1));
 
-    def = this->add("one_wall_draft_shield", coBool);
-    def->label = L("One wall draft shield");
+    def = this->add("single_loop_draft_shield", coBool);
+    def->label = L("Single loop draft shield");
     def->tooltip = L("Limits the draft shield loops to one wall after the first layer. This is useful, on occasion, to conserve filament but may cause the draft shield to warp / crack.");
     def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionBool(false));

src/libslic3r/PrintConfig.hpp

@@ -1286,7 +1286,7 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE(
     ((ConfigOptionInt,                skirt_loops))
     ((ConfigOptionEnum<SkirtType>,    skirt_type))
     ((ConfigOptionFloat,              skirt_speed))
-    ((ConfigOptionBool,               one_wall_draft_shield))
+    ((ConfigOptionBool,               single_loop_draft_shield))
     ((ConfigOptionFloat,              min_skirt_length))
     ((ConfigOptionFloats,             slow_down_layer_time))
     ((ConfigOptionBool,               spiral_mode))

src/slic3r/GUI/ConfigManipulation.cpp

@@ -565,8 +565,8 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co
 
     bool have_skirt = config->opt_int("skirt_loops") > 0;
     toggle_field("skirt_height", have_skirt && config->opt_enum<DraftShield>("draft_shield") != dsEnabled);
-    toggle_line("one_wall_draft_shield", have_skirt && config->opt_enum<DraftShield>("draft_shield") == dsEnabled); // ORCA: Display one wall draft shield if draft shield is enabled and skirt enabled
-    for (auto el : {"skirt_type","min_skirt_length", "skirt_distance", "skirt_start_angle","skirt_height","skirt_speed", "draft_shield", "one_wall_draft_shield"})
+    toggle_line("single_loop_draft_shield", have_skirt && config->opt_enum<DraftShield>("draft_shield") == dsEnabled); // ORCA: Display one wall draft shield if draft shield is enabled and skirt enabled
+    for (auto el : {"skirt_type","min_skirt_length", "skirt_distance", "skirt_start_angle","skirt_height","skirt_speed", "draft_shield", "single_loop_draft_shield"})
         toggle_field(el, have_skirt);   
 
     bool have_brim = (config->opt_enum<BrimType>("brim_type") != btNoBrim);

src/slic3r/GUI/Tab.cpp

@@ -2310,7 +2310,7 @@ page = add_options_page(L("Others"), "custom-gcode_other"); // ORCA: icon only v
         optgroup->append_single_option_line("skirt_height");
         optgroup->append_single_option_line("skirt_speed");
         optgroup->append_single_option_line("draft_shield");
-        optgroup->append_single_option_line("one_wall_draft_shield");
+        optgroup->append_single_option_line("single_loop_draft_shield");
 
         optgroup = page->new_optgroup(L("Brim"), L"param_adhension");
         optgroup->append_single_option_line("brim_type", "auto-brim");