From 385c8a36a1333e0e3c02cac14a81cc8b08fb8aa9 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Thu, 27 Feb 2025 16:37:01 +0800 Subject: [PATCH] FIX: update the time shown; keep the val update while popup jira: [STUDIO-9268] Change-Id: I0b743ddb0ae479f9baad6239f68861a199681cda (cherry picked from commit e1bc737d1cbc1dcf79ceecf9ed301a4a02590d5a) --- src/slic3r/GUI/Widgets/AMSControl.cpp | 20 +++++++++++++++++++- src/slic3r/GUI/Widgets/AMSItem.cpp | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index d6118d20e3..2397c99ca7 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -1063,7 +1063,25 @@ void AMSControl::UpdateAms(std::vector ams_info, std::vectorex }*/ } - + /*update humidity popup*/ + if (m_percent_humidity_dry_popup->IsShown()) + { + string target_id = m_percent_humidity_dry_popup->get_owner_ams_id(); + for (const auto& the_info : ams_info) + { + if (target_id == the_info.ams_id) + { + uiAmsHumidityInfo humidity_info; + humidity_info.ams_id = the_info.ams_id; + humidity_info.humidity_level = the_info.ams_humidity; + humidity_info.humidity_percent = the_info.humidity_raw; + humidity_info.left_dry_time = the_info.left_dray_time; + humidity_info.current_temperature = the_info.current_temperature; + m_percent_humidity_dry_popup->Update(&humidity_info); + break; + } + } + } } void AMSControl::AddAmsPreview(AMSinfo info, AMSModel type) diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp index 43df5c7a52..afb5bb93da 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.cpp +++ b/src/slic3r/GUI/Widgets/AMSItem.cpp @@ -2794,6 +2794,7 @@ AMSHumidity::AMSHumidity(wxWindow* parent, wxWindowID id, AMSinfo info, const wx wxCommandEvent show_event(EVT_AMS_SHOW_HUMIDITY_TIPS); uiAmsHumidityInfo *info = new uiAmsHumidityInfo; + info->ams_id = m_amsinfo.ams_id; info->humidity_level = m_amsinfo.ams_humidity; info->humidity_percent = m_amsinfo.humidity_raw; info->left_dry_time = m_amsinfo.left_dray_time;