Load GCode file after slicing if we still have the same model loaded

diff --git a/SkeinPyPy/newui/preview3d.py b/SkeinPyPy/newui/preview3d.py
index dc663b69a14461dadee185c47436ae4dfac69a33..040579a72e2a1b4126bf436fd3ba380fa355ca3b 100644 (file)
--- a/SkeinPyPy/newui/preview3d.py
+++ b/SkeinPyPy/newui/preview3d.py
@@ -102,8 +102,13 @@ class previewPanel(wx.Panel):
                self.gcodeFilename = filename[: filename.rfind('.')] + "_export.gcode"\r
                self.logFilename = filename[: filename.rfind('.')] + "_export.log"\r
                #Do the STL file loading in a background thread so we don't block the UI.\r
-               thread = threading.Thread(target=self.doFileLoad)\r
-               thread.start()\r
+               threading.Thread(target=self.doFileLoad).start()\r
+       \r
+       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
+               threading.Thread(target=self.doFileLoad).start()\r
        \r
        def doFileLoad(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 f9d33a94cd34110457aca331ce11dcc19c6ae878..6b45a12b9837b02cfd351921507934905fd3d1e5 100644 (file)
--- a/SkeinPyPy/newui/sliceProgessPanel.py
+++ b/SkeinPyPy/newui/sliceProgessPanel.py
@@ -91,6 +91,7 @@ class sliceProgessPanel(wx.Panel):
                self.sizer.Layout()
                self.Layout()
                self.abort = True
+               self.mainWindow.preview3d.loadReModelFile(self.filename)
        
        def SetProgress(self, stepName, layer, maxLayer):
                if self.prevStep != stepName: