mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-07 23:17:35 -06:00
ENH: remember the filament_opts and limit minimum flushing volumes
Change-Id: I7b2538fcaf5b5fc5e4f86191207de981bd766a89 (cherry picked from commit 392be8d2a4e9465fffc4018da77c6ee00ad46ade)
This commit is contained in:
parent
eb80720e75
commit
13df80ffb7
8 changed files with 99 additions and 3 deletions
|
@ -809,6 +809,36 @@ void PresetBundle::update_system_preset_setting_ids(std::map<std::string, std::m
|
|||
return;
|
||||
}
|
||||
|
||||
void PresetBundle::load_default_setting_from_app_config(const AppConfig &config) {
|
||||
auto config_filament_presets = config.get_filament_presets();
|
||||
if (!config_filament_presets.empty())
|
||||
this->filament_presets = config_filament_presets;
|
||||
|
||||
auto config_filament_colors = config.get_filament_colors();
|
||||
if (!config_filament_colors.empty()) {
|
||||
ConfigOptionStrings *filament_color = project_config.option<ConfigOptionStrings>("filament_colour");
|
||||
filament_color->resize(config_filament_colors.size());
|
||||
filament_color->values = config_filament_colors;
|
||||
}
|
||||
|
||||
auto config_flush_volumes_matrix = config.get_flush_volumes_matrix();
|
||||
if (!config_flush_volumes_matrix.empty()) {
|
||||
ConfigOptionFloats *flush_volumes_matrix = project_config.option<ConfigOptionFloats>("flush_volumes_matrix");
|
||||
flush_volumes_matrix->values = std::vector<double>(config_flush_volumes_matrix.begin(), config_flush_volumes_matrix.end());
|
||||
}
|
||||
}
|
||||
|
||||
void PresetBundle::update_filament_info_to_app_config(AppConfig &config)
|
||||
{
|
||||
config.set_filament_presets(this->filament_presets);
|
||||
|
||||
ConfigOptionStrings *filament_color = project_config.option<ConfigOptionStrings>("filament_colour");
|
||||
config.set_filament_colors(filament_color->values);
|
||||
|
||||
ConfigOptionFloats *flush_volumes_matrix = project_config.option<ConfigOptionFloats>("flush_volumes_matrix");
|
||||
config.set_flush_volumes_matrix(std::vector<float>(flush_volumes_matrix->values.begin(), flush_volumes_matrix->values.end()));
|
||||
}
|
||||
|
||||
//BBS: validate printers from previous project
|
||||
bool PresetBundle::validate_printers(const std::string &name, DynamicPrintConfig& config)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue