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

FIX: modify the cali mode name 

Change-Id: Ic234ac3ac776e40fadcf4d3a65c511ceb3946666
(cherry picked from commit 91fee384ddf055a6689160c64fdbdcc5caf91325)
This commit is contained in:
zhimin.zeng 2023-06-30 10:32:01 +08:00 committed by Lane.Wei
parent 04bfe7e405
commit e9f3ddb61b
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1946,7 +1946,7 @@ int MachineObject::command_start_calibration(bool vibration, bool bed_leveling,
} }
} }
int MachineObject::command_start_pa_calibration(const X1CCalibInfos &pa_data, bool is_manual) int MachineObject::command_start_pa_calibration(const X1CCalibInfos &pa_data, int mode)
{ {
pa_calib_results.clear(); pa_calib_results.clear();
if ((printer_type == "BL-P001" || printer_type == "BL-P002")) { if ((printer_type == "BL-P001" || printer_type == "BL-P002")) {
@ -1954,7 +1954,7 @@ int MachineObject::command_start_pa_calibration(const X1CCalibInfos &pa_data, bo
j["print"]["command"] = "extrusion_cali"; j["print"]["command"] = "extrusion_cali";
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++); j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
j["print"]["nozzle_diameter"] = to_string_nozzle_diameter(pa_data.calib_datas[0].nozzle_diameter); j["print"]["nozzle_diameter"] = to_string_nozzle_diameter(pa_data.calib_datas[0].nozzle_diameter);
j["print"]["manual"] = is_manual; j["print"]["mode"] = mode;
for (int i = 0; i < pa_data.calib_datas.size(); ++i) { for (int i = 0; i < pa_data.calib_datas.size(); ++i) {
j["print"]["filaments"][i]["tray_id"] = pa_data.calib_datas[i].tray_id; j["print"]["filaments"][i]["tray_id"] = pa_data.calib_datas[i].tray_id;
@ -3914,6 +3914,7 @@ int MachineObject::parse_json(std::string payload)
else if ((*it)["n_coef"].is_string()) else if ((*it)["n_coef"].is_string())
pa_calib_result.n_coef = stof((*it)["n_coef"].get<std::string>().c_str()); pa_calib_result.n_coef = stof((*it)["n_coef"].get<std::string>().c_str());
if ((*it).contains("confidence"))
pa_calib_result.confidence = (*it)["confidence"].get<int>(); pa_calib_result.confidence = (*it)["confidence"].get<int>();
pa_calib_results.push_back(pa_calib_result); pa_calib_results.push_back(pa_calib_result);

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

@ -338,7 +338,7 @@ public:
std::string name; std::string name;
float k_value; float k_value;
float n_coef; float n_coef;
int confidence; int confidence = -1;
}; };
struct PACalibIndexInfo struct PACalibIndexInfo
@ -827,7 +827,7 @@ public:
int command_start_calibration(bool vibration, bool bed_leveling, bool xcam_cali); int command_start_calibration(bool vibration, bool bed_leveling, bool xcam_cali);
// PA calibration // PA calibration
int command_start_pa_calibration(const X1CCalibInfos& pa_data, bool is_manual = false); int command_start_pa_calibration(const X1CCalibInfos& pa_data, int mode = 0); // 0: automatic mode; 1: manual mode. default: automatic mode
int command_set_pa_calibration(const std::vector<PACalibResult>& pa_calib_values); int command_set_pa_calibration(const std::vector<PACalibResult>& pa_calib_values);
int command_delete_pa_calibration(const PACalibIndexInfo& pa_calib); int command_delete_pa_calibration(const PACalibIndexInfo& pa_calib);
int command_get_pa_calibration_tab(float nozzle_diameter, const std::string &filament_id = ""); int command_get_pa_calibration_tab(float nozzle_diameter, const std::string &filament_id = "");

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

@ -92,7 +92,7 @@ CalibMode CalibUtils::get_calib_mode_by_name(const std::string &name)
return CalibMode::Calib_None; return CalibMode::Calib_None;
} }
void CalibUtils::calib_PA(const X1CCalibInfos &calib_infos, std::string &error_message, bool is_manual) void CalibUtils::calib_PA(const X1CCalibInfos &calib_infos, std::string &error_message, int mode)
{ {
DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager(); DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) if (!dev)
@ -103,7 +103,7 @@ void CalibUtils::calib_PA(const X1CCalibInfos &calib_infos, std::string &error_m
return; return;
if (calib_infos.calib_datas.size() > 0) if (calib_infos.calib_datas.size() > 0)
obj_->command_start_pa_calibration(calib_infos, is_manual); obj_->command_start_pa_calibration(calib_infos, mode);
} }
void CalibUtils::emit_get_PA_calib_results(float nozzle_diameter) void CalibUtils::emit_get_PA_calib_results(float nozzle_diameter)

2
src/slic3r/Utils/CalibUtils.hpp
View File

@ -30,7 +30,7 @@ public:
static CalibMode get_calib_mode_by_name(const std::string &name); static CalibMode get_calib_mode_by_name(const std::string &name);
static void calib_PA(const X1CCalibInfos &calib_infos, std::string &error_message, bool is_manual = false); static void calib_PA(const X1CCalibInfos &calib_infos, std::string &error_message, int mode = 0); // 0: automatic mode; 1: manual mode. default: automatic mode
static void emit_get_PA_calib_results(float nozzle_diameter); static void emit_get_PA_calib_results(float nozzle_diameter);
static bool get_PA_calib_results(std::vector<PACalibResult> &pa_calib_results); static bool get_PA_calib_results(std::vector<PACalibResult> &pa_calib_results);