FIX: modify the message of cali
jira: none Change-Id: Ibc2dfa0588a02508cc625eedb3da38d0eae2199c
This commit is contained in:
parent
72816060ab
commit
2004e769ce
|
@ -1158,27 +1158,29 @@ bool CalibUtils::check_printable_status_before_cali(const MachineObject *obj, co
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const auto &cali_info : cali_infos.calib_datas) {
|
for (const auto &cali_info : cali_infos.calib_datas) {
|
||||||
|
wxString name = _L("left");
|
||||||
|
if (cali_info.extruder_id == 0) {
|
||||||
|
name = _L("right");
|
||||||
|
}
|
||||||
|
|
||||||
if (!is_approx(cali_info.nozzle_diameter, diameter)) {
|
if (!is_approx(cali_info.nozzle_diameter, diameter)) {
|
||||||
error_message = _L("The selected filament's nozzle diameter or type does not match the actual printer configuration.\n"
|
if (is_multi_extruder)
|
||||||
|
error_message = wxString::Format(_L("The currently selected nozzle diameter of %s extruder does not match the actual nozzle diameter.\n"
|
||||||
|
"Please click the Sync button above and restart the calibration."), name);
|
||||||
|
else
|
||||||
|
error_message = _L("The nozzle diameter does not match the actual printer nozzle diameter.\n"
|
||||||
"Please click the Sync button above and restart the calibration.");
|
"Please click the Sync button above and restart the calibration.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_multi_extruder) {
|
if (is_multi_extruder) {
|
||||||
if (nozzle_volume_types[cali_info.extruder_id] == NozzleFlowType::NONE_FLOWTYPE) {
|
if (nozzle_volume_types[cali_info.extruder_id] == NozzleFlowType::NONE_FLOWTYPE) {
|
||||||
wxString name = _L("left");
|
|
||||||
if (cali_info.extruder_id == 0) {
|
|
||||||
name = _L("right");
|
|
||||||
}
|
|
||||||
error_message = wxString::Format(_L("Printer %s nozzle information has not been set. Please configure it before proceeding with the calibration."), name);
|
error_message = wxString::Format(_L("Printer %s nozzle information has not been set. Please configure it before proceeding with the calibration."), name);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (NozzleVolumeType(nozzle_volume_types[cali_info.extruder_id] - 1) != cali_info.nozzle_volume_type) {
|
if (NozzleVolumeType(nozzle_volume_types[cali_info.extruder_id] - 1) != cali_info.nozzle_volume_type) {
|
||||||
wxString name = _L("left");
|
|
||||||
if (cali_info.extruder_id == 0) {
|
|
||||||
name = _L("right");
|
|
||||||
}
|
|
||||||
error_message = wxString::Format(_L("The currently selected nozzle type of %s extruder does not match the actual printer nozzle type.\n"
|
error_message = wxString::Format(_L("The currently selected nozzle type of %s extruder does not match the actual printer nozzle type.\n"
|
||||||
"Please click the Sync button above and restart the calibration."), name);
|
"Please click the Sync button above and restart the calibration."), name);
|
||||||
return false;
|
return false;
|
||||||
|
@ -1207,23 +1209,28 @@ bool CalibUtils::check_printable_status_before_cali(const MachineObject* obj, co
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxString name = _L("left");
|
||||||
|
if (cali_info.extruder_id == 0) {
|
||||||
|
name = _L("right");
|
||||||
|
}
|
||||||
|
|
||||||
if (!is_approx(nozzle_diameter, diameter)) {
|
if (!is_approx(nozzle_diameter, diameter)) {
|
||||||
error_message = _L("The selected filament's nozzle diameter or type does not match the actual printer configuration.\n"
|
if (is_multi_extruder)
|
||||||
|
error_message = wxString::Format(_L("The currently selected nozzle diameter of %s extruder does not match the actual nozzle diameter.\n"
|
||||||
|
"Please click the Sync button above and restart the calibration."), name);
|
||||||
|
else
|
||||||
|
error_message = _L("The nozzle diameter does not match the actual printer nozzle diameter.\n"
|
||||||
"Please click the Sync button above and restart the calibration.");
|
"Please click the Sync button above and restart the calibration.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_multi_extruder) {
|
if (is_multi_extruder) {
|
||||||
if (nozzle_volume_types[cali_info.extruder_id] == NozzleFlowType::NONE_FLOWTYPE) {
|
if (nozzle_volume_types[cali_info.extruder_id] == NozzleFlowType::NONE_FLOWTYPE) {
|
||||||
wxString name = _L("left");
|
|
||||||
if (cali_info.extruder_id == 0) { name = _L("right"); }
|
|
||||||
error_message = wxString::Format(_L("Printer %s nozzle information has not been set. Please configure it before proceeding with the calibration."), name);
|
error_message = wxString::Format(_L("Printer %s nozzle information has not been set. Please configure it before proceeding with the calibration."), name);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (NozzleVolumeType(nozzle_volume_types[cali_info.extruder_id] - 1) != cali_info.nozzle_volume_type) {
|
if (NozzleVolumeType(nozzle_volume_types[cali_info.extruder_id] - 1) != cali_info.nozzle_volume_type) {
|
||||||
wxString name = _L("left");
|
|
||||||
if (cali_info.extruder_id == 0) { name = _L("right"); }
|
|
||||||
error_message = wxString::Format(_L("The currently selected nozzle type of %s extruder does not match the actual printer nozzle type.\n"
|
error_message = wxString::Format(_L("The currently selected nozzle type of %s extruder does not match the actual printer nozzle type.\n"
|
||||||
"Please click the Sync button above and restart the calibration."), name);
|
"Please click the Sync button above and restart the calibration."), name);
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue