mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 23:46:24 -06:00
FIX: auto calibrate status
Change-Id: I6ce6a53e71056e32b70b302b34127056a9ccdb9c
This commit is contained in:
parent
4831506422
commit
95ab9e2951
2 changed files with 40 additions and 19 deletions
|
@ -669,7 +669,7 @@ void FlowRateWizard::on_cali_start(CaliPresetStage stage, float cali_value, Flow
|
||||||
if (!curr_obj) return;
|
if (!curr_obj) return;
|
||||||
|
|
||||||
//clean flow rate result
|
//clean flow rate result
|
||||||
curr_obj->flow_ratio_results.clear();
|
curr_obj->reset_flow_rate_cali_result();
|
||||||
|
|
||||||
float nozzle_dia = 0.4;
|
float nozzle_dia = 0.4;
|
||||||
std::string setting_id;
|
std::string setting_id;
|
||||||
|
|
|
@ -123,15 +123,25 @@ void CalibrationCaliPage::update(MachineObject* obj)
|
||||||
if (obj) {
|
if (obj) {
|
||||||
if (m_cali_mode == CalibMode::Calib_PA_Line) {
|
if (m_cali_mode == CalibMode::Calib_PA_Line) {
|
||||||
if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
|
if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
|
||||||
if (obj->get_pa_calib_result) {
|
if (get_obj_calibration_mode(obj) == m_cali_mode) {
|
||||||
enable_cali = true;
|
if (obj->is_printing_finished()) {
|
||||||
} else {
|
if (obj->print_status == "FINISH") {
|
||||||
if (get_obj_calibration_mode(obj) == m_cali_mode && obj->is_printing_finished()) {
|
if (obj->get_pa_calib_result) {
|
||||||
// use selected diameter, add a counter to timeout, add a warning tips when get result failed
|
enable_cali = true;
|
||||||
CalibUtils::emit_get_PA_calib_results(get_selected_calibration_nozzle_dia(obj));
|
}
|
||||||
BOOST_LOG_TRIVIAL(trace) << "CalibUtils::emit_get_PA_calib_results, auto count = " << get_result_count++;
|
else {
|
||||||
} else {
|
// use selected diameter, add a counter to timeout, add a warning tips when get result failed
|
||||||
;
|
CalibUtils::emit_get_PA_calib_results(get_selected_calibration_nozzle_dia(obj));
|
||||||
|
BOOST_LOG_TRIVIAL(trace) << "CalibUtils::emit_get_PA_calib_results, auto count = " << get_result_count++;
|
||||||
|
enable_cali = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (obj->print_status == "FAILED") {
|
||||||
|
enable_cali = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
enable_cali = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) {
|
} else if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) {
|
||||||
|
@ -146,14 +156,24 @@ void CalibrationCaliPage::update(MachineObject* obj)
|
||||||
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_CALI_NEXT, enable_cali);
|
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_CALI_NEXT, enable_cali);
|
||||||
} else if (m_cali_mode == CalibMode::Calib_Flow_Rate) {
|
} else if (m_cali_mode == CalibMode::Calib_Flow_Rate) {
|
||||||
if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
|
if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
|
||||||
if (obj->get_flow_calib_result) {
|
if (get_obj_calibration_mode(obj) == m_cali_mode) {
|
||||||
enable_cali = true;
|
if (obj->is_printing_finished()) {
|
||||||
} else {
|
if (obj->print_status == "FINISH") {
|
||||||
if (get_obj_calibration_mode(obj) == m_cali_mode && obj->is_printing_finished()) {
|
if (obj->get_pa_calib_result) {
|
||||||
// use selected diameter, add a counter to timeout, add a warning tips when get result failed
|
enable_cali = true;
|
||||||
CalibUtils::emit_get_flow_ratio_calib_results(get_selected_calibration_nozzle_dia(obj));
|
}
|
||||||
} else {
|
else {
|
||||||
;
|
// use selected diameter, add a counter to timeout, add a warning tips when get result failed
|
||||||
|
CalibUtils::emit_get_flow_ratio_calib_results(get_selected_calibration_nozzle_dia(obj));
|
||||||
|
enable_cali = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (obj->print_status == "FAILED") {
|
||||||
|
enable_cali = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
enable_cali = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) {
|
} else if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) {
|
||||||
|
@ -246,7 +266,8 @@ void CalibrationCaliPage::update_subtask(MachineObject* obj)
|
||||||
m_printing_panel->show_profile_info(false);
|
m_printing_panel->show_profile_info(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
update_basic_print_data(false, obj->slice_info->weight, obj->slice_info->prediction);
|
if (obj->slice_info)
|
||||||
|
update_basic_print_data(false, obj->slice_info->weight, obj->slice_info->prediction);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (obj->can_resume()) {
|
if (obj->can_resume()) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue