juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:not allowed to map to empty slots

Browse Source 
jira:[STUDIO-9901]

Change-Id: I98e2ad72b957bd6c42f6baa765a181aebaf81f1a
(cherry picked from commit be912aa84ac930b81a52687a3f536e96af454ec1)
This commit is contained in:
tao wang
2025-01-16 17:20:46 +08:00
committed by Noisyfox
parent 62a85019d3
commit 780d547727
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -807,6 +807,7 @@ void AmsMapingPopup::on_left_down(wxMouseEvent &evt)
if (pos.x > p_rect.x && pos.y > p_rect.y && pos.x < (p_rect.x + item->GetSize().x) && pos.y < (p_rect.y + item->GetSize().y)) { if (pos.x > p_rect.x && pos.y > p_rect.y && pos.x < (p_rect.x + item->GetSize().x) && pos.y < (p_rect.y + item->GetSize().y)) {
if (item->m_tray_data.type == TrayType::NORMAL && !is_match_material(item->m_tray_data.filament_type)) return; if (item->m_tray_data.type == TrayType::NORMAL && !is_match_material(item->m_tray_data.filament_type)) return;
if (item->m_tray_data.type == TrayType::EMPTY) return;
item->send_event(m_current_filament_id); item->send_event(m_current_filament_id);
Dismiss(); Dismiss();
} }
@@ -1250,6 +1251,7 @@ void AmsMapingPopup::add_ams_mapping(std::vector<TrayData> tray_data, bool remai
if (tray_data[i].type == EMPTY) { if (tray_data[i].type == EMPTY) {
m_mapping_item->set_data(wxColour(0xCE, 0xCE, 0xCE), "-", remain_detect_flag, tray_data[i]); m_mapping_item->set_data(wxColour(0xCE, 0xCE, 0xCE), "-", remain_detect_flag, tray_data[i]);
m_mapping_item->Bind(wxEVT_LEFT_DOWN, [this, tray_data, i, m_mapping_item](wxMouseEvent &e) { m_mapping_item->Bind(wxEVT_LEFT_DOWN, [this, tray_data, i, m_mapping_item](wxMouseEvent &e) {
return; //not allowed to map to empty slots
m_mapping_item->send_event(m_current_filament_id); m_mapping_item->send_event(m_current_filament_id);
Dismiss(); Dismiss();
}); });