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

FIX:Ams cannot mapping 

jira: [ams mapping]

Change-Id: I17b88b169c30e7c567e5e505bd7f7c56357466eb
This commit is contained in:
hang.xu 2024-07-16 18:53:19 +08:00 committed by lane.wei
parent 91ea29eb56
commit 9166c1d0c4
1 changed files with 21 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -896,64 +896,35 @@ int MachineObject::ams_filament_mapping(std::vector<FilamentInfo> filaments, std
info.ams_id = ams->first.c_str();
info.slot_id = tray->first.c_str();
}
if (!ext_first && !ext_second)
{
tray_filaments.emplace(std::make_pair(tray_index, info));
}
else if (ams->second->nozzle == 0 && ext_second)
{
tray_filaments.emplace(std::make_pair(tray_index, info));
}
else if (ams->second->nozzle == 1 && ext_first)
if ((!ext_first && !ext_second) || (ams->second->nozzle == 0 && ext_first) || (ams->second->nozzle == 1 && ext_second))
{
tray_filaments.emplace(std::make_pair(tray_index, info));
}
}
}
if (ext_first)
if (ext_first || ext_second)
{
auto tray = vt_slot.begin();
if (tray != vt_slot.end())
for (auto tray : vt_slot)
{
FilamentInfo info;
info.color = tray->color;
//info.color = "EEEEEEFF";
info.type = tray->get_filament_type();
//info.type = "PLA"; //temp change
info.tray_id = atoi(tray->id.c_str());
info.id = atoi(tray->id.c_str());
info.filament_id = tray->setting_id;
info.ctype = tray->ctype;
info.colors = tray->cols;
if ((tray.id == std::to_string(VIRTUAL_TRAY_MAIN_ID) && ext_first) || (tray.id == std::to_string(VIRTUAL_TRAY_DEPUTY_ID) && ext_second))
{
FilamentInfo info;
info.color = tray.color;
//info.color = "EEEEEEFF";
info.type = tray.get_filament_type();
//info.type = "PLA"; //temp change
info.tray_id = atoi(tray.id.c_str());
info.id = atoi(tray.id.c_str());
info.filament_id = tray.setting_id;
info.ctype = tray.ctype;
info.colors = tray.cols;
/*for new ams mapping*/
info.ams_id = tray->id.c_str();
info.slot_id = std::to_string(0);
tray_filaments.emplace(std::make_pair(info.tray_id, info));
}
}
if (ext_second)
{
auto tray = vt_slot.begin();
tray++;
if (tray != vt_slot.end())
{
FilamentInfo info;
info.color = tray->color;
//info.color = "EEEEEEFF";
info.type = tray->get_filament_type();
//info.type = "PLA"; //temp change
info.tray_id = atoi(tray->id.c_str());
info.id = atoi(tray->id.c_str());
info.filament_id = tray->setting_id;
info.ctype = tray->ctype;
info.colors = tray->cols;
/*for new ams mapping*/
info.ams_id = tray->id.c_str();
info.slot_id = std::to_string(0);
tray_filaments.emplace(std::make_pair(info.tray_id, info));
/*for new ams mapping*/
info.ams_id = tray.id.c_str();
info.slot_id = std::to_string(0);
tray_filaments.emplace(std::make_pair(info.tray_id, info));
}
}
}