From be912aa84ac930b81a52687a3f536e96af454ec1 Mon Sep 17 00:00:00 2001 From: tao wang Date: Thu, 16 Jan 2025 17:20:46 +0800 Subject: [PATCH] ENH:not allowed to map to empty slots jira:[STUDIO-9901] Change-Id: I98e2ad72b957bd6c42f6baa765a181aebaf81f1a --- src/slic3r/GUI/AmsMappingPopup.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index d9ea9e2f0..8e994e461 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -406,6 +406,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 (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); Dismiss(); } @@ -610,6 +611,7 @@ void AmsMapingPopup::add_ams_mapping(std::vector tray_data, wxWindow* if (tray_data[i].type == EMPTY) { m_mapping_item->set_data(wxColour(0xCE, 0xCE, 0xCE), "-", tray_data[i]); 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); Dismiss(); });