Commit 225d6165 authored by Christopher Keller's avatar Christopher Keller

Added Current Z-Height to the status message.

Also added "Print Began at: HH:MM:SS"
and added the message "Print Ended at: HH:MM:SS: and took...
parent a09633a2
...@@ -122,10 +122,12 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -122,10 +122,12 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
def startcb(self): def startcb(self):
self.starttime=time.time() self.starttime=time.time()
print "Print Started at: " +time.strftime('%H:%M:%S',time.localtime(self.starttime))
def endcb(self): def endcb(self):
if(self.p.queueindex==0): if(self.p.queueindex==0):
print "Print took "+str(int(time.time()-self.starttime)/60)+" minutes "+str(int(time.time()-self.starttime)%60)+" seconds." print "Print ended at: " +time.strftime('%H:%M:%S',time.localtime(time.time()))
print "and took: "+time.strftime('%H:%M:%S', time.gmtime(int(time.time()-self.starttime))) #+str(int(time.time()-self.starttime)/60)+" minutes "+str(int(time.time()-self.starttime)%60)+" seconds."
wx.CallAfter(self.pausebtn.Disable) wx.CallAfter(self.pausebtn.Disable)
wx.CallAfter(self.printbtn.SetLabel,_("Print")) wx.CallAfter(self.printbtn.SetLabel,_("Print"))
...@@ -1099,11 +1101,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -1099,11 +1101,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
secondsremain = secondsestimate - secondselapsed secondsremain = secondsestimate - secondselapsed
string+= _(" Est: ") + time.strftime('%H:%M:%S', time.gmtime(secondsremain)) string+= _(" Est: ") + time.strftime('%H:%M:%S', time.gmtime(secondsremain))
string+= _(" of: ") + time.strftime('%H:%M:%S', time.gmtime(secondsestimate)) string+= _(" of: ") + time.strftime('%H:%M:%S', time.gmtime(secondsestimate))
string+= _(" Remaining") string+= _(" Remaining | ")
#string+= _(" Est:%02.0f") % (int(secondsremain/60),) string+= _(" Z: %0.2f mm") % self.curlayer
#string+= _(":%02.0f") % (int(secondsremain%60),)
#string+= _(" of %02.0f") % (int(secondsestimate/60),)
#string+= _(":%02.0f Remaining") % (int(secondsestimate%60),)
wx.CallAfter(self.status.SetStatusText,string) wx.CallAfter(self.status.SetStatusText,string)
wx.CallAfter(self.gviz.Refresh) wx.CallAfter(self.gviz.Refresh)
if(self.monitor and self.p.online): if(self.monitor and self.p.online):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment