From 2421afa48ccaf67ebbb0e41199cfb597d7725993 Mon Sep 17 00:00:00 2001 From: Guillaume Seguin Date: Tue, 28 Feb 2012 03:06:55 +0100 Subject: [PATCH 1/2] Replace "T:" and "B:" in temp monitoring display since a B might be in the translation for Heater --- pronterface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pronterface.py b/pronterface.py index f69d567..8f11348 100755 --- a/pronterface.py +++ b/pronterface.py @@ -1156,7 +1156,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole): string+=_("Loaded ")+os.path.split(self.filename)[1]+" " except: pass - string+=(self.tempreport.replace("\r","").replace("T",_("Hotend")).replace("B",_("Bed")).replace("\n","").replace("ok ",""))+" " + string+=(self.tempreport.replace("\r","").replace("T:",_("Hotend") + ":").replace("B:",_("Bed") + ":").replace("\n","").replace("ok ",""))+" " wx.CallAfter(self.tempdisp.SetLabel,self.tempreport.strip().replace("ok ","")) try: self.hottgauge.SetValue(float(filter(lambda x:x.startswith("T:"),self.tempreport.split())[0].split(":")[1])) From 9b32c9ae9e057d7a1d96372ddb541795a3bab8dd Mon Sep 17 00:00:00 2001 From: Guillaume Seguin Date: Tue, 28 Feb 2012 03:08:56 +0100 Subject: [PATCH 2/2] Reset Print button and status when resetting machine --- pronterface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pronterface.py b/pronterface.py index 8f11348..2aa3a31 100755 --- a/pronterface.py +++ b/pronterface.py @@ -1551,11 +1551,11 @@ class PronterWindow(wx.Frame,pronsole.pronsole): dlg=wx.MessageDialog(self, _("Are you sure you want to reset the printer?"), _("Reset?"), wx.YES|wx.NO) if dlg.ShowModal()==wx.ID_YES: self.p.reset() + self.p.printing=0 + wx.CallAfter(self.printbtn.SetLabel, _("Print")) if self.paused: self.p.paused=0 - self.p.printing=0 wx.CallAfter(self.pausebtn.SetLabel, _("Pause")) - wx.CallAfter(self.printbtn.SetLabel, _("Print")) self.paused=0 def get_build_dimensions(self,bdim):