juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:ams dialog

Browse Source 
Change-Id: Ia7f7849c13bc630114a0d703c0b5386e2e88349c
This commit is contained in:
liz.li
2022-08-02 10:45:43 +08:00
committed by Lane.Wei
parent 97ffa093c3
commit 55d59c7248
4 changed files with 106 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -464,16 +464,22 @@ void AMSLib::on_leave_window(wxMouseEvent &evt)
void AMSLib::on_left_down(wxMouseEvent &evt)
{
//dc.DrawBitmap(temp_bitmap, (size.x - m_bitmap_editable.GetSize().x) / 2, ( size.y - FromDIP(10) - temp_bitmap.GetSize().y) );
if (m_info.material_state != AMSCanType::AMS_CAN_TYPE_EMPTY && m_info.material_state != AMSCanType::AMS_CAN_TYPE_NONE &&
m_info.material_state == AMSCanType::AMS_CAN_TYPE_THIRDBRAND) {
auto size = GetSize();
auto pos = evt.GetPosition();
auto left = FromDIP(20);
auto top = (size.y - FromDIP(10) - m_bitmap_editable_lifht.GetBmpSize().y);
auto right = size.x - FromDIP(20);
auto bottom = size.y - FromDIP(10);
if (m_info.material_state != AMSCanType::AMS_CAN_TYPE_EMPTY && m_info.material_state != AMSCanType::AMS_CAN_TYPE_NONE) {
auto size = GetSize();
auto pos = evt.GetPosition();
if (m_info.material_state == AMSCanType::AMS_CAN_TYPE_THIRDBRAND) {
auto left = FromDIP(20);
auto top = (size.y - FromDIP(10) - m_bitmap_editable_lifht.GetBmpSize().y);
auto right = size.x - FromDIP(20);
auto bottom = size.y - FromDIP(10);
if (pos.x >= left && pos.x <= right && pos.y >= top && top <= bottom) { post_event(wxCommandEvent(EVT_AMS_ON_FILAMENT_EDIT)); }
if (pos.x >= left && pos.x <= right && pos.y >= top && top <= bottom) {
post_event(wxCommandEvent(EVT_AMS_ON_FILAMENT_EDIT));
}
}
if (m_info.material_state == AMSCanType::AMS_CAN_TYPE_BRAND) {
post_event(wxCommandEvent(EVT_AMS_ON_FILAMENT_EDIT));
}
}
}