Add layer changing with keyboard when viewing GCode.

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 7f3311154f7ab1e45df6b5fac51e3ff47beddb48..623d31a390cdf738fa56a782c7605733b1756edd 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -634,6 +634,20 @@ class PreviewGLCanvas(openglGui.glGuiPanel):
                        self.zoom = 500
                self.Refresh()
 
+       def OnKeyChar(self, keycode):
+               if keycode == wx.WXK_UP:
+                       self.parent.layerSelect.setValue(self.parent.layerSelect.getValue() + 1)
+                       self.Refresh()
+               elif keycode == wx.WXK_DOWN:
+                       self.parent.layerSelect.setValue(self.parent.layerSelect.getValue() - 1)
+                       self.Refresh()
+               elif keycode == wx.WXK_PAGEUP:
+                       self.parent.layerSelect.setValue(self.parent.layerSelect.getValue() + 10)
+                       self.Refresh()
+               elif keycode == wx.WXK_PAGEDOWN:
+                       self.parent.layerSelect.setValue(self.parent.layerSelect.getValue() - 10)
+                       self.Refresh()
+
        def OnPaint(self,e):
                opengl.InitGL(self, self.view3D, self.zoom)
                if self.view3D:

diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py
index 3dccef6579d25c11f5f915654991f877dd4bd993..436fc49041a4709fc33cb9f8d17ee11ad86588d5 100644 (file)
--- a/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@ -120,13 +120,15 @@ class glGuiPanel(glcanvas.GLCanvas):
                wx.EVT_LEFT_DOWN(self, self._OnGuiMouseLeftDown)
                wx.EVT_LEFT_UP(self, self._OnGuiMouseLeftUp)
                wx.EVT_MOTION(self, self._OnGuiMouseMotion)
-               wx.EVT_CHAR(self, self.OnKeyChar)
+               wx.EVT_CHAR(self, self._OnGuiKeyChar)
                wx.EVT_KILL_FOCUS(self, self.OnFocusLost)
 
-       def OnKeyChar(self, e):
+       def _OnGuiKeyChar(self, e):
                if self._focus is not None:
                        self._focus.OnKeyChar(e.GetKeyCode())
                        self.Refresh()
+               else:
+                       self.OnKeyChar(e.GetKeyCode())
 
        def OnFocusLost(self, e):
                self._focus = None
@@ -241,6 +243,8 @@ class glGuiPanel(glcanvas.GLCanvas):
                pass
        def OnPaint(self, e):
                pass
+       def OnKeyChar(self, keycode):
+               pass
 
        def add(self, ctrl):
                if self._container is not None: