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

ENH: change alt behavior for part selection 

1. Alt is no long for object/part delection
2. Alt is defined to select part in View3D

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: If0f14f79a321be2d0320a841e15dc973715364ea
(cherry picked from commit 9c092f2d20b89470202df037180425b2ecb8ef82)
This commit is contained in:
yifan.wu 2022-07-28 23:05:46 +08:00 committed by Lane.Wei
parent 7a5bca3c30
commit d14e5c9d59
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -3180,7 +3180,9 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
return; return;
} }
if (evt.LeftDown() && (evt.ShiftDown() || evt.AltDown()) && m_picking_enabled) { // BBS: define Alt key to enable volume selection mode
m_selection.set_volume_selection_mode(evt.AltDown() ? Selection::Volume : Selection::Instance);
if (evt.LeftDown() && evt.ShiftDown() && m_picking_enabled) {
if (m_gizmos.get_current_type() != GLGizmosManager::SlaSupports if (m_gizmos.get_current_type() != GLGizmosManager::SlaSupports
&& m_gizmos.get_current_type() != GLGizmosManager::FdmSupports && m_gizmos.get_current_type() != GLGizmosManager::FdmSupports
&& m_gizmos.get_current_type() != GLGizmosManager::Seam && m_gizmos.get_current_type() != GLGizmosManager::Seam

1
src/slic3r/GUI/GUI_Preview.cpp
View File

@ -766,6 +766,7 @@ bool AssembleView::init(wxWindow* parent, Bed3D& bed, Model* model, DynamicPrint
// BBS: set volume_selection_mode to Volume // BBS: set volume_selection_mode to Volume
m_canvas->get_selection().set_volume_selection_mode(Selection::Volume); m_canvas->get_selection().set_volume_selection_mode(Selection::Volume);
m_canvas->get_selection().lock_volume_selection_mode();
wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL);
main_sizer->Add(m_canvas_widget, 1, wxALL | wxEXPAND, 0); main_sizer->Add(m_canvas_widget, 1, wxALL | wxEXPAND, 0);

6
src/slic3r/GUI/Selection.hpp
View File

@ -226,6 +226,7 @@ private:
// BBS // BBS
EMode m_volume_selection_mode{ Instance }; EMode m_volume_selection_mode{ Instance };
bool m_volume_selection_locked { false };
public: public:
Selection(); Selection();
@ -343,7 +344,10 @@ public:
void translate(unsigned int object_idx, unsigned int instance_idx, const Vec3d& displacement); void translate(unsigned int object_idx, unsigned int instance_idx, const Vec3d& displacement);
//BBS: add partplate related logic //BBS: add partplate related logic
void notify_instance_update(int object_idx, int instance_idx); void notify_instance_update(int object_idx, int instance_idx);
void set_volume_selection_mode(EMode mode) { m_volume_selection_mode = mode; } // BBS
void set_volume_selection_mode(EMode mode) { if (!m_volume_selection_locked) m_volume_selection_mode = mode; }
void lock_volume_selection_mode() { m_volume_selection_locked = true; }
void unlock_volume_selection_mode() { m_volume_selection_locked = false; }
void erase(); void erase();