3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-22 04:22:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ENH:auto switch use ams option

Browse source 
jira:[none]

Change-Id: Ia1d5231284515226277b16d771342141e654a23d
(cherry picked from commit 956f1b9a59c11bce0428c3162beac45a5272c919)
This commit is contained in:
tao wang 2025-03-26 15:40:10 +08:00 • committed by Noisyfox
parent 2bc9cb4441
commit 157bec00a1
4 changed files with 22 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/slic3r/GUI/SelectMachine.cpp
View file

@ -2598,15 +2598,9 @@ void SelectMachineDialog::on_send_print()
}
}
if (obj_->is_support_ams_mapping()) {
m_print_job->task_ams_mapping = ams_mapping_array;
m_print_job->task_ams_mapping2 = ams_mapping_array2;
m_print_job->task_ams_mapping_info = ams_mapping_info;
} else {
m_print_job->task_ams_mapping = "";
m_print_job->task_ams_mapping2 = "";
m_print_job->task_ams_mapping_info = "";
}
m_print_job->task_ams_mapping = ams_mapping_array;
m_print_job->task_ams_mapping2 = ams_mapping_array2;
m_print_job->task_ams_mapping_info = ams_mapping_info;
/* build nozzles info for multi extruders printers */
if (build_nozzles_info(m_print_job->task_nozzles_info)) {
@ -2733,6 +2727,9 @@ void SelectMachineDialog::on_set_finish_mapping(wxCommandEvent &evt)
}
}
int use_ext_count = 0;
int use_ams_count = 0;
for (auto i = 0; i < m_ams_mapping_result.size(); i++) {
if (m_ams_mapping_result[i].id == wxAtoi(selection_data_arr[5])) {
m_ams_mapping_result[i].tray_id = evt.GetInt();
@ -2744,10 +2741,24 @@ void SelectMachineDialog::on_set_finish_mapping(wxCommandEvent &evt)
m_ams_mapping_result[i].ams_id = selection_data_arr[6].ToStdString();
m_ams_mapping_result[i].slot_id = selection_data_arr[7].ToStdString();
if (m_ams_mapping_result[i].ams_id == std::to_string(VIRTUAL_TRAY_MAIN_ID) || m_ams_mapping_result[i].ams_id == std::to_string(VIRTUAL_TRAY_DEPUTY_ID)) {
use_ext_count++;
} else if (m_ams_mapping_result[i].ams_id >= std::to_string(0)) {
use_ams_count++;
}
}
BOOST_LOG_TRIVIAL(trace) << "The ams mapping result: id is " << m_ams_mapping_result[i].id << "tray_id is " << m_ams_mapping_result[i].tray_id;
}
/*check use ams options*/
if (m_checkbox_list["use_ams"]->IsShown() && use_ext_count == m_ams_mapping_result.size()) {
m_checkbox_list["use_ams"]->setValue("off");
}
else if (use_ams_count > 0) {
m_checkbox_list["use_ams"]->setValue("on");
}
MaterialHash::iterator iter = m_materialList.begin();
while (iter != m_materialList.end()) {
Material* item = iter->second;
@ -4439,7 +4450,7 @@ void SelectMachineDialog::set_default_from_sdcard()
auto mouse_pos = ClientToScreen(e.GetPosition());
wxPoint rect = item->ClientToScreen(wxPoint(0, 0));
if (obj_ && obj_->is_support_ams_mapping()) {
if (obj_) {
if (m_mapping_popup.IsShown()) return;
wxPoint pos = item->ClientToScreen(wxPoint(0, 0));
pos.y += item->GetRect().height;