From: daid303 Date: Fri, 12 Apr 2013 17:08:30 +0000 (+0200) Subject: Add layer changing with keyboard when viewing GCode. X-Git-Tag: 13.05~64^2~4 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=424802f1d0ce5c88526a04a17d2cf97529a9b8cb;p=cura.git Add layer changing with keyboard when viewing GCode. --- diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py index 7f331115..623d31a3 100644 --- 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 3dccef65..436fc490 100644 --- 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: