diff --git a/resources/images/fd_calibration_auto_n7.png b/resources/images/fd_calibration_auto_n7.png new file mode 100644 index 0000000000..776c2ef0d0 Binary files /dev/null and b/resources/images/fd_calibration_auto_n7.png differ diff --git a/resources/printers/BL-P001.json b/resources/printers/BL-P001.json index 9841799aac..da71fcb1e0 100644 --- a/resources/printers/BL-P001.json +++ b/resources/printers/BL-P001.json @@ -52,6 +52,7 @@ "compatible_machine": [ "BL-P002", "C11", "C12", "C13" ], "auto_cali_not_support_filaments": [ "GFU03", "GFU04" ], "support_wrapping_detection": false, + "auto_pa_cali_thumbnail_image": "fd_calibration_auto", "printer_type": "3DPrinter-X1-Carbon", "printer_thumbnail_image": "printer_thumbnail", "printer_connect_help_image": "input_access_code_x1", diff --git a/resources/printers/BL-P002.json b/resources/printers/BL-P002.json index eee4691d4c..2ab18e94df 100644 --- a/resources/printers/BL-P002.json +++ b/resources/printers/BL-P002.json @@ -49,6 +49,7 @@ "support_user_preset": false }, "model_id": "BL-P002", + "auto_pa_cali_thumbnail_image": "fd_calibration_auto", "compatible_machine": [ "BL-P001", "C11", "C12", "C13" ], "auto_cali_not_support_filaments": [ "GFU03", "GFU04" ], "printer_type": "3DPrinter-X1", diff --git a/resources/printers/C11.json b/resources/printers/C11.json index bc8894158a..c8fbedda23 100644 --- a/resources/printers/C11.json +++ b/resources/printers/C11.json @@ -45,6 +45,7 @@ }, "model_id": "C11", "support_wrapping_detection": false, + "auto_pa_cali_thumbnail_image": "fd_calibration_auto", "compatible_machine": [ "BL-P001", "BL-P002", "C12", "C13" ], "auto_cali_not_support_filaments": [ "GFU03", "GFU04" ], "printer_type": "C11", diff --git a/resources/printers/C12.json b/resources/printers/C12.json index 754d2aba92..935223f176 100644 --- a/resources/printers/C12.json +++ b/resources/printers/C12.json @@ -45,6 +45,7 @@ }, "model_id": "C12", "support_wrapping_detection": false, + "auto_pa_cali_thumbnail_image": "fd_calibration_auto", "compatible_machine": [ "BL-P001", "BL-P002", "C11", "C13" ], "auto_cali_not_support_filaments": [ "GFU03", "GFU04" ], "printer_type": "C12", diff --git a/resources/printers/C13.json b/resources/printers/C13.json index 2b2fd54a5a..ff78eb3d64 100644 --- a/resources/printers/C13.json +++ b/resources/printers/C13.json @@ -54,6 +54,7 @@ }, "model_id": "C13", "support_wrapping_detection": false, + "auto_pa_cali_thumbnail_image": "fd_calibration_auto", "compatible_machine": [ "BL-P001", "BL-P002", "C11", "C12" ], "auto_cali_not_support_filaments": [ "GFU03", "GFU04" ], "printer_type": "C13", diff --git a/resources/printers/N1.json b/resources/printers/N1.json index 025bdf888d..579f1a0732 100644 --- a/resources/printers/N1.json +++ b/resources/printers/N1.json @@ -45,6 +45,7 @@ }, "model_id": "N1", "support_wrapping_detection": false, + "auto_pa_cali_thumbnail_image": "fd_calibration_auto_i3", "compatible_machine": [], "auto_cali_not_support_filaments": [ "GFU03", "GFU04" ], "printer_type": "N1", diff --git a/resources/printers/N2S.json b/resources/printers/N2S.json index 1aea65ae9a..53de2333b4 100644 --- a/resources/printers/N2S.json +++ b/resources/printers/N2S.json @@ -47,6 +47,7 @@ "compatible_machine": [], "auto_cali_not_support_filaments": [ "GFU03", "GFU04" ], "support_wrapping_detection": false, + "auto_pa_cali_thumbnail_image": "fd_calibration_auto_i3", "printer_type": "N2S", "ftp_folder": "sdcard/", "printer_thumbnail_image": "printer_thumbnail_n2s", diff --git a/resources/printers/O1D.json b/resources/printers/O1D.json index f2a874b00f..33661c1fa9 100644 --- a/resources/printers/O1D.json +++ b/resources/printers/O1D.json @@ -64,6 +64,7 @@ }, "model_id": "O1D", "support_wrapping_detection": true, + "auto_pa_cali_thumbnail_image": "fd_calibration_auto_multi_extruders", "printer_modes": [ "fdm", "laser", "cut" ], "compatible_machine": ["O1E"], "printer_type": "O1D", diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp index b2421bb2d7..2baaf364fe 100644 --- a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp @@ -109,22 +109,15 @@ void CalibrationCaliPage::set_cali_img() } else if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO || m_cali_method == CalibrationMethod::CALI_METHOD_NEW_AUTO) { if (curr_obj) { + std::string image_name = curr_obj->get_auto_pa_cali_thumbnail_img_str(); if (curr_obj->is_multi_extruders()) { if (m_cur_extruder_id == 0) { - m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_auto_multi_extruders_right", 400)); + image_name += "_right"; } else { - assert(m_cur_extruder_id == 1); - m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_auto_multi_extruders_left", 400)); + image_name += "_left"; } } - else if (curr_obj->get_printer_arch() == PrinterArch::ARCH_I3) { - m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_auto_i3", 400)); - } else if (curr_obj->is_series_o()) { - m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_auto_single_o", 400)); - } - else { - m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_auto", 400)); - } + m_picture_panel->set_bmp(ScalableBitmap(this, image_name, 400)); } else { m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_auto", 400)); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 3c676185cf..8d851edb1a 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -3638,23 +3638,18 @@ void StatusPanel::update_subtask(MachineObject *obj) int width = m_project_task_panel->get_bitmap_thumbnail()->GetSize().x; int height = m_project_task_panel->get_bitmap_thumbnail()->GetSize().y; if (m_calib_method == CALI_METHOD_AUTO) { + std::string image_name = obj->get_auto_pa_cali_thumbnail_img_str(); if (m_calib_mode == CalibMode::Calib_PA_Line) { if (obj->is_multi_extruders()) { int cur_ext_id = obj->GetExtderSystem()->GetCurrentExtderId(); if (cur_ext_id == 0) { - png_path = (boost::format("%1%/images/fd_calibration_auto_multi_extruders_right.png") % resources_dir()).str(); + image_name += "_right"; } else { - assert(cur_ext_id == 1); - png_path = (boost::format("%1%/images/fd_calibration_auto_multi_extruders_left.png") % resources_dir()).str(); + image_name += "_left"; } } - else if (obj->get_printer_arch() == PrinterArch::ARCH_I3) - png_path = (boost::format("%1%/images/fd_calibration_auto_i3.png") % resources_dir()).str(); - else if (obj->is_series_o()) - png_path = (boost::format("%1%/images/fd_calibration_auto_single_o.png") % resources_dir()).str(); - else - png_path = (boost::format("%1%/images/fd_calibration_auto.png") % resources_dir()).str(); + png_path = (boost::format("%1%/images/%2%.png") % resources_dir() % image_name).str(); } else if (m_calib_mode == CalibMode::Calib_Flow_Rate) { png_path = (boost::format("%1%/images/flow_rate_calibration_auto.png") % resources_dir()).str();