3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When loading installed filaments and SLA materials from PrusaSlicer.ini,

Browse Source 
the "renamed_from" property of current profiles was not taken into account.
This lead to a situation where there were no MMU or SLA materials installed
after upgrade from PrusaSlicer 2.2.1 to 2.2. This should work now.
This commit is contained in:
bubnikv 2020-03-02 16:15:41 +01:00
parent d88c073a5a
commit aaaeafcdeb
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/slic3r/GUI/Preset.cpp
View File

@ -374,12 +374,23 @@ void Preset::set_visible_from_appconfig(const AppConfig &app_config)
if (type == TYPE_PRINTER) { if (type == TYPE_PRINTER) {
const std::string &model = config.opt_string("printer_model"); const std::string &model = config.opt_string("printer_model");
const std::string &variant = config.opt_string("printer_variant"); const std::string &variant = config.opt_string("printer_variant");
if (model.empty() || variant.empty()) { return; } if (model.empty() || variant.empty())
return;
is_visible = app_config.get_variant(vendor->id, model, variant); is_visible = app_config.get_variant(vendor->id, model, variant);
} else if (type == TYPE_FILAMENT) { } else if (type == TYPE_FILAMENT || type == TYPE_SLA_MATERIAL) {
is_visible = app_config.has("filaments", name); const char *section_name = (type == TYPE_FILAMENT) ? "filaments" : "sla_materials";
} else if (type == TYPE_SLA_MATERIAL) { if (app_config.has_section(section_name)) {
is_visible = app_config.has("sla_materials", name); // Check whether this profile is marked as "installed" in PrusaSlicer.ini,
// or whether a profile is marked as "installed", which this profile may have been renamed from.
const std::map<std::string, std::string> &installed = app_config.get_section(section_name);
auto has = [&installed](const std::string &name) {
auto it = installed.find(name);
return it != installed.end() && ! it->second.empty();
};
is_visible = has(this->name);
for (auto it = this->renamed_from.begin(); ! is_visible && it != this->renamed_from.end(); ++ it)
is_visible = has(*it);
}
} }
} }