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

FIX: move the pre-check 

jira: [none]
Change-Id: Ia11d9dfbce9b7013daf85231f68a6ec9f3d2e609
This commit is contained in:
xin.zhang 2025-04-03 17:04:01 +08:00 committed by lane.wei
parent 2f979b27c9
commit 9505df87c1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/PrintOptionsDialog.cpp
View File

@ -820,11 +820,6 @@ void PrinterPartsDialog::set_nozzle_data(wxCommandEvent& evt)
nozzle_id = MAIN_NOZZLE_ID; nozzle_id = MAIN_NOZZLE_ID;
} }
/*filter invalid set*/
if (current_nozzle_type_combox && current_nozzle_type_combox->IsShown() && current_nozzle_type_combox->GetValue().IsEmpty()) { return; }
if (current_nozzle_diameter_combox && current_nozzle_diameter_combox->IsShown() && current_nozzle_diameter_combox->GetValue().IsEmpty()) { return; }
if (current_nozzle_flow_combox && current_nozzle_flow_combox->IsShown() && current_nozzle_flow_combox->GetValue().IsEmpty()) { return; }
if (obj) { if (obj) {
try { try {
auto nozzle_type = NozzleType::ntHardenedSteel; auto nozzle_type = NozzleType::ntHardenedSteel;
@ -886,6 +881,8 @@ void PrinterPartsDialog::set_nozzle_data(wxCommandEvent& evt)
} }
if (!obj->is_enable_np) { if (!obj->is_enable_np) {
if (current_nozzle_type_combox && current_nozzle_type_combox->IsShown() && current_nozzle_type_combox->GetValue().IsEmpty()) { return; }
if (current_nozzle_diameter_combox && current_nozzle_diameter_combox->IsShown() && current_nozzle_diameter_combox->GetValue().IsEmpty()) { return; }
obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_diameter = nozzle_diameter; obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_diameter = nozzle_diameter;
obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_type = nozzle_type; obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_type = nozzle_type;
obj->command_set_printer_nozzle(NozzleTypeEumnToStr[nozzle_type], nozzle_diameter); obj->command_set_printer_nozzle(NozzleTypeEumnToStr[nozzle_type], nozzle_diameter);
@ -909,6 +906,9 @@ void PrinterPartsDialog::set_nozzle_data(wxCommandEvent& evt)
return; return;
} }
if (current_nozzle_type_combox && current_nozzle_type_combox->IsShown() && current_nozzle_type_combox->GetValue().IsEmpty()) { return; }
if (current_nozzle_diameter_combox && current_nozzle_diameter_combox->IsShown() && current_nozzle_diameter_combox->GetValue().IsEmpty()) { return; }
if (current_nozzle_flow_combox && current_nozzle_flow_combox->IsShown() && current_nozzle_flow_combox->GetValue().IsEmpty()) { return; }
obj->m_extder_data.extders[nozzle_id].current_nozzle_diameter = nozzle_diameter; obj->m_extder_data.extders[nozzle_id].current_nozzle_diameter = nozzle_diameter;
obj->m_extder_data.extders[nozzle_id].current_nozzle_flow_type = nozzle_flow; obj->m_extder_data.extders[nozzle_id].current_nozzle_flow_type = nozzle_flow;
obj->m_extder_data.extders[nozzle_id].current_nozzle_type = nozzle_type; obj->m_extder_data.extders[nozzle_id].current_nozzle_type = nozzle_type;