github/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-04-06 00:32:05 +02:00
Code Issues 1.2k Packages Projects Releases Wiki Activity

FIX: Configuring auto calibration thumbnail using a configuration file

Browse Source 
jira: STUDIO-12173
Change-Id: I16e984b679c0c6c169f4c4d208805237f97a3a25
(cherry picked from commit b61d4194311a09eca0294fe0aa3f11471ba924b3)
(cherry picked from commit f7c2223b71e0b7aaf7520501a96e0e120a373504)
(cherry picked from commit 96ddca220d8ff13941ebe13152a09cb7a1dd63a7)
This commit is contained in:
zhimin.zeng
2025-06-17 19:04:47 +08:00
committed by Noisyfox
parent 27599a998f
commit 8ca6484e58
11 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 63 KiB

1
resources/printers/BL-P001.json
View File

@@ -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",

1
resources/printers/BL-P002.json
View File

@@ -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",

1
resources/printers/C11.json
View File

@@ -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",

1
resources/printers/C12.json
View File

@@ -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",

1
resources/printers/C13.json
View File

@@ -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",

1
resources/printers/N1.json
View File

@@ -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",

1
resources/printers/N2S.json
View File

@@ -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",

1
resources/printers/O1D.json
View File

@@ -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",

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

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

13
src/slic3r/GUI/StatusPanel.cpp
View File

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