diff --git a/resources/images/fd_calibration_auto.png b/resources/images/fd_calibration_auto.png new file mode 100644 index 0000000000..d25ec69bd8 Binary files /dev/null and b/resources/images/fd_calibration_auto.png differ diff --git a/resources/images/fd_calibration_manual.png b/resources/images/fd_calibration_manual.png new file mode 100644 index 0000000000..e27ac56471 Binary files /dev/null and b/resources/images/fd_calibration_manual.png differ diff --git a/resources/images/fd_calibration_manual_result.png b/resources/images/fd_calibration_manual_result.png new file mode 100644 index 0000000000..e6d64449f0 Binary files /dev/null and b/resources/images/fd_calibration_manual_result.png differ diff --git a/resources/images/flow_rate_calibration_auto.png b/resources/images/flow_rate_calibration_auto.png new file mode 100644 index 0000000000..41b5b99be4 Binary files /dev/null and b/resources/images/flow_rate_calibration_auto.png differ diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp index a9d406b575..be495ca34a 100644 --- a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp @@ -97,19 +97,28 @@ void CalibrationCaliPage::on_subtask_abort(wxCommandEvent& event) abort_dlg->on_show(); } - void CalibrationCaliPage::set_cali_img() { if (m_cali_mode == CalibMode::Calib_PA_Line) { - m_printing_picture->SetBitmap(create_scaled_bitmap("extrusion_calibration_tips_en", nullptr, 400)); + if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) { + m_printing_picture->SetBitmap(create_scaled_bitmap("fd_calibration_manual", nullptr, 400)); + } + else if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) { + m_printing_picture->SetBitmap(create_scaled_bitmap("fd_calibration_auto", nullptr, 400)); + } } else if (m_cali_mode == CalibMode::Calib_Flow_Rate) { - if (m_page_type == CaliPageType::CALI_PAGE_CALI) - m_printing_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_coarse", nullptr, 400)); - if (m_page_type == CaliPageType::CALI_PAGE_FINE_CALI) - m_printing_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_fine", nullptr, 400)); - else - m_printing_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_coarse", nullptr, 400)); + if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) { + if (m_page_type == CaliPageType::CALI_PAGE_CALI) + m_printing_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_coarse", nullptr, 400)); + if (m_page_type == CaliPageType::CALI_PAGE_FINE_CALI) + m_printing_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_fine", nullptr, 400)); + else + m_printing_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_coarse", nullptr, 400)); + } + else if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) { + m_printing_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_auto", nullptr, 400)); + } } else if (m_cali_mode == CalibMode::Calib_Vol_speed_Tower) { m_printing_picture->SetBitmap(create_scaled_bitmap("max_volumetric_speed_calibration", nullptr, 400)); @@ -392,6 +401,8 @@ void CalibrationCaliPage::set_cali_method(CalibrationMethod method) { m_cali_method = method; + set_cali_img(); + wxArrayString auto_steps; auto_steps.Add(_L("Preset")); auto_steps.Add(_L("Calibration")); diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp index b0c004c9f5..db8b5909be 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp @@ -468,7 +468,7 @@ void CaliPASaveManualPanel::create_panel(wxWindow* parent) } void CaliPASaveManualPanel::set_save_img() { - m_record_picture->SetBitmap(create_scaled_bitmap("extrusion_calibration_tips_en", nullptr, 400)); + m_record_picture->SetBitmap(create_scaled_bitmap("fd_calibration_manual_result", nullptr, 400)); } void CaliPASaveManualPanel::set_default_name(const wxString& name) { @@ -596,7 +596,7 @@ void CaliPASaveP1PPanel::create_panel(wxWindow* parent) } void CaliPASaveP1PPanel::set_save_img() { - m_record_picture->SetBitmap(create_scaled_bitmap("extrusion_calibration_tips_en", nullptr, 400)); + m_record_picture->SetBitmap(create_scaled_bitmap("fd_calibration_manual_result", nullptr, 400)); } bool CaliPASaveP1PPanel::get_result(float* out_k, float* out_n){