mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:optimize the display logic of backup 

jira:[STUDIO-4215]

Change-Id: I89436e88be64cfa9d6ff0c191a1539234917fd9b
This commit is contained in:
tao wang 2023-08-29 20:55:13 +08:00 committed by Lane.Wei
parent a67eabbffb
commit 642e82fccf
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3142,7 +3142,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")) {
is_support_filament_backup = true; is_support_show_filament_backup = 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++) {
@ -3151,7 +3151,7 @@ int MachineObject::parse_json(std::string payload)
} }
} }
else { else {
is_support_filament_backup = false; is_support_show_filament_backup = false;
} }
} }
catch (...) { catch (...) {

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

@ -700,6 +700,7 @@ public:
bool is_support_aux_fan {false}; bool is_support_aux_fan {false};
bool is_support_chamber_fan{false}; bool is_support_chamber_fan{false};
bool is_support_filament_backup{false}; bool is_support_filament_backup{false};
bool is_support_show_filament_backup{false};
bool is_support_timelapse{false}; bool is_support_timelapse{false};
bool is_support_update_remain{false}; bool is_support_update_remain{false};
bool is_support_auto_leveling{false}; bool is_support_auto_leveling{false};

1
src/slic3r/GUI/SelectMachine.cpp
View File

@ -2955,6 +2955,7 @@ void SelectMachineDialog::on_timer(wxTimerEvent &event)
|| obj_->amsList.empty() || obj_->amsList.empty()
|| obj_->ams_exist_bits == 0 || obj_->ams_exist_bits == 0
|| !obj_->is_support_filament_backup || !obj_->is_support_filament_backup
|| !obj_->is_support_show_filament_backup
|| !obj_->ams_auto_switch_filament_flag || !obj_->ams_auto_switch_filament_flag
|| !m_checkbox_list["use_ams"]->GetValue() ) { || !m_checkbox_list["use_ams"]->GetValue() ) {
if (m_ams_backup_tip->IsShown()) { if (m_ams_backup_tip->IsShown()) {