From d4e6b73de1933ada9f8cae73b61535417d6294d0 Mon Sep 17 00:00:00 2001 From: hemai Date: Mon, 13 Oct 2025 20:12:39 +0800 Subject: [PATCH] FIX: update tips msg for single extuder printer Jira: [STUDIO-15067] Change-Id: Ieddce97efd740747cec67beb5d13d8a05f9554e2 (cherry picked from commit 98f5d3af5f4f5f47a3f7098fddcd5a2c4e3b7eae) --- src/slic3r/Utils/CalibUtils.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp index 313ca1ce85..bbd930759a 100644 --- a/src/slic3r/Utils/CalibUtils.cpp +++ b/src/slic3r/Utils/CalibUtils.cpp @@ -1371,10 +1371,8 @@ bool CalibUtils::check_printable_status_before_cali(const MachineObject *obj, co Preset *printer_preset = get_printer_preset(obj); for (const auto &cali_info : cali_infos.calib_datas) { - wxString name = _L("left"); - if (cali_info.extruder_id == 0) { - name = _L("right"); - } + wxString name = ""; + if (is_multi_extruder) { name = cali_info.extruder_id == MAIN_EXTRUDER_ID ? _L("right") + " ": _L("left") + " "; } float cali_diameter = cali_info.nozzle_diameter; int extruder_id = cali_info.extruder_id; @@ -1385,7 +1383,7 @@ bool CalibUtils::check_printable_status_before_cali(const MachineObject *obj, co if (is_approx(double(cali_info.nozzle_diameter), 0.2) && !obj->is_series_x()) { - error_message = wxString::Format(_L("The nozzle diameter of %s extruder is 0.2mm which does not support automatic Flow Dynamics calibration."), name); + error_message = wxString::Format(_L("The nozzle diameter of %sextruder is 0.2mm which does not support automatic Flow Dynamics calibration."), name); return false; } @@ -1435,10 +1433,8 @@ bool CalibUtils::check_printable_status_before_cali(const MachineObject *obj, co Preset *printer_preset = get_printer_preset(obj); for (const auto &cali_info : cali_infos) { - wxString name = _L("left"); - if (cali_info.extruder_id == 0) { - name = _L("right"); - } + wxString name = ""; + if (is_multi_extruder) { name = cali_info.extruder_id == MAIN_EXTRUDER_ID ? _L("right") + " " : _L("left") + " "; } if (cali_info.params.mode == CalibMode::Calib_Auto_PA_Line && !is_support_auto_pa_cali(cali_info.filament_prest->filament_id)) { error_message = _L("TPU 90A/TPU 85A is too soft and does not support automatic Flow Dynamics calibration."); @@ -1447,7 +1443,7 @@ bool CalibUtils::check_printable_status_before_cali(const MachineObject *obj, co if (is_approx(double(cali_info.nozzle_diameter), 0.2) && !obj->is_series_x()) { - error_message = wxString::Format(_L("The nozzle diameter of %s extruder is 0.2mm which does not support automatic Flow Dynamics calibration."), name); + error_message = wxString::Format(_L("The nozzle diameter of %sextruder is 0.2mm which does not support automatic Flow Dynamics calibration."), name); return false; }