diff --git a/configtool.py b/configtool.py index 6625f55..876579d 100755 --- a/configtool.py +++ b/configtool.py @@ -391,9 +391,8 @@ class ConfigFrame(wx.Frame): self.onSaveBoardConfig(None) if not self.verifyConfigLoaded(): - dlg = wx.MessageDialog(self, "Loaded configuration does not match what " - "the config.h file. Click Yes to load " - "config.h.", + dlg = wx.MessageDialog(self, "Loaded configuration does not match the " + "config.h file. Click Yes to load config.h.", "Incorrect data loaded", wx.YES_NO | wx.NO_DEFAULT | wx.ICON_INFORMATION) rc = dlg.ShowModal() diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py index 67971cf..66046b5 100644 --- a/configtool/boardpanel.py +++ b/configtool/boardpanel.py @@ -564,8 +564,8 @@ class BoardPanel(wx.Panel): self.addNewDefine(fp, k, values[k]) if newLabels != "": - dlg = wx.MessageDialog(self, "New Defines added to board config:\n" + - newLabels, "New Defines", + dlg = wx.MessageDialog(self, "New defines added to board config:\n" + + newLabels, "New defines", wx.OK + wx.ICON_INFORMATION) dlg.ShowModal() dlg.Destroy() diff --git a/configtool/build.py b/configtool/build.py index 3033e95..97522c4 100644 --- a/configtool/build.py +++ b/configtool/build.py @@ -129,7 +129,7 @@ class Build(wx.Dialog): builddir = join(self.root, "build") if not os.path.exists(builddir): os.makedirs(builddir) - self.log.AppendText("Directory (%s) created.\n\n" % builddir) + self.log.AppendText("Directory %s created.\n\n" % builddir) self.compile() @@ -265,8 +265,8 @@ class Build(wx.Dialog): def formatReportLine(self, m, name, v168, v328, v644, v1280): t = m.groups() v = int(t[0], 16) - self.log.AppendText(("%12s : %6d bytes %6.2f%% %6.2f%%" - " %6.2f%% %6.2f%%\n") % + self.log.AppendText(("%12s: %6d bytes %6.2f%% %6.2f%%" + " %6.2f%% %6.2f%%\n") % (name, v, v / float(v168 * 1024) * 100.0, v / float(v328 * 1024) * 100.0, v / float(v644 * 1024) * 100.0, @@ -277,8 +277,8 @@ class Build(wx.Dialog): reBss = re.compile("\.bss\s+([0-9a-f]+)") reEEProm = re.compile("\.eeprom\s+([0-9a-f]+)") - self.log.AppendText("\n ATmega... '168 '328(P)" - " '644(P) '1280\n") + self.log.AppendText("\n ATmega... '168 '328(P)" + " '644(P) '1280\n") for l in self.reportLines: m = reText.search(l) if m: diff --git a/configtool/calcbelt.py b/configtool/calcbelt.py index 72ddf2e..f58ac5a 100644 --- a/configtool/calcbelt.py +++ b/configtool/calcbelt.py @@ -214,7 +214,7 @@ class CalcBelt(wx.Dialog): resultmm = steps / length self.result = int(resultmm * 1000.0) - self.tcResult.SetLabel("%d steps/m (%.3f steps/mm)" % + self.tcResult.SetLabel("%d steps/m (%.3f steps/mm)" % (self.result, resultmm)) self.tcResolution.SetLabel("%.3f micrometers" % (length / steps * 1000.0)) self.enableUseButtons(True) diff --git a/configtool/calcscrew.py b/configtool/calcscrew.py index 9a26327..96d2af4 100644 --- a/configtool/calcscrew.py +++ b/configtool/calcscrew.py @@ -234,7 +234,7 @@ class CalcScrew(wx.Dialog): resultmm = steps / sp / ratio self.result = int(resultmm * 1000.0) - self.tcResult.SetLabel("%d steps/m (%.3f steps/mm)" % + self.tcResult.SetLabel("%d steps/m (%.3f steps/mm)" % (self.result, resultmm)) self.tcResolution.SetLabel("%.3f micrometers" % (1.0 / resultmm * 1000.0)) self.enableUseButtons(True) diff --git a/configtool/data.py b/configtool/data.py index 41c5d2e..fc814d7 100644 --- a/configtool/data.py +++ b/configtool/data.py @@ -14,7 +14,7 @@ sensorTypes = {'MAX6675': "TT_MAX6675", 'Thermistor': "TT_THERMISTOR", 'AD595': "TT_AD595", 'PT100': "TT_PT100", 'Intercom': "TT_INTERCOM"} -BSIZE = (90, 60) +BSIZE = (100, 60) BSIZESMALL = (90, 30) diff --git a/configtool/miscellaneouspage.py b/configtool/miscellaneouspage.py index ac3974d..61782c4 100644 --- a/configtool/miscellaneouspage.py +++ b/configtool/miscellaneouspage.py @@ -74,15 +74,15 @@ class MiscellaneousPage(wx.Panel, Page): k = 'FAST_PWM' cb = self.addCheckBox(k, self.onCheckBox) - sz.Add(cb, pos = (6, 1)) + sz.Add(cb, pos = (5, 1)) k = 'HEATER_SANITY_CHECK' cb = self.addCheckBox(k, self.onCheckBox) - sz.Add(cb, pos = (7, 1)) + sz.Add(cb, pos = (6, 1)) k = 'REPORT_TARGET_TEMPS' cb = self.addCheckBox(k, self.onCheckBox) - sz.Add(cb, pos = (8, 1)) + sz.Add(cb, pos = (7, 1)) k = 'REFERENCE' ch = self.addChoice(k, self.references, @@ -129,7 +129,7 @@ class MiscellaneousPage(wx.Panel, Page): sz.Add(sbox, pos = (8,3), flag = wx.ALIGN_CENTER_HORIZONTAL) - labelWidth = 180; + labelWidth = 190; k = 'MOVEBUFFER_SIZE' tc = self.addTextCtrl(k, labelWidth, self.onTextCtrlInteger)