From de3bb7eb4ff52b4ba41d04cb71cc61aef1105c2f Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Tue, 11 Apr 2023 11:07:54 +0800 Subject: [PATCH] FIX: new project use the app_config flush_multiplier Change-Id: I5b820399a814a043581fcfadb9629cbe15dd1c52 --- src/libslic3r/PresetBundle.cpp | 8 ++++++++ src/slic3r/GUI/Plater.cpp | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index da08a08ed..ac3aa32bd 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -1322,6 +1322,11 @@ void PresetBundle::load_selections(AppConfig &config, const PresetPreferences& p auto flush_volumes_vector = matrix | boost::adaptors::transformed(boost::lexical_cast); project_config.option("flush_volumes_vector")->values = std::vector(flush_volumes_vector.begin(), flush_volumes_vector.end()); } + if (config.has("app", "flush_multiplier")) { + std::string str_flush_multiplier = config.get("app", "flush_multiplier"); + if (!str_flush_multiplier.empty()) + project_config.option("flush_multiplier")->set(new ConfigOptionFloat(std::stof(str_flush_multiplier))); + } // Update visibility of presets based on their compatibility with the active printer. // Always try to select a compatible print and filament preset to the current printer preset, @@ -1396,6 +1401,9 @@ void PresetBundle::export_selections(AppConfig &config) config.set("presets", "flush_volumes_vector", flush_volumes_vector); config.set("presets", PRESET_PRINTER_NAME, printers.get_selected_preset_name()); + + auto flush_multi_opt = project_config.option("flush_multiplier"); + config.set("flush_multiplier", std::to_string(flush_multi_opt ? flush_multi_opt->getFloat() : 1.0f)); // BBS //config.set("presets", "sla_print", sla_prints.get_selected_preset_name()); //config.set("presets", "sla_material", sla_materials.get_selected_preset_name()); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index f6259c48e..a01112e6b 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -758,7 +758,6 @@ Sidebar::Sidebar(Plater *parent) (project_config.option("flush_volumes_vector"))->values = std::vector(extruders.begin(), extruders.end()); (project_config.option("flush_multiplier"))->set(new ConfigOptionFloat(dlg.get_flush_multiplier())); - wxGetApp().app_config->set("flush_multiplier", std::to_string(dlg.get_flush_multiplier())); wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config); wxGetApp().plater()->update_project_dirty_from_presets();