From 7c1700cc9ba3cae93b1868bb14b57d61f497e9a4 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Tue, 11 Oct 2005 01:13:48 +0000 Subject: [PATCH] use a configElement_nonSave instead of constructor argument in configElement --- lib/python/Components/ScanSetup.py | 46 +++++++++++++++--------------- lib/python/Components/config.py | 13 ++++++--- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/lib/python/Components/ScanSetup.py b/lib/python/Components/ScanSetup.py index 864eec74..6cdefe43 100644 --- a/lib/python/Components/ScanSetup.py +++ b/lib/python/Components/ScanSetup.py @@ -1,6 +1,6 @@ from config import config from config import ConfigSubsection -from config import configElement +from config import configElement_nonSave from config import configSelection from config import configSequence from Components.NimManager import nimmanager @@ -10,41 +10,41 @@ def InitScanSetup(): config.scan.sat = ConfigSubsection() config.scan.cab = ConfigSubsection() config.scan.ter = ConfigSubsection() - config.scan.type = configElement("config.scan.type", configSelection, 0, ("Single transponder", "Single satellite", "Multisat"), False) + config.scan.type = configElement_nonSave("config.scan.type", configSelection, 0, ("Single transponder", "Single satellite", "Multisat")) nimList = [ ] for nim in nimmanager.nimList(): nimList.append(nim[0]) nimList.append("all") - config.scan.nims = configElement("config.scan.nims", configSelection, 0, nimList, False) + config.scan.nims = configElement_nonSave("config.scan.nims", configSelection, 0, nimList) # sat - config.scan.sat.frequency = configElement("config.scan.sat.frequency", configSequence, [12187], (("."), (10000,14000)), False) - config.scan.sat.inversion = configElement("config.scan.sat.inversion", configSelection, 0, ("off", "on"), False) - config.scan.sat.symbolrate = configElement("config.scan.sat.symbolrate", configSequence, [27500], (("."), (1,30000)), False) - config.scan.sat.polarzation = configElement("config.scan.sat.polarzation", configSelection, 0, ("horizontal", "vertical"), False) - config.scan.sat.fec = configElement("config.scan.sat.fec", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9"), False) + config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [12187], (("."), (10000,14000))) + config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 0, ("off", "on")) + config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], (("."), (1,30000))) + config.scan.sat.polarzation = configElement_nonSave("config.scan.sat.polarzation", configSelection, 0, ("horizontal", "vertical")) + config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) # cable - config.scan.cab.frequency = configElement("config.scan.cab.frequency", configSequence, [466], (("."), (10000,14000)), False) - config.scan.cab.inversion = configElement("config.scan.cab.inversion", configSelection, 0, ("off", "on"), False) - config.scan.cab.modulation = configElement("config.scan.cab.modulation", configSelection, 0, ("Auto", "16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM"), False) - config.scan.cab.fec = configElement("config.scan.cab.fec", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9"), False) - config.scan.cab.symbolrate = configElement("config.scan.cab.symbolrate", configSequence, [6900], (("."), (1,30000)), False) + config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], (("."), (10000,14000))) + config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, 0, ("off", "on")) + config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 0, ("Auto", "16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM")) + config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) + config.scan.cab.symbolrate = configElement_nonSave("config.scan.cab.symbolrate", configSequence, [6900], (("."), (1,30000))) # terrestial - config.scan.ter.frequency = configElement("config.scan.ter.frequency", configSequence, [466], (("."), (10000,14000)), False) - config.scan.ter.inversion = configElement("config.scan.ter.inversion", configSelection, 0, ("off", "on"), False) - config.scan.ter.bandwidth = configElement("config.scan.ter.bandwidth", configSelection, 0, ("Auto", "6 MHz", "7MHz", "8MHz"), False) - config.scan.ter.fechigh = configElement("config.scan.ter.fechigh", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9"), False) - config.scan.ter.feclow = configElement("config.scan.ter.feclow", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9"), False) - config.scan.ter.modulation = configElement("config.scan.ter.modulation", configSelection, 0, ("Auto", "16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM"), False) - config.scan.ter.transmission = configElement("config.scan.ter.transmission", configSelection, 0, ("Auto", "2K", "8K"), False) - config.scan.ter.guard = configElement("config.scan.ter.guard", configSelection, 0, ("Auto", "1/4", "1/8", "1/16", "1/32"), False) - config.scan.ter.hierarchy = configElement("config.scan.ter.hierarchy", configSelection, 0, ("Auto", "1", "2", "4"), False) + config.scan.ter.frequency = configElement_nonSave("config.scan.ter.frequency", configSequence, [466], (("."), (10000,14000))) + config.scan.ter.inversion = configElement_nonSave("config.scan.ter.inversion", configSelection, 0, ("off", "on")) + config.scan.ter.bandwidth = configElement_nonSave("config.scan.ter.bandwidth", configSelection, 0, ("Auto", "6 MHz", "7MHz", "8MHz")) + config.scan.ter.fechigh = configElement_nonSave("config.scan.ter.fechigh", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) + config.scan.ter.feclow = configElement_nonSave("config.scan.ter.feclow", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) + config.scan.ter.modulation = configElement_nonSave("config.scan.ter.modulation", configSelection, 0, ("Auto", "16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM")) + config.scan.ter.transmission = configElement_nonSave("config.scan.ter.transmission", configSelection, 0, ("Auto", "2K", "8K")) + config.scan.ter.guard = configElement_nonSave("config.scan.ter.guard", configSelection, 0, ("Auto", "1/4", "1/8", "1/16", "1/32")) + config.scan.ter.hierarchy = configElement_nonSave("config.scan.ter.hierarchy", configSelection, 0, ("Auto", "1", "2", "4")) config.scan.scansat = {} for sat in nimmanager.satList: #print sat[1] - config.scan.scansat[sat[1]] = configElement("config.scan.scansat[" + str(sat[1]) + "]", configSelection, 0, ("yes", "no"), False) + config.scan.scansat[sat[1]] = configElement_nonSave("config.scan.scansat[" + str(sat[1]) + "]", configSelection, 0, ("yes", "no")) \ No newline at end of file diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 482482ce..3598fd6e 100644 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -316,14 +316,13 @@ class configElement: #is this right? activate settings after load/cancel and use default self.change() - def __init__(self, configPath, control, defaultValue, vals, shouldSave = True): + def __init__(self, configPath, control, defaultValue, vals): self.configPath = configPath self.defaultValue = defaultValue self.controlType = control self.vals = vals self.notifierList = [ ] self.enabled = True - self.shouldSave = shouldSave self.loadData() def addNotifier(self, notifier): self.notifierList.append(notifier); @@ -334,9 +333,15 @@ class configElement: def reload(self): self.loadData() def save(self): - if (self.shouldSave == True): - configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value)) + configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value)) +class configElement_nonSave(configElement): + def __init__(self, configPath, control, defaultValue, vals): + configElement.__init__(self, configPath, control, defaultValue, vals) + + def save(self): + pass + def getConfigListEntry(description, element): b = element item = b.controlType(b) -- 2.30.2