Move the G-code processing result instead of copying it

GCodeProcessorResult declares a copy assignment, which suppresses the implicit
move assignment, so `*result = std::move(processor.extract_result())` binds to
the copy and duplicates the whole moves array: 96 bytes per move, measured at
147.7 MiB in one allocation for a 597k facet model at 0.08 mm, with the source
staying alive until the export returns.

Add the move assignment. It assigns exactly the same 39 members in the same
order as the copy, including the ones the copy deliberately leaves alone, so a
target that carries its own filament maps and nozzle type keeps them. A move
constructor is intentionally not added: the type holds a std::mutex, so it is
neither copy nor move constructible today and a partial one would leave ten
members uninitialised.

reset() now releases the two print sized vectors rather than clearing them. Its
callers are the paths that discard a result, so the memory went back only at the
next slice.

ViewerImpl::reset() does the same for the two vectors sized by the print, which
is what keeps a discarded preview resident, and counts m_vertices_colors in the
reported CPU memory, where it was missing.

deps/python3/python3.cmake

@@ -151,12 +151,6 @@ elseif(APPLE)
     # the post-install -add_rpath below.
     set(_python_ldflags "${_python_arch_flags} -Wl,-headerpad_max_install_names")
 
-    # The macOS 27 SDK declares pipe2() and dup3() as available from macOS 27, so
-    # configure finds them and CPython 3.12 calls them without a runtime check.
-    # Below a macOS 27 deployment target they are weak-linked and resolve to NULL
-    # on older systems, where os.pipe() then segfaults -- in `make install`
-    # (compileall, ensurepip) and in the shipped app alike. Every configure below
-    # keeps the pipe()/dup2() fallbacks (python/cpython#153711).
     if(IS_CROSS_COMPILE)
         set(_python_build_tgt --build=${_python_build_arch}-apple-darwin --host=${_python_host_arch}-apple-darwin)
         set(_python_build_arch_flags "-arch ${_python_build_arch_flag} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
@@ -180,8 +174,7 @@ elseif(APPLE)
                  --enable-shared \
                  --without-static-libpython \
                  --disable-test-modules \
-                 --build=${_python_build_arch}-apple-darwin \
+                 --build=${_python_build_arch}-apple-darwin && \
-                 ac_cv_func_pipe2=no ac_cv_func_dup3=no && \
              make -j${NPROC} python && \
              cd '<SOURCE_DIR>' && \
              env \
@@ -198,7 +191,6 @@ elseif(APPLE)
                  --without-static-libpython \
                  --with-openssl='${DESTDIR}' \
                  --disable-test-modules \
-                 ac_cv_func_pipe2=no ac_cv_func_dup3=no \
                  ${_python_build_tgt} \
                  --with-build-python='${_python_build_python}' \
                  py_cv_module__tkinter=n/a"
@@ -221,8 +213,6 @@ elseif(APPLE)
             --with-openssl=${DESTDIR}
             --disable-test-modules
             ${_python_build_tgt}
-            ac_cv_func_pipe2=no
-            ac_cv_func_dup3=no
             # Tcl/Tk 9.0 (e.g. from Homebrew) is incompatible with CPython 3.12's
             # _tkinter; OrcaSlicer's embedded Python does not need tkinter anyway.
             py_cv_module__tkinter=n/a

src/libslic3r/Config.cpp

@@ -873,10 +873,10 @@ int ConfigBase::load_from_json(const std::string &file, ConfigSubstitutionContex
 
     CNumericLocalesSetter locales_setter;
 
-    std::function<bool(const json&, const char,const char,const bool,std::string&)> parse_str_arr = [&parse_str_arr](const json& arr, const char single_sep,const char array_sep,const bool escape_string_style,std::string& value_str)->bool {
+    std::function<bool(const json::const_iterator&, const char,const char,const bool,std::string&)> parse_str_arr = [&parse_str_arr](const json::const_iterator& it, const char single_sep,const char array_sep,const bool escape_string_style,std::string& value_str)->bool {
         // must have consistent type name
         std::string consistent_type;
-        for (auto iter = arr.begin(); iter != arr.end(); ++iter) {
+        for (auto iter = it.value().begin(); iter != it.value().end(); ++iter) {
             if (consistent_type.empty())
                 consistent_type = iter.value().type_name();
             else {
@@ -886,13 +886,13 @@ int ConfigBase::load_from_json(const std::string &file, ConfigSubstitutionContex
         }
 
         bool first = true;
-        for (auto iter = arr.begin(); iter != arr.end(); iter++) {
+        for (auto iter = it.value().begin(); iter != it.value().end(); iter++) {
             if (iter.value().is_array()) {
                 if (!first)
                     value_str += array_sep;
                 else
                     first = false;
-                bool success = parse_str_arr(iter.value(), single_sep, array_sep,escape_string_style, value_str);
+                bool success = parse_str_arr(iter, single_sep, array_sep,escape_string_style, value_str);
                 if (!success)
                     return false;
             }
@@ -1038,39 +1038,8 @@ int ConfigBase::load_from_json(const std::string &file, ConfigSubstitutionContex
                         }
                     }
 
-                    // BambuStudio and its forks save a nozzle variant that matches the parent preset as "nil".
-                    // An option that can't hold nil gets its default in that slot, and the slot is reported so
-                    // the merge onto the parent keeps the parent's value. All slots nil means the key is not set.
-                    const json *values = &it.value();
-                    json values_with_defaults;
-                    if (substitution_context.accept_nil && optdef && !optdef->nullable && optdef->default_value &&
-                        (optdef->type == coFloats || optdef->type == coPercents || optdef->type == coFloatsOrPercents ||
-                         optdef->type == coInts || optdef->type == coEnums || optdef->type == coBools)) {
-                        auto is_nil = [](const json &v) { return v.is_string() && v.get<std::string>() == "nil"; };
-                        std::vector<size_t> nil_slots;
-                        for (size_t i = 0; i < values->size(); ++i)
-                            if (is_nil((*values)[i]))
-                                nil_slots.push_back(i);
-                        if (!nil_slots.empty()) {
-                            BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ": " << file << ": " << it.key() << " is nil in "
-                                                       << nil_slots.size() << " of " << values->size()
-                                                       << " slots, read as not set (the parent preset's value, or the default)";
-                            if (nil_slots.size() == values->size())
-                                continue;
-                            // create_default_option() gives enums their names, which vserialize() needs.
-                            std::unique_ptr<ConfigOption> default_option(optdef->create_default_option());
-                            const std::vector<std::string> defaults = static_cast<const ConfigOptionVectorBase*>(default_option.get())->vserialize();
-                            values_with_defaults = *values;
-                            const json first_value = *std::find_if_not(values->begin(), values->end(), is_nil);
-                            for (size_t i : nil_slots)
-                                values_with_defaults[i] = defaults.empty() ? first_value : json(defaults[i % defaults.size()]);
-                            values = &values_with_defaults;
-                            substitution_context.nil_slots[opt_key] = std::move(nil_slots);
-                        }
-                    }
-
                     // BBS: we only support 2 depth array
-                    valid = parse_str_arr(*values, single_sep, array_sep,escape_string_type, value_str);
+                    valid = parse_str_arr(it, single_sep, array_sep,escape_string_type, value_str);
                     if (!valid) {
                         BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": parse " << file << " error, invalid json array for " << it.key();
                         break;

src/libslic3r/Config.hpp

@@ -267,11 +267,6 @@ struct ConfigSubstitutionContext
     ForwardCompatibilitySubstitutionRule 	rule;
     ConfigSubstitutions					    substitutions;
     std::vector<std::string>                unrecogized_keys;
-    // Read "nil" in an option that can't hold it as not set instead of failing. Set by callers that hand
-    // nil_slots to the merge onto the parent preset, or for which the option default is the right fallback.
-    bool                                    accept_nil = false;
-    // Slots of options that can't hold nil but were "nil" in the file; they hold the option default.
-    std::map<std::string, std::vector<size_t>> nil_slots;
 };
 
 // A generic value of a configuration option.

src/libslic3r/Format/bbs_3mf.cpp

@@ -2696,8 +2696,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
             }
             std::map<std::string, std::string> key_values;
             std::string reason;
-            // No parent preset here: a nil slot keeps the option default.
-            config_substitutions.accept_nil = true;
             int ret = config.load_from_json(dest_file, config_substitutions, true, key_values, reason);
             if (ret) {
                 add_error("Error load config from json:"+reason);
@@ -2738,13 +2736,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
             //ConfigSubstitutions config_substitutions = config.load_from_ini(dest_file, Enable);
             std::map<std::string, std::string> key_values;
             std::string reason;
-            ConfigSubstitutionContext load_context(Enable);
+            ConfigSubstitutions config_substitutions = use_json? config.load_from_json(dest_file, Enable, key_values, reason) : config.load_from_ini(dest_file, Enable);
-            load_context.accept_nil = true;
-            if (use_json)
-                config.load_from_json(dest_file, load_context, true, key_values, reason);
-            else
-                load_context.substitutions = config.load_from_ini(dest_file, Enable);
-            ConfigSubstitutions config_substitutions = std::move(load_context.substitutions);
             if (!reason.empty()) {
                 BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", load project embedded config from  %1% failed\n") % dest_file;
                 //skip this file
@@ -2793,7 +2785,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
             preset->is_project_embedded = true;
             preset->is_external = true;
             preset->is_dirty = false;
-            preset->nil_slots = std::move(load_context.nil_slots);
 
             std::string version_str = key_values[BBL_JSON_KEY_VERSION];
             boost::optional<Semver> version = Semver::parse(version_str);

src/libslic3r/GCode/GCodeProcessor.cpp

@@ -2582,8 +2582,12 @@ void GCodeProcessorResult::reset() {
     //BBS: add mutex for protection of gcode result
     lock();
 
-    moves.clear();
+    // release rather than clear: these two are sized by the print - one entry per move and one
-    lines_ends.clear();
+    // per g-code line - and a reset is where the memory is expected to go back to the allocator
+    // (see BackgroundSlicingProcess::apply()). The capacity would not be reused anyway: the
+    // result is refilled by move-assigning the processor's own result.
+    moves = std::vector<MoveVertex>();
+    lines_ends = std::vector<size_t>();
     printable_area = Pointfs();
     //BBS: add bed exclude area
     bed_exclude_area = Pointfs();

src/libslic3r/GCode/GCodeProcessor.hpp

@@ -369,6 +369,56 @@ class Print;
             initial_layer_time = other.initial_layer_time;
 #if ENABLE_GCODE_VIEWER_STATISTICS
             time = other.time;
+#endif
+            return *this;
+        }
+        // Orca: the user-declared copy assignment above suppresses the implicit move assignment, so
+        // `*result = std::move(processor.extract_result())` used to deep copy 'moves' (one MoveVertex
+        // per move, gigabytes on a large print) while the source stayed alive. This moves exactly the
+        // same members as the copy above, with the same omissions, so the members the copy leaves
+        // untouched on the target are left untouched here too.
+        GCodeProcessorResult& operator=(GCodeProcessorResult &&other)
+        {
+            filename = std::move(other.filename);
+            id = other.id;
+            moves = std::move(other.moves);
+            lines_ends = std::move(other.lines_ends);
+            printable_area = std::move(other.printable_area);
+            bed_exclude_area = std::move(other.bed_exclude_area);
+            wrapping_exclude_area = std::move(other.wrapping_exclude_area);
+            toolpath_outside = other.toolpath_outside;
+            label_object_enabled = other.label_object_enabled;
+            long_retraction_when_cut = other.long_retraction_when_cut;
+            timelapse_warning_code = other.timelapse_warning_code;
+            printable_height = other.printable_height;
+            settings_ids = std::move(other.settings_ids);
+            filaments_count = other.filaments_count;
+            extruder_colors = std::move(other.extruder_colors);
+            filament_diameters = std::move(other.filament_diameters);
+            filament_densities = std::move(other.filament_densities);
+            filament_costs = std::move(other.filament_costs);
+            print_statistics = std::move(other.print_statistics);
+            custom_gcode_per_print_z = std::move(other.custom_gcode_per_print_z);
+            spiral_vase_mode = other.spiral_vase_mode;
+            warnings = std::move(other.warnings);
+            bed_type = other.bed_type;
+            gcode_check_result = std::move(other.gcode_check_result);
+            limit_filament_maps = std::move(other.limit_filament_maps);
+            filament_printable_reuslt = std::move(other.filament_printable_reuslt);
+            nozzle_group_result = std::move(other.nozzle_group_result);
+            extruder_types = std::move(other.extruder_types);
+            printer_extruder_variant = std::move(other.printer_extruder_variant);
+            printer_extruder_id = std::move(other.printer_extruder_id);
+            layer_filaments = std::move(other.layer_filaments);
+            filament_change_sequence = std::move(other.filament_change_sequence);
+            used_mixed_filaments = std::move(other.used_mixed_filaments);
+            nozzle_change_sequence = std::move(other.nozzle_change_sequence);
+            optimal_assignment = std::move(other.optimal_assignment);
+            filament_change_count_map = std::move(other.filament_change_count_map);
+            skippable_part_time = std::move(other.skippable_part_time);
+            initial_layer_time = other.initial_layer_time;
+#if ENABLE_GCODE_VIEWER_STATISTICS
+            time = other.time;
 #endif
             return *this;
         }

src/libslic3r/Preset.cpp

@@ -1726,11 +1726,9 @@ PresetCollection::UserPresetLoad PresetCollection::resolve_user_preset(
         //ConfigSubstitutions config_substitutions = config.load_from_ini(preset.file, substitution_rule);
         std::map<std::string, std::string> key_values;
         std::string reason;
-        ConfigSubstitutionContext load_context(substitution_rule);
+        ConfigSubstitutions config_substitutions = config.load_from_json(preset.file, substitution_rule, key_values, reason);
-        load_context.accept_nil = true;
+        if (! config_substitutions.empty())
-        config.load_from_json(preset.file, load_context, true, key_values, reason);
+            out.substitutions.push_back({ preset.name, m_type, PresetConfigSubstitutions::Source::UserFile, preset.file, std::move(config_substitutions) });
-        if (! load_context.substitutions.empty())
-            out.substitutions.push_back({ preset.name, m_type, PresetConfigSubstitutions::Source::UserFile, preset.file, std::move(load_context.substitutions) });
         if (!reason.empty()) {
             out.discard_file = true;
             out.errors.push_back((boost::format("parse config %1% failed") % preset.file).str());
@@ -1766,7 +1764,7 @@ PresetCollection::UserPresetLoad PresetCollection::resolve_user_preset(
             preset.config = inherit_preset->config;
             preset.filament_id = inherit_preset->filament_id;
             extend_default_config_length(config, false, {});
-            preset.config.update_diff_values_to_child_config(config, extruder_id_name, extruder_variant_name, *key_set1, *key_set2, &load_context.nil_slots);
+            preset.config.update_diff_values_to_child_config(config, extruder_id_name, extruder_variant_name, *key_set1, *key_set2);
         }
         else {
             auto inherits_config2 = dynamic_cast<ConfigOptionString *>(inherits_config);
@@ -2139,8 +2137,7 @@ void PresetCollection::load_project_embedded_presets(std::vector<Preset*>& proje
                 BOOST_LOG_TRIVIAL(error) << boost::format("can not find parent for config %1%!")%preset->file;
                 continue;
             }
-            preset->config.update_diff_values_to_child_config(config, extruder_id_name, extruder_variant_name, *key_set1, *key_set2, &preset->nil_slots);
+            preset->config.update_diff_values_to_child_config(config, extruder_id_name, extruder_variant_name, *key_set1, *key_set2);
-            preset->nil_slots.clear();
             //preset->config.apply(std::move(config));
             Preset::normalize(preset->config);
             // Report configuration fields, which are misplaced into a wrong group.

src/libslic3r/Preset.hpp

@@ -269,8 +269,6 @@ public:
     //BBS: add type for project-embedded
     bool                is_project_embedded = false;
     ConfigSubstitutions *loading_substitutions{nullptr};
-    // Slots that were nil in the embedded preset's file, see ConfigSubstitutionContext::nil_slots.
-    std::map<std::string, std::vector<size_t>> nil_slots;
     bool                is_user() const { return ! this->is_default && ! this->is_system && ! this->is_project_embedded && ! this->is_from_bundle(); }
     bool                can_overwrite() const { return ! this->is_default && ! this->is_system && ! this->is_from_bundle(); }
     //bool                is_user() const { return ! this->is_default && ! this->is_system; }

src/libslic3r/PrintConfig.cpp

@@ -10,8 +10,6 @@
 #include "GCode/Thumbnails.hpp"
 #include <set>
 #include <boost/algorithm/string/case_conv.hpp>
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
@@ -9187,18 +9185,16 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
     } else if (opt_key == "tree_support_wall_count" && value == "-1") {
         value = "0";
     } else if (opt_key == "different_settings_to_system") {
-        // Rename whole entries: a substring rename would also hit longer keys that contain the old name.
+        std::string copy_value = value;
-        std::vector<std::string> entries;
+        copy_value.erase(std::remove(copy_value.begin(), copy_value.end(), '\"'), copy_value.end()); // remove '"' in string
-        boost::split(entries, value, boost::is_any_of(";"));
+        std::set<std::string> split_keys = SplitStringAndRemoveDuplicateElement(copy_value, ";");
-        for (std::string &entry : entries) {
+        for (std::string split_key : split_keys) {
-            std::string key = entry, unused_value;
+            std::string copy_key = split_key, copy_value = "";
-            key.erase(std::remove(key.begin(), key.end(), '\"'), key.end());
+            handle_legacy(copy_key, copy_value);
-            std::string new_key = key;
+            if (copy_key != split_key) {
-            handle_legacy(new_key, unused_value);
+                ReplaceString(value, split_key, copy_key);
-            if (new_key != key)
+            }
-                ReplaceString(entry, key, new_key);
         }
-        value = boost::algorithm::join(entries, ";");
     } else if (opt_key == "overhang_fan_threshold" && value == "5%") {
         value = "10%";
     } else if( opt_key == "wall_infill_order" ) {
@@ -9240,13 +9236,6 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
         else if (value == "0"){
             value = "ensure_moderate";
         }
-        // BambuStudio's levels
-        else if (value == "enabled")
-            value = "ensure_all";
-        else if (value == "partial")
-            value = "ensure_moderate";
-        else if (value == "disabled")
-            value = "none";
     } else if (opt_key == "rotate_solid_infill_direction") {
         opt_key = "solid_infill_rotate_template";
         if (value == "1") {
@@ -9262,11 +9251,9 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
         opt_key = "chamber_temperature";
     } else if (opt_key == "thumbnail_size") {
         opt_key = "thumbnails";
-    } else if (opt_key == "top_one_wall_type") {
+    } else if (opt_key == "top_one_wall_type" && value != "none") {
-        // BambuStudio's "topmost" (one wall on the topmost layer only) widens to every top surface.
         opt_key = "only_one_wall_top";
-        if (!value.empty())
+        value = "1";
-            value = (value == "not apply" || value == "none") ? "0" : "1";
     } else if (opt_key == "initial_layer_flow_ratio") {
         opt_key = "bottom_solid_infill_flow_ratio";
     } else if (opt_key == "ironing_direction") {
@@ -9284,20 +9271,6 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
                 opt_key == "ironing_pattern"               ||
                 opt_key == "support_ironing_pattern") && value == "zig-zag") {
         value = "rectilinear";
-    } else if (opt_key == "sparse_infill_pattern" && value == "2dlattice") {
-        // BambuStudio's name, and OrcaSlicer's before the lateral patterns were renamed
-        value = "lateral-lattice";
-    } else if (opt_key == "sparse_infill_pattern" && value == "2dhoneycomb") {
-        value = "lateral-honeycomb";
-    } else if (opt_key == "sparse_infill_lattice_angle_1" || opt_key == "lattice_angle_1") {
-        opt_key = "lateral_lattice_angle_1";
-    } else if (opt_key == "sparse_infill_lattice_angle_2" || opt_key == "lattice_angle_2") {
-        opt_key = "lateral_lattice_angle_2";
-    } else if (opt_key == "support_style" && value == "tree_organic") {
-        value = "organic";
-    } else if (opt_key == "raft_first_layer_expansion" && !value.empty() && value.front() == '-') {
-        // BambuStudio's auto: 2 mm for normal supports and rafts. Tree branches use tree_support_auto_brim here.
-        value = "2";
     } else if (opt_key == "filament_map_mode") {
         if (value == "Auto") value = "Auto For Flush";
     }
@@ -9326,11 +9299,12 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
     }
     // Orca: Rename wipe tower ribs related options
     else if (opt_key == "prime_tower_rib_wall") {
-        opt_key = "wipe_tower_wall_type";
+        if (value == "1") {
-        if (value == "1" || value == "true")
+            opt_key = "wipe_tower_wall_type";
-            value = "rib";
+            value   = "rib";
-        else if (!value.empty())
+        } else {
-            value = "rectangle";
+            opt_key = "";
+        }
     } else if (opt_key == "prime_tower_extra_rib_length") {
         opt_key = "wipe_tower_extra_rib_length";
     } else if (opt_key == "prime_tower_rib_width") {
@@ -9342,18 +9316,6 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
     } else if (opt_key == "machine_switch_extruder_time") {
         opt_key = "machine_tool_change_time";
     }
-    // BambuStudio names of OrcaSlicer options
-    else if (opt_key == "role_base_wipe_speed") {
-        opt_key = "role_based_wipe_speed";
-    } else if (opt_key == "no_slow_down_for_cooling_on_outwalls") {
-        opt_key = "dont_slow_down_outer_wall";
-    } else if (opt_key == "process_notes") {
-        opt_key = "notes";
-    } else if (opt_key == "prime_tower_max_speed") {
-        opt_key = "wipe_tower_max_purge_speed";
-    } else if (opt_key == "enable_support_ironing") {
-        opt_key = "support_ironing";
-    }
     else if (opt_key == "wall_direction" && value == "auto") {
         value = "ccw";
     }
@@ -11596,8 +11558,7 @@ void DynamicPrintConfig::update_non_diff_values_to_base_config(DynamicPrintConfi
     return;
 }
 
-void DynamicPrintConfig::update_diff_values_to_child_config(DynamicPrintConfig& new_config, std::string extruder_id_name, std::string extruder_variant_name, std::set<std::string>& key_set1, std::set<std::string>& key_set2,
+void DynamicPrintConfig::update_diff_values_to_child_config(DynamicPrintConfig& new_config, std::string extruder_id_name, std::string extruder_variant_name, std::set<std::string>& key_set1, std::set<std::string>& key_set2)
-    const std::map<std::string, std::vector<size_t>>* nil_slots)
 {
     std::vector<int> cur_extruder_ids, target_extruder_ids, variant_index;
     std::vector<std::string> cur_extruder_variants, target_extruder_variants;
@@ -11658,13 +11619,6 @@ void DynamicPrintConfig::update_diff_values_to_child_config(DynamicPrintConfig&
         if (opt_src && opt_target && (*opt_src != *opt_target)) {
             BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" change key %1% from base_value %2% to child's value %3%")
                     %opt %(opt_src->serialize()) %(opt_target->serialize());
-            const std::vector<size_t> *unset_slots = nullptr;
-            if (nil_slots && opt_src->is_vector())
-                if (auto it = nil_slots->find(opt); it != nil_slots->end())
-                    unset_slots = &it->second;
-            std::unique_ptr<ConfigOption> base_value(unset_slots ? opt_src->clone() : nullptr);
-            int  stride            = 1;
-            bool merged_by_variant = false;
             if (opt_target->is_scalar()
                 || ((key_set1.find(opt) == key_set1.end()) && (key_set2.empty() || (key_set2.find(opt) == key_set2.end())))) {
                 //nothing to do, keep the original one
@@ -11673,6 +11627,7 @@ void DynamicPrintConfig::update_diff_values_to_child_config(DynamicPrintConfig&
             else {
                 ConfigOptionVectorBase* opt_vec_src = static_cast<ConfigOptionVectorBase*>(opt_src);
                 const ConfigOptionVectorBase* opt_vec_dest = static_cast<const ConfigOptionVectorBase*>(opt_target);
+                int stride = 1;
                 if (key_set2.find(opt) != key_set2.end())
                     stride = 2;
                 // set_only_diff() requires the base vector length to equal variant_index.size()*stride, where
@@ -11686,26 +11641,8 @@ void DynamicPrintConfig::update_diff_values_to_child_config(DynamicPrintConfig&
                 if (opt_vec_src->size() != variant_index.size() * size_t(stride)) {
                     opt_src->set(opt_target);
                 }
-                else {
+                else
                     opt_vec_src->set_only_diff(opt_vec_dest, variant_index, stride);
-                    merged_by_variant = true;
-                }
-            }
-            // A slot that was nil in the child's file is not set there, so it keeps this config's value.
-            if (unset_slots) {
-                auto       *merged    = static_cast<ConfigOptionVectorBase*>(opt_src);
-                const size_t base_size = static_cast<const ConfigOptionVectorBase*>(base_value.get())->size();
-                for (size_t slot = 0; slot < merged->size() && slot < base_size; ++slot) {
-                    size_t child_slot = slot;
-                    if (merged_by_variant) {
-                        const int child_variant = variant_index[slot / stride];
-                        if (child_variant == -1)
-                            continue;
-                        child_slot = size_t(child_variant) * stride + slot % stride;
-                    }
-                    if (std::find(unset_slots->begin(), unset_slots->end(), child_slot) != unset_slots->end())
-                        merged->set_at(base_value.get(), slot, slot);
-                }
             }
         }
     }

src/libslic3r/PrintConfig.hpp

@@ -859,10 +859,7 @@ public:
 
     void update_non_diff_values_to_base_config(DynamicPrintConfig& new_config, const t_config_option_keys& keys, const std::set<std::string>& different_keys, std::string extruder_id_name, std::string extruder_variant_name,
         std::set<std::string>& key_set1, std::set<std::string>& key_set2);
-    // nil_slots: per option, the slots of new_config that were nil in its file (see ConfigSubstitutionContext::nil_slots);
+    void update_diff_values_to_child_config(DynamicPrintConfig& new_config, std::string extruder_id_name, std::string extruder_variant_name, std::set<std::string>& key_set1, std::set<std::string>& key_set2);
-    // those variants keep this config's value.
-    void update_diff_values_to_child_config(DynamicPrintConfig& new_config, std::string extruder_id_name, std::string extruder_variant_name, std::set<std::string>& key_set1, std::set<std::string>& key_set2,
-        const std::map<std::string, std::vector<size_t>>* nil_slots = nullptr);
 
     int update_values_from_single_to_multi(DynamicPrintConfig& multi_config, std::set<std::string>& key_set, std::string id_name, std::string variant_name);
     int update_values_from_multi_to_multi(DynamicPrintConfig& new_config, std::set<std::string>& key_set, std::string id_name, std::string variant_name, std::vector<std::string>& extruder_variants);

src/libvgcode/src/ViewerImpl.cpp

@@ -883,15 +883,17 @@ void ViewerImpl::reset()
     m_used_extruders.clear();
     m_total_time = { 0.0f, 0.0f };
     m_travels_time = { 0.0f, 0.0f };
-    m_vertices.clear();
-    m_vertices_colors.clear();
     // swap rather than clear: these are sized by the print, and a reset means the memory
     // should go back, not sit reserved until the next load
+    std::vector<PathVertex>().swap(m_vertices);
+    std::vector<float>().swap(m_vertices_colors);
     for (std::vector<float>& times : m_layer_start_times)
         std::vector<float>().swap(times);
     std::vector<uint32_t>().swap(m_layer_first_vertex);
     std::vector<float>().swap(m_colors_scratch);
-    m_valid_lines_bitset.clear();
+    // BitSet::clear() only zeroes the bits, it keeps the blocks allocated; load() builds a new
+    // bitset anyway and it is never read while m_vertices is empty
+    m_valid_lines_bitset = BitSet<>();
 #if VGCODE_ENABLE_COG_AND_TOOL_MARKERS
     m_cog_marker.reset();
 #endif // VGCODE_ENABLE_COG_AND_TOOL_MARKERS
@@ -1812,6 +1814,7 @@ size_t ViewerImpl::get_used_cpu_memory() const
     ret += sizeof(m_extrusion_roles_colors);
     ret += sizeof(m_options_colors);
     ret += STDVEC_MEMSIZE(m_vertices, PathVertex);
+    ret += STDVEC_MEMSIZE(m_vertices_colors, float);
     for (const std::vector<float>& times : m_layer_start_times)
         ret += STDVEC_MEMSIZE(times, float);
     ret += STDVEC_MEMSIZE(m_layer_first_vertex, uint32_t);

src/slic3r/Utils/OrcaCloudServiceAgent.cpp

@@ -819,9 +819,7 @@ int OrcaCloudServiceAgent::user_logout(bool request)
         }
     }
 
-    // An explicit logout also wipes the backend the token storage option is not using, so a token
+    clear_session();
-    // stranded by switching that option cannot sign the account back in later.
-    clear_session(/*all_backends=*/request);
     return BAMBU_NETWORK_SUCCESS;
 }
 
@@ -1606,9 +1604,7 @@ void OrcaCloudServiceAgent::persist_user_secret(const std::string& secret)
         }
     }
 
-    if (stored) {
+    (void) stored;
-        secret_stored = true;
-    }
 }
 
 bool OrcaCloudServiceAgent::load_user_secret(std::string& out_secret)
@@ -1648,7 +1644,6 @@ bool OrcaCloudServiceAgent::load_user_secret(std::string& out_secret)
                 }
 
                 if (integrity_ok && aes256gcm_decrypt(encoded_payload, key, plain) && !plain.empty()) {
-                    secret_stored = true;
                     out_secret = plain;
                     // Upgrade legacy payloads to signed format
                     if (payload.rfind("v2:", 0) != 0) {
@@ -1666,7 +1661,6 @@ bool OrcaCloudServiceAgent::load_user_secret(std::string& out_secret)
             if (store.Load(SECRET_STORE_SERVICE, username, secret) && secret.IsOk()) {
                 out_secret.assign(static_cast<const char*>(secret.GetData()), secret.GetSize());
                 if (!out_secret.empty()) {
-                    secret_stored = true;
                     return true;
                 }
             }
@@ -1676,20 +1670,11 @@ bool OrcaCloudServiceAgent::load_user_secret(std::string& out_secret)
     return false;
 }
 
-void OrcaCloudServiceAgent::clear_user_secret(bool all_backends)
+void OrcaCloudServiceAgent::clear_user_secret()
 {
-    // Nothing this process loaded or saved: leave the store alone. Deleting would only cost a
+    wxSecretStore store = wxSecretStore::GetDefault();
-    // keychain round trip (or a hang while the keychain is unresponsive) and could remove a
+    if (store.IsOk()) {
-    // login another instance just saved.
+        store.Delete(SECRET_STORE_SERVICE);
-    if (!secret_stored.exchange(false) && !all_backends) {
-        return;
-    }
-
-    if (all_backends || !m_use_encrypted_token_file) {
-        wxSecretStore store = wxSecretStore::GetDefault();
-        if (store.IsOk()) {
-            store.Delete(SECRET_STORE_SERVICE);
-        }
     }
 
     compute_fallback_path();
@@ -2038,13 +2023,13 @@ bool OrcaCloudServiceAgent::set_user_session(const json& session_json, bool noti
     return success;
 }
 
-void OrcaCloudServiceAgent::clear_session(bool all_backends)
+void OrcaCloudServiceAgent::clear_session()
 {
     {
         std::lock_guard<std::mutex> lock(session_mutex);
         session = SessionInfo{};
     }
-    clear_user_secret(all_backends);
+    clear_user_secret();
 }
 
 // ============================================================================

src/slic3r/Utils/OrcaCloudServiceAgent.hpp

@@ -326,7 +326,7 @@ public:
 
     void persist_user_secret(const std::string& secret);
     bool load_user_secret(std::string& out_secret);
-    void clear_user_secret(bool all_backends = false);
+    void clear_user_secret();
 
     // Token refresh helpers
     bool          refresh_if_expiring(std::chrono::seconds skew, const std::string& reason);
@@ -344,7 +344,7 @@ public:
                           bool persist = true);
     // Accepts either nested Orca cloud / GoTrue session JSON or flat WebView token JSON.
     bool set_user_session(const nlohmann::json& session_json, bool notify_login = true);
-    void clear_session(bool all_backends = false);
+    void clear_session();
 
     static std::string generate_uuid_for_setting_id(const std::string& name, const std::string& user_id = "");
 
@@ -413,11 +413,6 @@ private:
     // Member variables - auth state
     PkceBundle pkce_bundle;
     std::string secret_fallback_path;
-    // Set once this process has read a secret from the store or written one. Unless the user logs
-    // out explicitly, clear_user_secret() only touches the store while it is set, so a logged-out
-    // instance (the GUI polls the login status every 2 s) makes no keychain calls and cannot wipe
-    // a login another instance saved.
-    std::atomic_bool secret_stored{false};
     SessionHandler session_handler;
     OnLoginCompleteHandler on_login_complete_handler;
     SessionInfo session;

tests/libslic3r/test_config.cpp

@@ -508,158 +508,6 @@ TEST_CASE("load_from_json hands a preset's include list to the caller instead of
     CHECK(config.opt_string("machine_end_gcode") == "M84");
 }
 
-TEST_CASE("handle_legacy maps BambuStudio keys and values to their OrcaSlicer equivalents", "[Config]") {
-    struct Row { std::string key, value, expected_key, expected_value; };
-    const Row row = GENERATE(values<Row>({
-        {"role_base_wipe_speed", "0", "role_based_wipe_speed", "0"},
-        {"no_slow_down_for_cooling_on_outwalls", "1", "dont_slow_down_outer_wall", "1"},
-        {"process_notes", "note", "notes", "note"},
-        {"prime_tower_max_speed", "70", "wipe_tower_max_purge_speed", "70"},
-        {"enable_support_ironing", "1", "support_ironing", "1"},
-        {"sparse_infill_lattice_angle_1", "-30", "lateral_lattice_angle_1", "-30"},
-        {"sparse_infill_lattice_angle_2", "20", "lateral_lattice_angle_2", "20"},
-        {"lattice_angle_1", "-30", "lateral_lattice_angle_1", "-30"},
-        {"lattice_angle_2", "20", "lateral_lattice_angle_2", "20"},
-        {"sparse_infill_pattern", "2dlattice", "sparse_infill_pattern", "lateral-lattice"},
-        {"sparse_infill_pattern", "2dhoneycomb", "sparse_infill_pattern", "lateral-honeycomb"},
-        {"support_style", "tree_organic", "support_style", "organic"},
-        {"raft_first_layer_expansion", "-1", "raft_first_layer_expansion", "2"},
-        {"raft_first_layer_expansion", "3.5", "raft_first_layer_expansion", "3.5"},
-        {"ensure_vertical_shell_thickness", "enabled", "ensure_vertical_shell_thickness", "ensure_all"},
-        {"ensure_vertical_shell_thickness", "partial", "ensure_vertical_shell_thickness", "ensure_moderate"},
-        {"ensure_vertical_shell_thickness", "disabled", "ensure_vertical_shell_thickness", "none"},
-        {"top_one_wall_type", "not apply", "only_one_wall_top", "0"},
-        {"top_one_wall_type", "all top", "only_one_wall_top", "1"},
-        {"top_one_wall_type", "topmost", "only_one_wall_top", "1"},
-        {"prime_tower_rib_wall", "1", "wipe_tower_wall_type", "rib"},
-        {"prime_tower_rib_wall", "0", "wipe_tower_wall_type", "rectangle"},
-        {"prime_tower_rib_wall", "true", "wipe_tower_wall_type", "rib"},
-        // A rename touches whole entries, not keys that contain the old name.
-        {"different_settings_to_system", "lattice_angle_1;sparse_infill_lattice_angle_1;wall_loops", "different_settings_to_system",
-         "lateral_lattice_angle_1;lateral_lattice_angle_1;wall_loops"},
-        // different_settings_to_system and JSON arrays pass the key alone
-        {"prime_tower_rib_wall", "", "wipe_tower_wall_type", ""},
-        {"top_one_wall_type", "", "only_one_wall_top", ""},
-        {"enable_height_slowdown", "1", "", "1"},
-        {"counter_coef_2", "0.025", "", "0.025"},
-    }));
-    t_config_option_key key = row.key;
-    std::string value = row.value;
-    PrintConfigDef::handle_legacy(key, value);
-    INFO(row.key << " = " << row.value);
-    CHECK(key == row.expected_key);
-    CHECK(value == row.expected_value);
-}
-
-TEST_CASE("A BambuStudio project config loads its renamed settings without substitutions", "[Config]") {
-    ScopedTemporaryFile tmp(".json");
-    {
-        boost::nowide::ofstream ofs(tmp.string());
-        ofs << R"({"role_base_wipe_speed":"0","no_slow_down_for_cooling_on_outwalls":["1","0"],)"
-               R"("process_notes":"note","prime_tower_max_speed":"70","enable_support_ironing":"1",)"
-               R"("sparse_infill_pattern":"2dlattice","sparse_infill_lattice_angle_1":"-30",)"
-               R"("support_style":"tree_organic","ensure_vertical_shell_thickness":"partial",)"
-               R"("top_one_wall_type":"not apply","prime_tower_rib_wall":"0","raft_first_layer_expansion":"-1",)"
-               R"("enable_height_slowdown":["1"]})";
-    }
-    DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
-    ConfigSubstitutionContext substitutions(ForwardCompatibilitySubstitutionRule::Disable);
-    std::map<std::string, std::string> key_values;
-    std::string reason;
-    REQUIRE(config.load_from_json(tmp.string(), substitutions, true, key_values, reason) == 0);
-    CHECK(substitutions.substitutions.empty());
-    CHECK(substitutions.unrecogized_keys == std::vector<std::string>{"enable_height_slowdown"});
-
-    CHECK_FALSE(config.opt_bool("role_based_wipe_speed"));
-    CHECK(config.option<ConfigOptionBools>("dont_slow_down_outer_wall")->values == std::vector<unsigned char>{1, 0});
-    CHECK(config.opt_string("notes") == "note");
-    CHECK_THAT(config.opt_float("wipe_tower_max_purge_speed"), Catch::Matchers::WithinAbs(70., 1e-9));
-    CHECK(config.opt_bool("support_ironing"));
-    CHECK(config.opt_enum<InfillPattern>("sparse_infill_pattern") == ipLateralLattice);
-    CHECK_THAT(config.opt_float("lateral_lattice_angle_1"), Catch::Matchers::WithinAbs(-30., 1e-9));
-    CHECK(config.opt_enum<SupportMaterialStyle>("support_style") == smsTreeOrganic);
-    CHECK(config.opt_enum<EnsureVerticalShellThickness>("ensure_vertical_shell_thickness") == evstModerate);
-    CHECK_FALSE(config.opt_bool("only_one_wall_top"));
-    CHECK(config.opt_enum<WipeTowerWallType>("wipe_tower_wall_type") == wtwRectangle);
-    CHECK_THAT(config.opt_float("raft_first_layer_expansion"), Catch::Matchers::WithinAbs(2., 1e-9));
-    CHECK(config.validate().count("raft_first_layer_expansion") == 0);
-}
-
-TEST_CASE("load_from_json reads a BambuStudio nil slot as not set", "[Config]") {
-    ScopedTemporaryFile tmp(".json");
-    {
-        boost::nowide::ofstream ofs(tmp.string());
-        // Keys after retraction_length in file order must still load.
-        ofs << R"({"layer_height":"0.2","retraction_length":["0.8","nil"],"wall_loops":"3","z_hop":["nil","nil"],)"
-               R"("z_hop_types":["Spiral Lift","nil"]})";
-    }
-    std::map<std::string, std::string> key_values;
-    std::string reason;
-
-    SECTION("a loader that doesn't merge onto a parent still rejects nil") {
-        DynamicPrintConfig config;
-        ConfigSubstitutionContext context(ForwardCompatibilitySubstitutionRule::Enable);
-        config.load_from_json(tmp.string(), context, true, key_values, reason);
-        CHECK_FALSE(reason.empty());
-    }
-
-    SECTION("a loader that opts in reads it as not set") {
-        DynamicPrintConfig config;
-        ConfigSubstitutionContext context(ForwardCompatibilitySubstitutionRule::Enable);
-        context.accept_nil = true;
-        REQUIRE(config.load_from_json(tmp.string(), context, true, key_values, reason) == 0);
-        CHECK(reason.empty());
-
-        const auto *default_length = static_cast<const ConfigOptionFloats*>(print_config_def.get("retraction_length")->default_value.get());
-        const auto &retraction_length = config.option<ConfigOptionFloats>("retraction_length")->values;
-        REQUIRE(retraction_length.size() == 2);
-        CHECK_THAT(retraction_length[0], Catch::Matchers::WithinAbs(0.8, 1e-9));
-        CHECK_THAT(retraction_length[1], Catch::Matchers::WithinAbs(default_length->get_at(1), 1e-9));
-
-        std::unique_ptr<ConfigOption> default_types(print_config_def.get("z_hop_types")->create_default_option());
-        const std::vector<std::string> type_defaults = static_cast<const ConfigOptionVectorBase*>(default_types.get())->vserialize();
-        CHECK(static_cast<const ConfigOptionVectorBase*>(config.option("z_hop_types"))->vserialize() ==
-              std::vector<std::string>{"Spiral Lift", type_defaults[1 % type_defaults.size()]});
-
-        CHECK(context.nil_slots == std::map<std::string, std::vector<size_t>>{{"retraction_length", {1}}, {"z_hop_types", {1}}});
-        CHECK_FALSE(config.has("z_hop"));
-        CHECK(config.opt_int("wall_loops") == 3);
-    }
-}
-
-TEST_CASE("A nozzle variant that was nil keeps the parent preset's value", "[Config]") {
-    auto printer = [](std::vector<double> nozzle_diameter, std::vector<double> retraction_length, std::vector<double> max_speed_x) {
-        DynamicPrintConfig config;
-        config.set_key_value("printer_extruder_variant", new ConfigOptionStrings({"Direct Drive Standard", "Direct Drive High Flow"}));
-        config.set_key_value("printer_extruder_id", new ConfigOptionInts({1, 1}));
-        // Not a per-variant key, so the merge copies it whole.
-        config.set_key_value("nozzle_diameter", new ConfigOptionFloats(nozzle_diameter));
-        config.set_key_value("retraction_length", new ConfigOptionFloats(retraction_length));
-        // Two values per variant: normal and silent mode.
-        config.set_key_value("machine_max_speed_x", new ConfigOptionFloats(max_speed_x));
-        return config;
-    };
-    auto check_values = [](const DynamicPrintConfig &config, const char *key, const std::vector<double> &expected) {
-        const std::vector<double> &values = config.option<ConfigOptionFloats>(key)->values;
-        INFO(key);
-        REQUIRE(values.size() == expected.size());
-        for (size_t i = 0; i < expected.size(); ++i)
-            CHECK_THAT(values[i], Catch::Matchers::WithinAbs(expected[i], 1e-9));
-    };
-    DynamicPrintConfig parent = printer({0.4, 0.6}, {0.6, 0.5}, {500, 200, 400, 100});
-    // The nil slots of the child hold the option default after loading.
-    DynamicPrintConfig child = printer({0.2, 0.4}, {0.8, 0.4}, {500, 200, 300, 90});
-    const std::map<std::string, std::vector<size_t>> nil_slots{{"nozzle_diameter", {1}}, {"retraction_length", {1}}, {"machine_max_speed_x", {3}}};
-
-    parent.update_diff_values_to_child_config(child, "printer_extruder_id", "printer_extruder_variant",
-                                              printer_options_with_variant_1, printer_options_with_variant_2, &nil_slots);
-
-    check_values(parent, "nozzle_diameter", {0.2, 0.6});
-    check_values(parent, "retraction_length", {0.8, 0.5});
-    // Only the silent-mode value of the second variant was nil.
-    check_values(parent, "machine_max_speed_x", {500, 200, 300, 100});
-}
-
 TEST_CASE("save_to_json writes the same document to a stream as to a file", "[Config]") {
     DynamicPrintConfig config;
     config.set_key_value("layer_height", new ConfigOptionFloat(0.2));

tests/slic3rutils/CMakeLists.txt

@@ -13,7 +13,6 @@ add_executable(${_TEST_NAME}_tests
     test_prebuild_queue.cpp
     test_staged_build.cpp
     test_network_versions.cpp
-    test_orca_cloud_agent.cpp
     test_action_source.cpp
     test_plugin_host_api.cpp
     # Exercise seam enums and predicates through the embedded Python host API.

tests/slic3rutils/python_test_support.hpp

@@ -6,7 +6,6 @@
 #include <boost/filesystem.hpp>
 #include <memory.h>
 #include <stdexcept>
-#include <string>
 #include <pybind11/embed.h>
 #include <pybind11/pybind11.h>
 
@@ -26,15 +25,8 @@ void ensure_python_initialized()
     config.parse_argv = 0;
 
     const auto python_home = boost::dll::program_location().parent_path() / "python";
-#ifdef _WIN32
-    const auto stdlib = python_home / "Lib";
-#else
-    const auto stdlib = python_home / "lib" /
-                        ("python" + std::to_string(PY_MAJOR_VERSION) + "." + std::to_string(PY_MINOR_VERSION));
-#endif
 
-    // Only a real runtime: a stray python/ folder (packages a test left behind) is not a home.
+    if (boost::filesystem::exists(python_home)) {
-    if (boost::filesystem::exists(stdlib / "encodings")) {
         const std::string home = python_home.string();
         const PyStatus status  = PyConfig_SetBytesString(&config, &config.home, home.c_str());
 

tests/slic3rutils/test_orca_cloud_agent.cpp

@@ -1,86 +0,0 @@
-#include <catch2/catch_all.hpp>
-
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
-
-#include <memory>
-#include <string>
-
-#include "slic3r/Utils/OrcaCloudServiceAgent.hpp"
-#include "test_utils.hpp"
-
-using namespace Slic3r;
-namespace fs = boost::filesystem;
-
-namespace {
-
-// The encrypted token file is the one secret backend a test can observe without a system
-// keychain. Every agent pointed at the same directory shares it, like separate app instances
-// share the keychain entry.
-std::unique_ptr<OrcaCloudServiceAgent> make_file_backed_agent(const fs::path& dir)
-{
-    auto agent = std::make_unique<OrcaCloudServiceAgent>(dir.string());
-    agent->set_use_encrypted_token_file(true);
-    agent->set_config_dir(dir.string());
-    return agent;
-}
-
-fs::path secret_file(const fs::path& dir) { return dir / secret_constants::USER_SECRET_FILENAME; }
-
-} // namespace
-
-TEST_CASE("Logging out removes the secret this instance saved", "[OrcaCloudServiceAgent]")
-{
-    ScopedTemporaryDir dir("orca-secret");
-    auto agent = make_file_backed_agent(dir.path());
-
-    agent->persist_user_secret("refresh-token");
-    REQUIRE(fs::exists(secret_file(dir.path())));
-
-    agent->user_logout(false);
-    CHECK_FALSE(fs::exists(secret_file(dir.path())));
-}
-
-TEST_CASE("Logging out removes a secret this instance loaded from the store", "[OrcaCloudServiceAgent]")
-{
-    ScopedTemporaryDir dir("orca-secret");
-    make_file_backed_agent(dir.path())->persist_user_secret("refresh-token");
-
-    auto        agent = make_file_backed_agent(dir.path());
-    std::string secret;
-    REQUIRE(agent->load_user_secret(secret));
-    CHECK(secret == "refresh-token");
-
-    agent->user_logout(false);
-    CHECK_FALSE(fs::exists(secret_file(dir.path())));
-}
-
-TEST_CASE("Logging out leaves a secret this instance never loaded or saved alone", "[OrcaCloudServiceAgent]")
-{
-    ScopedTemporaryDir dir("orca-secret");
-    make_file_backed_agent(dir.path())->persist_user_secret("refresh-token");
-
-    // A logged-out instance is asked to log out on every login-status poll.
-    auto other = make_file_backed_agent(dir.path());
-    other->user_logout(false);
-    other->user_logout(false);
-    CHECK(fs::exists(secret_file(dir.path())));
-
-    std::string secret;
-    REQUIRE(make_file_backed_agent(dir.path())->load_user_secret(secret));
-    CHECK(secret == "refresh-token");
-}
-
-TEST_CASE("Logging out leaves a secret this instance could not read alone", "[OrcaCloudServiceAgent]")
-{
-    ScopedTemporaryDir dir("orca-secret");
-    // Written under another encryption key, e.g. by another OS user sharing the data directory.
-    fs::ofstream(secret_file(dir.path())) << "v2:0000:not-a-payload-this-user-can-decrypt";
-
-    auto        agent = make_file_backed_agent(dir.path());
-    std::string secret;
-    REQUIRE_FALSE(agent->load_user_secret(secret));
-
-    agent->user_logout(false);
-    CHECK(fs::exists(secret_file(dir.path())));
-}

tests/slic3rutils/test_plugin_capability_config.cpp

@@ -38,9 +38,6 @@ namespace {
 // before this destructor's shutdown() runs.
 struct ScopedPluginManager
 {
-    // Before initialize(): the interpreter creates {data_dir}/python/packages and {data_dir}/log,
-    // which would otherwise land in the working directory.
-    ScopedDataDir python_data_dir{"plugin-python"};
     bool initialized = PluginManager::instance().initialize();
 
     ~ScopedPluginManager()

tests/slic3rutils/test_plugin_cloud_metadata.cpp

@@ -31,9 +31,6 @@ namespace {
 // same as any other plugin.
 struct ScopedManagerShutdown
 {
-    // Before initialize(): the interpreter creates {data_dir}/python/packages and {data_dir}/log,
-    // which would otherwise land in the working directory.
-    ScopedDataDir python_data_dir{"plugin-python"};
     bool initialized = PluginManager::instance().initialize();
 
     ~ScopedManagerShutdown()

tests/slic3rutils/test_plugin_lifecycle.cpp

@@ -42,9 +42,6 @@ namespace {
 // Declare this FIRST in a test so it is destroyed last.
 struct ScopedPluginManager
 {
-    // Before initialize(): the interpreter creates {data_dir}/python/packages and {data_dir}/log,
-    // which would otherwise land in the working directory.
-    ScopedDataDir python_data_dir{"plugin-python"};
     bool initialized = false;
 
     ScopedPluginManager() { initialized = PluginManager::instance().initialize(); }

tests/slic3rutils/test_plugin_printer_agent.cpp

@@ -12,8 +12,6 @@
 #include <memory>
 #include <string>
 
-#include "plugin_test_utils.hpp"
-
 namespace py = pybind11;
 using namespace Slic3r;
 
@@ -23,9 +21,6 @@ namespace {
 // into Python unless PythonInterpreter::instance() reports initialized.
 struct ScopedPluginManager
 {
-    // Before initialize(): the interpreter creates {data_dir}/python/packages and {data_dir}/log,
-    // which would otherwise land in the working directory.
-    ScopedDataDir python_data_dir{"plugin-python"};
     bool initialized = PluginManager::instance().initialize();
 
     ~ScopedPluginManager()

tests/slic3rutils/test_slicing_pipeline_config.cpp

@@ -35,9 +35,6 @@ namespace {
 
 struct ScopedPluginManager
 {
-    // Before initialize(): the interpreter creates {data_dir}/python/packages and {data_dir}/log,
-    // which would otherwise land in the working directory.
-    ScopedDataDir python_data_dir{"plugin-python"};
     bool initialized = false;
 
     ScopedPluginManager() { initialized = PluginManager::instance().initialize(); }