From: daid <daid303@gmail.com>
Date: Mon, 22 Dec 2014 17:33:11 +0000 (+0100)
Subject: Fix the skin not showing in the layer view. Fix the race condition where plugin resul... 
X-Git-Tag: 15.01-RC6~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=19e6cb423c7fd60482af2b697f5666f8e1d58ed2;p=cura.git

Fix the skin not showing in the layer view. Fix the race condition where plugin results are not shown when the layer view is active during slicing.
---

diff --git a/Cura/gui/util/engineResultView.py b/Cura/gui/util/engineResultView.py
index 91e047ab..295f47e1 100644
--- a/Cura/gui/util/engineResultView.py
+++ b/Cura/gui/util/engineResultView.py
@@ -92,8 +92,8 @@ class engineResultView(object):
 			('inset0',     'WALL-OUTER', [1,0,0,1]),
 			('insetx',     'WALL-INNER', [0,1,0,1]),
 			('openoutline', None,        [1,0,0,1]),
-			('skin',       'FILL',       [1,1,0,1]),
-			('infill',      None,        [1,1,0,1]),
+			('skin',       'SKIN',       [1,1,0,1]),
+			('infill',     'FILL',       [1,1,0,1]),
 			('support',    'SUPPORT',    [0,1,1,1]),
 			('skirt',      'SKIRT',      [0,1,1,1]),
 			('outline',     None,        [0,0,0,1])
diff --git a/Cura/util/bigDataStorage.py b/Cura/util/bigDataStorage.py
index d1b4e84d..cfd34736 100644
--- a/Cura/util/bigDataStorage.py
+++ b/Cura/util/bigDataStorage.py
@@ -76,6 +76,9 @@ class BigDataStorage(object):
 			pos += self._list[self._iter_index].tell()
 		return pos
 
+	def close(self):
+		pass
+
 	def clone(self):
 		clone = BigDataStorage()
 		clone._list = []
diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index f16c033b..1a4e904c 100644
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -404,11 +404,11 @@ class Engine(object):
 			returnCode = self._process.wait()
 			logThread.join()
 			if returnCode == 0:
-				self._result.setFinished(True)
 				plugin_error = pluginInfo.runPostProcessingPlugins(self._result)
 				if plugin_error is not None:
 					print plugin_error
 					self._result.addLog(plugin_error)
+				self._result.setFinished(True)
 				self._callback(1.0)
 			else:
 				for line in self._result.getLog():