From e9d8a6c8352628e3f7bb33e2ffaa38e03ebe929b Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Thu, 8 May 2025 20:57:35 +0800 Subject: [PATCH] REF: remove useless codes jira: [none] Change-Id: I86202fdaa09c5953d9bb4f21cc6dd9d9609c0a7f --- src/slic3r/GUI/StatusPanel.cpp | 10 ---------- src/slic3r/GUI/StatusPanel.hpp | 1 - src/slic3r/GUI/Widgets/AMSItem.cpp | 13 ------------- src/slic3r/GUI/Widgets/AMSItem.hpp | 1 - 4 files changed, 25 deletions(-) diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 4b2a86f28..108a9469c 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -4841,23 +4841,13 @@ void StatusPanel::on_switch_speed(wxCommandEvent &event) popUp->Bind(wxEVT_SHOW, [this, popUp](auto &e) { if (!e.IsShown()) { popUp->Destroy(); - m_showing_speed_popup = false; speed_dismiss_time = boost::posix_time::microsec_clock::universal_time(); } }); - m_ams_control->Bind(EVT_CLEAR_SPEED_CONTROL, [this, popUp](auto& e) { - if (m_showing_speed_popup) { - if (popUp && popUp->IsShown()) { - popUp->Show(false); - } - } - e.Skip(); - }); wxPoint pos = m_switch_speed->ClientToScreen(wxPoint(0, -6)); popUp->Position(pos, {0, m_switch_speed->GetSize().y + 12}); popUp->Popup(); - m_showing_speed_popup = true; } void StatusPanel::on_printing_fan_switch(wxCommandEvent &event) diff --git a/src/slic3r/GUI/StatusPanel.hpp b/src/slic3r/GUI/StatusPanel.hpp index dee8e80d5..ea353f0d5 100644 --- a/src/slic3r/GUI/StatusPanel.hpp +++ b/src/slic3r/GUI/StatusPanel.hpp @@ -634,7 +634,6 @@ protected: int speed_lvl = 1; // 0 - 3 int speed_lvl_timeout {0}; boost::posix_time::ptime speed_dismiss_time; - bool m_showing_speed_popup = false; bool m_show_mode_changed = false; std::map img_list; // key: url, value: wxBitmap png Image std::map m_print_connect_types; diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp index 16b36e83d..952201fd4 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.cpp +++ b/src/slic3r/GUI/Widgets/AMSItem.cpp @@ -34,7 +34,6 @@ namespace Slic3r { namespace GUI { wxDEFINE_EVENT(EVT_AMS_RETRY, wxCommandEvent); wxDEFINE_EVENT(EVT_AMS_SHOW_HUMIDITY_TIPS, wxCommandEvent); wxDEFINE_EVENT(EVT_AMS_UNSELETED_VAMS, wxCommandEvent); - wxDEFINE_EVENT(EVT_CLEAR_SPEED_CONTROL, wxCommandEvent); wxDEFINE_EVENT(EVT_AMS_SWITCH, SimpleEvent); @@ -1724,12 +1723,6 @@ AMSRoad::AMSRoad(wxWindow *parent, wxWindowID id, Caninfo info, int canindex, in mouse_pos.y > rect.y + GetSize().y - FromDIP(40)) { wxCommandEvent show_event(EVT_AMS_SHOW_HUMIDITY_TIPS); wxPostEvent(GetParent()->GetParent(), show_event); - -#ifdef __WXMSW__ - wxCommandEvent close_event(EVT_CLEAR_SPEED_CONTROL); - wxPostEvent(GetParent()->GetParent(), close_event); -#endif // __WXMSW__ - } } }); @@ -2819,12 +2812,6 @@ AMSHumidity::AMSHumidity(wxWindow* parent, wxWindowID id, AMSinfo info, const wx info->current_temperature = m_amsinfo.current_temperature; show_event.SetClientData(info); wxPostEvent(GetParent()->GetParent(), show_event); - -#ifdef __WXMSW__ - wxCommandEvent close_event(EVT_CLEAR_SPEED_CONTROL); - wxPostEvent(GetParent()->GetParent(), close_event); -#endif // __WXMSW__ - } } }); diff --git a/src/slic3r/GUI/Widgets/AMSItem.hpp b/src/slic3r/GUI/Widgets/AMSItem.hpp index ff1a3f75f..770a9948f 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.hpp +++ b/src/slic3r/GUI/Widgets/AMSItem.hpp @@ -846,7 +846,6 @@ wxDECLARE_EVENT(EVT_AMS_RETRY, wxCommandEvent); wxDECLARE_EVENT(EVT_AMS_SHOW_HUMIDITY_TIPS, wxCommandEvent); wxDECLARE_EVENT(EVT_AMS_UNSELETED_VAMS, wxCommandEvent); wxDECLARE_EVENT(EVT_AMS_UNSELETED_AMS, wxCommandEvent); -wxDECLARE_EVENT(EVT_CLEAR_SPEED_CONTROL, wxCommandEvent); wxDECLARE_EVENT(EVT_VAMS_ON_FILAMENT_EDIT, wxCommandEvent); wxDECLARE_EVENT(EVT_AMS_SWITCH, SimpleEvent);