Merge branch 'experimental' of github.com:kliment/Printrun into experimental

pronsole.py

@@ -1121,21 +1121,22 @@ class pronsole(cmd.Cmd):
             return [i for i in self.temps.keys() if i.startswith(text)]
 
     def do_bedtemp(self, l):
-            try:
-                l = l.lower().replace(", ",".")
-                for i in self.bedtemps.keys():
-                    l = l.replace(i, self.bedtemps[i])
-                f = float(l)
-            except:
-                self.logError(_("You must enter a temperature."))
-            if f>=0:
-                if self.p.online:
-                    self.p.send_now("M140 S"+l)
-                    self.log(_("Setting bed temperature to %s degrees Celsius.") % f)
-                else:
-                    self.logError(_("Printer is not online."))
+        f = None
+        try:
+            l = l.lower().replace(", ",".")
+            for i in self.bedtemps.keys():
+                l = l.replace(i, self.bedtemps[i])
+            f = float(l)
+        except:
+            self.logError(_("You must enter a temperature."))
+        if f is not None and f >= 0:
+            if self.p.online:
+                self.p.send_now("M140 S" + l)
+                self.log(_("Setting bed temperature to %s degrees Celsius.") % f)
             else:
-                self.logError(_("You cannot set negative temperatures. To turn the bed off entirely, set its temperature to 0."))
+                self.logError(_("Printer is not online."))
+        else:
+            self.logError(_("You cannot set negative temperatures. To turn the bed off entirely, set its temperature to 0."))
 
     def help_bedtemp(self):
         self.log(_("Sets the bed temperature to the value entered."))

pronterface.py

@@ -233,6 +233,7 @@ class PronterWindow(MainWindow, pronsole.pronsole):
         self.monitor_interval = 3
         self.current_pos = [0, 0, 0]
         self.paused = False
+        self.uploading = False
         self.sentlines = Queue.Queue(0)
         self.cpbuttons = [
             SpecialButton(_("Motors off"), ("M84"), (250, 250, 250), None, 0, _("Switch all motors off")),
@@ -1276,9 +1277,14 @@ class PronterWindow(MainWindow, pronsole.pronsole):
         while self.statuscheck:
             string = ""
             fractioncomplete = 0.0
-            if self.sdprinting:
-                fractioncomplete = float(self.percentdone / 100.0)
-                string += _(" SD printing:%04.2f %%") % (self.percentdone,)
+            if self.sdprinting or self.uploading:
+                if self.uploading:
+                    fractioncomplete = float(self.p.queueindex) / len(self.p.mainqueue)
+                    string += _("SD upload: %04.2f%% |") % (100*fractioncomplete,)
+                    string += _(" Line# %d of %d lines |" ) % (self.p.queueindex, len(self.p.mainqueue))
+                else:
+                    fractioncomplete = float(self.percentdone / 100.0)
+                    string += _("SD printing: %04.2f%% |") % (self.percentdone,)
                 if fractioncomplete > 0.0:
                     secondselapsed = int(time.time() - self.starttime + self.extra_print_time)
                     secondsestimate = secondselapsed / fractioncomplete
@@ -1286,9 +1292,9 @@ class PronterWindow(MainWindow, pronsole.pronsole):
                     string += _(" Est: %s of %s remaining | ") % (format_duration(secondsremain),
                                                                   format_duration(secondsestimate))
                     string += _(" Z: %.3f mm") % self.curlayer
-            if self.p.printing:
+            elif self.p.printing:
                 fractioncomplete = float(self.p.queueindex) / len(self.p.mainqueue)
-                string += _(" Printing: %04.2f%% |") % (100*float(self.p.queueindex)/len(self.p.mainqueue),)
+                string += _("Printing: %04.2f%% |") % (100*float(self.p.queueindex)/len(self.p.mainqueue),)
                 string += _(" Line# %d of %d lines |" ) % (self.p.queueindex, len(self.p.mainqueue))
                 if self.p.queueindex > 0:
                     secondselapsed = int(time.time() - self.starttime + self.extra_print_time)
@@ -1607,8 +1613,8 @@ class PronterWindow(MainWindow, pronsole.pronsole):
         dlg = wx.TextEntryDialog(self, ("Enter a target filename in 8.3 format:"), _("Pick SD filename") ,dosify(self.filename))
         if dlg.ShowModal() == wx.ID_OK:
             self.p.send_now("M21")
-            self.p.send_now("M28 "+str(dlg.GetValue()))
-            self.recvlisteners+=[self.uploadtrigger]
+            self.p.send_now("M28 " + str(dlg.GetValue()))
+            self.recvlisteners.append(self.uploadtrigger)
         dlg.Destroy()
 
     def pause(self, event):