From 31cbf5e1a899516cf389e70ebde5813912fdcc58 Mon Sep 17 00:00:00 2001 From: Daid Date: Thu, 21 Jun 2012 14:18:31 +0200 Subject: [PATCH] Fix for double retraction, fix for errorlist in model not showing correctly. --- .../skeinforge_plugins/craft_plugins/dimension.py | 9 +++++---- Cura/gui/preview3d.py | 6 ++++-- Cura/gui/simpleMode.py | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) 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 684f8e9..59b9cff 100644 --- 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 == '()': 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 == '(': 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 49659d8..6eb6334 100644 --- a/Cura/gui/preview3d.py +++ b/Cura/gui/preview3d.py @@ -234,6 +234,7 @@ class previewPanel(wx.Panel): obj.dirty = False obj.mesh = mesh self.updateModelTransform() + self.errorList = [] wx.CallAfter(self.updateToolbar) wx.CallAfter(self.glCanvas.Refresh) @@ -243,7 +244,6 @@ class previewPanel(wx.Panel): gcode.progressCallback = self.loadProgress gcode.load(self.gcodeFilename) self.gcodeDirty = False - self.errorList = [] self.gcode = gcode self.gcodeDirty = True wx.CallAfter(self.updateToolbar) @@ -455,6 +455,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas): glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, [0.8, 0.8, 0.8, 1.0]); glColor3f(1.0,1.0,1.0) + glPushMatrix() glTranslate(self.parent.machineCenter.x, self.parent.machineCenter.y, 0) for obj in self.parent.objectList: if obj.mesh == None: @@ -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)])) glEnable(GL_LIGHTING) self.drawModel(obj) - + + glPopMatrix() if self.viewMode == "Normal" or self.viewMode == "Transparent" or self.viewMode == "X-Ray": glDisable(GL_LIGHTING) glDisable(GL_DEPTH_TEST) diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py index 0d9e95a..3f95326 100644 --- 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')