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

FIX: fix the humidity display of N3S_AMS 

jira: [STUDIO-10641]
Change-Id: I48ac96443f851262b3ce720d4b4948b7b515a381
This commit is contained in:
xin.zhang 2025-02-28 20:13:14 +08:00 committed by lane.wei
parent 38f1f265cf
commit 51042edcbd
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/slic3r/GUI/DeviceManager.cpp
View File

@ -4476,6 +4476,30 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
} catch (...) { } catch (...) {
; ;
} }
if (curr_ams->humidity_raw != -1)
{
if (curr_ams->humidity_raw < 20)
{
curr_ams->humidity = 5;
}
else if (curr_ams->humidity_raw < 40)
{
curr_ams->humidity = 4;
}
else if (curr_ams->humidity_raw < 60)
{
curr_ams->humidity = 3;
}
else if (curr_ams->humidity_raw < 80)
{
curr_ams->humidity = 2;
}
else
{
curr_ams->humidity = 1;
}
}
} }

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

@ -48,7 +48,7 @@ bool AMSinfo::parse_ams_info(MachineObject *obj, Ams *ams, bool remain_flag, boo
if (!ams) return false; if (!ams) return false;
this->ams_id = ams->id; this->ams_id = ams->id;
if (ams->type == 1 || ams->type == 3){ if (ams->type == 1 || ams->type == 3 || ams->type == N3S_AMS){
this->ams_humidity = ams->humidity; this->ams_humidity = ams->humidity;
} }
else{ else{
@ -2924,7 +2924,7 @@ void AMSHumidity::doRender(wxDC& dc)
pot.y = pot.y + ((tsize1.y - tsize2.y) / 2) + FromDIP(2); pot.y = pot.y + ((tsize1.y - tsize2.y) / 2) + FromDIP(2);
dc.DrawText(_L("%"), pot); dc.DrawText(_L("%"), pot);
pot.x += tsize2.x + FromDIP(3); pot.x += tsize2.x;
} }
else /*image with number*/ else /*image with number*/
{ {
@ -2938,11 +2938,13 @@ void AMSHumidity::doRender(wxDC& dc)
pot = wxPoint(FromDIP(5), ((size.y - hum_img.GetBmpSize().y) / 2)); pot = wxPoint(FromDIP(5), ((size.y - hum_img.GetBmpSize().y) / 2));
dc.DrawBitmap(hum_img.bmp(), pot); dc.DrawBitmap(hum_img.bmp(), pot);
pot.x = pot.x + hum_img.GetBmpSize().x + FromDIP(3); pot.x = pot.x + hum_img.GetBmpSize().x;
} }
if (m_amsinfo.support_drying()) if (m_amsinfo.support_drying())
{ {
pot.x += FromDIP(2);// spacing
// vertical line // vertical line
dc.SetPen(wxPen(wxColour(194, 194, 194))); dc.SetPen(wxPen(wxColour(194, 194, 194)));
dc.SetBrush(wxBrush(wxColour(194, 194, 194))); dc.SetBrush(wxBrush(wxColour(194, 194, 194)));
@ -2950,12 +2952,11 @@ void AMSHumidity::doRender(wxDC& dc)
// sun image // sun image
dc.SetPen(wxPen(*wxTRANSPARENT_PEN)); dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
pot.x += ((size.GetWidth() - pot.x) - ams_drying_img.GetBmpWidth()) / 2;// spacing
if (m_amsinfo.left_dray_time > 0) { if (m_amsinfo.left_dray_time > 0) {
pot.x = pot.x + (ams_drying_img.GetBmpWidth() / 2);
pot.y = (size.y - ams_drying_img.GetBmpHeight()) / 2; pot.y = (size.y - ams_drying_img.GetBmpHeight()) / 2;
dc.DrawBitmap(ams_drying_img.bmp(), pot); dc.DrawBitmap(ams_drying_img.bmp(), pot);
} else { } else {
pot.x = pot.x + (ams_sun_img.GetBmpWidth() / 2);
pot.y = (size.y - ams_sun_img.GetBmpHeight()) / 2; pot.y = (size.y - ams_sun_img.GetBmpHeight()) / 2;
dc.DrawBitmap(ams_sun_img.bmp(), pot); dc.DrawBitmap(ams_sun_img.bmp(), pot);
} }