mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: preset: refine logic to judge Preset::is_bbl_vendor_preset 

JIRA: no jira
Change-Id: I64dedd76c10624ca51104a2c61b11d4c0f523646
This commit is contained in:
lane.wei 2023-10-27 08:41:09 +08:00 committed by Lane.Wei
parent b9898d1cf5
commit c1f891b646
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/libslic3r/Preset.cpp
View File

@ -730,26 +730,31 @@ bool Preset::is_custom_defined()
// I extened to support call on all presets // I extened to support call on all presets
bool Preset::is_bbl_vendor_preset(PresetBundle *preset_bundle) bool Preset::is_bbl_vendor_preset(PresetBundle *preset_bundle)
{ {
bool is_bbl_vendor_preset = true; bool is_bbl_vendor_preset = false;
if (preset_bundle) { if (preset_bundle) {
auto config = &this->config; auto config = &this->config;
auto printers = config->opt<ConfigOptionStrings>("compatible_printers"); if (type != TYPE_PRINTER) {
if (printers && !printers->values.empty()) { auto printers = config->opt<ConfigOptionStrings>("compatible_printers");
auto printer = preset_bundle->printers.find_preset(printers->values.front()); if (printers && !printers->values.empty()) {
if (printer) auto printer = preset_bundle->printers.find_preset(printers->values.front());
config = &printer->config; if (printer)
config = &printer->config;
}
} }
std::string vendor_name; auto printer_model_opt = config->opt<ConfigOptionString>("printer_model");
for (auto vendor_profile : preset_bundle->vendors) { if (printer_model_opt) {
for (auto vendor_model : vendor_profile.second.models) std::string vendor_name;
if (vendor_model.name == config->opt_string("printer_model")) for (auto vendor_profile : preset_bundle->vendors) {
{ for (auto vendor_model : vendor_profile.second.models)
vendor_name = vendor_profile.first; if (vendor_model.name == printer_model_opt->value)
break; {
} vendor_name = vendor_profile.first;
break;
}
}
if (!vendor_name.empty())
is_bbl_vendor_preset = (vendor_name.compare("BBL") == 0);
} }
if (!vendor_name.empty())
is_bbl_vendor_preset = vendor_name.compare("BBL") == 0 ? true : false;
} }
return is_bbl_vendor_preset; return is_bbl_vendor_preset;
} }
@ -1487,7 +1492,7 @@ int PresetCollection::get_user_presets(PresetBundle *preset_bundle, std::vector<
if (!preset.is_user()) continue; if (!preset.is_user()) continue;
if (get_preset_base(preset) != &preset && preset.base_id.empty()) continue; if (get_preset_base(preset) != &preset && preset.base_id.empty()) continue;
if (!preset.setting_id.empty() && preset.sync_info.empty()) continue; if (!preset.setting_id.empty() && preset.sync_info.empty()) continue;
if (!preset.is_bbl_vendor_preset(preset_bundle)) continue; //if (!preset.is_bbl_vendor_preset(preset_bundle)) continue;
result_presets.push_back(preset); result_presets.push_back(preset);
count++; count++;
@ -2168,7 +2173,7 @@ bool PresetCollection::create_presets_from_template_for_printer(std::vector<Pres
auto *compatible_printers = dynamic_cast<ConfigOptionStrings *>(preset.config.option("compatible_printers")); auto *compatible_printers = dynamic_cast<ConfigOptionStrings *>(preset.config.option("compatible_printers"));
compatible_printers->values = std::vector<std::string>{ printer }; compatible_printers->values = std::vector<std::string>{ printer };
preset.is_visible = true; preset.is_visible = true;
if (type == Preset::TYPE_FILAMENT) if (type == Preset::TYPE_FILAMENT)
preset.filament_id = create_filament_id(preset.name); preset.filament_id = create_filament_id(preset.name);
}, force_rewritten); }, force_rewritten);
} }
@ -2188,7 +2193,7 @@ bool PresetCollection::clone_presets_for_filament(Preset const *const & pres
preset.config.apply_only(dynamic_config, {"filament_vendor", "compatible_printers", "filament_type"},true); preset.config.apply_only(dynamic_config, {"filament_vendor", "compatible_printers", "filament_type"},true);
preset.filament_id = filament_id; preset.filament_id = filament_id;
} }
}, },
force_rewritten); force_rewritten);
} }
@ -2237,7 +2242,7 @@ void PresetCollection::save_current_preset(const std::string &new_name, bool det
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(": save preset %1% , with detach")%new_name; BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(": save preset %1% , with detach")%new_name;
} }
//BBS: add lock logic for sync preset in background //BBS: add lock logic for sync preset in background
if (m_type == Preset::TYPE_PRINT) if (m_type == Preset::TYPE_PRINT)
preset.config.option<ConfigOptionString>("print_settings_id", true)->value.clear(); preset.config.option<ConfigOptionString>("print_settings_id", true)->value.clear();
else if (m_type == Preset::TYPE_FILAMENT) else if (m_type == Preset::TYPE_FILAMENT)