mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: replace ',' with '.' when using minor languages 

Change-Id: I992f4c702141f89860625f64d9524ee1c0445cee
This commit is contained in:
zhimin.zeng 2023-08-14 10:30:41 +08:00 committed by Lane.Wei
parent e1178d122a
commit 21abdb24da
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/slic3r/GUI/CalibrationWizardPresetPage.cpp
View File

@ -5,13 +5,6 @@
#include "libslic3r/Print.hpp" #include "libslic3r/Print.hpp"
namespace Slic3r { namespace GUI { 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( CaliPresetCaliStagePanel::CaliPresetCaliStagePanel(
wxWindow* parent, wxWindow* parent,
wxWindowID id, wxWindowID id,

4
src/slic3r/GUI/DeviceManager.cpp
View File

@ -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) int MachineObject::command_start_pa_calibration(const X1CCalibInfos &pa_data, int mode)
{ {
CNumericLocalesSetter locales_setter;
pa_calib_results.clear(); pa_calib_results.clear();
if (get_printer_series() == PrinterSeries::SERIES_X1) { if (get_printer_series() == PrinterSeries::SERIES_X1) {
json j; json j;
@ -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) 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) { if (get_printer_series() == PrinterSeries::SERIES_X1 && calib_data.calib_datas.size() > 0) {
json j; json j;
j["print"]["command"] = "flowrate_cali"; j["print"]["command"] = "flowrate_cali";

12
src/slic3r/Utils/CalibUtils.cpp
View File

@ -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_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); 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(); print_job->start();
} }