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

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 d1b4e84d73489acdfbb3600b77afd3c4d2d6b9f0..cfd347362fdb71ced7d66da5a03bb515b5415669 100644 (file)
--- a/Cura/util/bigDataStorage.py
+++ b/Cura/util/bigDataStorage.py
@@ -76,6 +76,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 f16c033b49443530b7fe094e85604ac24a7faf01..1a4e904c3d86487d3ac574e75960bb9a75eafcc8 100644 (file)
--- 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():