Configtool: move handling of unused pins to parent class.
This shouldn't change behaviour.
This commit is contained in:
parent
7a18217dee
commit
ad021f7df7
|
|
@ -316,7 +316,14 @@ class Page:
|
||||||
|
|
||||||
for k in self.choices.keys():
|
for k in self.choices.keys():
|
||||||
v = self.choices[k].GetSelection()
|
v = self.choices[k].GetSelection()
|
||||||
result[k] = self.choices[k].GetString(v), True
|
s = self.choices[k].GetString(v)
|
||||||
|
if s == "-":
|
||||||
|
if k in self.choicesOriginal.keys():
|
||||||
|
result[k] = self.choicesOriginal[k][0], False
|
||||||
|
else:
|
||||||
|
result[k] = "", False
|
||||||
|
else:
|
||||||
|
result[k] = s, True
|
||||||
|
|
||||||
for k in self.boolChoices.keys():
|
for k in self.boolChoices.keys():
|
||||||
choice = self.boolChoices[k]
|
choice = self.boolChoices[k]
|
||||||
|
|
|
||||||
|
|
@ -177,15 +177,3 @@ class PinoutsPage(wx.Panel, Page):
|
||||||
def onChoice(self, evt):
|
def onChoice(self, evt):
|
||||||
self.assertModified(True)
|
self.assertModified(True)
|
||||||
evt.Skip()
|
evt.Skip()
|
||||||
|
|
||||||
def getValues(self):
|
|
||||||
result = Page.getValues(self)
|
|
||||||
|
|
||||||
for k in self.choices.keys():
|
|
||||||
if result[k][0] == "-":
|
|
||||||
if k in self.choicesOriginal.keys():
|
|
||||||
result[k] = self.choicesOriginal[k][0], False
|
|
||||||
else:
|
|
||||||
result[k] = "", False
|
|
||||||
|
|
||||||
return result
|
|
||||||
|
|
|
||||||
|
|
@ -194,11 +194,4 @@ class SensorsPage(wx.Panel, Page):
|
||||||
for v in values.keys():
|
for v in values.keys():
|
||||||
result[v] = values[v]
|
result[v] = values[v]
|
||||||
|
|
||||||
for k in self.choices.keys():
|
|
||||||
if result[k][0] == "-":
|
|
||||||
if k in self.choicesOriginal.keys():
|
|
||||||
result[k] = self.choicesOriginal[k][0], False
|
|
||||||
else:
|
|
||||||
result[k] = "", False
|
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue