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: lulzbot-15.02.1-1.01~61
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ac03f8c6d6f11028a6b701580db73ec0aaab2000;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.

Conflicts:
	Cura/util/sliceEngine.py
---

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 28362bf6..c32eb2cb 100644
--- a/Cura/util/bigDataStorage.py
+++ b/Cura/util/bigDataStorage.py
@@ -73,6 +73,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 01b7ad6b..d1b49ec4 100644
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -397,10 +397,10 @@ class Engine(object):
 			logThread.join()
 			self._result.addLog("Slicer process returned : %d" % returnCode)
 			if returnCode == 0:
-				self._result.setFinished(True)
 				plugin_error = pluginInfo.runPostProcessingPlugins(self._result, pluginConfig)
 				if plugin_error is not None:
 					self._result.addLog(plugin_error)
+				self._result.setFinished(True)
 				self._callback(1.0)
 			else:
 				self._callback(-1.0)