ENH:redraw the ams preview item
jira:[STUDIO-9823, STUDIO-9609,STUDIO-9366] Change-Id: I9bb71986e474257dc4d22fcb66706e4f61228e4e
This commit is contained in:
tao wang
lane.wei
parent
ade9688be9
commit
538316469a
|
|
@ -1,3 +0,0 @@
|
|||
<svg width="17" height="25" viewBox="0 0 17 25" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.9106 0.0214844H0.910583V24.0215H16.9106V0.0214844ZM8.91058 5.02148C7.25373 5.02148 5.91058 6.36463 5.91058 8.02148V14.0215C5.91058 15.6783 7.25373 17.0215 8.91058 17.0215C10.5674 17.0215 11.9106 15.6783 11.9106 14.0215V8.02148C11.9106 6.36463 10.5674 5.02148 8.91058 5.02148Z" fill="white"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 448 B |
|
|
@ -1,4 +1,5 @@
|
|||
<svg width="44" height="25" viewBox="0 0 44 25" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M32.5 12.7871H29.5V15.0488C29.5 16.7057 28.1569 18.0488 26.5 18.0488C24.8431 18.0488 23.5 16.7057 23.5 15.0488V12.7871H20.5V15.0488C20.5 16.7057 19.1569 18.0488 17.5 18.0488C15.8431 18.0488 14.5 16.7057 14.5 15.0488V12.7871H11.5V15.0488C11.5 16.7057 10.1569 18.0488 8.5 18.0488C6.84315 18.0488 5.5 16.7057 5.5 15.0488V12.7871H0V24.7871H44V12.7871H38.5V15.0488C38.5 16.7057 37.1569 18.0488 35.5 18.0488C33.8431 18.0488 32.5 16.7057 32.5 15.0488V12.7871Z" fill="#CECECE"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 5.97093C2 3.10799 4.32088 0.787109 7.18382 0.787109H36.8162C39.6791 0.787109 42 3.10799 42 5.97093V12.7871H38.5V9.04883C38.5 7.39197 37.1569 6.04883 35.5 6.04883C33.8431 6.04883 32.5 7.39197 32.5 9.04883V12.7871H29.5V9.04883C29.5 7.39197 28.1569 6.04883 26.5 6.04883C24.8431 6.04883 23.5 7.39197 23.5 9.04883V12.7871H20.5V9.04883C20.5 7.39197 19.1569 6.04883 17.5 6.04883C15.8431 6.04883 14.5 7.39197 14.5 9.04883V12.7871H11.5V9.04883C11.5 7.39197 10.1569 6.04883 8.5 6.04883C6.84315 6.04883 5.5 7.39197 5.5 9.04883V12.7871H2V5.97093Z" fill="#EEEEEE"/>
|
||||
<svg width="52" height="32" viewBox="0 0 52 32" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 0C1.79086 0 0 1.79086 0 4V28C0 30.2091 1.79086 32 4 32H48C50.2091 32 52 30.2091 52 28V4C52 1.79086 50.2091 0 48 0H4ZM44 8H8V24H44V8Z" fill="white"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M36.5 16H33.5V18.2617C33.5 19.9186 32.1569 21.2617 30.5 21.2617C28.8431 21.2617 27.5 19.9186 27.5 18.2617V16H24.5V18.2617C24.5 19.9186 23.1569 21.2617 21.5 21.2617C19.8431 21.2617 18.5 19.9186 18.5 18.2617V16H15.5V18.2617C15.5 19.9186 14.1569 21.2617 12.5 21.2617C10.8432 21.2617 9.5 19.9186 9.5 18.2617V16H4V28H48V16H42.5V18.2617C42.5 19.9186 41.1569 21.2617 39.5 21.2617C37.8431 21.2617 36.5 19.9186 36.5 18.2617V16Z" fill="#CECECE"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M6 9.18382C6 6.32088 8.32088 4 11.1838 4H40.8162C43.6791 4 46 6.32088 46 9.18382V16H42.5V12.2617C42.5 10.6049 41.1569 9.26172 39.5 9.26172C37.8431 9.26172 36.5 10.6049 36.5 12.2617V16H33.5V12.2617C33.5 10.6049 32.1569 9.26172 30.5 9.26172C28.8431 9.26172 27.5 10.6049 27.5 12.2617V16H24.5V12.2617C24.5 10.6049 23.1569 9.26172 21.5 9.26172C19.8431 9.26172 18.5 10.6049 18.5 12.2617V16H15.5V12.2617C15.5 10.6049 14.1569 9.26172 12.5 9.26172C10.8432 9.26172 9.5 10.6049 9.5 12.2617V16H6V9.18382Z" fill="#EEEEEE"/>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.3 KiB |
|
|
@ -1,4 +1,12 @@
|
|||
<svg width="20" height="25" viewBox="0 0 20 25" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 12.7871H0V24.7871H20V12.7871H13V15.0488C13 16.7057 11.6569 18.0488 10 18.0488C8.34315 18.0488 7 16.7057 7 15.0488V12.7871Z" fill="#CECECE"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.18382 0.787109C4.32088 0.787109 2 3.10799 2 5.97093V12.7871H7V9.04883C7 7.39197 8.34315 6.04883 10 6.04883C11.6569 6.04883 13 7.39197 13 9.04883V12.7871H18V5.97093C18 3.10799 15.6791 0.787109 12.8162 0.787109H7.18382Z" fill="#EEEEEE"/>
|
||||
<svg width="29" height="33" viewBox="0 0 29 33" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.77881 0.447754C2.56967 0.447754 0.778809 2.23861 0.778809 4.44775V28.4478C0.778809 30.6569 2.56967 32.4478 4.77881 32.4478H24.7788C26.9879 32.4478 28.7788 30.6569 28.7788 28.4478V4.44775C28.7788 2.23861 26.9879 0.447754 24.7788 0.447754H4.77881ZM21.125 8.44775H9.41602V24.4478H21.125V8.44775Z" fill="white"/>
|
||||
<g clip-path="url(#clip0_20951_60572)">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.7788 16.7349H4.77881V28.7349H24.7788V16.7349H17.7788V18.9966C17.7788 20.6535 16.4357 21.9966 14.7788 21.9966C13.122 21.9966 11.7788 20.6535 11.7788 18.9966V16.7349Z" fill="#CECECE"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.9626 4.73486C9.09969 4.73486 6.77881 7.05574 6.77881 9.91868V16.7349H11.7788V12.9966C11.7788 11.3397 13.122 9.99658 14.7788 9.99658C16.4357 9.99658 17.7788 11.3397 17.7788 12.9966V16.7349H22.7788V9.91868C22.7788 7.05574 20.4579 4.73486 17.595 4.73486H11.9626Z" fill="#EEEEEE"/>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_20951_60572">
|
||||
<rect width="20" height="25" fill="white" transform="translate(4.77881 3.94775)"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 584 B After Width: | Height: | Size: 1.2 KiB |
|
|
@ -1098,7 +1098,6 @@ void AMSLib::doRender(wxDC &dc)
|
|||
else {
|
||||
render_generic_lib(dc);
|
||||
}
|
||||
//render_extra_lib(dc);
|
||||
}
|
||||
|
||||
void AMSLib::render_lite_lib(wxDC& dc)
|
||||
|
|
@ -1184,7 +1183,7 @@ void AMSLib::render_lite_lib(wxDC& dc)
|
|||
for (int i = 0; i < cols_size; i++) {
|
||||
dc.SetBrush(wxBrush(m_info.material_cols[i]));
|
||||
float x = FromDIP(10) + ((float)libsize.x - FromDIP(18)) * i / cols_size;
|
||||
dc.DrawRoundedRectangle(x, FromDIP(10), ((float)libsize.x - FromDIP(17)) / cols_size, libsize.y - FromDIP(18), 0);
|
||||
dc.DrawRoundedRectangle(x, FromDIP(10), ((float)libsize.x - FromDIP(17)) / cols_size, libsize.y - FromDIP(20), 0);
|
||||
}
|
||||
dc.SetBrush(wxBrush(tmp_lib_colour));
|
||||
}
|
||||
|
|
@ -1195,7 +1194,7 @@ void AMSLib::render_lite_lib(wxDC& dc)
|
|||
dc.DrawRoundedRectangle(FromDIP(10), (size.y - libsize.y) / 2 + FromDIP(8), libsize.x - FromDIP(17), libsize.y - FromDIP(16), 0);
|
||||
}
|
||||
else{
|
||||
dc.DrawRoundedRectangle(FromDIP(10), (size.y - libsize.y) / 2 + FromDIP(10), libsize.x - FromDIP(17), libsize.y - FromDIP(18), 0);
|
||||
dc.DrawRoundedRectangle(FromDIP(10), (size.y - libsize.y) / 2 + FromDIP(10), libsize.x - FromDIP(17), libsize.y - FromDIP(20), 0);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1237,8 +1236,6 @@ void AMSLib::render_generic_lib(wxDC &dc)
|
|||
//draw def background
|
||||
dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
|
||||
dc.SetBrush(wxBrush(AMS_CONTROL_DEF_LIB_BK_COLOUR));
|
||||
//dc.DrawRoundedRectangle(FromDIP(4), FromDIP(4), size.x - FromDIP(8), size.y - FromDIP(8), m_radius);
|
||||
//dc.DrawRoundedRectangle(FromDIP(4), FromDIP(4), size.x - FromDIP(8), size.y - FromDIP(m_radius - 2), m_radius);
|
||||
dc.DrawRoundedRectangle(FromDIP(2), FromDIP(2), size.x - FromDIP(4), size.y - FromDIP(3), m_radius);
|
||||
|
||||
if (tmp_lib_colour.GetLuminance() < 0.6) {
|
||||
|
|
@ -1272,12 +1269,7 @@ void AMSLib::render_generic_lib(wxDC &dc)
|
|||
int top = height - curr_height;
|
||||
|
||||
if (m_ams_model == EXT_AMS){
|
||||
if (m_radius > 0){
|
||||
dc.DrawRoundedRectangle(FromDIP(1), FromDIP(1), size.x - FromDIP(2), size.y - FromDIP(1), m_radius - 1);
|
||||
}
|
||||
else{
|
||||
dc.DrawRectangle(FromDIP(1), FromDIP(1), size.x - FromDIP(2), size.y - FromDIP(1));
|
||||
}
|
||||
dc.DrawRoundedRectangle(FromDIP(1), FromDIP(1), size.x - FromDIP(2), size.y - FromDIP(1), m_radius - 1);
|
||||
if (!m_disable_mode) {
|
||||
// edit icon
|
||||
if (m_info.material_state != AMSCanType::AMS_CAN_TYPE_EMPTY && m_info.material_state != AMSCanType::AMS_CAN_TYPE_NONE){
|
||||
|
|
@ -1385,20 +1377,9 @@ void AMSLib::render_generic_lib(wxDC &dc)
|
|||
dc.SetBrush(wxBrush(m_info.material_cols[i]));
|
||||
if (i == 0 || i == m_info.material_cols.size() - 1) {
|
||||
#ifdef __APPLE__
|
||||
if (height - curr_height < m_radius){
|
||||
dc.DrawRoundedRectangle(left + gwidth * i, height - curr_height, gwidth, curr_height, m_radius);
|
||||
}
|
||||
else{
|
||||
dc.DrawRoundedRectangle(left + gwidth * i, height - curr_height, gwidth, curr_height, 0);
|
||||
}
|
||||
|
||||
dc.DrawRoundedRectangle(left + gwidth * i - FromDIP(1), height - curr_height, gwidth, curr_height, m_radius);
|
||||
#else
|
||||
if (height - curr_height < m_radius) {
|
||||
dc.DrawRoundedRectangle(left + gwidth * i, height - curr_height, gwidth, curr_height, m_radius - 1);
|
||||
}
|
||||
else {
|
||||
dc.DrawRoundedRectangle(left + gwidth * i, height - curr_height, gwidth, curr_height, 0);
|
||||
}
|
||||
dc.DrawRoundedRectangle(left + gwidth * i, height - curr_height, gwidth, curr_height, m_radius - 1);
|
||||
#endif
|
||||
//add rectangle
|
||||
int dr_gwidth = std::round(gwidth * 0.6);
|
||||
|
|
@ -1428,21 +1409,9 @@ void AMSLib::render_generic_lib(wxDC &dc)
|
|||
auto brush = dc.GetBrush();
|
||||
if (alpha != 0 && alpha != 255 && alpha != 254) dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH));
|
||||
#ifdef __APPLE__
|
||||
|
||||
//dc.DrawRoundedRectangle(FromDIP(4), FromDIP(4) + top, size.x - FromDIP(8), curr_height, m_radius);
|
||||
if (top < m_radius){
|
||||
dc.DrawRoundedRectangle(FromDIP(4), FromDIP(4) + top, size.x - FromDIP(8), curr_height, m_radius - 1);
|
||||
}
|
||||
else{
|
||||
dc.DrawRectangle(FromDIP(1), FromDIP(1), size.x - FromDIP(2), size.y - FromDIP(1));
|
||||
}
|
||||
dc.DrawRoundedRectangle(FromDIP(1), FromDIP(1), size.x - FromDIP(2), size.y - FromDIP(1), m_radius - 1);
|
||||
#else
|
||||
if (top < m_radius) {
|
||||
dc.DrawRoundedRectangle(FromDIP(2), FromDIP(1) + top, size.x - FromDIP(4), curr_height, m_radius - 1);
|
||||
}
|
||||
else {
|
||||
dc.DrawRoundedRectangle(FromDIP(2), FromDIP(1) + top, size.x - FromDIP(4), curr_height, 0);
|
||||
}
|
||||
dc.DrawRoundedRectangle(FromDIP(2), FromDIP(1) + top, size.x - FromDIP(4), curr_height, m_radius - 1);
|
||||
#endif
|
||||
dc.SetBrush(brush);
|
||||
}
|
||||
|
|
@ -2398,13 +2367,11 @@ void AMSPreview::Update(AMSinfo amsinfo)
|
|||
void AMSPreview::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size)
|
||||
{
|
||||
m_ts_bitmap_cube = ScalableBitmap(this, "ts_bitmap_cube", 14);
|
||||
m_four_slot_bitmap = ScalableBitmap(this, "four_slot_ams_item", 26);
|
||||
m_single_slot_bitmap = ScalableBitmap(this, "single_slot_ams_item", 26);
|
||||
m_ext_bitmap = ScalableBitmap(this, "ext_ams_item", 26);
|
||||
m_four_slot_bitmap = ScalableBitmap(this, "four_slot_ams_item", 32);
|
||||
m_single_slot_bitmap = ScalableBitmap(this, "single_slot_ams_item", 32);
|
||||
wxWindow::Create(parent, id, pos, size);
|
||||
SetMinSize(size);
|
||||
SetMaxSize(size);
|
||||
//SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
|
||||
Refresh();
|
||||
}
|
||||
|
||||
|
|
@ -2465,19 +2432,15 @@ void AMSPreview::render(wxDC &dc)
|
|||
void AMSPreview::doRender(wxDC &dc)
|
||||
{
|
||||
wxSize size = GetSize();
|
||||
/*dc.SetPen(wxPen(StateColor::darkModeColorFor(m_background_colour)));
|
||||
dc.SetBrush(wxBrush(StateColor::darkModeColorFor(m_background_colour)));
|
||||
dc.DrawRoundedRectangle(0, 0, size.x, size.y, 3);*/
|
||||
|
||||
auto left = 8;
|
||||
m_space = 9;
|
||||
auto color = *wxWHITE;
|
||||
dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
|
||||
dc.SetBrush(color);
|
||||
dc.DrawRoundedRectangle(0, 0, size.x, size.y, FromDIP(3));
|
||||
|
||||
auto left = 0;
|
||||
//four slot
|
||||
if (m_ams_item_type != AMSModel::EXT_AMS && m_ams_item_type != AMSModel::N3S_AMS){
|
||||
left = FromDIP(8);
|
||||
for (std::vector<Caninfo>::iterator iter = m_amsinfo.cans.begin(); iter != m_amsinfo.cans.end(); iter++) {
|
||||
|
||||
dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
|
||||
|
|
@ -2491,9 +2454,9 @@ void AMSPreview::doRender(wxDC &dc)
|
|||
dc.SetBrush(AMS_CONTROL_DISABLE_COLOUR);
|
||||
}
|
||||
if (iter->material_cols.size() > 1) {
|
||||
int fleft = FromDIP(left);
|
||||
float total_width = AMS_ITEM_CUBE_SIZE.x;
|
||||
int gwidth = (total_width / (iter->material_cols.size() - 1));
|
||||
int fleft = left;
|
||||
|
||||
int gwidth = (AMS_ITEM_CUBE_SIZE.x / (iter->material_cols.size() - 1));
|
||||
if (iter->ctype == 0) {
|
||||
for (int i = 0; i < iter->material_cols.size() - 1; i++) {
|
||||
if (fleft + gwidth > (AMS_ITEM_CUBE_SIZE.x)) {
|
||||
|
|
@ -2509,34 +2472,31 @@ void AMSPreview::doRender(wxDC &dc)
|
|||
int cols_size = iter->material_cols.size();
|
||||
for (int i = 0; i < cols_size; i++) {
|
||||
dc.SetBrush(wxBrush(iter->material_cols[i]));
|
||||
int x = FromDIP(left) + total_width * i / cols_size;
|
||||
dc.DrawRectangle(x, (size.y - AMS_ITEM_CUBE_SIZE.y) / 2, total_width / cols_size, AMS_ITEM_CUBE_SIZE.y);
|
||||
int x = left + AMS_ITEM_CUBE_SIZE.x * i / cols_size;
|
||||
dc.DrawRectangle(x, (size.y - AMS_ITEM_CUBE_SIZE.y) / 2, AMS_ITEM_CUBE_SIZE.x / cols_size, AMS_ITEM_CUBE_SIZE.y);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (iter->material_colour.Alpha() == 0) {
|
||||
dc.DrawBitmap(m_ts_bitmap_cube.bmp(), FromDIP(left), (size.y - AMS_ITEM_CUBE_SIZE.y) / 2);
|
||||
dc.DrawBitmap(m_ts_bitmap_cube.bmp(), left, (size.y - AMS_ITEM_CUBE_SIZE.y) / 2);
|
||||
}
|
||||
else {
|
||||
wxRect rect(FromDIP(left), (size.y - AMS_ITEM_CUBE_SIZE.y) / 2, AMS_ITEM_CUBE_SIZE.x, AMS_ITEM_CUBE_SIZE.y);
|
||||
wxRect rect(left, (size.y - AMS_ITEM_CUBE_SIZE.y) / 2, AMS_ITEM_CUBE_SIZE.x, AMS_ITEM_CUBE_SIZE.y);
|
||||
if (iter->material_state == AMSCanType::AMS_CAN_TYPE_EMPTY) {
|
||||
|
||||
// draw a slash when ams slot is empty
|
||||
/*dc.SetPen(wxPen(wxColor(0, 0, 0)));
|
||||
dc.DrawRoundedRectangle(rect, 3);*/
|
||||
//dc.DrawLine(rect.GetRight() - FromDIP(1), rect.GetTop() + FromDIP(1), rect.GetLeft() + FromDIP(1), rect.GetBottom() - FromDIP(1));
|
||||
dc.SetPen(wxPen(wxColor(0, 0, 0)));
|
||||
dc.DrawLine(rect.GetRight() - FromDIP(1), rect.GetTop() + FromDIP(1), rect.GetLeft() + FromDIP(1), rect.GetBottom() - FromDIP(1));
|
||||
}
|
||||
else {
|
||||
dc.DrawRoundedRectangle(rect, 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
left += m_space;
|
||||
left += AMS_ITEM_CUBE_SIZE.x;
|
||||
}
|
||||
|
||||
auto pot = wxPoint((size.x - m_four_slot_bitmap.GetBmpSize().x) / 2, (size.y - m_four_slot_bitmap.GetBmpSize().y) / 2);
|
||||
dc.DrawBitmap(m_four_slot_bitmap.bmp(), pot);
|
||||
//auto pot = wxPoint((size.x - m_four_slot_bitmap.GetBmpSize().x) / 2, (size.y - m_four_slot_bitmap.GetBmpSize().y) / 2);
|
||||
dc.DrawBitmap(m_four_slot_bitmap.bmp(), wxPoint(0,0));
|
||||
}
|
||||
|
||||
//single slot
|
||||
|
|
@ -2578,19 +2538,25 @@ void AMSPreview::doRender(wxDC &dc)
|
|||
dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
|
||||
dc.SetBrush(iter.material_colour);
|
||||
//dc.SetBrush(*wxGREEN);
|
||||
auto rect = wxRect(((size.x - AMS_ITEM_CUBE_SIZE.x) / 2), ((size.y - AMS_ITEM_CUBE_SIZE.y) / 2), (AMS_ITEM_CUBE_SIZE.x), (AMS_ITEM_CUBE_SIZE.y));
|
||||
dc.DrawRoundedRectangle(rect, FromDIP(4));
|
||||
if (m_ams_item_type == AMSModel::N3S_AMS) {
|
||||
auto rect = wxRect(((size.x - AMS_ITEM_CUBE_SIZE.x) / 2), ((size.y - AMS_ITEM_CUBE_SIZE.y) / 2), (AMS_ITEM_CUBE_SIZE.x), (AMS_ITEM_CUBE_SIZE.y));
|
||||
dc.DrawRoundedRectangle(rect, 0);
|
||||
} else {
|
||||
auto rect = wxRect(((size.x - AMS_ITEM_CUBE_SIZE2.x) / 2), ((size.y - AMS_ITEM_CUBE_SIZE2.y) / 2), (AMS_ITEM_CUBE_SIZE2.x), (AMS_ITEM_CUBE_SIZE2.y));
|
||||
dc.DrawRoundedRectangle(rect, FromDIP(3));
|
||||
}
|
||||
}
|
||||
|
||||
if (m_ams_item_type == AMSModel::N3S_AMS) {
|
||||
auto pot = wxPoint(((size.x - m_single_slot_bitmap.GetBmpSize().x) / 2), ((size.y - m_single_slot_bitmap.GetBmpSize().y) / 2));
|
||||
dc.DrawBitmap(m_single_slot_bitmap.bmp(), pot);
|
||||
//auto pot = wxPoint(((size.x - m_single_slot_bitmap.GetBmpSize().x) / 2), ((size.y - m_single_slot_bitmap.GetBmpSize().y) / 2));
|
||||
dc.DrawBitmap(m_single_slot_bitmap.bmp(), wxPoint(0,0));
|
||||
}
|
||||
if (((iter.material_colour.Red() >= 238 && iter.material_colour.Green() >= 238 && iter.material_colour.Blue() >= 238)
|
||||
|| iter.material_colour.Alpha() == 0) && m_ams_item_type == AMSModel::EXT_AMS) {
|
||||
dc.SetPen(wxPen(AMS_CONTROL_GRAY500));
|
||||
dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH));
|
||||
auto rect = wxRect((size.x - AMS_ITEM_CUBE_SIZE.x) / 2, (size.y - AMS_ITEM_CUBE_SIZE.y) / 2, AMS_ITEM_CUBE_SIZE.x, AMS_ITEM_CUBE_SIZE.y);
|
||||
dc.DrawRoundedRectangle(rect, FromDIP(4));
|
||||
auto rect = wxRect(((size.x - AMS_ITEM_CUBE_SIZE2.x) / 2), ((size.y - AMS_ITEM_CUBE_SIZE2.y) / 2), (AMS_ITEM_CUBE_SIZE2.x), (AMS_ITEM_CUBE_SIZE2.y));
|
||||
dc.DrawRoundedRectangle(rect, FromDIP(3));
|
||||
}
|
||||
}
|
||||
auto border_colour = AMS_CONTROL_BRAND_COLOUR;
|
||||
|
|
@ -2610,14 +2576,13 @@ void AMSPreview::doRender(wxDC &dc)
|
|||
}
|
||||
}
|
||||
|
||||
void AMSPreview::DoSetSize(int x, int y, int width, int height, int sizeFlags /*= wxSIZE_AUTO*/) { wxWindow::DoSetSize(x, y, width, height, sizeFlags); }
|
||||
void AMSPreview::msw_rescale() {
|
||||
void AMSPreview::msw_rescale()
|
||||
{
|
||||
m_ts_bitmap_cube = ScalableBitmap(this, "ts_bitmap_cube", 14);
|
||||
m_four_slot_bitmap = ScalableBitmap(this, "four_slot_ams_item", 26);
|
||||
m_single_slot_bitmap = ScalableBitmap(this, "single_slot_ams_item", 26);
|
||||
m_ext_bitmap = ScalableBitmap(this, "ext_ams_item", 26);
|
||||
|
||||
Layout();
|
||||
//m_four_slot_bitmap = ScalableBitmap(this, "four_slot_ams_item", 32);
|
||||
//m_single_slot_bitmap = ScalableBitmap(this, "single_slot_ams_item", 28);
|
||||
m_four_slot_bitmap.msw_rescale();
|
||||
m_single_slot_bitmap.msw_rescale();
|
||||
Refresh();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,8 @@ enum FilamentStepType {
|
|||
STEP_TYPE_VT_LOAD = 2,
|
||||
};
|
||||
|
||||
#define AMS_ITEM_CUBE_SIZE wxSize(FromDIP(8), FromDIP(14))
|
||||
#define AMS_ITEM_CUBE_SIZE wxSize(FromDIP(9), FromDIP(14))
|
||||
#define AMS_ITEM_CUBE_SIZE2 wxSize(FromDIP(6), FromDIP(12))
|
||||
#define AMS_PREVIEW_SIZE wxSize(FromDIP(82), FromDIP(27))
|
||||
#define AMS_ITEM_SIZE wxSize(FromDIP(78), FromDIP(184))
|
||||
#define AMS_PREV_FOUR_SIZE wxSize(FromDIP(52), FromDIP(32))
|
||||
|
|
@ -617,7 +618,6 @@ public:
|
|||
/*************************************************
|
||||
Description:AMSPreview
|
||||
**************************************************/
|
||||
|
||||
class AMSPreview : public wxWindow
|
||||
{
|
||||
public:
|
||||
|
|
@ -651,12 +651,10 @@ protected:
|
|||
ScalableBitmap m_ts_bitmap_cube;
|
||||
ScalableBitmap m_four_slot_bitmap;
|
||||
ScalableBitmap m_single_slot_bitmap;
|
||||
ScalableBitmap m_ext_bitmap;
|
||||
|
||||
void paintEvent(wxPaintEvent &evt);
|
||||
void render(wxDC &dc);
|
||||
void doRender(wxDC &dc);
|
||||
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue