juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-29 21:07:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop blocking print on unreported nozzle data

Browse Source
This commit is contained in:
Andrew
2026-07-27 16:16:48 +08:00
committed by Ian Chua
parent deaca0189f
commit cd6d2cbf5e
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4551,11 +4551,13 @@ bool SelectMachineDialog::CheckErrorExtruderNozzleWithSlicing(MachineObject* obj
// check nozzle data valid // check nozzle data valid
{ {
if (installed_ext_nozzle.GetNozzleType() == NozzleType::ntUndefine || // Commented out the following as ntUndefine and 0.0f are default values
installed_ext_nozzle.GetNozzleDiameter() <= 0.0f) { // (signifying that the value is not given) that should PASS, not fail
show_status(PrintDialogStatus::PrintStatusNozzleDataInvalid); // if (installed_ext_nozzle.GetNozzleType() == NozzleType::ntUndefine ||
return false; // installed_ext_nozzle.GetNozzleDiameter() <= 0.0f) {
} // show_status(PrintDialogStatus::PrintStatusNozzleDataInvalid);
// return false;
// }
if (obj_->is_nozzle_flow_type_supported() && if (obj_->is_nozzle_flow_type_supported() &&
installed_ext_nozzle.GetNozzleFlowType() == NozzleFlowType::NONE_FLOWTYPE) { installed_ext_nozzle.GetNozzleFlowType() == NozzleFlowType::NONE_FLOWTYPE) {
@@ -4584,7 +4586,10 @@ bool SelectMachineDialog::CheckErrorExtruderNozzleWithSlicing(MachineObject* obj
// check nozzle diameter // check nozzle diameter
{ {
if (slicing_ext.nozzle_diameter != installed_ext_nozzle.GetNozzleDiameter()) { // 0.0f is default when there is no nozzle diameter is given.
// In nozzle_diameter == 0.0f case, it passes and does not require a comparison
if (installed_ext_nozzle.GetNozzleDiameter() > 0.0f &&
slicing_ext.nozzle_diameter != installed_ext_nozzle.GetNozzleDiameter()) {
std::vector<wxString> msg_params; std::vector<wxString> msg_params;
if (ext_sys->GetTotalExtderCount() == 2) { if (ext_sys->GetTotalExtderCount() == 2) {
const wxString& mismatch_nozzle_str = _get_nozzle_name(ext_sys->GetTotalExtderCount(), slicing_ext_idx); const wxString& mismatch_nozzle_str = _get_nozzle_name(ext_sys->GetTotalExtderCount(), slicing_ext_idx);