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

FIX: The warning box still exits when the temperature has reset. 

Jira: STUDIO-5562

Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com>
Change-Id: I7532db69880449eb3fa0a14fc4dfc61e7f6d518e
(cherry picked from commit 589ed5fe045b5e7ec3effe437c9685085960c0fc)
This commit is contained in:
wenjie.guo 2023-12-13 16:38:37 +08:00 committed by Lane.Wei
parent d15f49a7c0
commit 67205a0eee
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/StatusPanel.cpp
View File

@ -3162,6 +3162,7 @@ void StatusPanel::on_set_bed_temp()
BOOST_LOG_TRIVIAL(info) << "can not set over limit = " << limit << ", set temp = " << bed_temp;
bed_temp = limit;
m_tempCtrl_bed->SetTagTemp(wxString::Format("%d", bed_temp));
m_tempCtrl_bed->Warning(false);
}
obj->command_set_bed(bed_temp);
}
@ -3177,6 +3178,11 @@ void StatusPanel::on_set_nozzle_temp()
long nozzle_temp;
if (str.ToLong(&nozzle_temp) && obj) {
set_hold_count(m_temp_nozzle_timeout);
if (nozzle_temp > m_tempCtrl_nozzle->get_max_temp()) {
nozzle_temp = m_tempCtrl_nozzle->get_max_temp();
m_tempCtrl_nozzle->SetTagTemp(wxString::Format("%d", nozzle_temp));
m_tempCtrl_nozzle->Warning(false);
}
obj->command_set_nozzle(nozzle_temp);
}
} catch (...) {
@ -3191,6 +3197,11 @@ void StatusPanel::on_set_chamber_temp()
long chamber_temp;
if (str.ToLong(&chamber_temp) && obj) {
set_hold_count(m_temp_chamber_timeout);
if (chamber_temp > m_tempCtrl_chamber->get_max_temp()) {
chamber_temp = m_tempCtrl_chamber->get_max_temp();
m_tempCtrl_chamber->SetTagTemp(wxString::Format("%d", chamber_temp));
m_tempCtrl_chamber->Warning(false);
}
obj->command_set_chamber(chamber_temp);
}
}
@ -3934,6 +3945,7 @@ void StatusPanel::set_default()
m_ams_control_box->Hide();
m_ams_control->Reset();
error_info_reset();
SetFocus();
}
void StatusPanel::show_status(int status)

2
src/slic3r/GUI/Widgets/TempInput.hpp
View File

@ -89,7 +89,7 @@ public:
wxString GetTagTemp() { return text_ctrl->GetValue(); }
wxString GetCurrTemp() { return GetLabel(); }
int get_max_temp() { return max_temp; }
void SetLabel(const wxString &label);
void SetTextColor(StateColor const &color);