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

Added stat calculation after project slicing.

Browse source
This commit is contained in:
Daid 2012-05-04 19:28:24 +02:00
parent c1dc9f4354
commit c09861249e
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Cura/gui/projectPlanner.py
View file

@ -23,6 +23,7 @@ from util import profile
from util import util3d
from util import stl
from util import sliceRun
from util import gcodeInterpreter
class Action():
pass
@ -722,6 +723,7 @@ class ProjectSliceProgressWindow(wx.Frame):
if self.abort:
p.terminate()
wx.CallAfter(self.statusText.SetLabel, "Aborted by user.")
resultFile.close()
return
line = p.stdout.readline()
self.returnCode = p.wait()
@ -758,9 +760,20 @@ class ProjectSliceProgressWindow(wx.Frame):
resultFile.write(';TYPE:CUSTOM\n')
resultFile.write(profile.getAlterationFileContents('end.gcode'))
resultFile.close()
gcode = gcodeInterpreter.gcode()
gcode.load(self.resultFilename)
self.abort = True
sliceTime = time.time() - self.sliceStartTime
wx.CallAfter(self.statusText.SetLabel, 'Slicing took: %02d:%02d' % (sliceTime / 60, sliceTime % 60))
status = "Slicing took: %02d:%02d\n" % (sliceTime / 60, sliceTime % 60)
status = "Filament: %.2fm %.2fg\n" % (gcode.extrusionAmount / 1000, gcode.calculateWeight() * 1000)
status += "Print time: %02d:%02d\n" % (int(gcode.totalMoveTimeMinute / 60), int(gcode.totalMoveTimeMinute % 60))
cost = gcode.calculateCost()
if cost != False:
status += "Cost: %s\n" % (cost)
wx.CallAfter(self.statusText.SetLabel, status)
wx.CallAfter(self.abortButton.SetLabel, 'Close')
def main():