Fix for double retraction, fix for errorlist in model not showing correctly.
This commit is contained in:
parent
d59953be3e
commit
31cbf5e1a8
3 changed files with 10 additions and 7 deletions
|
@ -390,9 +390,10 @@ class DimensionSkein:
|
||||||
elif firstWord == '(</nestedRing>)':
|
elif firstWord == '(</nestedRing>)':
|
||||||
if self.onlyRetractOnJumps:
|
if self.onlyRetractOnJumps:
|
||||||
self.addRetraction = True
|
self.addRetraction = True
|
||||||
self.retractionRatio = self.getRetractionRatio(lineIndex)
|
if not self.reverseRetraction:
|
||||||
self.addLinearMoveExtrusionDistanceLine(-self.repository.retractionDistance.value * self.retractionRatio)
|
self.retractionRatio = self.getRetractionRatio(lineIndex)
|
||||||
self.reverseRetraction = True
|
self.addLinearMoveExtrusionDistanceLine(-self.repository.retractionDistance.value * self.retractionRatio)
|
||||||
|
self.reverseRetraction = True
|
||||||
elif firstWord == '(<layer>':
|
elif firstWord == '(<layer>':
|
||||||
self.layerIndex += 1
|
self.layerIndex += 1
|
||||||
settings.printProgress(self.layerIndex, 'dimension')
|
settings.printProgress(self.layerIndex, 'dimension')
|
||||||
|
@ -411,7 +412,7 @@ class DimensionSkein:
|
||||||
self.isExtruderActive = True
|
self.isExtruderActive = True
|
||||||
elif firstWord == 'M103':
|
elif firstWord == 'M103':
|
||||||
self.retractionRatio = self.getRetractionRatio(lineIndex)
|
self.retractionRatio = self.getRetractionRatio(lineIndex)
|
||||||
if self.addRetraction:
|
if self.addRetraction and not self.reverseRetraction:
|
||||||
self.addLinearMoveExtrusionDistanceLine(-self.repository.retractionDistance.value * self.retractionRatio)
|
self.addLinearMoveExtrusionDistanceLine(-self.repository.retractionDistance.value * self.retractionRatio)
|
||||||
self.reverseRetraction = True
|
self.reverseRetraction = True
|
||||||
self.isExtruderActive = False
|
self.isExtruderActive = False
|
||||||
|
|
|
@ -234,6 +234,7 @@ class previewPanel(wx.Panel):
|
||||||
obj.dirty = False
|
obj.dirty = False
|
||||||
obj.mesh = mesh
|
obj.mesh = mesh
|
||||||
self.updateModelTransform()
|
self.updateModelTransform()
|
||||||
|
self.errorList = []
|
||||||
wx.CallAfter(self.updateToolbar)
|
wx.CallAfter(self.updateToolbar)
|
||||||
wx.CallAfter(self.glCanvas.Refresh)
|
wx.CallAfter(self.glCanvas.Refresh)
|
||||||
|
|
||||||
|
@ -243,7 +244,6 @@ class previewPanel(wx.Panel):
|
||||||
gcode.progressCallback = self.loadProgress
|
gcode.progressCallback = self.loadProgress
|
||||||
gcode.load(self.gcodeFilename)
|
gcode.load(self.gcodeFilename)
|
||||||
self.gcodeDirty = False
|
self.gcodeDirty = False
|
||||||
self.errorList = []
|
|
||||||
self.gcode = gcode
|
self.gcode = gcode
|
||||||
self.gcodeDirty = True
|
self.gcodeDirty = True
|
||||||
wx.CallAfter(self.updateToolbar)
|
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]);
|
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, [0.8, 0.8, 0.8, 1.0]);
|
||||||
|
|
||||||
glColor3f(1.0,1.0,1.0)
|
glColor3f(1.0,1.0,1.0)
|
||||||
|
glPushMatrix()
|
||||||
glTranslate(self.parent.machineCenter.x, self.parent.machineCenter.y, 0)
|
glTranslate(self.parent.machineCenter.x, self.parent.machineCenter.y, 0)
|
||||||
for obj in self.parent.objectList:
|
for obj in self.parent.objectList:
|
||||||
if obj.mesh == None:
|
if obj.mesh == None:
|
||||||
|
@ -530,6 +531,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
|
||||||
glEnable(GL_LIGHTING)
|
glEnable(GL_LIGHTING)
|
||||||
self.drawModel(obj)
|
self.drawModel(obj)
|
||||||
|
|
||||||
|
glPopMatrix()
|
||||||
if self.viewMode == "Normal" or self.viewMode == "Transparent" or self.viewMode == "X-Ray":
|
if self.viewMode == "Normal" or self.viewMode == "Transparent" or self.viewMode == "X-Ray":
|
||||||
glDisable(GL_LIGHTING)
|
glDisable(GL_LIGHTING)
|
||||||
glDisable(GL_DEPTH_TEST)
|
glDisable(GL_DEPTH_TEST)
|
||||||
|
|
|
@ -192,7 +192,7 @@ class simpleModeWindow(configBase.configWindowBase):
|
||||||
put('bottom_layer_speed', '25')
|
put('bottom_layer_speed', '25')
|
||||||
put('cool_min_layer_time', '10')
|
put('cool_min_layer_time', '10')
|
||||||
put('fan_enabled', 'True')
|
put('fan_enabled', 'True')
|
||||||
put('fan_layer', '0')
|
put('fan_layer', '1')
|
||||||
put('fan_speed', '100')
|
put('fan_speed', '100')
|
||||||
#put('model_scale', '1.0')
|
#put('model_scale', '1.0')
|
||||||
#put('flip_x', 'False')
|
#put('flip_x', 'False')
|
||||||
|
|
Loading…
Reference in a new issue