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

FIX: preset without compatible_printer cannot be exported 

github: #4290

Change-Id: I42dff3380a698ff86dba6409e61442357759a7c4
This commit is contained in:
maosheng.wei 2024-06-26 18:08:49 +08:00 committed by Lane.Wei
parent 1ca982c9fc
commit ddbecb4f5e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libslic3r/PresetBundle.cpp
View File

@ -1747,6 +1747,7 @@ unsigned int PresetBundle::sync_ams_list(unsigned int &unknowns)
std::vector<std::string> filament_presets;
std::vector<std::string> filament_colors;
ams_multi_color_filment.clear();
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(": filament_ams_list size: %1%") % filament_ams_list.size();
for (auto &entry : filament_ams_list) {
auto & ams = entry.second;
auto filament_id = ams.opt_string("filament_id", 0u);

4
src/slic3r/GUI/CreatePresetsDialog.cpp
View File

@ -3445,7 +3445,7 @@ bool ExportConfigsDialog::preset_is_not_compatible_bbl_printer(Preset *preset)
PresetBundle * preset_bundle = wxGetApp().preset_bundle;
vector<std::string> printers;
get_filament_compatible_printer(preset, printers);
if (printers.empty()) return true;
if (printers.empty()) return false; // no compatable printer preset must be compatable bbl printer
Preset *printer_preset = preset_bundle->printers.find_preset(printers[0], false);
if (!printer_preset) return true;
if (!printer_preset->is_bbl_vendor_preset(preset_bundle)) return true;
@ -3947,7 +3947,7 @@ ExportConfigsDialog::ExportCase ExportConfigsDialog::archive_filament_bundle_to_
std::string filament_vendor = filament_vendor_to_preset.first;
if (filament_vendor.empty()) continue;
Preset *filament_preset = filament_vendor_to_preset.second;
if (preset_is_not_compatible_bbl_printer(filament_preset)) continue;
//if (preset_is_not_compatible_bbl_printer(filament_preset)) continue;
if (vendor_to_filament_name.find(std::make_pair(filament_vendor, filament_preset->name)) != vendor_to_filament_name.end()) continue;
vendor_to_filament_name.insert(std::make_pair(filament_vendor, filament_preset->name));
std::string preset_path = boost::filesystem::path(filament_preset->file).make_preferred().string();