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

Configtool: move choices value insertion to the parent class. 

This shouldn't change behaviour.
This commit is contained in:
Markus Hitter 2016-05-29 19:17:25 +02:00
parent ca69343a04
commit 7a18217dee
5 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configtool/communicationspage.py
View File

@ -47,8 +47,6 @@ class CommunicationsPage(wx.Panel, Page):
k = 'BAUD' k = 'BAUD'
self.setChoice(k, cfgValues, self.defaultBaud) self.setChoice(k, cfgValues, self.defaultBaud)
if k in cfgValues.keys():
self.choicesOriginal[k] = cfgValues[k]
if self.checkBoxes['USB_SERIAL'].IsChecked(): if self.checkBoxes['USB_SERIAL'].IsChecked():
self.checkBoxes['XONXOFF'].Enable(False) self.checkBoxes['XONXOFF'].Enable(False)

7
configtool/miscellaneouspage.py
View File

@ -238,13 +238,6 @@ class MiscellaneousPage(wx.Panel, Page):
v = 0 v = 0
self.choices[k].SetSelection(v) self.choices[k].SetSelection(v)
def insertValues(self, cfgValues):
Page.insertValues(self, cfgValues)
for k in self.choices.keys():
if k in cfgValues.keys():
self.choicesOriginal[k] = cfgValues[k]
def getValues(self): def getValues(self):
result = Page.getValues(self) result = Page.getValues(self)

7
configtool/page.py
View File

@ -260,6 +260,13 @@ class Page:
else: else:
print "Key " + k + " not found in config data." print "Key " + k + " not found in config data."
for k in self.choices.keys():
if k in cfgValues.keys():
self.choicesOriginal[k] = cfgValues[k]
self.setChoice(k, cfgValues, "-")
else:
print "Key " + k + " not found in config data."
for k in self.boolChoices.keys(): for k in self.boolChoices.keys():
choice = self.boolChoices[k] choice = self.boolChoices[k]

10
configtool/pinoutspage.py
View File

@ -178,16 +178,6 @@ class PinoutsPage(wx.Panel, Page):
self.assertModified(True) self.assertModified(True)
evt.Skip() evt.Skip()
def insertValues(self, cfgValues):
Page.insertValues(self, cfgValues)
for k in self.choices.keys():
if k in cfgValues.keys():
self.choicesOriginal[k] = cfgValues[k]
self.setChoice(k, cfgValues, "-")
else:
print "Key " + k + " not found in config data."
def getValues(self): def getValues(self):
result = Page.getValues(self) result = Page.getValues(self)

7
configtool/sensorpage.py
View File

@ -151,13 +151,6 @@ class SensorsPage(wx.Panel, Page):
def insertValues(self, cfgValues): def insertValues(self, cfgValues):
Page.insertValues(self, cfgValues) Page.insertValues(self, cfgValues)
for k in self.choices.keys():
if k in cfgValues.keys():
self.choicesOriginal[k] = cfgValues[k]
self.setChoice(k, cfgValues, "-")
else:
print "Key " + k + " not found in config data."
self.bAdd.Enable(True) self.bAdd.Enable(True)
def setSensors(self, sensors): def setSensors(self, sensors):