3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-06 06:47:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

ENH: check if the custom k value will be used, and show warning

Browse source 
jira: [STUDIO-10970]
Change-Id: If67ef695340e6bed38604d92ea86a4b0d5e57bdf
(cherry picked from commit 8b775f5c2e6c5c11baceb3c8292b41c59b98e0d0)
This commit is contained in:
xin.zhang 2025-03-19 18:03:18 +08:00 • committed by Noisyfox
parent 367cf4dd06
commit 5fc2af6707
2 changed files with 52 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1936,6 +1936,9 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector<wxSt
} else if (status == PrintStatusTPUUnsupportAutoCali) {
wxString msg_text = _L("TPU 90A/TPU 85A is too soft and does not support automatic Flow Dynamics calibration.");
update_print_status_msg(msg_text, false, false, true);
} else if (status == PrintStatusWarningKvalueNotUsed && !params.empty()) {
wxString msg_text = _L("Custom K value of { %s } will not be used since dynamic flow calibration is enabled.");
update_print_status_msg(wxString::Format(msg_text, params[0]), false, true, true);
}
// m_panel_warn m_simplebook
@ -3239,6 +3242,37 @@ void SelectMachineDialog::update_filament_change_count()
Fit();
}
static wxString _check_kval_not_default(const MachineObject* obj, const std::vector<FilamentInfo> &mapping_result)
{
if (!obj) { return wxEmptyString;}
wxString ams_names;
for (const auto& info : mapping_result) {
auto ams_iter = obj->amsList.find(info.ams_id);
if (ams_iter == obj->amsList.end()) { continue; }
auto tray_iter = ams_iter->second->trayList.find(std::to_string(info.tray_id));
if (tray_iter == ams_iter->second->trayList.end()) { continue; }
if (tray_iter->second->cali_idx == -1) { continue; } /*-1 means default*/
wxString ams_name;
if (info.tray_id == VIRTUAL_TRAY_MAIN_ID) {
ams_name = "Right-Ext";
} else if (info.tray_id == VIRTUAL_TRAY_DEPUTY_ID) {
ams_name = "Left-Ext";
} else {
ams_name = wxGetApp().transition_tridid(info.tray_id);
}
if (!ams_names.empty()) { ams_names += ", ";}
ams_names += ams_name;
}
return ams_names;
}
void SelectMachineDialog::update_show_status()
{
// refreshing return
@ -3587,29 +3621,35 @@ void SelectMachineDialog::update_show_status()
if (m_ams_mapping_res) {
if (has_timelapse_warning()) {
show_status(PrintDialogStatus::PrintStatusTimelapseWarning);
return;
}
else {
show_status(PrintDialogStatus::PrintStatusAmsMappingSuccess);
}
return;
}
else {
if (obj_->is_valid_mapping_result(m_ams_mapping_result)) {
if (!has_tips(obj_)){
if (has_timelapse_warning()) {
show_status(PrintDialogStatus::PrintStatusTimelapseWarning);
return;
}
else {
show_status(PrintDialogStatus::PrintStatusAmsMappingValid);
}
return;
}
}
}
else {
show_status(PrintDialogStatus::PrintStatusAmsMappingInvalid);
return;
}
}
}
/*STUDIO-10970 check the k value and flow cali option*/
if (m_checkbox_list["flow_cali"]->getValue() != "off") {
const auto &not_default_ams_names = _check_kval_not_default(obj_, m_ams_mapping_result);
if (!not_default_ams_names.empty()) {
std::vector<wxString> params{not_default_ams_names};
show_status(PrintDialogStatus::PrintStatusWarningKvalueNotUsed, params);
return;
}
}
update_print_status_msg(wxEmptyString, false, true, true);
}
bool SelectMachineDialog::has_timelapse_warning()