GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-04-18 12:10:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

NEW: calibration : add new image

Browse Source 
Change-Id: I42ec622e3394c832a8b7f12d618b557cba095018
This commit is contained in:
liz.li 2023-07-07 11:32:42 +08:00 committed by Lane.Wei
parent 16a4742d1f
commit 045c2e8c87
6 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/images/fd_calibration_auto.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 620 KiB

BIN
resources/images/fd_calibration_manual.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 308 KiB

BIN
resources/images/fd_calibration_manual_result.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 376 KiB

BIN
resources/images/flow_rate_calibration_auto.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 344 KiB

27
src/slic3r/GUI/CalibrationWizardCaliPage.cpp
View File

@ -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"));

4
src/slic3r/GUI/CalibrationWizardSavePage.cpp
View File

@ -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){