q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some more protection against the bug #220

master
daid 2012-09-27 11:08:33 +02:00
parent 9261e66b2a
commit 43ca701216
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cura/gui/projectPlanner.py
View File

@ -603,7 +603,7 @@ class projectPlanner(wx.Frame):
action.temperature = profile.getProfileSettingFloat('print_temperature')
action.extruder = item.extruder
action.filename = item.filename
clearZ = max(clearZ, item.getMaximum()[2] * item.scale + 5.0)
clearZ = max(clearZ, item.getSize()[2] * item.scale + 5.0)
action.clearZ = clearZ
action.leaveResultForNextSlice = False
action.usePreviousSlice = False
@ -637,6 +637,7 @@ class projectPlanner(wx.Frame):
action.clearZ = 0
action.leaveResultForNextSlice = False
action.usePreviousSlice = False
actionList.append(action)
#Restore the old profile.
@ -1011,7 +1012,7 @@ class ProjectSliceProgressWindow(wx.Frame):
wx.CallAfter(self.progressGauge2.SetValue, self.actionList.index(action) + 1)
resultFile.write(';TYPE:CUSTOM\n')
if len(self.actionList) > 1:
if len(self.actionList) > 1 and self.actionList[-1].clearZ > 1:
#only move to higher Z if we have sliced more then 1 object. This solves the "move into print after printing" problem with the print-all-at-once option.
resultFile.write('G1 Z%f F%f\n' % (self.actionList[-1].clearZ, profile.getProfileSettingFloat('max_z_speed') * 60))
resultFile.write(profile.getAlterationFileContents('end.gcode'))