josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Configtool: de-duplicate insertValues(). 

No change in behaviour intended.
This commit is contained in:
Markus Hitter 2015-07-16 12:34:36 +02:00
parent 88b813c4ba
commit 27cf051f03
9 changed files with 28 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configtool/accelerationpage.py
View File

@ -100,18 +100,10 @@ class AccelerationPage(wx.Panel, Page):
evt.Skip() evt.Skip()
def insertValues(self, cfgValues): def insertValues(self, cfgValues):
self.assertValid(True) Page.insertValues(self, cfgValues)
self.enableAll(True)
for k in self.fieldValid.keys():
self.fieldValid[k] = True
self.checkBoxes['LOOKAHEAD'].Enable(False) self.checkBoxes['LOOKAHEAD'].Enable(False)
self.textControls['ACCELERATION'].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', for tag in ['ACCELERATION_REPRAP', 'ACCELERATION_RAMPING',
'ACCELERATION_TEMPORAL']: 'ACCELERATION_TEMPORAL']:
if tag in cfgValues.keys() and cfgValues[tag]: if tag in cfgValues.keys() and cfgValues[tag]:
@ -119,10 +111,3 @@ class AccelerationPage(wx.Panel, Page):
if tag == 'ACCELERATION_RAMPING': if tag == 'ACCELERATION_RAMPING':
self.checkBoxes['LOOKAHEAD'].Enable(True) self.checkBoxes['LOOKAHEAD'].Enable(True)
self.textControls['ACCELERATION'].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)

13
configtool/communicationspage.py
View File

@ -43,24 +43,13 @@ class CommunicationsPage(wx.Panel, Page):
evt.Skip() evt.Skip()
def insertValues(self, cfgValues): def insertValues(self, cfgValues):
self.assertValid(True) Page.insertValues(self, cfgValues)
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)
self.setChoice('BAUD', cfgValues, self.defaultBaud) self.setChoice('BAUD', cfgValues, self.defaultBaud)
if self.checkBoxes['USB_SERIAL'].IsChecked(): if self.checkBoxes['USB_SERIAL'].IsChecked():
self.checkBoxes['XONXOFF'].Enable(False) self.checkBoxes['XONXOFF'].Enable(False)
self.choices['BAUD'].Enable(False) self.choices['BAUD'].Enable(False)
self.assertModified(False)
def getValues(self): def getValues(self):
result = Page.getValues(self) result = Page.getValues(self)

8
configtool/cpupage.py
View File

@ -45,15 +45,9 @@ class CpuPage(wx.Panel, Page):
self.clocks = clist self.clocks = clist
def insertValues(self, cfgValues): def insertValues(self, cfgValues):
self.assertValid(True) Page.insertValues(self, cfgValues)
self.enableAll(True)
for k in self.fieldValid.keys():
self.fieldValid[k] = True
if len(self.clocks) > 0: if len(self.clocks) > 0:
self.setChoice('F_CPU', cfgValues, self.clocks[0]) self.setChoice('F_CPU', cfgValues, self.clocks[0])
if len(self.processors) > 0: if len(self.processors) > 0:
self.setChoice('CPU', cfgValues, self.processors[0]) self.setChoice('CPU', cfgValues, self.processors[0])
self.assertModified(False)

10
configtool/heaterspage.py
View File

@ -144,16 +144,6 @@ class HeatersPage(wx.Panel, Page):
self.parent.setHeaters(self.heaters) self.parent.setHeaters(self.heaters)
self.assertModified(True) 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): def setHeaters(self, heaters):
self.heaters = heaters self.heaters = heaters
self.lb.updateList(self.heaters) self.lb.updateList(self.heaters)

18
configtool/mechanicalpage.py
View File

@ -182,20 +182,7 @@ class MechanicalPage(wx.Panel, Page):
self.radioButtons[k].SetToolTipString(ht['KINEMATICS']) self.radioButtons[k].SetToolTipString(ht['KINEMATICS'])
def insertValues(self, cfgValues): def insertValues(self, cfgValues):
self.assertValid(True) Page.insertValues(self, cfgValues)
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)
if 'KINEMATICS' in cfgValues.keys(): if 'KINEMATICS' in cfgValues.keys():
k = cfgValues['KINEMATICS'] k = cfgValues['KINEMATICS']
@ -206,9 +193,6 @@ class MechanicalPage(wx.Panel, Page):
else: else:
self.radioButtons[self.kinematicsKeys[0]].SetValue(True) self.radioButtons[self.kinematicsKeys[0]].SetValue(True)
self.assertModified(False)
self.enableAll(True)
def getValues(self): def getValues(self):
result = Page.getValues(self) result = Page.getValues(self)

20
configtool/miscellaneouspage.py
View File

@ -233,26 +233,6 @@ class MiscellaneousPage(wx.Panel, Page):
v = 0 v = 0
self.choices[k].SetSelection(v) 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): def getValues(self):
result = Page.getValues(self) result = Page.getValues(self)

20
configtool/page.py
View File

@ -211,6 +211,26 @@ class Page:
if k in ht.keys(): if k in ht.keys():
self.choices[k].SetToolTipString(ht[k]) 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): def getValues(self):
self.assertModified(False) self.assertModified(False)
result = {} result = {}

18
configtool/pinoutspage.py
View File

@ -179,27 +179,11 @@ class PinoutsPage(wx.Panel, Page):
evt.Skip() evt.Skip()
def insertValues(self, cfgValues): def insertValues(self, cfgValues):
self.assertValid(True) Page.insertValues(self, cfgValues)
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)
for k in self.choices.keys(): for k in self.choices.keys():
self.setChoice(k, cfgValues, "-") self.setChoice(k, cfgValues, "-")
self.assertModified(False)
def getValues(self): def getValues(self):
result = Page.getValues(self) result = Page.getValues(self)

16
configtool/sensorpage.py
View File

@ -141,21 +141,9 @@ class SensorsPage(wx.Panel, Page):
self.assertModified(True) self.assertModified(True)
def insertValues(self, cfgValues): def insertValues(self, cfgValues):
self.enableAll(True) Page.insertValues(self, cfgValues)
self.bAdd.Enable(True) 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): def setSensors(self, sensors):
self.sensors = sensors self.sensors = sensors