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

Revert "#9483 - Added keyboard shortcut CTRL+D to toggle the visibility of the printbed reference axes"

Browse source 
This reverts commit f038eca52c. We will only use the axes that automatically
scale, without the option to turn the rendering off.
This commit is contained in:
Lukas Matena 2023-03-27 15:46:06 +02:00
parent 451097bcac
commit fd457fb40b
3 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -1572,7 +1572,6 @@ void GLCanvas3D::render()
_render_objects(GLVolumeCollection::ERenderType::Opaque); _render_objects(GLVolumeCollection::ERenderType::Opaque);
_render_sla_slices(); _render_sla_slices();
_render_selection(); _render_selection();
if (m_show_bed_axes)
_render_bed_axes(); _render_bed_axes();
if (is_looking_downward) if (is_looking_downward)
_render_bed(camera.get_view_matrix(), camera.get_projection_matrix(), false); _render_bed(camera.get_view_matrix(), camera.get_projection_matrix(), false);
@ -2351,15 +2350,6 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
#endif /* __APPLE__ */ #endif /* __APPLE__ */
post_event(SimpleEvent(EVT_GLTOOLBAR_COPY)); post_event(SimpleEvent(EVT_GLTOOLBAR_COPY));
break; break;
#ifdef __APPLE__
case 'd':
case 'D':
#else /* __APPLE__ */
case WXK_CONTROL_D:
#endif /* __APPLE__ */
m_show_bed_axes = !m_show_bed_axes;
m_dirty = true;
break;
#ifdef __APPLE__ #ifdef __APPLE__
case 'f': case 'f':
case 'F': case 'F':

1
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -522,7 +522,6 @@ private:
ECursorType m_cursor_type; ECursorType m_cursor_type;
GLSelectionRectangle m_rectangle_selection; GLSelectionRectangle m_rectangle_selection;
std::vector<int> m_hover_volume_idxs; std::vector<int> m_hover_volume_idxs;
bool m_show_bed_axes{ true };
// Following variable is obsolete and it should be safe to remove it. // Following variable is obsolete and it should be safe to remove it.
// I just don't want to do it now before a release (Lukas Matena 24.3.2019) // I just don't want to do it now before a release (Lukas Matena 24.3.2019)

2
src/slic3r/GUI/KBShortcutsDialog.cpp
View file

@ -151,7 +151,6 @@ void KBShortcutsDialog::fill_shortcuts()
{ L("Arrow Right"), L("Move selection 10 mm in positive X direction") }, { L("Arrow Right"), L("Move selection 10 mm in positive X direction") },
{ std::string("Shift+") + L("Any arrow"), L("Movement step set to 1 mm") }, { std::string("Shift+") + L("Any arrow"), L("Movement step set to 1 mm") },
{ ctrl + L("Any arrow"), L("Movement in camera space") }, { ctrl + L("Any arrow"), L("Movement in camera space") },
{ ctrl + "D", L("Show/hide reference axes") },
{ L("Page Up"), L("Rotate selection 45 degrees CCW") }, { L("Page Up"), L("Rotate selection 45 degrees CCW") },
{ L("Page Down"), L("Rotate selection 45 degrees CW") }, { L("Page Down"), L("Rotate selection 45 degrees CW") },
{ "M", L("Gizmo move") }, { "M", L("Gizmo move") },
@ -232,7 +231,6 @@ void KBShortcutsDialog::fill_shortcuts()
{ "X", L("On/Off one layer mode of the vertical slider") }, { "X", L("On/Off one layer mode of the vertical slider") },
{ "L", L("Show/Hide legend") }, { "L", L("Show/Hide legend") },
{ "C", L("Show/Hide G-code window") }, { "C", L("Show/Hide G-code window") },
{ ctrl + "D", L("Show/hide reference axes") },
}; };
m_full_shortcuts.push_back({ { _L("Preview"), "" }, preview_shortcuts }); m_full_shortcuts.push_back({ { _L("Preview"), "" }, preview_shortcuts });