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

FIX:k value is set to default value when editing k value on printer 

jira: STUDIO-10120
Change-Id: I6c67efb77ca681aab510399031deed7faa473713
This commit is contained in:
zhimin.zeng 2025-01-23 11:38:06 +08:00 committed by lane.wei
parent 3f2f704676
commit 7380ee0a2c
2 changed files with 72 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2508,7 +2508,7 @@ int MachineObject::command_start_pa_calibration(const X1CCalibInfos &pa_data, in
filament_ids += pa_data.calib_datas[i].filament_id;
}
BOOST_LOG_TRIVIAL(trace) << "extrusion_cali: " << j.dump();
BOOST_LOG_TRIVIAL(info) << "extrusion_cali: " << j.dump();
try {
json js;
@ -2554,7 +2554,7 @@ int MachineObject::command_set_pa_calibration(const std::vector<PACalibResult> &
j["print"]["filaments"][i]["n_coef"] = "0.0";
}
BOOST_LOG_TRIVIAL(trace) << "extrusion_cali_set: " << j.dump();
BOOST_LOG_TRIVIAL(info) << "extrusion_cali_set: " << j.dump();
return this->publish_json(j.dump());
}
@ -2572,7 +2572,7 @@ int MachineObject::command_delete_pa_calibration(const PACalibIndexInfo& pa_cali
j["print"]["cali_idx"] = pa_calib.cali_idx;
j["print"]["nozzle_diameter"] = to_string_nozzle_diameter(pa_calib.nozzle_diameter);
BOOST_LOG_TRIVIAL(trace) << "extrusion_cali_del: " << j.dump();
BOOST_LOG_TRIVIAL(info) << "extrusion_cali_del: " << j.dump();
return this->publish_json(j.dump());
}
@ -2590,7 +2590,8 @@ int MachineObject::command_get_pa_calibration_tab(const PACalibExtruderInfo &cal
j["print"]["nozzle_id"] = generate_nozzle_id(calib_info.nozzle_volume_type, to_string_nozzle_diameter(calib_info.nozzle_diameter)).ToStdString();
j["print"]["nozzle_diameter"] = to_string_nozzle_diameter(calib_info.nozzle_diameter);
BOOST_LOG_TRIVIAL(trace) << "extrusion_cali_get: " << j.dump();
BOOST_LOG_TRIVIAL(info) << "extrusion_cali_get: " << j.dump();
request_tab_from_bbs = true;
return this->publish_json(j.dump());
}
@ -2601,7 +2602,7 @@ int MachineObject::command_get_pa_calibration_result(float nozzle_diameter)
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
j["print"]["nozzle_diameter"] = to_string_nozzle_diameter(nozzle_diameter);
BOOST_LOG_TRIVIAL(trace) << "extrusion_cali_get_result: " << j.dump();
BOOST_LOG_TRIVIAL(info) << "extrusion_cali_get_result: " << j.dump();
return this->publish_json(j.dump());
}
@ -2617,7 +2618,7 @@ int MachineObject::commnad_select_pa_calibration(const PACalibIndexInfo& pa_cali
j["print"]["filament_id"] = pa_calib_info.filament_id;
j["print"]["nozzle_diameter"] = to_string_nozzle_diameter(pa_calib_info.nozzle_diameter);
BOOST_LOG_TRIVIAL(trace) << "extrusion_cali_sel: " << j.dump();
BOOST_LOG_TRIVIAL(info) << "extrusion_cali_sel: " << j.dump();
return this->publish_json(j.dump());
}
@ -2657,7 +2658,7 @@ int MachineObject::command_start_flow_ratio_calibration(const X1CCalibInfos& cal
if (agent) agent->track_event("cali", js.dump());
} catch (...) {}
BOOST_LOG_TRIVIAL(trace) << "flowrate_cali: " << j.dump();
BOOST_LOG_TRIVIAL(info) << "flowrate_cali: " << j.dump();
return this->publish_json(j.dump());
}
return -1;
@ -2670,7 +2671,7 @@ int MachineObject::command_get_flow_ratio_calibration_result(float nozzle_diamet
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
j["print"]["nozzle_diameter"] = to_string_nozzle_diameter(nozzle_diameter);
BOOST_LOG_TRIVIAL(trace) << "flowrate_get_result: " << j.dump();
BOOST_LOG_TRIVIAL(info) << "flowrate_get_result: " << j.dump();
return this->publish_json(j.dump());
}
@ -4848,7 +4849,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
info = reason;
}
GUI::wxGetApp().push_notification(info, _L("Calibration error"), UserNotificationStyle::UNS_WARNING_CONFIRM);
BOOST_LOG_TRIVIAL(trace) << cali_mode << " result fail, reason = " << reason;
BOOST_LOG_TRIVIAL(info) << cali_mode << " result fail, reason = " << reason;
}
}
} else if (jj["command"].get<std::string>() == "extrusion_cali_set") {
@ -4955,7 +4956,9 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
}
else if (jj["command"].get<std::string>() == "extrusion_cali_get") {
std::string str = jj.dump();
BOOST_LOG_TRIVIAL(info) << "extrusion_cali_get: " << str;
if (request_tab_from_bbs) {
BOOST_LOG_TRIVIAL(info) << "bbs extrusion_cali_get: " << str;
request_tab_from_bbs = false;
reset_pa_cali_history_result();
bool is_succeed = true;
if (jj.contains("result") && jj.contains("reason")) {
@ -5022,6 +5025,9 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
}
}
// notify cali history to update
} else {
BOOST_LOG_TRIVIAL(info) << "printer extrusion_cali_get: " << str;
}
}
else if (jj["command"].get<std::string>() == "extrusion_cali_get_result") {
std::string str = jj.dump();

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

@ -843,6 +843,7 @@ public:
ManualPaCaliMethod manual_pa_cali_method = ManualPaCaliMethod::PA_LINE;
bool has_get_pa_calib_tab{ false };
bool request_tab_from_bbs { false };
std::vector<PACalibResult> pa_calib_tab;
bool get_pa_calib_result { false };
std::vector<PACalibResult> pa_calib_results;