From: daid303 <daid303@gmail.com>
Date: Tue, 4 Dec 2012 07:27:04 +0000 (+0100)
Subject: Fix another UTF-8 filename encoding bug. Add error output to the slice log so we... 
X-Git-Tag: 13.03~185
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=57b585b8512baec56416fdd5170d1a490ce6d27d;p=cura.git

Fix another UTF-8 filename encoding bug. Add error output to the slice log so we see exceptions.
---

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py
index 72b0760a..c76fbaa9 100644
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py
@@ -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'
diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py
index 8801d17d..5e099b96 100644
--- a/Cura/gui/sliceProgessPanel.py
+++ b/Cura/gui/sliceProgessPanel.py
@@ -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):