3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ENH:check if filling auto backup is supported

Browse source 
Change-Id: Iebc9843e16ebf6c7be895be80731f7b70520b765
This commit is contained in:
tao wang 2023-07-01 17:09:53 +08:00 • committed by Lane.Wei
parent e55aa34da0
commit 334eb36559
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2326,6 +2326,7 @@ void MachineObject::reset()
print_status = ""; print_status = "";
last_mc_print_stage = -1; last_mc_print_stage = -1;
m_new_ver_list_exist = false; m_new_ver_list_exist = false;
m_is_support_show_bak = false;
extruder_axis_status = LOAD; extruder_axis_status = LOAD;
nozzle_diameter = 0.0f; nozzle_diameter = 0.0f;
@ -2938,6 +2939,7 @@ int MachineObject::parse_json(std::string payload)
/*get filam_bak*/ /*get filam_bak*/
try { try {
if (jj.contains("filam_bak")) { if (jj.contains("filam_bak")) {
m_is_support_show_bak = true;
filam_bak.clear(); filam_bak.clear();
if (jj["filam_bak"].is_array()) { if (jj["filam_bak"].is_array()) {
for (auto it = jj["filam_bak"].begin(); it != jj["filam_bak"].end(); it++) { for (auto it = jj["filam_bak"].begin(); it != jj["filam_bak"].end(); it++) {
@ -2945,6 +2947,9 @@ int MachineObject::parse_json(std::string payload)
} }
} }
} }
else {
m_is_support_show_bak = false;
}
} }
catch (...) { catch (...) {
; ;

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

@ -495,6 +495,7 @@ public:
std::string product_name; // set by iot service, get /user/print std::string product_name; // set by iot service, get /user/print
std::vector<int> filam_bak; std::vector<int> filam_bak;
bool m_is_support_show_bak{false};
std::string bind_user_name; std::string bind_user_name;
std::string bind_user_id; std::string bind_user_id;

7
src/slic3r/GUI/StatusPanel.cpp
View file

@ -2025,6 +2025,9 @@ void StatusPanel::update_ams(MachineObject *obj)
if (!obj if (!obj
|| !obj->is_connected() || !obj->is_connected()
|| obj->amsList.empty() || obj->amsList.empty()
|| !is_support_filament_backup
|| !obj->ams_auto_switch_filament_flag
|| !obj->m_is_support_show_bak
|| obj->ams_exist_bits == 0) { || obj->ams_exist_bits == 0) {
if (!obj || !obj->is_connected()) { if (!obj || !obj->is_connected()) {
last_tray_exist_bits = -1; last_tray_exist_bits = -1;
@ -2040,10 +2043,8 @@ void StatusPanel::update_ams(MachineObject *obj)
m_ams_control->show_auto_refill(false); m_ams_control->show_auto_refill(false);
} }
else { else {
show_ams_group(true, obj->is_function_supported(PrinterFunction::FUNC_VIRTUAL_TYAY), is_support_extrusion_cali, obj->is_support_filament_edit_virtual_tray); show_ams_group(true, obj->is_function_supported(PrinterFunction::FUNC_VIRTUAL_TYAY), is_support_extrusion_cali, obj->is_support_filament_edit_virtual_tray);
m_ams_control->show_auto_refill(is_support_filament_backup); m_ams_control->show_auto_refill(true);
if(is_support_filament_backup) m_ams_control->show_auto_refill(obj->ams_auto_switch_filament_flag);
} }