From c1e487679306a5a9af911dac3347ef1b4c64a342 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Thu, 21 Aug 2025 14:36:38 +0800 Subject: [PATCH] FIX: auto cali send failed and cannot set cali step to 0.001 jira: STUDIO-14042 & STUDIO-14119 Change-Id: I56ecc70d0413398ecacd1c842f7102e810277cfd (cherry picked from commit c16925931c642d8e27d739a401148bc94c5f3965) --- src/slic3r/Utils/CalibUtils.cpp | 10 +++++----- src/slic3r/Utils/CalibUtils.hpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp index 16f0b0fb60..7184d4cf12 100644 --- a/src/slic3r/Utils/CalibUtils.cpp +++ b/src/slic3r/Utils/CalibUtils.cpp @@ -22,8 +22,8 @@ namespace Slic3r { namespace GUI { -const float MIN_PA_K_VALUE = 0.0; -const float MAX_PA_K_VALUE = 2.0; +const double MIN_PA_K_VALUE = 0.0; +const double MAX_PA_K_VALUE = 2.0; std::unique_ptr CalibUtils::print_worker; wxString wxstr_temp_dir = fs::path(fs::temp_directory_path() / "calib").wstring(); @@ -1805,9 +1805,9 @@ void CalibUtils::send_to_print(const CalibInfo &calib_info, wxString &error_mess print_job->plate_data = plate_data; print_job->m_print_type = "from_normal"; - print_job->task_ams_mapping = select_ams; + print_job->task_ams_mapping = "[" + select_ams + "]"; print_job->task_ams_mapping_info = ""; - print_job->task_use_ams = select_ams == "[254]" ? false : true; + print_job->task_use_ams = devPrinterUtil::IsVirtualSlot(select_ams); std::string new_ams_mapping = "[{\"ams_id\":" + std::to_string(calib_info.ams_id) + ", \"slot_id\":" + std::to_string(calib_info.slot_id) + "}]"; print_job->task_ams_mapping2 = new_ams_mapping; @@ -1871,7 +1871,7 @@ void CalibUtils::send_to_print(const std::vector &calib_infos, wxStri } auto print_job = std::make_shared(dev_id); - print_job->m_dev_ip = obj_->get_dev_ip(); + print_job->m_dev_ip = obj_->get_dev_ip(); print_job->m_ftp_folder = obj_->get_ftp_folder(); print_job->m_access_code = obj_->get_access_code(); diff --git a/src/slic3r/Utils/CalibUtils.hpp b/src/slic3r/Utils/CalibUtils.hpp index 118894dc7f..e59bbf68ec 100644 --- a/src/slic3r/Utils/CalibUtils.hpp +++ b/src/slic3r/Utils/CalibUtils.hpp @@ -10,8 +10,8 @@ class ProgressIndicator; class Preset; namespace GUI { -extern const float MIN_PA_K_VALUE; -extern const float MAX_PA_K_VALUE; +extern const double MIN_PA_K_VALUE; +extern const double MAX_PA_K_VALUE; class CalibInfo {