3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: fix bug for flow ratio

Browse source 
Change-Id: Id683301dd260c202a37560c771dff01acd63681a
This commit is contained in:
zhimin.zeng 2023-06-25 16:21:40 +08:00 • committed by Lane.Wei
parent c4836e29a4
commit 66bb5bc4b6
3 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/slic3r/GUI/CalibrationWizard.cpp
View file

@ -2390,12 +2390,9 @@ void PressureAdvanceWizard::check_sync_printer_status()
if (!obj_) if (!obj_)
return; return;
if (!m_printer_preset || !m_filament_preset)
return;
if (m_cali_version != obj_->cali_version) { if (m_cali_version != obj_->cali_version) {
m_cali_version = obj_->cali_version; m_cali_version = obj_->cali_version;
CalibUtils::emit_get_PA_calib_info(obj_->nozzle_diameter, m_filament_preset->filament_id); CalibUtils::emit_get_PA_calib_info(obj_->nozzle_diameter, "");
} }
if (CalibUtils::get_PA_calib_tab(m_calib_results_history)) { if (CalibUtils::get_PA_calib_tab(m_calib_results_history)) {

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

@ -2058,8 +2058,7 @@ int MachineObject::command_start_flow_ratio_calibration(const X1CCalibInfos& cal
j["print"]["filaments"][i]["filament_id"] = calib_data.calib_datas[i].filament_id; j["print"]["filaments"][i]["filament_id"] = calib_data.calib_datas[i].filament_id;
j["print"]["filaments"][i]["setting_id"] = calib_data.calib_datas[i].setting_id; j["print"]["filaments"][i]["setting_id"] = calib_data.calib_datas[i].setting_id;
j["print"]["filaments"][i]["nozzle_temp"] = calib_data.calib_datas[i].nozzle_temp; j["print"]["filaments"][i]["nozzle_temp"] = calib_data.calib_datas[i].nozzle_temp;
// todo: new version need j["print"]["filaments"][i]["def_flow_ratio"] = std::to_string(calib_data.calib_datas[i].flow_rate);
//j["print"]["filaments"][i]["def_flow_ratio"] = std::to_string(calib_data.calib_datas[i].flow_rate);
j["print"]["filaments"][i]["max_volumetric_speed"] = std::to_string(calib_data.calib_datas[i].max_volumetric_speed); j["print"]["filaments"][i]["max_volumetric_speed"] = std::to_string(calib_data.calib_datas[i].max_volumetric_speed);
} }
@ -3909,7 +3908,7 @@ int MachineObject::parse_json(std::string payload)
flow_ratio_calib_result.tray_id = (*it)["tray_id"].get<int>(); flow_ratio_calib_result.tray_id = (*it)["tray_id"].get<int>();
flow_ratio_calib_result.filament_id = (*it)["filament_id"].get<std::string>(); flow_ratio_calib_result.filament_id = (*it)["filament_id"].get<std::string>();
flow_ratio_calib_result.setting_id = (*it)["setting_id"].get<std::string>(); flow_ratio_calib_result.setting_id = (*it)["setting_id"].get<std::string>();
flow_ratio_calib_result.nozzle_diameter = stof((*it)["nozzle_diameter"].get<std::string>().c_str()); flow_ratio_calib_result.nozzle_diameter = stof(jj["nozzle_diameter"].get<std::string>().c_str());
flow_ratio_calib_result.flow_ratio = stof((*it)["flow_ratio"].get<std::string>().c_str()); flow_ratio_calib_result.flow_ratio = stof((*it)["flow_ratio"].get<std::string>().c_str());
flow_ratio_results.push_back(flow_ratio_calib_result); flow_ratio_results.push_back(flow_ratio_calib_result);

2
src/slic3r/GUI/StatusPanel.cpp
View file

@ -2015,7 +2015,7 @@ void StatusPanel::update_ams(MachineObject *obj)
if (obj->is_high_printer_type() && last_cali_version != obj->cali_version) { if (obj->is_high_printer_type() && last_cali_version != obj->cali_version) {
last_cali_version = obj->cali_version; last_cali_version = obj->cali_version;
CalibUtils::emit_get_PA_calib_info(obj->nozzle_diameter, "GFA01"); // todo: get all CalibUtils::emit_get_PA_calib_info(obj->nozzle_diameter, "");
} }
bool is_support_extrusion_cali = obj->is_function_supported(PrinterFunction::FUNC_EXTRUSION_CALI); bool is_support_extrusion_cali = obj->is_function_supported(PrinterFunction::FUNC_EXTRUSION_CALI);