FIX:add exit_gizmo before slice model
jira: STUDIO-5531 Change-Id: Icddc9d73b3d91bb68e9768d13e48cbae0680e58e
This commit is contained in:
parent
9b9cf5f912
commit
b02661e85f
|
@ -2148,6 +2148,13 @@ void GLCanvas3D::deselect_all()
|
|||
post_event(SimpleEvent(EVT_GLCANVAS_OBJECT_SELECT));
|
||||
}
|
||||
|
||||
void GLCanvas3D::exit_gizmo() {
|
||||
if (m_gizmos.get_current_type() != GLGizmosManager::Undefined) {
|
||||
m_gizmos.reset_all_states();
|
||||
m_gizmos.update_data();
|
||||
}
|
||||
}
|
||||
|
||||
void GLCanvas3D::set_selected_visible(bool visible)
|
||||
{
|
||||
for (unsigned int i : m_selection.get_volume_idxs()) {
|
||||
|
|
|
@ -872,6 +872,7 @@ public:
|
|||
|
||||
void select_all();
|
||||
void deselect_all();
|
||||
void exit_gizmo();
|
||||
void set_selected_visible(bool visible);
|
||||
void delete_selected();
|
||||
void ensure_on_bed(unsigned int object_idx, bool allow_negative_z);
|
||||
|
|
|
@ -149,6 +149,12 @@ void View3D::deselect_all()
|
|||
m_canvas->deselect_all();
|
||||
}
|
||||
|
||||
void View3D::exit_gizmo()
|
||||
{
|
||||
if (m_canvas != nullptr)
|
||||
m_canvas->exit_gizmo();
|
||||
}
|
||||
|
||||
void View3D::delete_selected()
|
||||
{
|
||||
if (m_canvas != nullptr)
|
||||
|
|
|
@ -63,6 +63,7 @@ public:
|
|||
|
||||
void select_all();
|
||||
void deselect_all();
|
||||
void exit_gizmo();
|
||||
void delete_selected();
|
||||
void center_selected();
|
||||
void center_selected_plate(const int plate_idx);
|
||||
|
|
|
@ -1600,6 +1600,7 @@ wxBoxSizer* MainFrame::create_side_tools()
|
|||
m_slice_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event)
|
||||
{
|
||||
//this->m_plater->select_view_3D("Preview");
|
||||
m_plater->exit_gizmo();
|
||||
m_plater->update(true, true);
|
||||
if (m_slice_select == eSliceAll)
|
||||
wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SLICE_ALL));
|
||||
|
|
|
@ -2438,6 +2438,7 @@ struct Plater::priv
|
|||
|
||||
void select_all();
|
||||
void deselect_all();
|
||||
void exit_gizmo();
|
||||
void remove(size_t obj_idx);
|
||||
bool delete_object_from_model(size_t obj_idx, bool refresh_immediately = true); //BBS
|
||||
void delete_all_objects_from_model();
|
||||
|
@ -4719,6 +4720,11 @@ void Plater::priv::deselect_all()
|
|||
view3D->deselect_all();
|
||||
}
|
||||
|
||||
void Plater::priv::exit_gizmo()
|
||||
{
|
||||
view3D->exit_gizmo();
|
||||
}
|
||||
|
||||
void Plater::priv::remove(size_t obj_idx)
|
||||
{
|
||||
if (view3D->is_layers_editing_enabled())
|
||||
|
@ -10602,6 +10608,7 @@ void Plater::remove_curr_plate_all() { p->remove_curr_plate_all(); }
|
|||
|
||||
void Plater::select_all() { p->select_all(); }
|
||||
void Plater::deselect_all() { p->deselect_all(); }
|
||||
void Plater::exit_gizmo() { p->exit_gizmo(); }
|
||||
|
||||
void Plater::remove(size_t obj_idx) { p->remove(obj_idx); }
|
||||
void Plater::reset(bool apply_presets_change) { p->reset(apply_presets_change); }
|
||||
|
|
|
@ -324,6 +324,7 @@ public:
|
|||
|
||||
void select_all();
|
||||
void deselect_all();
|
||||
void exit_gizmo();
|
||||
void remove(size_t obj_idx);
|
||||
void reset(bool apply_presets_change = false);
|
||||
void reset_with_confirm();
|
||||
|
|
Loading…
Reference in New Issue