diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index 2b6975848d..5917f7007d 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -2390,12 +2390,9 @@ void PressureAdvanceWizard::check_sync_printer_status() if (!obj_) return; - if (!m_printer_preset || !m_filament_preset) - return; - if (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)) { @@ -2888,7 +2885,7 @@ void FlowRateWizard::sync_save_page_data() { save_name_input->GetTextCtrl()->Bind(wxEVT_TEXT_ENTER, [this, fcb, save_name_input](auto& e) { m_high_end_save_names[fcb->get_tray_id()] = save_name_input->GetTextCtrl()->GetValue().ToStdString(); e.Skip(); - }); + }); save_name_input->GetTextCtrl()->Bind(wxEVT_KILL_FOCUS, [this, fcb, save_name_input](auto& e) { m_high_end_save_names[fcb->get_tray_id()] = save_name_input->GetTextCtrl()->GetValue().ToStdString(); }); diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 6c9468fc0d..64c1b0fe74 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -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]["setting_id"] = calib_data.calib_datas[i].setting_id; 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); } @@ -3909,7 +3908,7 @@ int MachineObject::parse_json(std::string payload) flow_ratio_calib_result.tray_id = (*it)["tray_id"].get(); flow_ratio_calib_result.filament_id = (*it)["filament_id"].get(); flow_ratio_calib_result.setting_id = (*it)["setting_id"].get(); - flow_ratio_calib_result.nozzle_diameter = stof((*it)["nozzle_diameter"].get().c_str()); + flow_ratio_calib_result.nozzle_diameter = stof(jj["nozzle_diameter"].get().c_str()); flow_ratio_calib_result.flow_ratio = stof((*it)["flow_ratio"].get().c_str()); flow_ratio_results.push_back(flow_ratio_calib_result); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index caa2c9ba01..e2376aecba 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -2015,7 +2015,7 @@ void StatusPanel::update_ams(MachineObject *obj) if (obj->is_high_printer_type() && 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);