3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-27 19:30:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ENH: update the mapping algorithm, take a retry to mapping to an used tray

Browse source 
jira: [STUDIO-11971]
Change-Id: I22e34193318386a954d57ea3597cd3909db0ecb4
(cherry picked from commit 59db0a22657f879b94e88f18cf0b89448a5df222)
This commit is contained in:
xin.zhang 2025-05-08 10:15:34 +08:00 • committed by Noisyfox
parent 3e8ca38990
commit 5cf7843e73
1 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/slic3r/GUI/DeviceManager.cpp
View file

@ -1013,8 +1013,9 @@ int MachineObject::ams_filament_mapping(
if (filaments.empty())
return -1;
// tray_index : tray_color
std::map<int, FilamentInfo> tray_filaments;
/////////////////////////
// Step 1: collect filaments in machine
std::map<int, FilamentInfo> tray_filaments; // tray_index : tray_color
bool left_nozzle_has_ams = false, right_nozzle_has_ams = false;
for (auto ams = amsList.begin(); ams != amsList.end(); ams++) {
std::string ams_id = ams->second->id;
@ -1067,6 +1068,8 @@ int MachineObject::ams_filament_mapping(
}
}
/////////////////////////
// Step 2: collect the distances of filaments_in_slicing to filaments_in_machine
char buffer[256];
std::vector<std::vector<DisValue>> distance_map;
@ -1077,7 +1080,7 @@ int MachineObject::ams_filament_mapping(
::sprintf(buffer, " AMS%02d", tray->second.id+1);
line += std::string(buffer);
}
BOOST_LOG_TRIVIAL(info) << "ams_mapping_distance:" << line;
BOOST_LOG_TRIVIAL(info) << "ams_mapping_distance:" << line;// Print the collected filaments
for (int i = 0; i < filaments.size(); i++) {
std::vector<DisValue> rol;
@ -1105,7 +1108,10 @@ int MachineObject::ams_filament_mapping(
distance_map.push_back(rol);
}
// mapping algorithm
/////////////////////////
// Step 3: do mapping algorithm
// setup the mapping result
for (int i = 0; i < filaments.size(); i++) {
FilamentInfo info;
info.id = filaments[i].id;
@ -1115,6 +1121,7 @@ int MachineObject::ams_filament_mapping(
result.push_back(info);
}
// traverse the mapping
std::set<int> picked_src;
std::set<int> picked_tar;
for (int k = 0; k < distance_map.size(); k++) {
@ -1124,6 +1131,8 @@ int MachineObject::ams_filament_mapping(
for (int i = 0; i < distance_map.size(); i++) {
if (picked_src.find(i) != picked_src.end())
continue;
// try to mapping to different tray
for (int j = 0; j < distance_map[i].size(); j++) {
if (picked_tar.find(j) != picked_tar.end()){
if (distance_map[i][j].is_same_color
@ -1153,7 +1162,25 @@ int MachineObject::ams_filament_mapping(
}
}
}
// take a retry to mapping to used tray
if (picked_src_idx < 0 || picked_tar_idx < 0) {
for (int j = 0; j < distance_map[i].size(); j++) {
if (distance_map[i][j].is_same_color && distance_map[i][j].is_type_match) {
if (min_val > distance_map[i][j].distance) {
min_val = distance_map[i][j].distance;
picked_src_idx = i;
picked_tar_idx = j;
tray_filaments[picked_tar_idx].distance = min_val;
} else if (min_val == distance_map[i][j].distance && filaments[picked_src_idx].filament_id != tray_filaments[picked_tar_idx].filament_id && filaments[i].filament_id == tray_filaments[j].filament_id) {
picked_src_idx = i;
picked_tar_idx = j;
}
}
}
}
}
if (picked_src_idx >= 0 && picked_tar_idx >= 0) {
auto tray = tray_filaments.find(distance_map[k][picked_tar_idx].tray_id);
@ -1180,8 +1207,6 @@ int MachineObject::ams_filament_mapping(
}
}
std::vector<FilamentInfo> cache_map_result = result;
//check ams mapping result
if (is_valid_mapping_result(result, true)) {
return 0;