diff --git a/configtool/accelerationpage.py b/configtool/accelerationpage.py index 8f6b86c..10ab006 100644 --- a/configtool/accelerationpage.py +++ b/configtool/accelerationpage.py @@ -100,18 +100,10 @@ class AccelerationPage(wx.Panel, Page): evt.Skip() def insertValues(self, cfgValues): - self.assertValid(True) - self.enableAll(True) - for k in self.fieldValid.keys(): - self.fieldValid[k] = True + Page.insertValues(self, cfgValues) + self.checkBoxes['LOOKAHEAD'].Enable(False) self.textControls['ACCELERATION'].Enable(False) - for k in self.textControls.keys(): - if k in cfgValues.keys(): - self.textControls[k].SetValue(cfgValues[k]) - else: - self.textControls[k].SetValue("") - for tag in ['ACCELERATION_REPRAP', 'ACCELERATION_RAMPING', 'ACCELERATION_TEMPORAL']: if tag in cfgValues.keys() and cfgValues[tag]: @@ -119,10 +111,3 @@ class AccelerationPage(wx.Panel, Page): if tag == 'ACCELERATION_RAMPING': self.checkBoxes['LOOKAHEAD'].Enable(True) self.textControls['ACCELERATION'].Enable(True) - - k = 'LOOKAHEAD' - if k in cfgValues.keys() and cfgValues[k]: - self.checkBoxes[k].SetValue(True) - else: - self.checkBoxes[k].SetValue(False) - self.assertModified(False) diff --git a/configtool/communicationspage.py b/configtool/communicationspage.py index 132f09f..44a5f89 100644 --- a/configtool/communicationspage.py +++ b/configtool/communicationspage.py @@ -43,24 +43,13 @@ class CommunicationsPage(wx.Panel, Page): evt.Skip() def insertValues(self, cfgValues): - self.assertValid(True) - self.enableAll(True) - for k in self.fieldValid.keys(): - self.fieldValid[k] = True - - for k in self.checkBoxes.keys(): - if k in cfgValues.keys() and cfgValues[k]: - self.checkBoxes[k].SetValue(True) - else: - self.checkBoxes[k].SetValue(False) + Page.insertValues(self, cfgValues) self.setChoice('BAUD', cfgValues, self.defaultBaud) if self.checkBoxes['USB_SERIAL'].IsChecked(): self.checkBoxes['XONXOFF'].Enable(False) self.choices['BAUD'].Enable(False) - self.assertModified(False) - def getValues(self): result = Page.getValues(self) diff --git a/configtool/cpupage.py b/configtool/cpupage.py index 98e1c6a..9b2cb04 100644 --- a/configtool/cpupage.py +++ b/configtool/cpupage.py @@ -45,15 +45,9 @@ class CpuPage(wx.Panel, Page): self.clocks = clist def insertValues(self, cfgValues): - self.assertValid(True) - self.enableAll(True) - - for k in self.fieldValid.keys(): - self.fieldValid[k] = True + Page.insertValues(self, cfgValues) if len(self.clocks) > 0: self.setChoice('F_CPU', cfgValues, self.clocks[0]) if len(self.processors) > 0: self.setChoice('CPU', cfgValues, self.processors[0]) - - self.assertModified(False) diff --git a/configtool/heaterspage.py b/configtool/heaterspage.py index 8a515b3..181d19c 100644 --- a/configtool/heaterspage.py +++ b/configtool/heaterspage.py @@ -144,16 +144,6 @@ class HeatersPage(wx.Panel, Page): self.parent.setHeaters(self.heaters) self.assertModified(True) - def insertValues(self, cfgValues): - self.enableAll(True) - for k in self.checkBoxes.keys(): - if k in cfgValues.keys() and cfgValues[k]: - self.checkBoxes[k].SetValue(True) - else: - self.checkBoxes[k].SetValue(False) - - self.assertModified(False) - def setHeaters(self, heaters): self.heaters = heaters self.lb.updateList(self.heaters) diff --git a/configtool/mechanicalpage.py b/configtool/mechanicalpage.py index 0ae66b7..73e3a89 100644 --- a/configtool/mechanicalpage.py +++ b/configtool/mechanicalpage.py @@ -182,20 +182,7 @@ class MechanicalPage(wx.Panel, Page): self.radioButtons[k].SetToolTipString(ht['KINEMATICS']) def insertValues(self, cfgValues): - self.assertValid(True) - for k in self.fieldValid.keys(): - self.fieldValid[k] = True - for k in self.textControls.keys(): - if k in cfgValues.keys(): - self.textControls[k].SetValue(cfgValues[k]) - else: - self.textControls[k].SetValue("") - - for k in self.checkBoxes.keys(): - if k in cfgValues.keys() and cfgValues[k]: - self.checkBoxes[k].SetValue(True) - else: - self.checkBoxes[k].SetValue(False) + Page.insertValues(self, cfgValues) if 'KINEMATICS' in cfgValues.keys(): k = cfgValues['KINEMATICS'] @@ -206,9 +193,6 @@ class MechanicalPage(wx.Panel, Page): else: self.radioButtons[self.kinematicsKeys[0]].SetValue(True) - self.assertModified(False) - self.enableAll(True) - def getValues(self): result = Page.getValues(self) diff --git a/configtool/miscellaneouspage.py b/configtool/miscellaneouspage.py index 2b6d361..76dd778 100644 --- a/configtool/miscellaneouspage.py +++ b/configtool/miscellaneouspage.py @@ -233,26 +233,6 @@ class MiscellaneousPage(wx.Panel, Page): v = 0 self.choices[k].SetSelection(v) - def insertValues(self, cfgValues): - self.assertValid(True) - for k in self.fieldValid.keys(): - self.fieldValid[k] = True - - for k in self.checkBoxes.keys(): - if k in cfgValues.keys() and cfgValues[k]: - self.checkBoxes[k].SetValue(True) - else: - self.checkBoxes[k].SetValue(False) - - for k in self.textControls.keys(): - if k in cfgValues.keys(): - self.textControls[k].SetValue(str(cfgValues[k])) - else: - self.textControls[k].SetValue("") - - self.assertModified(False) - self.enableAll(True) - def getValues(self): result = Page.getValues(self) diff --git a/configtool/page.py b/configtool/page.py index a3bf713..545e46f 100644 --- a/configtool/page.py +++ b/configtool/page.py @@ -211,6 +211,26 @@ class Page: if k in ht.keys(): self.choices[k].SetToolTipString(ht[k]) + def insertValues(self, cfgValues): + self.assertValid(True) + self.enableAll(True) + for k in self.fieldValid.keys(): + self.fieldValid[k] = True + + for k in self.checkBoxes.keys(): + if k in cfgValues.keys() and cfgValues[k]: + self.checkBoxes[k].SetValue(True) + else: + self.checkBoxes[k].SetValue(False) + + for k in self.textControls.keys(): + if k in cfgValues.keys(): + self.textControls[k].SetValue(str(cfgValues[k])) + else: + self.textControls[k].SetValue("") + + self.assertModified(False) + def getValues(self): self.assertModified(False) result = {} diff --git a/configtool/pinoutspage.py b/configtool/pinoutspage.py index 2711385..f1c17ca 100644 --- a/configtool/pinoutspage.py +++ b/configtool/pinoutspage.py @@ -179,27 +179,11 @@ class PinoutsPage(wx.Panel, Page): evt.Skip() def insertValues(self, cfgValues): - self.assertValid(True) - self.enableAll(True) - for k in self.fieldValid.keys(): - self.fieldValid[k] = True - for k in self.textControls.keys(): - if k in cfgValues.keys(): - self.textControls[k].SetValue(cfgValues[k]) - else: - self.textControls[k].SetValue("") - - for k in self.checkBoxes.keys(): - if k in cfgValues.keys() and cfgValues[k]: - self.checkBoxes[k].SetValue(True) - else: - self.checkBoxes[k].SetValue(False) + Page.insertValues(self, cfgValues) for k in self.choices.keys(): self.setChoice(k, cfgValues, "-") - self.assertModified(False) - def getValues(self): result = Page.getValues(self) diff --git a/configtool/sensorpage.py b/configtool/sensorpage.py index 270ebc1..68bf203 100644 --- a/configtool/sensorpage.py +++ b/configtool/sensorpage.py @@ -141,21 +141,9 @@ class SensorsPage(wx.Panel, Page): self.assertModified(True) def insertValues(self, cfgValues): - self.enableAll(True) + Page.insertValues(self, cfgValues) + self.bAdd.Enable(True) - for k in self.textControls.keys(): - if k in cfgValues.keys(): - self.textControls[k].SetValue(cfgValues[k]) - else: - self.textControls[k].SetValue("") - - for k in self.checkBoxes.keys(): - if k in cfgValues.keys() and cfgValues[k]: - self.checkBoxes[k].SetValue(True) - else: - self.checkBoxes[k].SetValue(False) - - self.assertModified(False) def setSensors(self, sensors): self.sensors = sensors