From: daid303 <daid303@gmail.com>
Date: Wed, 17 Apr 2013 07:06:42 +0000 (+0200)
Subject: Add keyboard control to gcode layer switching.
X-Git-Tag: 13.05~87
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=53647bc5989a6a550be714fb0bc894fdb5745505;p=cura.git

Add keyboard control to gcode layer switching.
---

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index ba2afe66..c50b6091 100644
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -187,6 +187,9 @@ class SceneView(openglGui.glGuiPanel):
 	def OnViewChange(self):
 		if self.viewSelection.getValue() == 1:
 			self.viewMode = 'gcode'
+			if self._gcode is not None:
+				self.layerSelect.setRange(1, len(self._gcode.layerList) - 1)
+				self.layerSelect.setValue(len(self._gcode.layerList) - 1)
 			self._selectObject(None)
 		else:
 			self.viewMode = 'normal'
@@ -383,6 +386,18 @@ class SceneView(openglGui.glGuiPanel):
 			if self._selectedObj is not None:
 				self._deleteObject(self._selectedObj)
 				self.QueueRefresh()
+		if keyCode == wx.WXK_UP:
+			self.layerSelect.setValue(self.layerSelect.getValue() + 1)
+			self.QueueRefresh()
+		elif keyCode == wx.WXK_DOWN:
+			self.layerSelect.setValue(self.layerSelect.getValue() - 1)
+			self.QueueRefresh()
+		elif keyCode == wx.WXK_PAGEUP:
+			self.layerSelect.setValue(self.layerSelect.getValue() + 10)
+			self.QueueRefresh()
+		elif keyCode == wx.WXK_PAGEDOWN:
+			self.layerSelect.setValue(self.layerSelect.getValue() - 10)
+			self.QueueRefresh()
 
 		if keyCode == wx.WXK_F3 and wx.GetKeyState(wx.WXK_SHIFT):
 			shaderEditor(self, self.ShaderUpdate, self._objectLoadShader.getVertexShader(), self._objectLoadShader.getFragmentShader())
diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index c967ca6b..6dd73514 100644
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -39,7 +39,10 @@ class Slicer(object):
 
 	def abortSlicer(self):
 		if self._process is not None:
-			self._process.terminate()
+			try:
+				self._process.terminate()
+			except:
+				pass
 			self._thread.join()
 
 	def getGCodeFilename(self):