juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix H2D AMS render

Browse Source
This commit is contained in:
Noisyfox
2025-05-25 16:45:31 +08:00
parent 67ccaa3f6c
commit 59c2a453ab
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -713,7 +713,7 @@ void AMSLib::on_left_down(wxMouseEvent &evt)
auto top = 0;
auto bottom = 0;
if (m_ams_model == AMSModel::GENERIC_AMS) {
if (m_ams_model == AMSModel::GENERIC_AMS || m_ams_model == AMSModel::N3F_AMS || m_ams_model == AMSModel::N3S_AMS || m_ams_model == AMSModel::EXT_AMS) {
top = (size.y - FromDIP(15) - m_bitmap_editable_light.GetBmpSize().y);
bottom = size.y - FromDIP(15);
}
@@ -766,12 +766,12 @@ void AMSLib::render(wxDC &dc)
#endif
// text
if (m_ams_model == AMSModel::GENERIC_AMS) {
render_generic_text(dc);
}
else if (m_ams_model == AMSModel::AMS_LITE) {
if (m_ams_model == AMSModel::AMS_LITE) {
render_lite_text(dc);
}
else{
render_generic_text(dc);
}
}
void AMSLib::render_lite_text(wxDC& dc)
@@ -983,12 +983,12 @@ void AMSLib::render_generic_text(wxDC &dc)
void AMSLib::doRender(wxDC &dc)
{
if (m_ams_model == AMSModel::GENERIC_AMS) {
render_generic_lib(dc);
}
else if (m_ams_model == AMSModel::AMS_LITE) {
if (m_ams_model == AMSModel::AMS_LITE) {
render_lite_lib(dc);
}
else {
render_generic_lib(dc);
}
}
void AMSLib::render_lite_lib(wxDC& dc)
@@ -2143,7 +2143,7 @@ void AmsItem::AddCan(Caninfo caninfo, int canindex, int maxcan, wxBoxSizer* size
auto m_panel_road = new AMSRoad(amscan, wxID_ANY, caninfo, canindex, maxcan, wxDefaultPosition, AMS_CAN_ROAD_SIZE);
if (m_ams_model == AMSModel::GENERIC_AMS) {
if (m_ams_model != AMSModel::AMS_LITE && m_ams_model != AMSModel::EXT_AMS) {
//m_sizer_ams->Add(0, 0, 0, wxEXPAND | wxTOP, FromDIP(2));
m_sizer_ams->Add(m_panel_refresh, 0, wxALIGN_CENTER_HORIZONTAL, 0);
//m_sizer_ams->Add(0, 0, 0, wxEXPAND | wxTOP, FromDIP(2));
@@ -2168,7 +2168,7 @@ void AmsItem::AddCan(Caninfo caninfo, int canindex, int maxcan, wxBoxSizer* size
amscan->Layout();
amscan->Fit();
if (m_ams_model == AMSModel::GENERIC_AMS) {
if (m_ams_model != AMSModel::AMS_LITE && m_ams_model != AMSModel::EXT_AMS) {
sizer->Add(amscan, 0, wxALL, 0);
}
else if (m_ams_model == AMSModel::AMS_LITE)