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

FIX:multi colour displayed as gradient color on AMS 

JIRA:5925
Change-Id: Ic7a925dda2e3bde066ba40ba27002569040f9518
This commit is contained in:
hu.wang 2024-02-21 15:00:07 +08:00 committed by Lane.Wei
parent c094afe37a
commit 96e29c7b70
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/slic3r/GUI/Widgets/AMSControl.cpp
View File

@ -1395,8 +1395,15 @@ AMSRoad::AMSRoad(wxWindow *parent, wxWindowID id, Caninfo info, int canindex, in
for (int i = 1; i <= 5; i++) { for (int i = 1; i <= 5; i++) {
ams_humidity_img.push_back(ScalableBitmap(this, "hum_level" + std::to_string(i) + "_dark", 32)); ams_humidity_img.push_back(ScalableBitmap(this, "hum_level" + std::to_string(i) + "_dark", 32));
} }
if (m_rode_mode != AMSRoadMode::AMS_ROAD_MODE_VIRTUAL_TRAY) {
create(parent, id, pos, size);
}
else {
wxSize virtual_size(size.x - 1, size.y + 2);
create(parent, id, pos, virtual_size);
create(parent, id, pos, size); }
Bind(wxEVT_PAINT, &AMSRoad::paintEvent, this); Bind(wxEVT_PAINT, &AMSRoad::paintEvent, this);
wxWindow::SetBackgroundColour(AMS_CONTROL_DEF_BLOCK_BK_COLOUR); wxWindow::SetBackgroundColour(AMS_CONTROL_DEF_BLOCK_BK_COLOUR);
@ -1753,16 +1760,24 @@ void AMSItem::doRender(wxDC &dc)
int fleft = left; int fleft = left;
float total_width = AMS_ITEM_CUBE_SIZE.x; float total_width = AMS_ITEM_CUBE_SIZE.x;
int gwidth = std::round(total_width / (iter->material_cols.size() - 1)); int gwidth = std::round(total_width / (iter->material_cols.size() - 1));
if (iter->ctype == 0) {
for (int i = 0; i < iter->material_cols.size() - 1; i++) {
for (int i = 0; i < iter->material_cols.size() - 1; i++) { if ((fleft + gwidth) > (AMS_ITEM_CUBE_SIZE.x)) {
gwidth = (fleft + AMS_ITEM_CUBE_SIZE.x) - fleft;
}
if ((fleft + gwidth) > (AMS_ITEM_CUBE_SIZE.x)) { auto rect = wxRect(fleft, (size.y - AMS_ITEM_CUBE_SIZE.y) / 2, gwidth, AMS_ITEM_CUBE_SIZE.y);
gwidth = (fleft + AMS_ITEM_CUBE_SIZE.x) - fleft; dc.GradientFillLinear(rect, iter->material_cols[i], iter->material_cols[i + 1], wxEAST);
fleft += gwidth;
}
} else {
int cols_size = iter->material_cols.size();
for (int i = 0; i < cols_size; i++) {
dc.SetBrush(wxBrush(iter->material_cols[i]));
float x = left + total_width * i / cols_size;
dc.DrawRoundedRectangle(x, (size.y - AMS_ITEM_CUBE_SIZE.y) / 2, total_width / cols_size, AMS_ITEM_CUBE_SIZE.y , 0);
} }
auto rect = wxRect(fleft, (size.y - AMS_ITEM_CUBE_SIZE.y) / 2, gwidth, AMS_ITEM_CUBE_SIZE.y);
dc.GradientFillLinear(rect, iter->material_cols[i], iter->material_cols[i + 1], wxEAST);
fleft += gwidth;
} }
dc.SetPen(wxPen(StateColor::darkModeColorFor(m_background_colour))); dc.SetPen(wxPen(StateColor::darkModeColorFor(m_background_colour)));