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

Enhanced the progress indicator to be "total" not per step.

master
daid 2012-02-23 15:56:03 +01:00
parent bdb4b5b4e9
commit 38842d5343
1 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
SkeinPyPy_NewUI/newui/sliceProgessPanel.py
View File

@ -1,7 +1,13 @@
from __future__ import absolute_import
import __init__
import wx,sys,math,threading,subprocess
import wx
import sys
import math
import threading
import subprocess
import time
from newui import skeinRun
class sliceProgessPanel(wx.Panel):
@ -10,6 +16,25 @@ class sliceProgessPanel(wx.Panel):
self.mainWindow = mainWindow
self.filename = filename
self.abort = False
#How long does each step take compared to the others. This is used to make a better scaled progress bar, and guess time left.
self.sliceStepTimeFactor = {
'start': 3.3713991642,
'slice': 15.4984838963,
'preface': 5.17178297043,
'inset': 116.362634182,
'fill': 215.702672005,
'multiply': 21.9536788464,
'speed': 12.759510994,
'raft': 31.4580039978,
'skirt': 19.3436040878,
'comb': 23.7805759907,
'cool': 27.148763895,
'dimension': 90.4914340973
}
self.totalRunTimeFactor = 0
for v in self.sliceStepTimeFactor.itervalues():
self.totalRunTimeFactor += v
box = wx.StaticBox(self, -1, filename)
self.sizer = wx.StaticBoxSizer(box, wx.HORIZONTAL)
@ -19,6 +44,7 @@ class sliceProgessPanel(wx.Panel):
self.statusText = wx.StaticText(self, -1, "Starting...")
self.progressGauge = wx.Gauge(self, -1)
self.progressGauge.SetRange(10000)
self.abortButton = wx.Button(self, -1, "X", style=wx.BU_EXACTFIT)
self.sizer.Add(self.statusText, 2, flag=wx.ALIGN_CENTER )
self.sizer.Add(self.progressGauge, 2)
@ -27,6 +53,9 @@ class sliceProgessPanel(wx.Panel):
self.Bind(wx.EVT_BUTTON, self.OnAbort, self.abortButton)
self.SetSizer(mainSizer)
self.prevStep = 'start'
self.totalDoneFactor = 0.0
self.startTime = time.time()
self.thread = WorkerThread(self, filename)
def OnAbort(self, e):
@ -48,6 +77,18 @@ class sliceProgessPanel(wx.Panel):
self.sizer.Add(self.abortButton, 0)
self.sizer.Layout()
self.abort = True
def SetProgress(self, stepName, layer, maxLayer):
if self.prevStep != stepName:
self.totalDoneFactor += self.sliceStepTimeFactor[self.prevStep]
newTime = time.time()
#print "#####" + str(newTime-self.startTime) + " " + self.prevStep + " -> " + stepName
self.startTime = newTime
self.prevStep = stepName
progresValue = ((self.totalDoneFactor + self.sliceStepTimeFactor[stepName] * layer / maxLayer) / self.totalRunTimeFactor) * 10000
self.progressGauge.SetValue(int(progresValue))
self.statusText.SetLabel(stepName + " [" + str(layer) + "/" + str(maxLayer) + "]")
class WorkerThread(threading.Thread):
def __init__(self, notifyWindow, filename):
@ -62,15 +103,13 @@ class WorkerThread(threading.Thread):
maxValue = 1
while(len(line) > 0):
line = line.rstrip()
print line
if line[0:9] == "Progress[" and line[-1:] == "]":
progress = line[9:-1].split(":")
if len(progress) > 2:
maxValue = int(progress[2])
wx.CallAfter(self.notifyWindow.progressGauge.SetRange, maxValue)
wx.CallAfter(self.notifyWindow.statusText.SetLabel, progress[0] + " [" + progress[1] + "/" + str(maxValue) + "]")
wx.CallAfter(self.notifyWindow.progressGauge.SetValue, int(progress[1]))
wx.CallAfter(self.notifyWindow.SetProgress, progress[0], int(progress[1]), maxValue)
else:
print line
wx.CallAfter(self.notifyWindow.statusText.SetLabel, line)
if self.notifyWindow.abort:
p.terminate()
@ -78,3 +117,4 @@ class WorkerThread(threading.Thread):
return
line = p.stdout.readline()
wx.CallAfter(self.notifyWindow.OnSliceDone)