3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Follow-up of 8453c88482, c09091c407 and 9d55121695 -> Use key down event in place of key up event

Browse source
This commit is contained in:
Enrico Turri 2020-02-03 16:05:13 +01:00
parent f09bed32b6
commit e042cab8fa
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
View file

@ -776,6 +776,18 @@ bool GLGizmosManager::on_key(wxKeyEvent& evt)
processed = true; processed = true;
} }
} }
// if (processed)
// m_parent.set_cursor(GLCanvas3D::Standard);
}
else if (evt.GetEventType() == wxEVT_KEY_DOWN)
{
if ((m_current == SlaSupports) && ((keyCode == WXK_SHIFT) || (keyCode == WXK_ALT))
&& dynamic_cast<GLGizmoSlaSupports*>(get_current())->is_in_editing_mode())
{
// m_parent.set_cursor(GLCanvas3D::Cross);
processed = true;
}
else if (m_current == Move) else if (m_current == Move)
{ {
auto do_move = [this, &processed](const Vec3d& displacement) { auto do_move = [this, &processed](const Vec3d& displacement) {
@ -784,7 +796,6 @@ bool GLGizmosManager::on_key(wxKeyEvent& evt)
selection.translate(displacement); selection.translate(displacement);
wxGetApp().obj_manipul()->set_dirty(); wxGetApp().obj_manipul()->set_dirty();
m_parent.do_move(L("Gizmo-Move")); m_parent.do_move(L("Gizmo-Move"));
m_parent.set_as_dirty();
processed = true; processed = true;
}; };
@ -805,16 +816,13 @@ bool GLGizmosManager::on_key(wxKeyEvent& evt)
selection.rotate(rotation, TransformationType(TransformationType::World_Relative_Joint)); selection.rotate(rotation, TransformationType(TransformationType::World_Relative_Joint));
wxGetApp().obj_manipul()->set_dirty(); wxGetApp().obj_manipul()->set_dirty();
m_parent.do_rotate(L("Gizmo-Rotate")); m_parent.do_rotate(L("Gizmo-Rotate"));
m_parent.set_as_dirty();
processed = true; processed = true;
}; };
switch (keyCode) switch (keyCode)
{ {
case WXK_NUMPAD_LEFT: case WXK_LEFT: { do_rotate(Vec3d(0.0, 0.0, 0.5 * M_PI)); break; } case WXK_NUMPAD_LEFT: case WXK_LEFT: { do_rotate(Vec3d(0.0, 0.0, 0.25 * M_PI)); break; }
case WXK_NUMPAD_RIGHT: case WXK_RIGHT: { do_rotate(-Vec3d(0.0, 0.0, 0.5 * M_PI)); break; } case WXK_NUMPAD_RIGHT: case WXK_RIGHT: { do_rotate(-Vec3d(0.0, 0.0, 0.25 * M_PI)); break; }
case WXK_NUMPAD_UP: case WXK_UP: { do_rotate(Vec3d(0.0, 0.0, 0.25 * M_PI)); break; }
case WXK_NUMPAD_DOWN: case WXK_DOWN: { do_rotate(-Vec3d(0.0, 0.0, 0.25 * M_PI)); break; }
default: { break; } default: { break; }
} }
} }
@ -823,7 +831,6 @@ bool GLGizmosManager::on_key(wxKeyEvent& evt)
auto do_move = [this, &processed](double delta_z) { auto do_move = [this, &processed](double delta_z) {
GLGizmoCut* cut = dynamic_cast<GLGizmoCut*>(get_current()); GLGizmoCut* cut = dynamic_cast<GLGizmoCut*>(get_current());
cut->set_cut_z(delta_z + cut->get_cut_z()); cut->set_cut_z(delta_z + cut->get_cut_z());
m_parent.set_as_dirty();
processed = true; processed = true;
}; };
@ -834,18 +841,6 @@ bool GLGizmosManager::on_key(wxKeyEvent& evt)
default: { break; } default: { break; }
} }
} }
// if (processed)
// m_parent.set_cursor(GLCanvas3D::Standard);
}
else if (evt.GetEventType() == wxEVT_KEY_DOWN)
{
if ((m_current == SlaSupports) && ((keyCode == WXK_SHIFT) || (keyCode == WXK_ALT))
&& dynamic_cast<GLGizmoSlaSupports*>(get_current())->is_in_editing_mode())
{
// m_parent.set_cursor(GLCanvas3D::Cross);
processed = true;
}
} }
if (processed) if (processed)