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

FIX: Add a matching rule with the same name for PA value 

jira: 8339
Change-Id: Ib11be988a8e3cdbcaa853627cb946446730062c4
This commit is contained in:
zhimin.zeng 2024-10-17 18:30:08 +08:00 committed by lane.wei
parent 3cb36b5111
commit f4379b3e19
1 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/slic3r/GUI/AMSMaterialsSetting.cpp
View File

@ -1054,7 +1054,7 @@ void AMSMaterialsSetting::on_select_cali_result(wxCommandEvent &evt)
void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt) void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
{ {
// Get the flag whether to open the filament setting dialog from the device page // Get the flag whether to open the filament setting dialog from the device page
int *from_printer = static_cast<int *>(m_comboBox_filament->GetClientData()); int* from_printer = static_cast<int*>(m_comboBox_filament->GetClientData());
m_filament_type = ""; m_filament_type = "";
PresetBundle* preset_bundle = wxGetApp().preset_bundle; PresetBundle* preset_bundle = wxGetApp().preset_bundle;
@ -1172,6 +1172,14 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
m_pa_profile_items.clear(); m_pa_profile_items.clear();
m_comboBox_cali_result->SetValue(wxEmptyString); m_comboBox_cali_result->SetValue(wxEmptyString);
auto get_cali_index = [this](const std::string& str) -> int{
for (int i = 0; i < int(m_pa_profile_items.size()); ++i) {
if (m_pa_profile_items[i].name == str)
return i;
}
return 0;
};
if (obj->cali_version >= 0) { if (obj->cali_version >= 0) {
// add default item // add default item
PACalibResult default_item; PACalibResult default_item;
@ -1192,31 +1200,43 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
m_comboBox_cali_result->Set(items); m_comboBox_cali_result->Set(items);
if (ams_id == VIRTUAL_TRAY_MAIN_ID || ams_id == VIRTUAL_TRAY_DEPUTY_ID) { if (ams_id == VIRTUAL_TRAY_MAIN_ID || ams_id == VIRTUAL_TRAY_DEPUTY_ID) {
for (auto slot : obj->vt_slot) { if (from_printer && (*from_printer == 1)) {
if (slot.id == std::to_string(ams_id)) for (auto slot : obj->vt_slot) {
cali_select_idx = CalibUtils::get_selected_calib_idx(m_pa_profile_items, slot.cali_idx); if (slot.id == std::to_string(ams_id))
} cali_select_idx = CalibUtils::get_selected_calib_idx(m_pa_profile_items, slot.cali_idx);
}
if (cali_select_idx >= 0) if (cali_select_idx >= 0)
m_comboBox_cali_result->SetSelection(cali_select_idx); m_comboBox_cali_result->SetSelection(cali_select_idx);
else else
m_comboBox_cali_result->SetSelection(0); m_comboBox_cali_result->SetSelection(0);
}
else {
int index = get_cali_index(m_comboBox_filament->GetLabel().ToStdString());
m_comboBox_cali_result->SetSelection(index);
}
} }
else { else {
if (this->obj->amsList.find(std::to_string(ams_id)) != this->obj->amsList.end()) { if (from_printer && (*from_printer == 1)) {
Ams* selected_ams = this->obj->amsList[std::to_string(ams_id)]; if (this->obj->amsList.find(std::to_string(ams_id)) != this->obj->amsList.end()) {
if (!selected_ams) Ams* selected_ams = this->obj->amsList[std::to_string(ams_id)];
return; if (!selected_ams)
AmsTray* selected_tray = selected_ams->trayList[std::to_string(slot_id)]; return;
if (!selected_tray) AmsTray* selected_tray = selected_ams->trayList[std::to_string(slot_id)];
return; if (!selected_tray)
cali_select_idx = CalibUtils::get_selected_calib_idx(m_pa_profile_items, selected_tray->cali_idx); return;
if (cali_select_idx < 0) { cali_select_idx = CalibUtils::get_selected_calib_idx(m_pa_profile_items, selected_tray->cali_idx);
BOOST_LOG_TRIVIAL(info) << "extrusion_cali_status_error: cannot find pa profile, ams_id = " << ams_id if (cali_select_idx < 0) {
<< ", slot_id = " << slot_id << ", cali_idx = " << selected_tray->cali_idx; BOOST_LOG_TRIVIAL(info) << "extrusion_cali_status_error: cannot find pa profile, ams_id = " << ams_id
cali_select_idx = 0; << ", slot_id = " << slot_id << ", cali_idx = " << selected_tray->cali_idx;
cali_select_idx = 0;
}
m_comboBox_cali_result->SetSelection(cali_select_idx);
} }
m_comboBox_cali_result->SetSelection(cali_select_idx); }
else {
int index = get_cali_index(m_comboBox_filament->GetLabel().ToStdString());
m_comboBox_cali_result->SetSelection(index);
} }
} }