3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-07 23:17:35 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ENH: add logic to load default filaments of newly added model

Browse source 
1. fix the prefer_model issue
2. when a printer is visible and no filament is selected, just set its default materials to visible
3. add some log for shutdown debug

Change-Id: I599dbd9c8b180c944ff4086c7638267ff002f94a
This commit is contained in:
lane.wei 2022-10-18 16:07:50 +08:00 • committed by Lane.Wei
parent 16e7993a65
commit 631897c0a6
4 changed files with 47 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/libslic3r/PresetBundle.cpp
View file

@ -1128,14 +1128,33 @@ void PresetBundle::save_changes_for_preset(const std::string& new_name, Preset::
void PresetBundle::load_installed_filaments(AppConfig &config)
{
if (! config.has_section(AppConfig::SECTION_FILAMENTS)
|| config.get_section(AppConfig::SECTION_FILAMENTS).empty()) {
//if (! config.has_section(AppConfig::SECTION_FILAMENTS)
// || config.get_section(AppConfig::SECTION_FILAMENTS).empty()) {
// Compatibility with the PrusaSlicer 2.1.1 and older, where the filament profiles were not installable yet.
// Find all filament profiles, which are compatible with installed printers, and act as if these filament profiles
// were installed.
std::unordered_set<const Preset*> compatible_filaments;
for (const Preset &printer : printers)
if (printer.is_visible && printer.printer_technology() == ptFFF && printer.vendor && (!printer.vendor->models.empty())) {
bool add_default_materials = true;
if (config.has_section(AppConfig::SECTION_FILAMENTS))
{
const std::map<std::string, std::string>& installed_filament = config.get_section(AppConfig::SECTION_FILAMENTS);
for (auto filament_iter : installed_filament)
{
Preset* filament = filaments.find_preset(filament_iter.first, false, true);
if (filament && is_compatible_with_printer(PresetWithVendorProfile(*filament, filament->vendor), PresetWithVendorProfile(printer, printer.vendor)))
{
//already has compatible filament
add_default_materials = false;
break;
}
}
}
if (!add_default_materials)
continue;
for (auto default_filament: printer.vendor->models[0].default_materials)
{
Preset* filament = filaments.find_preset(default_filament, false, true);
@ -1150,7 +1169,7 @@ void PresetBundle::load_installed_filaments(AppConfig &config)
// and mark these filaments as installed, therefore this code will not be executed at the next start of the application.
for (const auto &filament: compatible_filaments)
config.set(AppConfig::SECTION_FILAMENTS, filament->name, "true");
}
//}
for (auto &preset : filaments)
preset.set_visible_from_appconfig(config);