mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-16 23:42:11 +00:00
Fix incorrect length modification when loading device-related parameters
(cherry picked from commit bambulab/BambuStudio@ebf57372da) Co-Authored-By: weizhen.xie <weizhen.xie@bambulab.com>
This commit is contained in:
@@ -470,6 +470,8 @@ void Preset::normalize(DynamicPrintConfig &config)
|
||||
continue;
|
||||
if (filament_options_with_variant.find(key) != filament_options_with_variant.end())
|
||||
continue;
|
||||
if (filament_dev_options.find(key) != filament_dev_options.end())
|
||||
continue;
|
||||
auto *opt = config.option(key, false);
|
||||
/*assert(opt != nullptr);
|
||||
assert(opt->is_vector());*/
|
||||
|
||||
@@ -8538,6 +8538,17 @@ std::set<std::string> printer_options_with_variant_2 = {
|
||||
|
||||
std::set<std::string> empty_options;
|
||||
|
||||
std::set<std::string> filament_dev_options = {
|
||||
"filament_dev_ams_drying_ams_limitations",
|
||||
"filament_dev_ams_drying_temperature",
|
||||
"filament_dev_ams_drying_time",
|
||||
"filament_dev_ams_drying_heat_distortion_temperature",
|
||||
"filament_dev_chamber_drying_bed_temperature",
|
||||
"filament_dev_chamber_drying_time",
|
||||
"filament_dev_drying_softening_temperature",
|
||||
"filament_dev_drying_cooling_temperature"
|
||||
};
|
||||
|
||||
DynamicPrintConfig DynamicPrintConfig::full_print_config()
|
||||
{
|
||||
return DynamicPrintConfig((const PrintRegionConfig&)FullPrintConfig::defaults());
|
||||
|
||||
@@ -698,6 +698,8 @@ extern std::set<std::string> printer_options_with_variant_1;
|
||||
extern std::set<std::string> printer_options_with_variant_2;
|
||||
extern std::set<std::string> empty_options;
|
||||
|
||||
extern std::set<std::string> filament_dev_options;
|
||||
|
||||
extern void compute_filament_override_value(const std::string& opt_key, const ConfigOption *opt_old_machine, const ConfigOption *opt_new_machine, const ConfigOption *opt_new_filament, const DynamicPrintConfig& new_full_config,
|
||||
t_config_option_keys& diff_keys, DynamicPrintConfig& filament_overrides, std::vector<int>& f_maps);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user