Switch to GCode view when GCode is generated. Switch to model view when loading a...

diff --git a/SkeinPyPy/newui/mainWindow.py b/SkeinPyPy/newui/mainWindow.py
index 9d04138f250c694a239f897c92a8086b23de60f6..9c40d842e6d24d35e93f259d8fcf3a6b731caca2 100644 (file)
--- 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 5607f9c129958c6e78b92fcbe999bb7791ed5084..f2a8e480eb8eed280d3549320d4b5fdff1070eda 100644 (file)
--- a/SkeinPyPy/newui/preview3d.py
+++ b/SkeinPyPy/newui/preview3d.py
@@ -184,6 +184,11 @@ class previewPanel(wx.Panel):
                self.moveModel()\r
                self.glCanvas.Refresh()\r
        \r
+       def setViewMode(self, mode):\r
+               self.viewSelect.SetValue(mode)\r
+               self.glCanvas.viewMode = self.viewSelect.GetValue()\r
+               wx.CallAfter(self.glCanvas.Refresh)\r
+       \r
        def loadModelFile(self, filename):\r
                if self.modelFilename != filename:\r
                        self.modelFileTime = None\r
@@ -203,8 +208,9 @@ class previewPanel(wx.Panel):
        def loadReModelFile(self, filename):\r
                #Only load this again if the filename matches the file we have already loaded (for auto loading GCode after slicing)\r
                if self.modelFilename != filename:\r
-                       return\r
+                       return False\r
                self.loadModelFile(filename)\r
+               return True\r
        \r
        def doFileLoadThread(self):\r
                if os.path.isfile(self.modelFilename) and self.modelFileTime != os.stat(self.modelFilename).st_mtime:\r

diff --git a/SkeinPyPy/newui/sliceProgessPanel.py b/SkeinPyPy/newui/sliceProgessPanel.py
index 8d2a83e85e7e6f5c0991f58959a0dd03db9c0cdd..ddd35043cc3f2582664059a10bdd1878a67e5ae4 100644 (file)
--- 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: