Fix for double retraction, fix for errorlist in model not showing correctly.

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py
index 684f8e9d0187215ff33cfc9ec9d60e676ca4da4b..59b9cffcdf807704a2f2211b218e690c3d10e17e 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py
@@ -390,9 +390,10 @@ class DimensionSkein:
                elif firstWord == '(</nestedRing>)':
                        if self.onlyRetractOnJumps:
                                self.addRetraction = True
-                               self.retractionRatio = self.getRetractionRatio(lineIndex)
-                               self.addLinearMoveExtrusionDistanceLine(-self.repository.retractionDistance.value * self.retractionRatio)
-                               self.reverseRetraction = True
+                               if not self.reverseRetraction:
+                                       self.retractionRatio = self.getRetractionRatio(lineIndex)
+                                       self.addLinearMoveExtrusionDistanceLine(-self.repository.retractionDistance.value * self.retractionRatio)
+                                       self.reverseRetraction = True
                elif firstWord == '(<layer>':
                        self.layerIndex += 1
                        settings.printProgress(self.layerIndex, 'dimension')
@@ -411,7 +412,7 @@ class DimensionSkein:
                        self.isExtruderActive = True
                elif firstWord == 'M103':
                        self.retractionRatio = self.getRetractionRatio(lineIndex)
-                       if self.addRetraction:
+                       if self.addRetraction and not self.reverseRetraction:
                                self.addLinearMoveExtrusionDistanceLine(-self.repository.retractionDistance.value * self.retractionRatio)
                                self.reverseRetraction = True
                        self.isExtruderActive = False

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 49659d8510651eda137ceaa4f59dc3a31ddc026f..6eb6334e4138a4cc96c2177a8c1b3867dabf7d08 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -234,6 +234,7 @@ class previewPanel(wx.Panel):
                                obj.dirty = False\r
                                obj.mesh = mesh\r
                                self.updateModelTransform()\r
+                               self.errorList = []\r
                                wx.CallAfter(self.updateToolbar)\r
                                wx.CallAfter(self.glCanvas.Refresh)\r
                \r
@@ -243,7 +244,6 @@ class previewPanel(wx.Panel):
                        gcode.progressCallback = self.loadProgress\r
                        gcode.load(self.gcodeFilename)\r
                        self.gcodeDirty = False\r
-                       self.errorList = []\r
                        self.gcode = gcode\r
                        self.gcodeDirty = True\r
                        wx.CallAfter(self.updateToolbar)\r
@@ -455,6 +455,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                        glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, [0.8, 0.8, 0.8, 1.0]);\r
 \r
                glColor3f(1.0,1.0,1.0)\r
+               glPushMatrix()\r
                glTranslate(self.parent.machineCenter.x, self.parent.machineCenter.y, 0)\r
                for obj in self.parent.objectList:\r
                        if obj.mesh == None:\r
@@ -529,7 +530,8 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                                glLightfv(GL_LIGHT0, GL_AMBIENT, map(lambda x: x / 5, self.objColor[self.parent.objectList.index(obj)]))\r
                                glEnable(GL_LIGHTING)\r
                                self.drawModel(obj)\r
-                       \r
+               \r
+               glPopMatrix()   \r
                if self.viewMode == "Normal" or self.viewMode == "Transparent" or self.viewMode == "X-Ray":\r
                        glDisable(GL_LIGHTING)\r
                        glDisable(GL_DEPTH_TEST)\r

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index 0d9e95a7bc12097638b8b8611f212e18ec8f0188..3f95326edf9bb5e64891930633b7eb98823a784a 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -192,7 +192,7 @@ class simpleModeWindow(configBase.configWindowBase):
                put('bottom_layer_speed', '25')
                put('cool_min_layer_time', '10')
                put('fan_enabled', 'True')
-               put('fan_layer', '0')
+               put('fan_layer', '1')
                put('fan_speed', '100')
                #put('model_scale', '1.0')
                #put('flip_x', 'False')