Configtool: move choices value insertion to the parent class.

This shouldn't change behaviour.

configtool/communicationspage.py

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

configtool/miscellaneouspage.py

@@ -238,13 +238,6 @@ class MiscellaneousPage(wx.Panel, Page):
       v = 0
     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):
     result = Page.getValues(self)
 

configtool/page.py

@@ -260,6 +260,13 @@ class Page:
       else:
         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():
       choice = self.boolChoices[k]
 

configtool/pinoutspage.py

@@ -178,16 +178,6 @@ class PinoutsPage(wx.Panel, Page):
     self.assertModified(True)
     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):
     result = Page.getValues(self)
 

configtool/sensorpage.py

@@ -151,13 +151,6 @@ class SensorsPage(wx.Panel, Page):
   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."
-
     self.bAdd.Enable(True)
 
   def setSensors(self, sensors):