juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-23 13:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: detached presets not showing up (#13793)

Browse Source 
* fix: detached presets not showing up

* slightly better code clarity

* remove cloud_prefix
This commit is contained in:
Ian Chua
2026-05-22 19:05:28 +08:00
committed by GitHub
parent def47f8959
commit 464ca4c765
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/libslic3r/Preset.cpp
View File

@@ -2178,19 +2178,29 @@ bool PresetCollection::load_user_preset(std::string name, std::map<std::string,
} }
} }
// base_id // base_id is only required for presets inheriting from a parent. Root presets
if (preset_values.find(BBL_JSON_KEY_BASE_ID) == preset_values.end()) { // with an empty "inherits" field intentionally have no base_id.
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format("can not find base_id, not loading for user preset %1%") % canonical_name; std::string based_id;
const auto base_id = preset_values.find(BBL_JSON_KEY_BASE_ID);
if (base_id != preset_values.end()) {
based_id = base_id->second;
} else {
const auto inherits_iter = preset_values.find(BBL_JSON_KEY_INHERITS);
const bool preset_inherits_from_parent = inherits_iter != preset_values.end() && !inherits_iter->second.empty();
if (preset_inherits_from_parent) {
// This indicates that there is inherits exists but there is no base_id
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__
<< boost::format("can not find base_id, not loading for user preset %1%") % canonical_name;
unlock(); unlock();
return false; return false;
} }
std::string cloud_base_id = preset_values[BBL_JSON_KEY_BASE_ID]; }
//filament_id //filament_id
std::string cloud_filament_id; std::string cloud_filament_id;
if ((m_type == Preset::TYPE_FILAMENT) && preset_values.find(BBL_JSON_KEY_FILAMENT_ID) != preset_values.end()) { if ((m_type == Preset::TYPE_FILAMENT) && preset_values.find(BBL_JSON_KEY_FILAMENT_ID) != preset_values.end()) {
cloud_filament_id = preset_values[BBL_JSON_KEY_FILAMENT_ID]; cloud_filament_id = preset_values[BBL_JSON_KEY_FILAMENT_ID];
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " " << canonical_name << " filament_id: " << cloud_filament_id << " base_id: " << cloud_base_id; BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " " << canonical_name << " filament_id: " << cloud_filament_id << " base_id: " << based_id;
} }
DynamicPrintConfig new_config, cloud_config; DynamicPrintConfig new_config, cloud_config;
@@ -2263,7 +2273,7 @@ bool PresetCollection::load_user_preset(std::string name, std::map<std::string,
iter->version = cloud_version.value(); iter->version = cloud_version.value();
iter->user_id = cloud_user_id; iter->user_id = cloud_user_id;
iter->setting_id = cloud_setting_id; iter->setting_id = cloud_setting_id;
iter->base_id = cloud_base_id; iter->base_id = based_id;
iter->filament_id = cloud_filament_id; iter->filament_id = cloud_filament_id;
update_alias(*iter); update_alias(*iter);
//presets_loaded.emplace_back(*it->second); //presets_loaded.emplace_back(*it->second);
@@ -2282,7 +2292,7 @@ bool PresetCollection::load_user_preset(std::string name, std::map<std::string,
preset.version = cloud_version.value(); preset.version = cloud_version.value();
preset.user_id = cloud_user_id; preset.user_id = cloud_user_id;
preset.setting_id = cloud_setting_id; preset.setting_id = cloud_setting_id;
preset.base_id = cloud_base_id; preset.base_id = based_id;
preset.filament_id = cloud_filament_id; preset.filament_id = cloud_filament_id;
update_alias(preset); update_alias(preset);
@@ -3643,20 +3653,22 @@ void PresetCollection::set_custom_preset_alias(Preset &preset)
// For printers, there is nothing to remove // For printers, there is nothing to remove
// For prints AKA processes, the postfix should be kept // For prints AKA processes, the postfix should be kept
// Alias should be set here, as the preset name may be augmented further later (i.e., prefixing relative path for bundles) // Alias should be set here, as the preset name may be augmented further later (i.e., prefixing relative path for bundles)
std::string alias_name; std::string bare_preset_name = get_preset_bare_name(preset.name);
std::string preset_name = get_preset_bare_name(preset.name); std::string alias_name = bare_preset_name;
if (m_type == Preset::Type::TYPE_FILAMENT && preset.config.has(BBL_JSON_KEY_INHERITS) && preset.config.option<ConfigOptionString>(BBL_JSON_KEY_INHERITS)->value.empty()) {
if (alias_name.empty()) { const bool is_root_filament_preset =
size_t end_pos = preset_name.find_first_of("@"); m_type == Preset::Type::TYPE_FILAMENT &&
if (end_pos != std::string::npos) { preset.config.has(BBL_JSON_KEY_INHERITS) &&
alias_name = preset_name.substr(0, end_pos); preset.config.option<ConfigOptionString>(BBL_JSON_KEY_INHERITS)->value.empty();
if (is_root_filament_preset) {
const size_t suffix_separator_pos = bare_preset_name.find_first_of("@");
if (suffix_separator_pos != std::string::npos) {
alias_name = bare_preset_name.substr(0, suffix_separator_pos);
boost::trim_right(alias_name); boost::trim_right(alias_name);
if (alias_name.empty())
alias_name = bare_preset_name;
} }
} }
}
else {
alias_name = preset_name;
}
preset.alias = std::move(alias_name); preset.alias = std::move(alias_name);
m_map_alias_to_profile_name[preset.alias].push_back(preset.name); m_map_alias_to_profile_name[preset.alias].push_back(preset.name);