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

FIX: the AMS refresh does not show AMS_TEXT 

jira: [STUDIO-10322]
Change-Id: Ib17031b9b1eae07deabd418ec1211c465d4ab03d
This commit is contained in:
xin.zhang 2025-02-12 15:42:11 +08:00 committed by lane.wei
parent 0a5989f56c
commit 51feb5f544
2 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/slic3r/GUI/Widgets/AMSItem.cpp
View File

@ -241,18 +241,20 @@ Description:AMSrefresh
AMSrefresh::AMSrefresh() { SetFont(Label::Body_10);} AMSrefresh::AMSrefresh() { SetFont(Label::Body_10);}
AMSrefresh::AMSrefresh(wxWindow *parent, wxString number, Caninfo info, const wxPoint &pos, const wxSize &size) : AMSrefresh() AMSrefresh::AMSrefresh(wxWindow *parent, std::string ams_id, wxString can_id, Caninfo info, const wxPoint &pos, const wxSize &size) : AMSrefresh()
{ {
m_info = info; m_can_id = can_id.ToStdString();
m_can_id = number.ToStdString();
create(parent, wxID_ANY, pos, size); create(parent, wxID_ANY, pos, size);
Update(ams_id, info);
} }
AMSrefresh::AMSrefresh(wxWindow *parent, int number, Caninfo info, const wxPoint &pos, const wxSize &size) : AMSrefresh() AMSrefresh::AMSrefresh(wxWindow *parent, std::string ams_id, int can_id, Caninfo info, const wxPoint &pos, const wxSize &size) : AMSrefresh()
{ {
m_info = info; m_can_id = wxString::Format("%d", can_id).ToStdString();
m_can_id = wxString::Format("%d", number).ToStdString();
create(parent, wxID_ANY, pos, size); create(parent, wxID_ANY, pos, size);
Update(ams_id, info);
} }
AMSrefresh::~AMSrefresh() AMSrefresh::~AMSrefresh()
@ -317,16 +319,17 @@ void AMSrefresh::on_timer(wxTimerEvent &event)
void AMSrefresh::PlayLoading() void AMSrefresh::PlayLoading()
{ {
if (m_play_loading | m_disable_mode) return; if (m_play_loading || m_disable_mode) return;
m_play_loading = true; m_play_loading = true;
//m_rotation_angle = 0;
m_playing_timer->Start(AMS_REFRESH_PLAY_LOADING_TIMER); m_playing_timer->Start(AMS_REFRESH_PLAY_LOADING_TIMER);
Refresh(); Refresh();
} }
void AMSrefresh::StopLoading() void AMSrefresh::StopLoading()
{ {
if (!m_play_loading | m_disable_mode) return; if (!m_play_loading || m_disable_mode) return;
m_playing_timer->Stop(); m_playing_timer->Stop();
m_play_loading = false; m_play_loading = false;
Refresh(); Refresh();
@ -350,6 +353,8 @@ void AMSrefresh::OnClick(wxMouseEvent &evt) {
void AMSrefresh::post_event(wxCommandEvent &&event) void AMSrefresh::post_event(wxCommandEvent &&event)
{ {
if (m_play_loading) { return;}
if (m_disable_mode) if (m_disable_mode)
return; return;
event.SetString(m_info.can_id); event.SetString(m_info.can_id);
@ -400,6 +405,11 @@ void AMSrefresh::paintEvent(wxPaintEvent &evt)
void AMSrefresh::Update(std::string ams_id, Caninfo info) void AMSrefresh::Update(std::string ams_id, Caninfo info)
{ {
if (m_ams_id == ams_id && m_info == info)
{
return;
}
m_ams_id = ams_id; m_ams_id = ams_id;
m_info = info; m_info = info;
@ -409,7 +419,8 @@ void AMSrefresh::Update(std::string ams_id, Caninfo info)
auto tray_id = aid * 4 + tid; auto tray_id = aid * 4 + tid;
m_refresh_id = wxGetApp().transition_tridid(tray_id); m_refresh_id = wxGetApp().transition_tridid(tray_id);
} }
StopLoading();
Refresh();
} }
void AMSrefresh::msw_rescale() { void AMSrefresh::msw_rescale() {
@ -2986,7 +2997,6 @@ void AmsItem::create(wxWindow *parent)
void AmsItem::AddCan(Caninfo caninfo, int canindex, int maxcan, wxBoxSizer* sizer) void AmsItem::AddCan(Caninfo caninfo, int canindex, int maxcan, wxBoxSizer* sizer)
{ {
auto amscan = new wxWindow(this, wxID_ANY); auto amscan = new wxWindow(this, wxID_ANY);
amscan->SetSize(wxSize(FromDIP(52), FromDIP(109))); amscan->SetSize(wxSize(FromDIP(52), FromDIP(109)));
@ -3000,7 +3010,7 @@ void AmsItem::AddCan(Caninfo caninfo, int canindex, int maxcan, wxBoxSizer* size
AMSrefresh* m_panel_refresh; AMSrefresh* m_panel_refresh;
if (m_ams_model != AMSModel::EXT_AMS) if (m_ams_model != AMSModel::EXT_AMS)
{ {
m_panel_refresh = new AMSrefresh(amscan, m_can_count, caninfo); m_panel_refresh = new AMSrefresh(amscan, m_info.ams_id, m_can_count, caninfo);
m_can_refresh_list[caninfo.can_id] = m_panel_refresh; m_can_refresh_list[caninfo.can_id] = m_panel_refresh;
} }
else if (m_ams_model == AMSModel::EXT_AMS){ else if (m_ams_model == AMSModel::EXT_AMS){
@ -3109,7 +3119,7 @@ void AmsItem::AddLiteCan(Caninfo caninfo, int canindex, wxGridSizer* sizer)
ev.Skip(); ev.Skip();
}); });
auto ams_refresh = new AMSrefresh(amscan, canindex, caninfo); auto ams_refresh = new AMSrefresh(amscan, m_info.ams_id, canindex, caninfo);
m_can_refresh_list[caninfo.can_id] = ams_refresh; m_can_refresh_list[caninfo.can_id] = ams_refresh;
m_panel_lib->m_ams_model = m_ams_model; m_panel_lib->m_ams_model = m_ams_model;
m_panel_lib->m_ams_id = m_info.ams_id; m_panel_lib->m_ams_id = m_info.ams_id;
@ -3382,7 +3392,7 @@ void AmsItem::PlayRridLoading(wxString canid)
{ {
for (auto refresh_it : m_can_refresh_list) { for (auto refresh_it : m_can_refresh_list) {
AMSrefresh* refresh = refresh_it.second; AMSrefresh* refresh = refresh_it.second;
if (refresh->m_info.can_id == canid) { refresh->PlayLoading(); } if (refresh->GetCanId() == canid) { refresh->PlayLoading(); }
} }
} }
@ -3523,7 +3533,7 @@ void AmsItem::StopRridLoading(wxString canid)
{ {
for (auto refresh_it : m_can_refresh_list) { for (auto refresh_it : m_can_refresh_list) {
AMSrefresh* refresh = refresh_it.second; AMSrefresh* refresh = refresh_it.second;
if (refresh->m_info.can_id == canid) { refresh->StopLoading(); } if (refresh->GetCanId() == canid) { refresh->StopLoading(); }
} }
} }

33
src/slic3r/GUI/Widgets/AMSItem.hpp
View File

@ -275,23 +275,29 @@ class AMSrefresh : public wxWindow
{ {
public: public:
AMSrefresh(); AMSrefresh();
AMSrefresh(wxWindow *parent, wxString number, Caninfo info, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize); AMSrefresh(wxWindow *parent, std::string ams_id, wxString can_id, Caninfo info, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize);
AMSrefresh(wxWindow *parent, int number, Caninfo info, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize); AMSrefresh(wxWindow *parent, std::string ams_id, int can_id, Caninfo info, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize);
~AMSrefresh(); ~AMSrefresh();
public:
void Update(std::string ams_id, Caninfo info);
std::string GetCanId() const { return m_info.can_id; };
void PlayLoading(); void PlayLoading();
void StopLoading(); void StopLoading();
void create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size);
void on_timer(wxTimerEvent &event);
void OnEnterWindow(wxMouseEvent &evt);
void OnLeaveWindow(wxMouseEvent &evt);
void OnClick(wxMouseEvent &evt);
void post_event(wxCommandEvent &&event);
void paintEvent(wxPaintEvent &evt);
void Update(std::string ams_id, Caninfo info);
void msw_rescale();
void set_disable_mode(bool disable) { m_disable_mode = disable; }
Caninfo m_info;
void msw_rescale();
protected:
void create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size);
void on_timer(wxTimerEvent &event);
void OnEnterWindow(wxMouseEvent &evt);
void OnLeaveWindow(wxMouseEvent &evt);
void OnClick(wxMouseEvent &evt);
void post_event(wxCommandEvent &&event);
void paintEvent(wxPaintEvent &evt);
protected: protected:
wxTimer *m_playing_timer= {nullptr}; wxTimer *m_playing_timer= {nullptr};
@ -301,6 +307,7 @@ protected:
std::string m_ams_id; std::string m_ams_id;
std::string m_can_id; std::string m_can_id;
Caninfo m_info;
ScalableBitmap m_bitmap_normal; ScalableBitmap m_bitmap_normal;
ScalableBitmap m_bitmap_selected; ScalableBitmap m_bitmap_selected;