3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-03-14 15:26:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: update the flow calibration options

Browse source 
jira: [STUDIO-10784]
Change-Id: I75c5319daf01da52ae521632d71d32813bcbb32f
(cherry picked from commit 57245bd45620cffdcfce8ef623d79b284d60b3eb)
This commit is contained in:
xin.zhang 2025-03-11 11:00:48 +08:00 • committed by Noisyfox
parent 697dd13875
commit b0943a2d0b
11 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@
"support_print_all": true,
"support_print_without_sd": true,
"support_flow_calibration": true,
"support_auto_flow_calibration": false,
"support_build_plate_marker_detect": false,
"support_lidar_calibration": true,
"support_ai_monitoring": false,

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

@ -33,6 +33,7 @@
"support_print_all": true,
"support_print_without_sd": true,
"support_flow_calibration": true,
"support_auto_flow_calibration": false,
"support_build_plate_marker_detect": false,
"support_lidar_calibration": true,
"support_ai_monitoring": false,

1
resources/printers/C11.json
View file

@ -28,6 +28,7 @@
"support_print_all": false,
"support_print_without_sd": false,
"support_flow_calibration": false,
"support_auto_flow_calibration": false,
"support_build_plate_marker_detect": false,
"support_lidar_calibration": false,
"support_ai_monitoring": false,

1
resources/printers/C12.json
View file

@ -28,6 +28,7 @@
"support_print_all": false,
"support_print_without_sd": false,
"support_flow_calibration": false,
"support_auto_flow_calibration": false,
"support_build_plate_marker_detect": false,
"support_lidar_calibration": false,
"support_ai_monitoring": false,

1
resources/printers/C13.json
View file

@ -34,6 +34,7 @@
"support_print_all": true,
"support_print_without_sd": true,
"support_flow_calibration": true,
"support_auto_flow_calibration": true,
"support_build_plate_marker_detect": true,
"support_lidar_calibration": true,
"support_ai_monitoring": true,

1
resources/printers/N1.json
View file

@ -29,6 +29,7 @@
"support_print_all": false,
"support_print_without_sd": false,
"support_flow_calibration": true,
"support_auto_flow_calibration": false,
"support_lidar_calibration": false,
"support_ai_monitoring": false,
"support_first_layer_inspect": false,

1
resources/printers/N2S.json
View file

@ -29,6 +29,7 @@
"support_print_all": false,
"support_print_without_sd": false,
"support_flow_calibration": true,
"support_auto_flow_calibration": false,
"support_lidar_calibration": false,
"support_ai_monitoring": false,
"support_first_layer_inspect": false,

2
resources/printers/version.txt
View file

@ -1 +1 @@
02.00.00.04
02.00.00.05

12
src/slic3r/GUI/DeviceManager.cpp
View file

@ -3397,10 +3397,14 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
}
}
if (jj.contains("support_flow_calibration")) {
if (jj["support_flow_calibration"].is_boolean()) {
is_support_auto_flow_calibration = jj["support_flow_calibration"].get<bool>();
}
if (jj.contains("support_flow_calibration") && jj["support_flow_calibration"].is_boolean())
{
is_support_flow_calibration = jj["support_flow_calibration"].get<bool>();
}
if (jj.contains("support_auto_flow_calibration") && jj["support_auto_flow_calibration"].is_boolean())
{
is_support_auto_flow_calibration = jj["support_auto_flow_calibration"].get<bool>();
}
if (jj.contains("support_print_without_sd")) {

2
src/slic3r/GUI/DeviceManager.hpp
View file

@ -1003,7 +1003,7 @@ public:
bool is_support_build_plate_marker_detect{false};
bool is_support_pa_calibration{false};
bool is_support_flow_calibration{false};
bool is_support_auto_flow_calibration{false};
bool is_support_auto_flow_calibration{false};/*The flag is used to distinguish auto/on/off or on/off */
bool is_support_print_without_sd{false};
bool is_support_print_all{false};
bool is_support_send_to_sdcard {false};

23
src/slic3r/GUI/SelectMachine.cpp
View file

@ -985,27 +985,34 @@ void SelectMachineDialog::update_select_layout(MachineObject *obj)
m_checkbox_list["nozzle_offset_cali"]->Show();
m_checkbox_list["nozzle_offset_cali"]->update_options(ops_auto);
m_checkbox_list["bed_leveling"]->update_options(ops_auto);
m_checkbox_list["flow_cali"]->update_options(ops_auto);
m_checkbox_list["nozzle_offset_cali"]->setValue("auto");
m_checkbox_list["bed_leveling"]->setValue("auto");
m_checkbox_list["flow_cali"]->setValue("auto");
}
else {
m_checkbox_list["bed_leveling"]->update_options(ops_no_auto);
m_checkbox_list["flow_cali"]->update_options(ops_auto);
if (config && config->get("print", "bed_leveling") == "0") {
m_checkbox_list["bed_leveling"]->setValue("off");
} else {
m_checkbox_list["bed_leveling"]->setValue("on");
}
}
if (config && config->get("print", "flow_cali") == "0") {
m_checkbox_list["flow_cali"]->setValue("off");
if (obj->is_support_flow_calibration) {
if (obj->is_support_auto_flow_calibration) {
m_checkbox_list["flow_cali"]->update_options(ops_auto);
m_checkbox_list["flow_cali"]->setValue("auto");
} else {
m_checkbox_list["flow_cali"]->setValue("on");
m_checkbox_list["flow_cali"]->update_options(ops_no_auto);
if (config && config->get("print", "flow_cali") == "0") {
m_checkbox_list["flow_cali"]->setValue("off");
} else {
m_checkbox_list["flow_cali"]->setValue("on");
}
}
m_checkbox_list["flow_cali"]->Show();
}
update_timelapse_enable_status();
@ -1016,10 +1023,6 @@ void SelectMachineDialog::update_select_layout(MachineObject *obj)
m_checkbox_list["timelapse"]->setValue("on");
}
if (obj && obj->is_support_auto_flow_calibration) {
m_checkbox_list["flow_cali"]->Show();
}
if (obj && obj->is_support_auto_leveling) {
m_checkbox_list["bed_leveling"]->Show();
}