From 21abdb24da24ac50a754584dc19a358d20d4eb6c Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Mon, 14 Aug 2023 10:30:41 +0800 Subject: [PATCH] FIX: replace ',' with '.' when using minor languages Change-Id: I992f4c702141f89860625f64d9524ee1c0445cee --- src/slic3r/GUI/CalibrationWizardPresetPage.cpp | 7 ------- src/slic3r/GUI/DeviceManager.cpp | 6 +++++- src/slic3r/Utils/CalibUtils.cpp | 12 ++++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index 63ec7527d..3c1a63e9b 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -5,13 +5,6 @@ #include "libslic3r/Print.hpp" namespace Slic3r { namespace GUI { -std::string float_to_string(float value, int precision = 2) -{ - std::stringstream stream; - stream << std::fixed << std::setprecision(precision) << value; - return stream.str(); -} - CaliPresetCaliStagePanel::CaliPresetCaliStagePanel( wxWindow* parent, wxWindowID id, diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index b8bee6f5c..57da37fb9 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -2034,6 +2034,8 @@ int MachineObject::command_start_calibration(bool vibration, bool bed_leveling, int MachineObject::command_start_pa_calibration(const X1CCalibInfos &pa_data, int mode) { + CNumericLocalesSetter locales_setter; + pa_calib_results.clear(); if (get_printer_series() == PrinterSeries::SERIES_X1) { json j; @@ -2078,7 +2080,7 @@ int MachineObject::command_set_pa_calibration(const std::vector & j["print"]["filaments"][i]["name"] = pa_calib_values[i].name; j["print"]["filaments"][i]["k_value"] = std::to_string(pa_calib_values[i].k_value); if (is_auto_cali) - j["print"]["filaments"][i]["n_coef"] = std::to_string(pa_calib_values[i].n_coef); + j["print"]["filaments"][i]["n_coef"] = std::to_string(pa_calib_values[i].n_coef); else j["print"]["filaments"][i]["n_coef"] = "0.0"; } @@ -2156,6 +2158,8 @@ int MachineObject::commnad_select_pa_calibration(const PACalibIndexInfo& pa_cali int MachineObject::command_start_flow_ratio_calibration(const X1CCalibInfos& calib_data) { + CNumericLocalesSetter locales_setter; + if (get_printer_series() == PrinterSeries::SERIES_X1 && calib_data.calib_datas.size() > 0) { json j; j["print"]["command"] = "flowrate_cali"; diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp index e71cf5e32..6904daa2f 100644 --- a/src/slic3r/Utils/CalibUtils.cpp +++ b/src/slic3r/Utils/CalibUtils.cpp @@ -984,6 +984,18 @@ void CalibUtils::send_to_print(const CalibInfo &calib_info, std::string &error_m print_job->set_print_config(MachineBedTypeString[bed_type], true, false, false, false, true); print_job->set_print_job_finished_event(wxGetApp().plater()->get_send_calibration_finished_event(), print_job->m_project_name); + { // record the print job + json j; + j["print"]["cali_type"] = calib_info.params.mode; + j["print"]["flow_ratio_mode"] = flow_ratio_mode; + j["print"]["tray_id"] = calib_info.select_ams; + j["print"]["dev_id"] = calib_info.dev_id; + j["print"]["start"] = calib_info.params.start; + j["print"]["end"] = calib_info.params.end; + j["print"]["step"] = calib_info.params.step; + BOOST_LOG_TRIVIAL(trace) << "send_cali_job: " << j.dump(); + } + print_job->start(); }