From 5010994d88dc9f986c1785e7b5c2eb48f3fc48a8 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Wed, 6 Sep 2023 16:30:40 +0800 Subject: [PATCH] FIX: add log for cali Jira: XXXX Change-Id: Ifce2d57d2694c5b39fec93529e6efffa036b8e68 (cherry picked from commit e9ffe4de41096b01f6918eafec5b365360b9cff0) --- src/libslic3r/Calib.hpp | 2 +- src/slic3r/GUI/CalibrationWizard.cpp | 19 +++++++++++++++++++ src/slic3r/Utils/CalibUtils.cpp | 5 ++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/Calib.hpp b/src/libslic3r/Calib.hpp index 4077bad9c7..407051d81f 100644 --- a/src/libslic3r/Calib.hpp +++ b/src/libslic3r/Calib.hpp @@ -35,7 +35,7 @@ struct Calib_Params { Calib_Params() : mode(CalibMode::Calib_None){} double start, end, step; - bool print_numbers; + bool print_numbers = false; CalibMode mode; }; diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index 91baab36ce..245ccac2e4 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -151,6 +151,24 @@ void CalibrationWizard::on_device_connected(MachineObject* obj) recover_preset_info(obj); + BOOST_LOG_TRIVIAL(info) << "on_device_connected - machine object status:" + << " dev_id = " << obj->dev_id + << ", print_type = " << obj->printer_type + << ", cali_finished = " << obj->cali_finished + << ", cali_version = " << obj->cali_version + << ", cache_flow_ratio = " << obj->cache_flow_ratio + << ", sub_task_name = " << obj->subtask_name + << ", gcode_file_name = " << obj->m_gcode_file; + + for (const CaliPresetInfo& preset_info : obj->selected_cali_preset) { + BOOST_LOG_TRIVIAL(info) << "on_device_connected - selected preset: " + << "tray_id = " << preset_info.tray_id + << ", nozzle_diameter = " << preset_info.nozzle_diameter + << ", filament_id = " << preset_info.filament_id + << ", settring_id = " << preset_info.setting_id + << ", name = " << preset_info.name; + } + for (int i = 0; i < m_page_steps.size(); i++) { if (m_page_steps[i]->page) m_page_steps[i]->page->on_device_connected(obj); @@ -605,6 +623,7 @@ void PressureAdvanceWizard::on_cali_start() values[2].ToDouble(&calib_info.params.step); } calib_info.params.mode = preset_page->get_pa_cali_method(); + calib_info.params.print_numbers = true; if (!is_pa_params_valid(calib_info.params)) return; diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp index 8b6d9be67b..55240e2e3d 100644 --- a/src/slic3r/Utils/CalibUtils.cpp +++ b/src/slic3r/Utils/CalibUtils.cpp @@ -1057,7 +1057,7 @@ void CalibUtils::send_to_print(const CalibInfo &calib_info, std::string &error_m print_job->task_ams_mapping_info = ""; print_job->task_use_ams = select_ams == "[254]" ? false : true; - CalibMode cali_mode = calib_info.params.mode; + CalibMode cali_mode = calib_info.params.mode; print_job->m_project_name = get_calib_mode_name(cali_mode, flow_ratio_mode); print_job->set_calibration_task(true); @@ -1074,6 +1074,9 @@ void CalibUtils::send_to_print(const CalibInfo &calib_info, std::string &error_m j["print"]["start"] = calib_info.params.start; j["print"]["end"] = calib_info.params.end; j["print"]["step"] = calib_info.params.step; + j["print"]["print_numbers"] = calib_info.params.print_numbers; + j["print"]["cali_mode"] = int(cali_mode); + j["print"]["project_name"] = print_job->m_project_name; BOOST_LOG_TRIVIAL(trace) << "send_cali_job: " << j.dump(); }