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

ENH:optimized mapping rule for printing from SD card 

Change-Id: I435f518bb303c9592fde5c16eca6aa0d27211725
This commit is contained in:
tao wang 2025-02-11 12:01:39 +08:00 committed by lane.wei
parent 2c433396fa
commit cca59b8e52
1 changed files with 86 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1307,83 +1307,97 @@ bool SelectMachineDialog::get_ams_mapping_result(std::string &mapping_array_str,
if (invalid_count == m_ams_mapping_result.size()) { if (invalid_count == m_ams_mapping_result.size()) {
return false; return false;
} else { } else {
json mapping_v0_json = json::array(); if (m_print_type == FROM_NORMAL) {
json mapping_v1_json = json::array(); json mapping_v0_json = json::array();
json mapping_info_json = json::array(); json mapping_v1_json = json::array();
json mapping_info_json = json::array();
/* get filament maps */ /* get filament maps */
std::vector<int> filament_maps; std::vector<int> filament_maps;
Plater* plater = wxGetApp().plater(); Plater * plater = wxGetApp().plater();
if (plater) { if (plater) {
PartPlate* curr_plate = plater->get_partplate_list().get_curr_plate(); PartPlate *curr_plate = plater->get_partplate_list().get_curr_plate();
if (curr_plate) { if (curr_plate) {
filament_maps = curr_plate->get_filament_maps(); filament_maps = curr_plate->get_filament_maps();
} else {
BOOST_LOG_TRIVIAL(error) << "get_ams_mapping_result, curr_plate is nullptr";
}
} else { } else {
BOOST_LOG_TRIVIAL(error) << "get_ams_mapping_result, curr_plate is nullptr"; BOOST_LOG_TRIVIAL(error) << "get_ams_mapping_result, plater is nullptr";
} }
} else {
BOOST_LOG_TRIVIAL(error) << "get_ams_mapping_result, plater is nullptr";
}
for (int i = 0; i < wxGetApp().preset_bundle->filament_presets.size(); i++) { for (int i = 0; i < wxGetApp().preset_bundle->filament_presets.size(); i++) {
int tray_id = -1; int tray_id = -1;
json mapping_item_v1; json mapping_item_v1;
mapping_item_v1["ams_id"] = 0xff; mapping_item_v1["ams_id"] = 0xff;
mapping_item_v1["slot_id"] = 0xff; mapping_item_v1["slot_id"] = 0xff;
json mapping_item; json mapping_item;
mapping_item["ams"] = tray_id; mapping_item["ams"] = tray_id;
mapping_item["targetColor"] = ""; mapping_item["targetColor"] = "";
mapping_item["filamentId"] = ""; mapping_item["filamentId"] = "";
mapping_item["filamentType"] = ""; mapping_item["filamentType"] = "";
for (int k = 0; k < m_ams_mapping_result.size(); k++) { for (int k = 0; k < m_ams_mapping_result.size(); k++) {
if (m_ams_mapping_result[k].id == i) { if (m_ams_mapping_result[k].id == i) {
tray_id = m_ams_mapping_result[k].tray_id; tray_id = m_ams_mapping_result[k].tray_id;
mapping_item["ams"] = tray_id; mapping_item["ams"] = tray_id;
mapping_item["filamentType"] = m_filaments[k].type; mapping_item["filamentType"] = m_filaments[k].type;
auto it = wxGetApp().preset_bundle->filaments.find_preset(wxGetApp().preset_bundle->filament_presets[i]); if (i >= 0 && i < wxGetApp().preset_bundle->filament_presets.size()) {
if (it != nullptr) { auto it = wxGetApp().preset_bundle->filaments.find_preset(wxGetApp().preset_bundle->filament_presets[i]);
mapping_item["filamentId"] = it->filament_id; if (it != nullptr) { mapping_item["filamentId"] = it->filament_id; }
} }
/* nozzle id */ /* nozzle id */
if (i >= 0 && i < filament_maps.size()) { if (i >= 0 && i < filament_maps.size()) { mapping_item["nozzleId"] = convert_filament_map_nozzle_id_to_task_nozzle_id(filament_maps[i]); }
mapping_item["nozzleId"] = convert_filament_map_nozzle_id_to_task_nozzle_id(filament_maps[i]); // convert #RRGGBB to RRGGBBAA
} mapping_item["sourceColor"] = m_filaments[k].color;
//convert #RRGGBB to RRGGBBAA mapping_item["targetColor"] = m_ams_mapping_result[k].color;
mapping_item["sourceColor"] = m_filaments[k].color; if (tray_id == VIRTUAL_TRAY_MAIN_ID || tray_id == VIRTUAL_TRAY_DEPUTY_ID) { tray_id = -1; }
mapping_item["targetColor"] = m_ams_mapping_result[k].color;
if (tray_id == VIRTUAL_TRAY_MAIN_ID || tray_id == VIRTUAL_TRAY_DEPUTY_ID)
{
tray_id = -1;
}
/*new ams mapping data*/ /*new ams mapping data*/
try try {
{ if (m_ams_mapping_result[k].ams_id.empty() || m_ams_mapping_result[k].slot_id.empty()) { // invalid case
if (m_ams_mapping_result[k].ams_id.empty() || m_ams_mapping_result[k].slot_id.empty()) { // invalid case mapping_item_v1["ams_id"] = VIRTUAL_TRAY_MAIN_ID;
mapping_item_v1["ams_id"] = VIRTUAL_TRAY_MAIN_ID; mapping_item_v1["slot_id"] = VIRTUAL_TRAY_MAIN_ID;
mapping_item_v1["slot_id"] = VIRTUAL_TRAY_MAIN_ID; } else {
} mapping_item_v1["ams_id"] = std::stoi(m_ams_mapping_result[k].ams_id);
else { mapping_item_v1["slot_id"] = std::stoi(m_ams_mapping_result[k].slot_id);
mapping_item_v1["ams_id"] = std::stoi(m_ams_mapping_result[k].ams_id); }
mapping_item_v1["slot_id"] = std::stoi(m_ams_mapping_result[k].slot_id); } catch (...) {}
}
}
catch (...)
{
} }
} }
mapping_v0_json.push_back(tray_id);
mapping_v1_json.push_back(mapping_item_v1);
mapping_info_json.push_back(mapping_item);
} }
mapping_v0_json.push_back(tray_id);
mapping_v1_json.push_back(mapping_item_v1); mapping_array_str = mapping_v0_json.dump();
mapping_info_json.push_back(mapping_item); mapping_array_str2 = mapping_v1_json.dump();
ams_mapping_info = mapping_info_json.dump();
return valid_mapping_result;
} else if(m_print_type == FROM_SDCARD_VIEW){
json mapping_v0_json = json::array();
json mapping_v1_json = json::array();
for (int i = 0; i < m_filaments_map.size(); i++) {
int mapping_result = -1;
json mapping_item_v1;
mapping_item_v1["ams_id"] = 0xff;
mapping_item_v1["slot_id"] = 0xff;
for (int k = 0; k < m_ams_mapping_result.size(); k++) {
if (m_ams_mapping_result[k].id == i) {
mapping_result = m_ams_mapping_result[k].tray_id;
mapping_item_v1["ams_id"] = std::stoi(m_ams_mapping_result[k].ams_id);
mapping_item_v1["slot_id"] = std::stoi(m_ams_mapping_result[k].slot_id);
}
}
mapping_v0_json.push_back(mapping_result);
mapping_v1_json.push_back(mapping_item_v1);
mapping_array_str = mapping_v0_json.dump();
mapping_array_str2 = mapping_v1_json.dump();
}
return true;
} }
mapping_array_str = mapping_v0_json.dump();
mapping_array_str2 = mapping_v1_json.dump();
ams_mapping_info = mapping_info_json.dump();
return valid_mapping_result;
} }
return true; return true;
} }
@ -2479,12 +2493,12 @@ void SelectMachineDialog::on_send_print()
} }
if (obj_->is_support_ams_mapping()) { if (obj_->is_support_ams_mapping()) {
m_print_job->task_ams_mapping = ams_mapping_array; m_print_job->task_ams_mapping = ams_mapping_array;
m_print_job->task_ams_mapping2= ams_mapping_array2; m_print_job->task_ams_mapping2 = ams_mapping_array2;
m_print_job->task_ams_mapping_info = ams_mapping_info; m_print_job->task_ams_mapping_info = ams_mapping_info;
} else { } else {
m_print_job->task_ams_mapping = ""; m_print_job->task_ams_mapping = "";
m_print_job->task_ams_mapping2 = ""; m_print_job->task_ams_mapping2 = "";
m_print_job->task_ams_mapping_info = ""; m_print_job->task_ams_mapping_info = "";
} }