From: daid <daid303@gmail.com>
Date: Fri, 23 Mar 2012 13:04:50 +0000 (+0100)
Subject: Switch to GCode view when GCode is generated. Switch to model view when loading a... 
X-Git-Tag: RC1~22^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8567e7c2e078ff52ede4ad89c33044107505ab71;p=cura.git

Switch to GCode view when GCode is generated. Switch to model view when loading a new model. #27
---

diff --git a/SkeinPyPy/newui/mainWindow.py b/SkeinPyPy/newui/mainWindow.py
index 9d04138f..9c40d842 100644
--- a/SkeinPyPy/newui/mainWindow.py
+++ b/SkeinPyPy/newui/mainWindow.py
@@ -239,6 +239,7 @@ class mainWindow(configBase.configWindowBase):
 				return
 			self.lastPath = os.path.split(self.filename)[0]
 			self.preview3d.loadModelFile(self.filename)
+			self.preview3d.setViewMode("Model - Normal")
 		dlg.Destroy()
 	
 	def OnSlice(self, e):
diff --git a/SkeinPyPy/newui/preview3d.py b/SkeinPyPy/newui/preview3d.py
index 5607f9c1..f2a8e480 100644
--- a/SkeinPyPy/newui/preview3d.py
+++ b/SkeinPyPy/newui/preview3d.py
@@ -184,6 +184,11 @@ class previewPanel(wx.Panel):
 		self.moveModel()
 		self.glCanvas.Refresh()
 	
+	def setViewMode(self, mode):
+		self.viewSelect.SetValue(mode)
+		self.glCanvas.viewMode = self.viewSelect.GetValue()
+		wx.CallAfter(self.glCanvas.Refresh)
+	
 	def loadModelFile(self, filename):
 		if self.modelFilename != filename:
 			self.modelFileTime = None
@@ -203,8 +208,9 @@ class previewPanel(wx.Panel):
 	def loadReModelFile(self, filename):
 		#Only load this again if the filename matches the file we have already loaded (for auto loading GCode after slicing)
 		if self.modelFilename != filename:
-			return
+			return False
 		self.loadModelFile(filename)
+		return True
 	
 	def doFileLoadThread(self):
 		if os.path.isfile(self.modelFilename) and self.modelFileTime != os.stat(self.modelFilename).st_mtime:
diff --git a/SkeinPyPy/newui/sliceProgessPanel.py b/SkeinPyPy/newui/sliceProgessPanel.py
index 8d2a83e8..ddd35043 100644
--- a/SkeinPyPy/newui/sliceProgessPanel.py
+++ b/SkeinPyPy/newui/sliceProgessPanel.py
@@ -67,8 +67,7 @@ class sliceProgessPanel(wx.Panel):
 	
 	def OnShowGCode(self, e):
 		self.mainWindow.preview3d.loadModelFile(self.filename)
-		self.mainWindow.preview3d.viewSelect.SetValue("GCode")
-		self.mainWindow.preview3d.OnViewChange(None)
+		self.mainWindow.preview3d.setViewMode("GCode")
 	
 	def OnShowLog(self, e):
 		LogWindow('\n'.join(self.progressLog))
@@ -93,7 +92,8 @@ class sliceProgessPanel(wx.Panel):
 		self.sizer.Layout()
 		self.Layout()
 		self.abort = True
-		self.mainWindow.preview3d.loadReModelFile(self.filename)
+		if self.mainWindow.preview3d.loadReModelFile(self.filename):
+			self.mainWindow.preview3d.setViewMode("GCode")
 	
 	def SetProgress(self, stepName, layer, maxLayer):
 		if self.prevStep != stepName: