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

FIX: Mapping UI display 

jira: STUDIO-7473, 7817

Change-Id: Ibd014985b3b4997bd86700537e1d8a7d0d18176f
This commit is contained in:
hang.xu 2024-08-08 10:41:43 +08:00 committed by lane.wei
parent 0716b8518e
commit 66701cc4c9
3 changed files with 18 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/images/transparent_material_item.svg
View File

@ -1,4 +1,4 @@
<svg width="62" height="32" viewBox="0 0 62 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<svg width="62" height="60" viewBox="0 0 62 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_10955_38884)">
<path d="M0 0H62V32H0V0Z" fill="#FEFFFE"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0V4H3V8H0V12H3V16H0V20H3V24H0V28H3V32H7V28H11V32H15V28H19V32H23V28H27V32H31V28H35V32H39V28H43V32H47V28H51V32H55V28H59V32H62V28H59V24H62V20H59V16H62V12H59V8H62V4H59V0H55V4H51V0H47V4H43V0H39V4H35V0H31V4H27V0H23V4H19V0H15V4H11V0H7V4H3V0H0ZM7 8V4H11V8H7ZM7 12V8H3V12H7ZM11 12V8H15V12H11ZM11 16V12H7V16H3V20H7V24H3V28H7V24H11V28H15V24H19V28H23V24H27V28H31V24H35V28H39V24H43V28H47V24H51V28H55V24H59V20H55V16H59V12H55V8H59V4H55V8H51V4H47V8H43V4H39V8H35V4H31V8H27V4H23V8H19V4H15V8H19V12H15V16H11ZM11 20V24H15V20H19V24H23V20H27V24H31V20H35V24H39V20H43V24H47V20H51V24H55V20H51V16H55V12H51V8H47V12H43V8H39V12H35V8H31V12H27V8H23V12H19V16H15V20H11ZM23 16V12H27V16H23ZM31 16V12H35V16H31ZM39 16V12H43V16H39ZM47 16V20H43V16H47ZM39 16V20H35V16H39ZM31 16V20H27V16H31ZM23 16V20H19V16H23ZM47 16H51V12H47V16ZM11 20H7V16H11V20Z" fill="#D9D9D9"/>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

55
src/slic3r/GUI/AmsMappingPopup.cpp
View File

@ -29,11 +29,11 @@ wxDEFINE_EVENT(EVT_SET_FINISH_MAPPING, wxCommandEvent);
MaterialItem::MaterialItem(wxWindow *parent, wxColour mcolour, wxString mname)
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
{
m_arraw_bitmap_gray = ScalableBitmap(this, "drop_down", FromDIP(12));
m_arraw_bitmap_white = ScalableBitmap(this, "topbar_dropdown", FromDIP(12));
m_transparent_mitem = ScalableBitmap(this, "transparent_material_item", FromDIP(32));
m_arraw_bitmap_gray = ScalableBitmap(this, "drop_down", 12);
m_arraw_bitmap_white = ScalableBitmap(this, "topbar_dropdown", 12);
m_transparent_mitem = ScalableBitmap(this, "transparent_material_item", 52);
//m_ams_wheel_mitem = ScalableBitmap(this, "ams_wheel", FromDIP(25));
m_ams_wheel_mitem = ScalableBitmap(this, "ams_wheel_narrow", FromDIP(25));
m_ams_wheel_mitem = ScalableBitmap(this, "ams_wheel_narrow", 25);
m_material_coloul = mcolour;
m_material_name = mname;
@ -206,15 +206,15 @@ void MaterialItem::doRender(wxDC& dc)
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(wxBrush(mcolor));
dc.DrawRectangle(0, FromDIP(10), MATERIAL_ITEM_SIZE.x, FromDIP(11));
dc.DrawRectangle(0, FromDIP(10), MATERIAL_ITEM_SIZE.x, FromDIP(10));
dc.SetPen(wxColour(0xAC, 0xAC, 0xAC));
dc.DrawLine(FromDIP(1), FromDIP(20), FromDIP(MATERIAL_ITEM_SIZE.x), FromDIP(20));
//bottom rectangle in wheel bitmap, size is MATERIAL_REC_WHEEL_SIZE(22)
int left = FromDIP((size.x / 2 - MATERIAL_REC_WHEEL_SIZE.x) / 2) + 3;
int up = FromDIP((20 + (30 - MATERIAL_REC_WHEEL_SIZE.y) / 2));
int right = FromDIP(left + MATERIAL_REC_WHEEL_SIZE.x);
auto left = (size.x / 2 - MATERIAL_REC_WHEEL_SIZE.x) / 2 + FromDIP(3);
auto up = (size.y * 0.4 + (size.y * 0.6 - MATERIAL_REC_WHEEL_SIZE.y) / 2);
auto right = left + MATERIAL_REC_WHEEL_SIZE.x;
dc.SetPen(*wxTRANSPARENT_PEN);
//bottom
if (m_ams_cols.size() > 1) {
@ -239,14 +239,12 @@ void MaterialItem::doRender(wxDC& dc)
dc.DrawRoundedRectangle(x, up, ((float)MATERIAL_REC_WHEEL_SIZE.x) / cols_size, MATERIAL_REC_WHEEL_SIZE.y, 3);
}
}
}
}
else {
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(wxBrush(wxColour(acolor)));
dc.DrawRectangle(FromDIP((size.x / 2 - MATERIAL_REC_WHEEL_SIZE.x) / 2) + 3, up, FromDIP(MATERIAL_REC_WHEEL_SIZE.x), FromDIP(MATERIAL_REC_WHEEL_SIZE.y));
dc.DrawRectangle((size.x / 2 - MATERIAL_REC_WHEEL_SIZE.x) / 2 + FromDIP(3), up, MATERIAL_REC_WHEEL_SIZE.x, MATERIAL_REC_WHEEL_SIZE.y);
}
@ -284,7 +282,7 @@ void MaterialItem::doRender(wxDC& dc)
//wheel
dc.DrawBitmap(m_ams_wheel_mitem.bmp(), (GetSize().x / 2 - m_ams_wheel_mitem.GetBmpSize().x) / 2 + 3, ((float)GetSize().y * 3 / 5 - m_ams_wheel_mitem.GetBmpSize().y) / 2 + (float)GetSize().y * 2 / 5);
dc.DrawBitmap(m_ams_wheel_mitem.bmp(), (GetSize().x / 2 - m_ams_wheel_mitem.GetBmpSize().x) / 2 + FromDIP(3), ((float)GetSize().y * 0.6 - m_ams_wheel_mitem.GetBmpSize().y) / 2 + (float)GetSize().y * 0.4);
}
AmsMapingPopup::AmsMapingPopup(wxWindow *parent)
@ -353,32 +351,7 @@ AmsMapingPopup::AmsMapingPopup(wxWindow *parent)
m_right_extra_slot->SetMinSize(wxSize(FromDIP(48), FromDIP(60)));
m_right_extra_slot->SetMaxSize(wxSize(FromDIP(48), FromDIP(60)));
m_sizer_split_ams_left = new wxBoxSizer(wxHORIZONTAL);
auto ams_title_text = new Label(parent, _L("Left Ams"));
ams_title_text->SetFont(::Label::Body_13);
ams_title_text->SetForegroundColour(0x909090);
auto m_split_left_line = new wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
m_split_left_line->SetBackgroundColour(0xeeeeee);
m_split_left_line->SetMinSize(wxSize(-1, 1));
m_split_left_line->SetMaxSize(wxSize(-1, 1));
m_sizer_split_ams_left->Add(0, 0, 0, wxEXPAND, 0);
m_sizer_split_ams_left->Add(ams_title_text, 0, wxALIGN_CENTER, 0);
m_sizer_split_ams_left->Add(m_split_left_line, 1, wxALIGN_CENTER_VERTICAL, 0);
m_sizer_ams_left->Add(m_sizer_split_ams_left, 0, wxEXPAND, 0);
m_sizer_split_ams_right = new wxBoxSizer(wxHORIZONTAL);
ams_title_text = new Label(parent, _L("Right Ams"));
ams_title_text->SetFont(::Label::Body_13);
ams_title_text->SetForegroundColour(0x909090);
auto m_split_right_line = new wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
m_split_right_line->SetBackgroundColour(0xeeeeee);
m_split_right_line->SetMinSize(wxSize(-1, 1));
m_split_right_line->SetMaxSize(wxSize(-1, 1));
m_sizer_split_ams_right->Add(0, 0, 0, wxEXPAND, 0);
m_sizer_split_ams_right->Add(ams_title_text, 0, wxALIGN_CENTER, 0);
m_sizer_split_ams_right->Add(m_split_left_line, 1, wxALIGN_CENTER_VERTICAL, 0);
m_sizer_ams_right->Add(m_sizer_split_ams_right, 0, wxEXPAND, 0);
m_sizer_ams_left->Add(create_split_sizer(m_left_marea_panel, _L("Left Ams")), 0, wxEXPAND, 0);
m_sizer_ams_left->Add(m_sizer_ams_basket_left, 0, wxEXPAND|wxTOP, FromDIP(8));
m_sizer_ams_left->Add(create_split_sizer(m_left_marea_panel, _L("External")), 0, wxEXPAND|wxTOP, FromDIP(8));
//m_sizer_ams_left->Add(m_left_extra_slot, 0, wxEXPAND|wxTOP, FromDIP(8));
@ -396,7 +369,7 @@ AmsMapingPopup::AmsMapingPopup(wxWindow *parent)
//m_sizer_ams->Add(m_left_marea_panel, 0, wxEXPAND, FromDIP(0));
m_sizer_ams->Add(m_left_marea_panel, 0, wxRIGHT, FromDIP(10));
m_sizer_ams->Add(0, 0, 0, wxEXPAND, FromDIP(15));
m_sizer_ams->Add(m_right_marea_panel, 0, wxEXPAND, FromDIP(0));
m_sizer_ams->Add(m_right_marea_panel, 1, wxEXPAND, FromDIP(0));
m_warning_text = new wxStaticText(this, wxID_ANY, wxEmptyString);
@ -438,7 +411,7 @@ AmsMapingPopup::AmsMapingPopup(wxWindow *parent)
m_split_left_line->SetMaxSize(wxSize(-1, 1));
sizer_split_ams->Add(0, 0, 0, wxEXPAND, 0);
sizer_split_ams->Add(ams_title_text, 0, wxALIGN_CENTER, 0);
sizer_split_ams->Add(m_split_left_line, 1, wxALIGN_CENTER_VERTICAL, 0);
sizer_split_ams->Add(m_split_left_line, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND, 0);
return sizer_split_ams;
}
@ -578,13 +551,11 @@ void AmsMapingPopup::update(MachineObject* obj)
}
if (m_show_type == ShowType::LEFT)
{
m_sizer_split_ams_left->Show(false);
m_left_marea_panel->Show();
m_left_extra_slot->Show();
}
else if (m_show_type == ShowType::RIGHT)
{
m_sizer_split_ams_right->Show(false);
m_right_marea_panel->Show();
m_right_extra_slot->Show();
}

6
src/slic3r/GUI/SelectMachine.cpp
View File

@ -4092,8 +4092,10 @@ void SelectMachineDialog::on_dpi_changed(const wxRect &suggested_rect)
weightimg->SetBitmap(print_weight->bmp());
rename_editable->msw_rescale();
rename_editable_light->msw_rescale();
ams_mapping_help_icon->msw_rescale();
img_amsmapping_tip->SetBitmap(ams_mapping_help_icon->bmp());
if (ams_mapping_help_icon != nullptr) {
ams_mapping_help_icon->msw_rescale();
if (img_amsmapping_tip)img_amsmapping_tip->SetBitmap(ams_mapping_help_icon->bmp());
}
enable_ams->msw_rescale();
img_use_ams_tip->SetBitmap(enable_ams->bmp());