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

ENH: do ams mapping in printing and upgrading 

Change-Id: I592d37ce581077c317642cbdf250a369bc992d09
This commit is contained in:
Stone Li 2022-09-27 12:04:43 +08:00 committed by Lane.Wei
parent ad471bf3db
commit 32ac28738e
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/DeviceManager.cpp
View File

@ -666,9 +666,11 @@ int MachineObject::ams_filament_mapping(std::vector<FilamentInfo> filaments, std
} }
} }
// is_support_ams_mapping // is_support_ams_mapping
if (!is_support_ams_mapping()) { if (!is_support_ams_mapping()) {
BOOST_LOG_TRIVIAL(info) << "ams_mapping: do not support, use order mapping"; BOOST_LOG_TRIVIAL(info) << "ams_mapping: do not support, use order mapping";
result.clear();
for (int i = 0; i < filaments.size(); i++) { for (int i = 0; i < filaments.size(); i++) {
FilamentInfo info; FilamentInfo info;
info.id = filaments[i].id; info.id = filaments[i].id;

12
src/slic3r/GUI/SelectMachine.cpp
View File

@ -1991,6 +1991,18 @@ void SelectMachineDialog::update_show_status()
reset_timeout(); reset_timeout();
update_ams_check(obj_); update_ams_check(obj_);
// do ams mapping if no ams result
if (obj_->has_ams() && m_ams_mapping_result.empty()) {
if (obj_->ams_support_use_ams) {
if (ams_check->GetValue()) {
do_ams_mapping(obj_);
} else {
m_ams_mapping_result.clear();
sync_ams_mapping_result(m_ams_mapping_result);
}
}
}
// reading done // reading done
if (obj_->is_in_upgrading()) { if (obj_->is_in_upgrading()) {
show_status(PrintDialogStatus::PrintStatusInUpgrading); show_status(PrintDialogStatus::PrintStatusInUpgrading);