Merge Main into Belt Printer

Merge origin/main (00429da739) into belt-printer. Conflicts resolved: - src/CMakeLists.txt: keep both wxInspector workarounds. - GCodeProcessor.cpp: keep the belt compare_pos / z_for_height lines. - PrintObjectSlice.cpp: the belt bbox-Z guard also covers main's printable_region_ids bookkeeping. - TreeSupport.cpp: the belt-floor check runs before main's PendingNode queueing. - Tab.hpp: keep the belt fields, drop the removed upload description fields. - tests/libslic3r/CMakeLists.txt: keep both test files. Also included: - eSUN PLA belt presets declare their own filament_id (OFkrxQC4) and scripts/filament_id_snapshot.json is regenerated, as main's filament_id check requires. - Custom.json version bumped to 02.04.00.05 so the belt entries reach existing installs. - Fix the ambiguous WithinRel call in the belt apron width test, which otherwise breaks the fff_print build.
2026-09-26 02:11:18 +00:00 · 2026-09-14 16:33:08 +08:00
parent c96945490b 00429da739
commit 8e330f951a
4930 changed files with 62617 additions and 21404 deletions
@@ -277,6 +277,7 @@ static t_config_enum_values s_keys_map_InfillPattern {
    { "tpmsfk", ipTpmsFK },
    { "gyroid", ipGyroid },
    { "concentric", ipConcentric },
+    { "spiralinset", ipSpiralInset },
    { "hilbertcurve", ipHilbertCurve },
    { "archimedeanchords", ipArchimedeanChords },
    { "octagramspiral", ipOctagramSpiral }
@@ -421,6 +422,7 @@ static t_config_enum_values s_keys_map_SupportMaterialInterfacePattern {
    { "auto",           smipAuto },
    { "rectilinear",    smipRectilinear },
    { "concentric",     smipConcentric },
+    { "spiralinset",    smipSpiralInset },
    { "rectilinear_interlaced", smipRectilinearInterlaced},
    { "grid",           smipGrid }
 };
@@ -1181,8 +1183,7 @@ void PrintConfigDef::init_fff_params()
    // BBS
    def = this->add("supertack_plate_temp", coInts);
    def->label = L("Other layers");
-    def->tooltip = L("Bed temperature for layers except the initial one. "
-                     "A value of 0 means the filament does not support printing on the Cool Plate SuperTack.");
+    def->tooltip = L("This is the bed temperature for layers except for the first one. A value of 0 means the filament does not support printing on the Cool Plate SuperTack.");
    def->sidetext = L(u8"\u2103" /* °C */);	// degrees Celsius, CIS languages need translation
    def->full_label = L("Bed temperature");
    def->min = 0;
@@ -2385,6 +2386,7 @@ void PrintConfigDef::init_fff_params()
    def->enum_values.push_back("rectilinear");
    def->enum_values.push_back("alignedrectilinear");
    def->enum_values.push_back("concentric");
+    def->enum_values.push_back("spiralinset");
    def->enum_values.push_back("hilbertcurve");
    def->enum_values.push_back("archimedeanchords");
    def->enum_values.push_back("octagramspiral");
@@ -2393,6 +2395,7 @@ void PrintConfigDef::init_fff_params()
    def->enum_labels.push_back(L("Rectilinear"));
    def->enum_labels.push_back(L("Aligned Rectilinear"));
    def->enum_labels.push_back(L("Concentric"));
+    def->enum_labels.push_back(L("Spiral Inset"));
    def->enum_labels.push_back(L("Hilbert Curve"));
    def->enum_labels.push_back(L("Archimedean Chords"));
    def->enum_labels.push_back(L("Octagram Spiral"));
@@ -2475,7 +2478,7 @@ void PrintConfigDef::init_fff_params()
    def->label = L("Top surface fill order");
    def->category = L("Strength");
    def->tooltip = L("Direction in which top surfaces are filled when using a center-based pattern "
-                     "(Concentric, Archimedean Chords, Octagram Spiral).\n"
+                     "(Concentric, Spiral Inset, Archimedean Chords, Octagram Spiral).\n"
                     "Outward starts at the center of the surface, so any excess material is pushed "
                     "towards the edge where it is least visible. Inward starts at the edge and ends "
                     "with the tight curves at the center.\n"
@@ -2494,7 +2497,7 @@ void PrintConfigDef::init_fff_params()
    def->label = L("Bottom surface fill order");
    def->category = L("Strength");
    def->tooltip = L("Direction in which bottom surfaces are filled when using a center-based pattern "
-                     "(Concentric, Archimedean Chords, Octagram Spiral).\n"
+                     "(Concentric, Spiral Inset, Archimedean Chords, Octagram Spiral).\n"
                     "Inward starts each surface with the wider outer curves, which improves first layer "
                     "adhesion on build plates where the tight curves at the center may not stick. "
                     "Outward starts at the center, pushing any excess material towards the edge.\n"
@@ -2862,7 +2865,7 @@ void PrintConfigDef::init_fff_params()
    def = this->add("fan_cooling_layer_time", coFloats);
    def->label = L("Layer time");
    def->tooltip = L("The part cooling fan will be enabled for layers where the estimated time is shorter than this value. Fan speed is interpolated between the minimum and maximum fan speeds according to layer printing time.");
-    def->sidetext = L("s");	// seconds, CIS languages need translation
+    def->sidetext = L_CONTEXT("s", "second");	// seconds, CIS languages need translation
    def->min = 0;
    def->max = 1000;
    def->mode = comSimple;
@@ -3015,7 +3018,7 @@ void PrintConfigDef::init_fff_params()
    def->label = L("Filament load time");
    def->tooltip = L("Time to load new filament when switch filament. It's usually applicable for single-extruder multi-material machines. "
                     "For tool changers or multi-tool machines, it's typically 0. For statistics only.");
-    def->sidetext = L("s");	// seconds, CIS languages need translation
+    def->sidetext = L_CONTEXT("s", "second");	// seconds, CIS languages need translation
    def->min = 0;
    def->mode = comAdvanced;
    def->set_default_value(new ConfigOptionFloat(0.0));
@@ -3024,7 +3027,7 @@ void PrintConfigDef::init_fff_params()
    def->label = L("Filament unload time");
    def->tooltip = L("Time to unload old filament when switch filament. It's usually applicable for single-extruder multi-material machines. "
                     "For tool changers or multi-tool machines, it's typically 0. For statistics only.");
-    def->sidetext = L("s");	// seconds, CIS languages need translation
+    def->sidetext = L_CONTEXT("s", "second");	// seconds, CIS languages need translation
    def->min = 0;
    def->mode = comAdvanced;
    def->set_default_value(new ConfigOptionFloat(0.0));
@@ -3033,7 +3036,7 @@ void PrintConfigDef::init_fff_params()
    def->label = L("Tool change time");
    def->tooltip = L("Time taken to switch tools. It's usually applicable for tool changers or multi-tool machines. "
                     "For single-extruder multi-material machines, it's typically 0. For statistics only.");
-    def->sidetext = L("s");	// seconds, CIS languages need translation
+    def->sidetext = L_CONTEXT("s", "second");	// seconds, CIS languages need translation
    def->min = 0;
    def->mode = comAdvanced;
    def->set_default_value(new ConfigOptionFloat { 0. });
@@ -3179,7 +3182,7 @@ void PrintConfigDef::init_fff_params()
    def->tooltip = L("Time to wait after the filament is unloaded. "
                   "May help to get reliable tool changes with flexible materials "
                   "that may need more time to shrink to original dimensions.");
-    def->sidetext = L("s");	// seconds, CIS languages need translation
+    def->sidetext = L_CONTEXT("s", "second");	// seconds, CIS languages need translation
    def->min = 0;
    def->mode = comAdvanced;
    def->set_default_value(new ConfigOptionFloats { 0. });
@@ -4298,7 +4301,7 @@ void PrintConfigDef::init_fff_params()
        "\nIt won't move fan commands from custom G-code (they act as a sort of 'barrier')."
        "\nIt won't move fan commands into the start G-code if the 'only custom start G-code' is activated."
        "\nUse 0 to deactivate.");
-    def->sidetext = L("s");	// seconds, CIS languages need translation
+    def->sidetext = L_CONTEXT("s", "second");	// seconds, CIS languages need translation
    def->mode = comAdvanced;
    def->set_default_value(new ConfigOptionFloat(0));

@@ -4314,7 +4317,7 @@ void PrintConfigDef::init_fff_params()
                    "\nThis is useful for fans where a low PWM/power may be insufficient to get the fan started spinning from a stop, or to "
                    "get the fan up to speed faster."
                    "\nSet to 0 to deactivate.");
-    def->sidetext = L("s");	// seconds, CIS languages need translation
+    def->sidetext = L_CONTEXT("s", "second");	// seconds, CIS languages need translation
    def->min = 0;
    def->mode = comAdvanced;
    def->set_default_value(new ConfigOptionFloat(0));
@@ -4958,7 +4961,7 @@ void PrintConfigDef::init_fff_params()
    def->label    = L("Ironing expansion");
    def->category = L("Quality");
    def->tooltip  = L("Expand or contract the ironing area.");
-    def->sidetext = L("mm");
+    def->sidetext = L("mm");	// millimeters, CIS languages need translation
    def->min      = -100;
    def->max      = 100;
    def->mode     = comExpert;
@@ -4995,7 +4998,7 @@ void PrintConfigDef::init_fff_params()
    def->category = L("Quality");
    def->tooltip  = L("Minimum Z-layer height.\n"
                      "Also controls the slicing plane.");
-    def->sidetext = L("mm");
+    def->sidetext = L("mm");	// millimeters, CIS languages need translation
    def->min      = 0;
    def->max      = 100;
    def->mode     = comExpert;
@@ -5194,7 +5197,7 @@ void PrintConfigDef::init_fff_params()
    def->category   = L("Machine limits");
    def->readonly   = false;
    def->tooltip    = L("The allowed maximum output force of Y axis");
-    def->sidetext   = L("N");
+    def->sidetext   = L_CONTEXT("N", "Newton");	// Newtons, CIS languages need translation
    def->min        = 0;
    def->mode       = comDevelop;
    def->set_default_value(new ConfigOptionFloat(0));
@@ -5204,7 +5207,7 @@ void PrintConfigDef::init_fff_params()
    def->category   = L("Machine limits");
    def->readonly   = false;
    def->tooltip    = L("The machine bed mass load of Y axis");
-    def->sidetext   = L("g");
+    def->sidetext   = L_CONTEXT("g", "gram");	// grams, CIS languages need translation
    def->min        = 0;
    def->mode       = comDevelop;
    def->set_default_value(new ConfigOptionFloat(0));
@@ -5214,7 +5217,7 @@ void PrintConfigDef::init_fff_params()
    def->category   = L("Machine limits");
    def->readonly   = false;
    def->tooltip    = L("The allowed max printed mass on a plate");
-    def->sidetext   = L("g");
+    def->sidetext   = L_CONTEXT("g", "gram");	// grams, CIS languages need translation
    def->min        = 0;
    def->mode       = comDevelop;
    def->set_default_value(new ConfigOptionFloat(0));
@@ -5519,7 +5522,7 @@ void PrintConfigDef::init_fff_params()
    def->mode = comAdvanced;
    def->readonly = false;
    def->nullable = true;
-    def->set_default_value(new ConfigOptionFloatsNullable { {0.0} });
+    def->set_default_value(new ConfigOptionFloatsNullable { 0.0 });

    def = this->add("cooling_tube_retraction", coFloat);
    def->label = L("Cooling tube position");
@@ -5573,7 +5576,7 @@ void PrintConfigDef::init_fff_params()

    def = this->add("reduce_infill_retraction", coBool);
    def->label = L("Reduce infill retraction");
-    def->tooltip = L("Don\'t retract when the travel is entirely within an infill area. That means the oozing can\'t been seen. This can reduce times of retraction for complex model and save printing time, but make slicing and G-code generating slower. Note that z-hop is also not performed in areas where retraction is skipped.");
+    def->tooltip = L("Don\'t retract when the travel is entirely within an infill area. That means the oozing can\'t been seen. This can reduce times of retraction for complex model and save printing time, but make slicing and G-code generating slower. Note that Z-hop is also not performed in areas where retraction is skipped.");
    def->mode = comAdvanced;
    def->set_default_value(new ConfigOptionBool(false));

@@ -5828,7 +5831,7 @@ void PrintConfigDef::init_fff_params()
    def = this->add("retract_after_wipe", coPercents);
    def->label = L("Retract amount after wipe");
    // xgettext:no-c-format, no-boost-format
-    def->tooltip = L("The length of fast retraction after wipe, relative to retraction length.\n"
+    def->tooltip = L("This is the length of fast retraction after wipe, relative to retraction length.\n"
                     "The value will be clamped by 100% minus the retract amount before the wipe value.");
    def->sidetext = "%";
    def->mode = comExpert;
@@ -5894,7 +5897,7 @@ void PrintConfigDef::init_fff_params()

    def = this->add("z_hop", coFloats);
    def->label = L("Z-hop height");
-    def->tooltip = L("Whenever there is a retraction, the nozzle is lifted a little to create clearance between the nozzle and the print. This prevents the nozzle from hitting the print when traveling more. Using spiral lines to lift z can prevent stringing.");
+    def->tooltip = L("Whenever there is a retraction, the nozzle is lifted a little to create clearance between the nozzle and the print. This prevents the nozzle from hitting the print when traveling more. Using spiral lines to lift Z can prevent stringing.");
    def->sidetext = L("mm");	// millimeters, CIS languages need translation
    def->mode = comSimple;
    def->min = 0;
@@ -6472,7 +6475,7 @@ void PrintConfigDef::init_fff_params()
    def->label = L("Layer time");
    def->tooltip = L("The printing speed in exported G-code will be slowed down when the estimated layer time is "
                     "shorter than this value in order to get better cooling for these layers.");
-    def->sidetext = L("s");	// seconds, CIS languages need translation
+    def->sidetext = L_CONTEXT("s", "second");	// seconds, CIS languages need translation
    def->min = 0;
    def->max = 1000;
    def->mode = comSimple;
@@ -6625,7 +6628,7 @@ void PrintConfigDef::init_fff_params()
    def->label = L("Preheat time");
    def->tooltip = L("To reduce the waiting time after tool change, Orca can preheat the next tool while the current tool is still in use. "
                     "This setting specifies the time in seconds to preheat the next tool. Orca will insert a M104 command to preheat the tool in advance.");
-    def->sidetext = L("s");	// seconds, CIS languages need translation
+    def->sidetext = L_CONTEXT("s", "second");	// seconds, CIS languages need translation
    def->min = 0;
    def->max = 120;
    def->mode = comAdvanced;
@@ -7056,11 +7059,13 @@ void PrintConfigDef::init_fff_params()
    def->enum_values.push_back("auto");
    def->enum_values.push_back("rectilinear");
    def->enum_values.push_back("concentric");
+	def->enum_values.push_back("spiralinset");
    def->enum_values.push_back("rectilinear_interlaced");
    def->enum_values.push_back("grid");
    def->enum_labels.push_back(L("Default"));
    def->enum_labels.push_back(L("Rectilinear"));
    def->enum_labels.push_back(L("Concentric"));
+	def->enum_labels.push_back(L("Spiral Inset"));
    def->enum_labels.push_back(L("Rectilinear Interlaced"));
    def->enum_labels.push_back(L("Grid"));
    def->mode = comAdvanced;
@@ -8418,7 +8423,7 @@ void PrintConfigDef::init_fff_params()
    def           = this->add("machine_hotend_change_time", coFloat);
    def->label    = L("Hotend change time");
    def->tooltip  = L("Time to change hotend.");
-    def->sidetext = L("s");
+    def->sidetext = L_CONTEXT("s", "second");
    def->min      = 0;
    def->mode     = comAdvanced;
    def->set_default_value(new ConfigOptionFloat(0.0));
@@ -10259,7 +10264,15 @@ std::string DynamicPrintConfig::get_filament_type(std::string &displayed_filamen
    auto* filament_type = dynamic_cast<const ConfigOptionStrings*>(this->option("filament_type"));
    auto* filament_is_support = dynamic_cast<const ConfigOptionBools*>(this->option("filament_is_support"));

-    if (!filament_type)
+    // get_at() on an empty vector option is undefined behavior (.front() of an empty vector),
+    // and e.g. filament_id is never populated on a CLI from-scratch slice - treat an empty
+    // option the same as a missing one.
+    if (filament_id && filament_id->values.empty())
+        filament_id = nullptr;
+    if (filament_is_support && filament_is_support->values.empty())
+        filament_is_support = nullptr;
+
+    if (!filament_type || filament_type->values.empty())
        return "";

    if (!filament_is_support) {
@@ -10484,6 +10497,10 @@ int DynamicPrintConfig::update_values_from_single_to_multi(DynamicPrintConfig& m

                    for (int index = 0; index < variant_count; index++)
                    {
+                        //variant_count is the variant column width, src_opt the value array;
+                        //they disagree when the source was authored at a different width
+                        if (index >= (int)src_opt->values.size())
+                            break;
                        if (opt->values[index] > src_opt->values[index])
                            opt->values[index] = src_opt->values[index];
                    }
@@ -10501,6 +10518,8 @@ int DynamicPrintConfig::update_values_from_single_to_multi(DynamicPrintConfig& m

                    for (int index = 0; index < variant_count; index++)
                    {
+                        if (index >= (int)src_opt->values.size())
+                            break;
                        if (opt->values[index].value > src_opt->values[index].value)
                            opt->values[index] = src_opt->values[index];
                    }
@@ -10695,6 +10714,10 @@ int DynamicPrintConfig::update_values_from_multi_to_multi(DynamicPrintConfig& ne

                    for(auto idx : variant_indices){
                        assert(idx < old_count);
+                        //the counts come from the variant columns, the arrays from the options;
+                        //they disagree when a config was authored at a different variant width
+                        if (idx >= old_count || new_variant_index >= (int)opt->values.size())
+                            continue;
                        if (old_values[idx] < opt->values[new_variant_index])
                            opt->values[new_variant_index] = old_values[idx];
                    }
@@ -10725,6 +10748,10 @@ int DynamicPrintConfig::update_values_from_multi_to_multi(DynamicPrintConfig& ne

                    for(auto idx : variant_indices){
                        assert(idx < old_count);
+                        //the counts come from the variant columns, the arrays from the options;
+                        //they disagree when a config was authored at a different variant width
+                        if (idx >= old_count || new_variant_index >= (int)opt->values.size())
+                            continue;
                        if (old_values[idx] < opt->values[new_variant_index])
                            opt->values[new_variant_index] = old_values[idx];
                    }
@@ -10755,6 +10782,8 @@ int DynamicPrintConfig::update_values_from_multi_to_multi(DynamicPrintConfig& ne

                    for(auto idx : variant_indices){
                        assert(idx < old_count);
+                        if (idx >= old_count || new_variant_index >= (int)opt->values.size())
+                            continue;
                        if (old_values[idx]) //enabled
                            opt->values[new_variant_index] = old_values[idx];
                    }
@@ -10795,6 +10824,15 @@ int DynamicPrintConfig::update_values_from_multi_to_multi_2(const std::vector<st
        same_variant_indices.emplace_back(indices);
    }

+    //dst_values below is the destination PRINT preset's per-variant row, sized to its own
+    //print_extruder_variant; dst_extruder_variants is the PRINTER's list. They disagree until
+    //the print preset is re-selected, so size the row to the variant count before indexing it.
+    const size_t dst_variant_count = dst_extruder_variants.size();
+    if (dst_variant_count == 0) {
+        BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", Line %1%: empty destination variant list")%__LINE__;
+        return -1;
+    }
+
    t_config_option_keys keys = this->keys();
    for(auto& key : keys){
        if(key_sets.find(key) == key_sets.end())
@@ -10810,7 +10848,13 @@ int DynamicPrintConfig::update_values_from_multi_to_multi_2(const std::vector<st
            {
                ConfigOptionFloatsNullable* opt = this->option<ConfigOptionFloatsNullable>(key);
                auto src_values = opt->values;
-                auto dst_values = dst_config.option<ConfigOptionFloatsNullable>(key) ->values;
+                const auto* dst_opt = dst_config.option<ConfigOptionFloatsNullable>(key);
+                if(!dst_opt){
+                    BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: %2% missing from destination config")%__LINE__%key;
+                    break;
+                }
+                auto dst_values = dst_opt->values;
+                dst_values.resize(dst_variant_count, ConfigOptionFloatsNullable::nil_value());
                for(size_t dst_idx =0; dst_idx < same_variant_indices.size(); ++dst_idx){
                    auto& indices = same_variant_indices[dst_idx];
                    if(indices.empty())
@@ -10818,7 +10862,7 @@ int DynamicPrintConfig::update_values_from_multi_to_multi_2(const std::vector<st
                    bool has_value = false;
                    double target_value = std::numeric_limits<double>::max();
                    for(auto idx : indices){
-                        if(opt && idx < opt->values.size() && !opt->is_nil(idx)){
+                        if(idx < (int)opt->values.size() && !opt->is_nil(idx)){
                            has_value = true;
                            target_value = std::min(target_value, src_values[idx]);
                        }
@@ -10834,7 +10878,13 @@ int DynamicPrintConfig::update_values_from_multi_to_multi_2(const std::vector<st
            {
                ConfigOptionFloatsOrPercentsNullable* opt = this->option<ConfigOptionFloatsOrPercentsNullable>(key);
                auto src_values = opt->values;
-                auto dst_values = dst_config.option<ConfigOptionFloatsOrPercentsNullable>(key) ->values;
+                const auto* dst_opt = dst_config.option<ConfigOptionFloatsOrPercentsNullable>(key);
+                if(!dst_opt){
+                    BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: %2% missing from destination config")%__LINE__%key;
+                    break;
+                }
+                auto dst_values = dst_opt->values;
+                dst_values.resize(dst_variant_count, ConfigOptionFloatsOrPercentsNullable::nil_value());
                for(size_t dst_idx =0; dst_idx < same_variant_indices.size(); ++dst_idx){
                    auto& indices = same_variant_indices[dst_idx];
                    if(indices.empty())
@@ -10842,7 +10892,7 @@ int DynamicPrintConfig::update_values_from_multi_to_multi_2(const std::vector<st
                    bool has_value = false;
                    FloatOrPercent target_value{9999.f, true};
                    for(auto idx : indices){
-                        if(opt && !opt->is_nil(idx)){
+                        if(idx < (int)opt->values.size() && !opt->is_nil(idx)){
                            has_value = true;
                            target_value = src_values[idx].value < target_value.value ? src_values[idx] : target_value;
                        }
@@ -10858,15 +10908,21 @@ int DynamicPrintConfig::update_values_from_multi_to_multi_2(const std::vector<st
            {
                ConfigOptionBoolsNullable* opt = this->option<ConfigOptionBoolsNullable>(key);
                auto src_values = opt->values;
-                auto dst_values = dst_config.option<ConfigOptionBoolsNullable>(key) ->values;
+                const auto* dst_opt = dst_config.option<ConfigOptionBoolsNullable>(key);
+                if(!dst_opt){
+                    BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: %2% missing from destination config")%__LINE__%key;
+                    break;
+                }
+                auto dst_values = dst_opt->values;
+                dst_values.resize(dst_variant_count, ConfigOptionBoolsNullable::nil_value());
                for(size_t dst_idx =0; dst_idx < same_variant_indices.size(); ++dst_idx){
                    auto indices = same_variant_indices[dst_idx];
                    if(indices.empty())
                        continue;
                    bool has_value = false;
-                    bool target_value;
+                    bool target_value = false;
                    for(auto idx : indices){
-                        if(opt && !opt->is_nil(idx)){
+                        if(idx < (int)opt->values.size() && !opt->is_nil(idx)){
                            has_value = true;
                            target_value = src_values[idx];
                            break;
@@ -11273,6 +11329,28 @@ std::vector<int> DynamicPrintConfig::update_values_to_printer_extruders(DynamicP
    return variant_index;
 }

+// Regathers a vector option's values through per-slot source indices (one input index per
+// output slot). Out-of-range indices keep the first value, matching get_at's fallback.
+template<typename OptType, typename ValueType>
+static void gather_option_values(const char *caller, const std::string &key, OptType *opt, const std::vector<int> &slot_param_indices)
+{
+    if (!opt || opt->values.empty()) {
+        BOOST_LOG_TRIVIAL(warning) << caller << boost::format(", Line %1%: option %2% not found or empty, skipping")%__LINE__%key;
+        return;
+    }
+    std::vector<ValueType> new_values;
+    new_values.reserve(slot_param_indices.size());
+    for (int idx : slot_param_indices) {
+        if (idx < 0 || static_cast<size_t>(idx) >= opt->values.size()) {
+            BOOST_LOG_TRIVIAL(warning) << caller << boost::format(", Line %1%: option %2% slot index %3% out of range, keeping first value")%__LINE__%key%idx;
+            new_values.emplace_back(opt->values.front());
+        }
+        else
+            new_values.emplace_back(opt->values[idx]);
+    }
+    opt->values = std::move(new_values);
+}
+
 void DynamicPrintConfig::update_values_to_printer_extruders_for_multiple_filaments(DynamicPrintConfig& printer_config, int extruder_count, int extruder_nozzle_volume_count, std::set<std::string>& key_set, std::string id_name, std::string variant_name)
 {
    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", Line %1%: extruder_count %2%, extruder_nozzle_volume_count %3%")%__LINE__ %extruder_count %extruder_nozzle_volume_count;
@@ -11350,155 +11428,18 @@ void DynamicPrintConfig::update_values_to_printer_extruders_for_multiple_filamen
                BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: can not find opt define for %2%")%__LINE__%key;
                continue;
            }
+            // An empty option has no first value to fall back on; give it one registered default per filament.
+            if (auto *vec = dynamic_cast<ConfigOptionVectorBase*>(this->option(key)); vec && vec->empty() && optdef->default_value)
+                vec->resize(filament_count, optdef->default_value.get());

            switch (optdef->type) {
-                case coStrings:
-                {
-                    ConfigOptionStrings * opt = this->option<ConfigOptionStrings>(key);
-                    if (!opt) {
-                        BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% not found, skipping")%__LINE__%key;
-                        break;
-                    }
-                    std::vector<std::string> new_values;
-
-                    new_values.resize(filament_count);
-                    for (int f_index = 0; f_index < filament_count; f_index++)
-                    {
-                        if (variant_index[f_index] < 0 || static_cast<size_t>(variant_index[f_index]) >= opt->size()) {
-                            BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% variant index %3% out of range, skipping")%__LINE__%key%variant_index[f_index];
-                            continue;
-                        }
-                        new_values[f_index] = opt->get_at(variant_index[f_index]);
-                    }
-                    opt->values = new_values;
-                    break;
-                }
-                case coInts:
-                {
-                    ConfigOptionInts * opt = this->option<ConfigOptionInts>(key);
-                    if (!opt) {
-                        BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% not found, skipping")%__LINE__%key;
-                        break;
-                    }
-                    std::vector<int> new_values;
-
-                    new_values.resize(filament_count);
-                    for (int f_index = 0; f_index < filament_count; f_index++)
-                    {
-                        if (variant_index[f_index] < 0 || static_cast<size_t>(variant_index[f_index]) >= opt->size()) {
-                            BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% variant index %3% out of range, skipping")%__LINE__%key%variant_index[f_index];
-                            continue;
-                        }
-                        new_values[f_index] = opt->get_at(variant_index[f_index]);
-                    }
-                    opt->values = new_values;
-                    break;
-                }
-                case coFloats:
-                {
-                    ConfigOptionFloats * opt = this->option<ConfigOptionFloats>(key);
-                    if (!opt) {
-                        BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% not found, skipping")%__LINE__%key;
-                        break;
-                    }
-                    std::vector<double> new_values;
-
-                    new_values.resize(filament_count);
-                    for (int f_index = 0; f_index < filament_count; f_index++)
-                    {
-                        if (variant_index[f_index] < 0 || static_cast<size_t>(variant_index[f_index]) >= opt->size()) {
-                            BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% variant index %3% out of range, skipping")%__LINE__%key%variant_index[f_index];
-                            continue;
-                        }
-                        new_values[f_index] = opt->get_at(variant_index[f_index]);
-                    }
-                    opt->values = new_values;
-                    break;
-                }
-                case coPercents:
-                {
-                    ConfigOptionPercents * opt = this->option<ConfigOptionPercents>(key);
-                    if (!opt) {
-                        BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% not found, skipping")%__LINE__%key;
-                        break;
-                    }
-                    std::vector<double> new_values;
-
-                    new_values.resize(filament_count);
-                    for (int f_index = 0; f_index < filament_count; f_index++)
-                    {
-                        if (variant_index[f_index] < 0 || static_cast<size_t>(variant_index[f_index]) >= opt->size()) {
-                            BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% variant index %3% out of range, skipping")%__LINE__%key%variant_index[f_index];
-                            continue;
-                        }
-                        new_values[f_index] = opt->get_at(variant_index[f_index]);
-                    }
-                    opt->values = new_values;
-                    break;
-                }
-                case coFloatsOrPercents:
-                {
-                    ConfigOptionFloatsOrPercents * opt = this->option<ConfigOptionFloatsOrPercents>(key);
-                    if (!opt) {
-                        BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% not found, skipping")%__LINE__%key;
-                        break;
-                    }
-                    std::vector<FloatOrPercent> new_values;
-
-                    new_values.resize(filament_count);
-                    for (int f_index = 0; f_index < filament_count; f_index++)
-                    {
-                        if (variant_index[f_index] < 0 || static_cast<size_t>(variant_index[f_index]) >= opt->size()) {
-                            BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% variant index %3% out of range, skipping")%__LINE__%key%variant_index[f_index];
-                            continue;
-                        }
-                        new_values[f_index] = opt->get_at(variant_index[f_index]);
-                    }
-                    opt->values = new_values;
-                    break;
-                }
-                case coBools:
-                {
-                    ConfigOptionBools * opt = this->option<ConfigOptionBools>(key);
-                    if (!opt) {
-                        BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% not found, skipping")%__LINE__%key;
-                        break;
-                    }
-                    std::vector<unsigned char> new_values;
-
-                    new_values.resize(filament_count);
-                    for (int f_index = 0; f_index < filament_count; f_index++)
-                    {
-                        if (variant_index[f_index] < 0 || static_cast<size_t>(variant_index[f_index]) >= opt->size()) {
-                            BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% variant index %3% out of range, skipping")%__LINE__%key%variant_index[f_index];
-                            continue;
-                        }
-                        new_values[f_index] = opt->get_at(variant_index[f_index]);
-                    }
-                    opt->values = new_values;
-                    break;
-                }
-                case coEnums:
-                {
-                    ConfigOptionEnumsGeneric * opt = this->option<ConfigOptionEnumsGeneric>(key);
-                    if (!opt) {
-                        BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% not found, skipping")%__LINE__%key;
-                        break;
-                    }
-                    std::vector<int> new_values;
-
-                    new_values.resize(filament_count);
-                    for (int f_index = 0; f_index < filament_count; f_index++)
-                    {
-                        if (variant_index[f_index] < 0 || static_cast<size_t>(variant_index[f_index]) >= opt->size()) {
-                            BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% variant index %3% out of range, skipping")%__LINE__%key%variant_index[f_index];
-                            continue;
-                        }
-                        new_values[f_index] = opt->get_at(variant_index[f_index]);
-                    }
-                    opt->values = new_values;
-                    break;
-                }
+                case coStrings:          gather_option_values<ConfigOptionStrings, std::string>(__FUNCTION__, key, this->option<ConfigOptionStrings>(key), variant_index); break;
+                case coInts:             gather_option_values<ConfigOptionInts, int>(__FUNCTION__, key, this->option<ConfigOptionInts>(key), variant_index); break;
+                case coFloats:           gather_option_values<ConfigOptionFloats, double>(__FUNCTION__, key, this->option<ConfigOptionFloats>(key), variant_index); break;
+                case coPercents:         gather_option_values<ConfigOptionPercents, double>(__FUNCTION__, key, this->option<ConfigOptionPercents>(key), variant_index); break;
+                case coFloatsOrPercents: gather_option_values<ConfigOptionFloatsOrPercents, FloatOrPercent>(__FUNCTION__, key, this->option<ConfigOptionFloatsOrPercents>(key), variant_index); break;
+                case coBools:            gather_option_values<ConfigOptionBools, unsigned char>(__FUNCTION__, key, this->option<ConfigOptionBools>(key), variant_index); break;
+                case coEnums:            gather_option_values<ConfigOptionEnumsGeneric, int>(__FUNCTION__, key, this->option<ConfigOptionEnumsGeneric>(key), variant_index); break;
                default:
                    BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: unsupported option type for %2%")%__LINE__%key;
                    break;
@@ -11517,28 +11458,6 @@ void DynamicPrintConfig::update_values_to_printer_extruders_for_multiple_filamen
    }
 }

-// Regathers a vector option's values through per-slot source indices (one input index per
-// output slot). Out-of-range indices keep the first value, matching get_at's fallback.
-template<typename OptType, typename ValueType>
-static void gather_option_values(const std::string &key, OptType *opt, const std::vector<int> &slot_param_indices)
-{
-    if (!opt || opt->values.empty()) {
-        BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% not found or empty, skipping")%__LINE__%key;
-        return;
-    }
-    std::vector<ValueType> new_values;
-    new_values.reserve(slot_param_indices.size());
-    for (int idx : slot_param_indices) {
-        if (idx < 0 || static_cast<size_t>(idx) >= opt->values.size()) {
-            BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: option %2% slot index %3% out of range, keeping first value")%__LINE__%key%idx;
-            new_values.emplace_back(opt->values.front());
-        }
-        else
-            new_values.emplace_back(opt->values[idx]);
-    }
-    opt->values = std::move(new_values);
-}
-
 void DynamicPrintConfig::update_filament_config_values_for_multiple_extruders(DynamicPrintConfig& printer_config,
    const std::unordered_map<int, std::vector<FilamentVariantUse>>& filament_variant_uses,
    int extruder_count, int extruder_nozzle_volume_count,
@@ -11633,13 +11552,13 @@ void DynamicPrintConfig::update_filament_config_values_for_multiple_extruders(Dy
            continue;
        }
        switch (optdef->type) {
-            case coStrings:          gather_option_values<ConfigOptionStrings, std::string>(key, this->option<ConfigOptionStrings>(key), slot_param_indices); break;
-            case coInts:             gather_option_values<ConfigOptionInts, int>(key, this->option<ConfigOptionInts>(key), slot_param_indices); break;
-            case coFloats:           gather_option_values<ConfigOptionFloats, double>(key, this->option<ConfigOptionFloats>(key), slot_param_indices); break;
-            case coPercents:         gather_option_values<ConfigOptionPercents, double>(key, this->option<ConfigOptionPercents>(key), slot_param_indices); break;
-            case coFloatsOrPercents: gather_option_values<ConfigOptionFloatsOrPercents, FloatOrPercent>(key, this->option<ConfigOptionFloatsOrPercents>(key), slot_param_indices); break;
-            case coBools:            gather_option_values<ConfigOptionBools, unsigned char>(key, this->option<ConfigOptionBools>(key), slot_param_indices); break;
-            case coEnums:            gather_option_values<ConfigOptionEnumsGeneric, int>(key, this->option<ConfigOptionEnumsGeneric>(key), slot_param_indices); break;
+            case coStrings:          gather_option_values<ConfigOptionStrings, std::string>(__FUNCTION__, key, this->option<ConfigOptionStrings>(key), slot_param_indices); break;
+            case coInts:             gather_option_values<ConfigOptionInts, int>(__FUNCTION__, key, this->option<ConfigOptionInts>(key), slot_param_indices); break;
+            case coFloats:           gather_option_values<ConfigOptionFloats, double>(__FUNCTION__, key, this->option<ConfigOptionFloats>(key), slot_param_indices); break;
+            case coPercents:         gather_option_values<ConfigOptionPercents, double>(__FUNCTION__, key, this->option<ConfigOptionPercents>(key), slot_param_indices); break;
+            case coFloatsOrPercents: gather_option_values<ConfigOptionFloatsOrPercents, FloatOrPercent>(__FUNCTION__, key, this->option<ConfigOptionFloatsOrPercents>(key), slot_param_indices); break;
+            case coBools:            gather_option_values<ConfigOptionBools, unsigned char>(__FUNCTION__, key, this->option<ConfigOptionBools>(key), slot_param_indices); break;
+            case coEnums:            gather_option_values<ConfigOptionEnumsGeneric, int>(__FUNCTION__, key, this->option<ConfigOptionEnumsGeneric>(key), slot_param_indices); break;
            default:
                BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: unsupported option type for %2%")%__LINE__%key;
                break;
@@ -12341,13 +12260,11 @@ CLIActionsConfigDef::CLIActionsConfigDef()
    def = this->add("load_defaultfila", coBool);
    def->label = L("Load default filaments");
    def->tooltip = L("Load first filament as default for those not loaded.");
-    def->cli_params = "option";
    def->set_default_value(new ConfigOptionBool(false));

    def = this->add("min_save", coBool);
    def->label = L("Minimum save");
    def->tooltip = L("Export 3MF with minimum size.");
-    def->cli_params = "option";
    def->set_default_value(new ConfigOptionBool(false));

    def = this->add("mtcpp", coInt);
@@ -12373,7 +12290,6 @@ CLIActionsConfigDef::CLIActionsConfigDef()
    def = this->add("normative_check", coBool);
    def->label = L("Normative check");
    def->tooltip = L("Check the normative items.");
-    def->cli_params = "option";
    def->set_default_value(new ConfigOptionBool(true));

    /*def = this->add("help_fff", coBool);
@@ -12640,7 +12556,7 @@ CLIMiscConfigDef::CLIMiscConfigDef()
    def->cli_params = "level";
    def->set_default_value(new ConfigOptionInt(1));

-    def = this->add("logfile", coInt);
+    def = this->add("logfile", coString);
    def->label = L("Log file");
    def->tooltip = L("Redirects debug logging to file.\n");
    def->cli_params = "file";
@@ -12688,7 +12604,6 @@ CLIMiscConfigDef::CLIMiscConfigDef()
    def = this->add("skip_modified_gcodes", coBool);
    def->label = L("Skip modified G-code in 3MF");
    def->tooltip = L("Skip the modified G-code in 3MF from printer or filament presets.");
-    def->cli_params = "option";
    def->set_default_value(new ConfigOptionBool(false));

    def = this->add("makerlab_name", coString);
@@ -12718,14 +12633,12 @@ CLIMiscConfigDef::CLIMiscConfigDef()
    def = this->add("allow_newer_file", coBool);
    def->label = L("Allow 3MF with newer version to be sliced");
    def->tooltip = L("Allow 3MF with newer version to be sliced.");
-    def->cli_params = "option";
    def->set_default_value(new  ConfigOptionBool(false));

    def = this->add("allow_mix_temp", coBool);
    // internal use only, don't need translation
    def->label = "Allow filaments with high/low temperature to be printed together";
    def->tooltip = "Allow filaments with high/low temperature to be printed together.";
-    def->cli_params = "option";
    def->set_default_value(new  ConfigOptionBool(false));
 }