Fix the skin not showing in the layer view. Fix the race condition where plugin resul...

Conflicts:
	Cura/util/sliceEngine.py

diff --git a/Cura/gui/util/engineResultView.py b/Cura/gui/util/engineResultView.py
index 91e047ab6e4235f573f2fa4fccdce96f45e2f17b..295f47e1909699c993f8ee441b7bd6ebc17f867e 100644 (file)
--- 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 28362bf6d179c51934b933af4b57a97ed53e9bed..c32eb2cbc70221bd01d1b258fdec3101eb6682d1 100644 (file)
--- a/Cura/util/bigDataStorage.py
+++ b/Cura/util/bigDataStorage.py
@@ -73,6 +73,9 @@ class BigDataStorage(object):
                        pos += self._list[self._iter_index].tell()\r
                return pos\r
 \r
+       def close(self):\r
+               pass\r
+\r
        def clone(self):\r
                clone = BigDataStorage()\r
                clone._list = []\r

diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index 01b7ad6b4c33b1542eea285beb43a9e52d1fd833..d1b49ec4442bbaccdf44f680c63386e13da7de7b 100644 (file)
--- 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)