Attempt at cleaning up resuming/restarting behavior

printcore.py

@@ -332,7 +332,7 @@ class printcore():
           zFeedString = ""
           if self.xy_feedrate != None: xyFeedString = " F" + str(self.xy_feedrate)
           if self.z_feedrate != None: zFeedString = " F" + str(self.z_feedrate)
-        
+
           self.send_now("G1 X" + str(self.pauseX) + " Y" + str(self.pauseY) + xyFeedString)
           self.send_now("G1 Z" + str(self.pauseZ) + zFeedString)
           self.send_now("G92 E" + str(self.pauseE))
@@ -343,7 +343,7 @@ class printcore():
         
         self.paused = False
         self.printing = True
-        self.print_thread = Thread(target = self._print)
+        self.print_thread = Thread(target = self._print, kwargs = {"resuming": True})
         self.print_thread.start()
 
     def send(self, command, wait = 0):
@@ -388,10 +388,10 @@ class printcore():
         else:
             print "Not connected to printer."
 
-    def _print(self):
+    def _print(self, resuming = False):
         if self.startcb:
             #callback for printing started
-            try: self.startcb()
+            try: self.startcb(resuming)
             except: pass
         while self.printing and self.printer and self.online:
             self._sendnext()

pronterface.py

@@ -317,10 +317,13 @@ class PronterWindow(MainWindow, pronsole.pronsole):
         pronsole.pronsole.process_cmdline_arguments(self, args)
         self.autoconnect = args.autoconnect
 
-    def startcb(self):
+    def startcb(self, resuming = False):
         self.starttime = time.time()
-        self.compute_eta = RemainingTimeEstimator(self.p.mainqueue)
-        print _("Print Started at: %s") % format_time(self.starttime)
+        if resuming:
+            print _("Print resumed at: %s") % format_time(self.starttime)
+        else:
+            print _("Print started at: %s") % format_time(self.starttime)
+            self.compute_eta = RemainingTimeEstimator(self.fgcode)
 
     def endcb(self):
         if self.p.queueindex == 0:
@@ -1434,8 +1437,8 @@ class PronterWindow(MainWindow, pronsole.pronsole):
         if self.paused:
             self.p.paused = 0
             self.paused = 0
-            self.on_startprint()
             if self.sdprinting:
+                self.on_startprint()
                 self.p.send_now("M26 S0")
                 self.p.send_now("M24")
                 return
@@ -1483,8 +1486,8 @@ class PronterWindow(MainWindow, pronsole.pronsole):
         dlg.Destroy()
 
     def pause(self, event):
-        print _("Paused.")
         if not self.paused:
+            print _("Print paused at: %s") % format_time(time.time())
             if self.sdprinting:
                 self.p.send_now("M25")
             else:
@@ -1498,6 +1501,7 @@ class PronterWindow(MainWindow, pronsole.pronsole):
             self.extra_print_time += int(time.time() - self.starttime)
             wx.CallAfter(self.pausebtn.SetLabel, _("Resume"))
         else:
+            print _("Resuming.")
             self.paused = False
             if self.sdprinting:
                 self.p.send_now("M24")