chiark / gitweb /
Fix another UTF-8 filename encoding bug. Add error output to the slice log so we...
authordaid303 <daid303@gmail.com>
Tue, 4 Dec 2012 07:27:04 +0000 (08:27 +0100)
committerdaid303 <daid303@gmail.com>
Tue, 4 Dec 2012 07:27:04 +0000 (08:27 +0100)
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py
Cura/gui/sliceProgessPanel.py

index 72b0760a92d4bcc839c30c209fc5550a44b0fac2..c76fbaa92e46c45f27b2d0932ff921442481eb92 100644 (file)
@@ -266,7 +266,7 @@ def writeOutput(fileName, shouldAnalyze=True):
        repository = ExportRepository()
        settings.getReadRepository(repository)
        startTime = time.time()
-       print('File ' + archive.getSummarizedFileName(fileName) + ' is being chain exported.')
+       print('File ' + archive.getSummarizedFileName(fileName.encode('ascii', 'replace')) + ' is being chain exported.')
        fileNameSuffix = fileName[: fileName.rfind('.')]
        if repository.addExportSuffix.value:
                fileNameSuffix += '_export'
index 8801d17ddf3cbc00696781671d8e8dc5cd6999fd..5e099b96cac9e68b6daf25b074a922900cd2a292 100644 (file)
@@ -183,6 +183,11 @@ class WorkerThread(threading.Thread):
                                wx.CallAfter(self.notifyWindow.statusText.SetLabel, "Aborted by user.")
                                return
                        line = p.stdout.readline()
+               line = p.stderr.readline()
+               while(len(line) > 0):
+                       line = line.rstrip()
+                       self.progressLog.append(line)
+                       line = p.stderr.readline()
                self.returnCode = p.wait()
                self.fileIdx += 1
                if self.fileIdx == len(self.cmdList):