From 642e82fccfc7c7585b4d8bcab85c1a8673cb14cc Mon Sep 17 00:00:00 2001 From: tao wang Date: Tue, 29 Aug 2023 20:55:13 +0800 Subject: [PATCH] ENH:optimize the display logic of backup jira:[STUDIO-4215] Change-Id: I89436e88be64cfa9d6ff0c191a1539234917fd9b --- src/slic3r/GUI/DeviceManager.cpp | 4 ++-- src/slic3r/GUI/DeviceManager.hpp | 1 + src/slic3r/GUI/SelectMachine.cpp | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index ca286b555..d420bce2f 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -3142,7 +3142,7 @@ int MachineObject::parse_json(std::string payload) /*get filam_bak*/ try { if (jj.contains("filam_bak")) { - is_support_filament_backup = true; + is_support_show_filament_backup = true; filam_bak.clear(); if (jj["filam_bak"].is_array()) { 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 { - is_support_filament_backup = false; + is_support_show_filament_backup = false; } } catch (...) { diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 18ce968cb..bbea0756c 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -700,6 +700,7 @@ public: bool is_support_aux_fan {false}; bool is_support_chamber_fan{false}; bool is_support_filament_backup{false}; + bool is_support_show_filament_backup{false}; bool is_support_timelapse{false}; bool is_support_update_remain{false}; bool is_support_auto_leveling{false}; diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index f2f160bc7..31d67c51b 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -2955,6 +2955,7 @@ void SelectMachineDialog::on_timer(wxTimerEvent &event) || obj_->amsList.empty() || obj_->ams_exist_bits == 0 || !obj_->is_support_filament_backup + || !obj_->is_support_show_filament_backup || !obj_->ams_auto_switch_filament_flag || !m_checkbox_list["use_ams"]->GetValue() ) { if (m_ams_backup_tip->IsShown()) {