Fix support for slicing if running from pythonw.exe

diff --git a/Cura/gui/batchRun.py b/Cura/gui/batchRun.py
index 9762d6a07e8feafdd3155a58909b64ffa8876386..295d321ba1342f22b981f402982ecfad4c461332 100644 (file)
--- a/Cura/gui/batchRun.py
+++ b/Cura/gui/batchRun.py
@@ -187,7 +187,7 @@ class BatchSliceProgressWindow(wx.Frame):
                        self.cmdIndex += 1
                        wx.CallAfter(self.SetTitle, "Building: [%d/%d]"  % (self.sliceCmdList.index(action) + 1, len(self.sliceCmdList)))
 
-                       p = subprocess.Popen(action, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+                       p = sliceRun.startSliceCommandProcess(action)
                        line = p.stdout.readline()
                        maxValue = 1
                        while(len(line) > 0):

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 1bca20ad9148704b2824d7c4f4cba1e1a2f89d14..83642b18dc4a81221ba72bfed01d31f2cb6532bf 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -38,7 +38,7 @@ class printProcessMonitor():
        \r
        def loadFile(self, filename):\r
                if self.handle == None:\r
-                       self.handle = subprocess.Popen([sys.executable, sys.argv[0], '-r', filename], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)\r
+                       self.handle = subprocess.Popen([sys.executable, sys.argv[0], '-r', filename], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\r
                        self.thread = threading.Thread(target=self.Monitor)\r
                        self.thread.start()\r
                else:\r

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index c521ca550d96aaf7101159ec1ed11c9ed7dde470..b9652659ccb475ca5fa11ba182fbd4ab8154a355 100644 (file)
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -939,7 +939,7 @@ class ProjectSliceProgressWindow(wx.Frame):
                for action in self.actionList:\r
                        wx.CallAfter(self.SetTitle, "Building: [%d/%d]"  % (self.actionList.index(action) + 1, len(self.actionList)))\r
                        if not action.usePreviousSlice:\r
-                               p = subprocess.Popen(action.sliceCmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)\r
+                               p = sliceRun.startSliceCommandProcess(action.sliceCmd)\r
                                line = p.stdout.readline()\r
                \r
                                maxValue = 1\r

diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py
index bd278ccbbdd0d59551c06353b5e23695f3048a78..9cc68431d5954c4810ec30a089686dacbe9a2433 100644 (file)
--- a/Cura/gui/sliceProgessPanel.py
+++ b/Cura/gui/sliceProgessPanel.py
@@ -135,14 +135,7 @@ class WorkerThread(threading.Thread):
                self.start()
 
        def run(self):
-               kwargs = {} 
-               if subprocess.mswindows: 
-                       su = subprocess.STARTUPINFO() 
-                       su.dwFlags |= subprocess.STARTF_USESHOWWINDOW
-                       su.wShowWindow = subprocess.SW_HIDE
-                       kwargs['startupinfo'] = su
-               print self.cmdList[self.fileIdx]
-               p = subprocess.Popen(self.cmdList[self.fileIdx], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs)
+               p = sliceRun.startSliceCommandProcess(self.cmdList[self.fileIdx])
                line = p.stdout.readline()
                self.progressLog = []
                maxValue = 1

diff --git a/Cura/util/sliceRun.py b/Cura/util/sliceRun.py
index 824aa1e0c0c11111d2e623cb31d1a46dc5d4061b..c4b6bf79df0a54ba90c23c1cd716afd5ef3d712c 100644 (file)
--- a/Cura/util/sliceRun.py
+++ b/Cura/util/sliceRun.py
@@ -178,3 +178,11 @@ def getSliceCommand(filename):
                        cmd.append(filename)
                return cmd
 
+def startSliceCommandProcess(cmdList):
+       kwargs = {} 
+       if subprocess.mswindows: 
+               su = subprocess.STARTUPINFO() 
+               su.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+               su.wShowWindow = subprocess.SW_HIDE
+               kwargs['startupinfo'] = su
+       p = subprocess.Popen(cmdList, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs)