GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-02 05:40:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dk_templates_fix'

Browse Source
This commit is contained in:
David Kocik 2023-02-21 11:00:31 +01:00
commit 8f31cf6e3d
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/slic3r/GUI/ConfigWizard.cpp
View File

@ -2785,7 +2785,7 @@ bool ConfigWizard::priv::check_and_install_missing_materials(Technology technolo
{ {
// Walk over all installed Printer presets and verify whether there is a filament or SLA material profile installed at the same PresetBundle, // Walk over all installed Printer presets and verify whether there is a filament or SLA material profile installed at the same PresetBundle,
// which is compatible with it. // which is compatible with it.
const auto printer_models_missing_materials = [this, only_for_model_id](PrinterTechnology technology, const std::string &section) const auto printer_models_missing_materials = [this, only_for_model_id](PrinterTechnology technology, const std::string &section, bool no_templates)
{ {
const std::map<std::string, std::string> &appconfig_presets = appconfig_new.has_section(section) ? appconfig_new.get_section(section) : std::map<std::string, std::string>(); const std::map<std::string, std::string> &appconfig_presets = appconfig_new.has_section(section) ? appconfig_new.get_section(section) : std::map<std::string, std::string>();
std::set<const VendorProfile::PrinterModel*> printer_models_without_material; std::set<const VendorProfile::PrinterModel*> printer_models_without_material;
@ -2805,15 +2805,16 @@ bool ConfigWizard::priv::check_and_install_missing_materials(Technology technolo
has_material = true; has_material = true;
break; break;
} }
// find if preset.first is part of the templates profile (up is searching if preset.first is part of printer vendor preset) // find if preset.first is part of the templates profile (up is searching if preset.first is part of printer vendor preset)
for (const auto& bp : bundles) { if (!no_templates) {
if (!bp.second.preset_bundle->vendors.empty() && bp.second.preset_bundle->vendors.begin()->second.templates_profile) { for (const auto& bp : bundles) {
const PresetCollection& template_materials = bp.second.preset_bundle->materials(technology); if (!bp.second.preset_bundle->vendors.empty() && bp.second.preset_bundle->vendors.begin()->second.templates_profile) {
const Preset* template_material = template_materials.find_preset(preset.first, false); const PresetCollection& template_materials = bp.second.preset_bundle->materials(technology);
if (template_material && is_compatible_with_printer(PresetWithVendorProfile(*template_material, &bp.second.preset_bundle->vendors.begin()->second), PresetWithVendorProfile(printer, nullptr))) { const Preset* template_material = template_materials.find_preset(preset.first, false);
has_material = true; if (template_material && is_compatible_with_printer(PresetWithVendorProfile(*template_material, &bp.second.preset_bundle->vendors.begin()->second), PresetWithVendorProfile(printer, nullptr))) {
break; has_material = true;
break;
}
} }
} }
} }
@ -2872,8 +2873,10 @@ bool ConfigWizard::priv::check_and_install_missing_materials(Technology technolo
return out; return out;
}; };
bool no_templates = wxGetApp().app_config->get("no_templates") == "1";
if (any_fff_selected && (technology & T_FFF)) { if (any_fff_selected && (technology & T_FFF)) {
std::set<const VendorProfile::PrinterModel*> printer_models_without_material = printer_models_missing_materials(ptFFF, AppConfig::SECTION_FILAMENTS); std::set<const VendorProfile::PrinterModel*> printer_models_without_material = printer_models_missing_materials(ptFFF, AppConfig::SECTION_FILAMENTS, no_templates);
if (! printer_models_without_material.empty()) { if (! printer_models_without_material.empty()) {
if (only_for_model_id.empty()) if (only_for_model_id.empty())
ask_and_select_default_materials( ask_and_select_default_materials(
@ -2891,7 +2894,7 @@ bool ConfigWizard::priv::check_and_install_missing_materials(Technology technolo
} }
if (any_sla_selected && (technology & T_SLA)) { if (any_sla_selected && (technology & T_SLA)) {
std::set<const VendorProfile::PrinterModel*> printer_models_without_material = printer_models_missing_materials(ptSLA, AppConfig::SECTION_MATERIALS); std::set<const VendorProfile::PrinterModel*> printer_models_without_material = printer_models_missing_materials(ptSLA, AppConfig::SECTION_MATERIALS, no_templates);
if (! printer_models_without_material.empty()) { if (! printer_models_without_material.empty()) {
if (only_for_model_id.empty()) if (only_for_model_id.empty())
ask_and_select_default_materials( ask_and_select_default_materials(