From 0c4182b7ce069ba7055fc9d0ffda7f4f8ba13e9f Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Sat, 15 Oct 2005 00:14:57 +0000 Subject: [PATCH] add single satellite scan to userinterface --- data/skin.xml | 6 ++-- lib/python/Components/NimManager.py | 14 +++++++++ lib/python/Components/ScanSetup.py | 46 ----------------------------- lib/python/Screens/NetworkSetup.py | 3 ++ lib/python/Screens/ScanSetup.py | 11 ++++++- 5 files changed, 31 insertions(+), 49 deletions(-) diff --git a/data/skin.xml b/data/skin.xml index bf77ed85..4a7b8252 100644 --- a/data/skin.xml +++ b/data/skin.xml @@ -61,11 +61,13 @@ - - + + + + diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 01ef4bf4..2086bee8 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -119,6 +119,20 @@ class NimManager: nimText += ("DVB-S", "DVB-C", "DVB-T")[slot.nimType] + ")" list.append((nimText, slot)) return list + + def getSatListForNim(self, slotid): + print "slotid:", slotid + list = [] + print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value] + print "diseqcA:", config.Nims[slotid].diseqcA.value + if (config.Nims[slotid].diseqcMode.value <= 3): + list.append(self.satList[config.Nims[slotid].diseqcA.value]) + if (0 < config.Nims[slotid].diseqcMode.value <= 3): + list.append(self.satList[config.Nims[slotid].diseqcB.value]) + if (config.Nims[slotid].diseqcMode.value == 3): + list.append(self.satList[config.Nims[slotid].diseqcC.value]) + list.append(self.satList[config.Nims[slotid].diseqcD.value]) + return list #callbacks for c++ config def nimConfigModeChanged(self, slotid, mode): diff --git a/lib/python/Components/ScanSetup.py b/lib/python/Components/ScanSetup.py index 95e47671..e69de29b 100644 --- a/lib/python/Components/ScanSetup.py +++ b/lib/python/Components/ScanSetup.py @@ -1,46 +0,0 @@ -from config import * -from Components.NimManager import nimmanager - -def InitScanSetup(): - config.scan = ConfigSubsection() - config.scan.sat = ConfigSubsection() - config.scan.cab = ConfigSubsection() - config.scan.ter = ConfigSubsection() - 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_nonSave("config.scan.nims", configSelection, 0, nimList) - - # sat - config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [12187], configsequencearg.get("INTEGER", (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], configsequencearg.get("INTEGER", (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_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (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], configsequencearg.get("INTEGER", (1, 30000))) - - # terrestial - config.scan.ter.frequency = configElement_nonSave("config.scan.ter.frequency", configSequence, [466], configsequencearg.get("INTEGER", (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_nonSave("config.scan.scansat[" + str(sat[1]) + "]", configSelection, 0, ("yes", "no")) - - \ No newline at end of file diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py index 3f5520b1..8b552654 100644 --- a/lib/python/Screens/NetworkSetup.py +++ b/lib/python/Screens/NetworkSetup.py @@ -4,6 +4,7 @@ from Components.ConfigList import ConfigList from Components.config import config from Components.config import getConfigListEntry from Components.Network import iNetwork +from Components.Label import Label class NetworkSetup(Screen): def __init__(self, session): @@ -31,6 +32,8 @@ class NetworkSetup(Screen): self["config"] = ConfigList(self.list) self.createSetup() + self["introduction"] = Label("Press OK to activate the settings.") + def createSetup(self): self.list = [] diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index e93f0212..8f3c1e89 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -4,6 +4,8 @@ from Components.ConfigList import ConfigList from Components.config import config from Components.config import getConfigListEntry from Components.NimManager import nimmanager +from Components.Label import Label +from Components.ScanSetup import InitScanSetup class ScanSetup(Screen): def __init__(self, session): @@ -20,8 +22,11 @@ class ScanSetup(Screen): self.list = [] self["config"] = ConfigList(self.list) self.createSetup() + + self["introduction"] = Label("Press OK to start the scan") def createSetup(self): + #InitScanSetup() self.list = [] self.list.append(getConfigListEntry("Type of scan", config.scan.type)) @@ -53,8 +58,12 @@ class ScanSetup(Screen): self.list.append(getConfigListEntry("Hierarchy mode", config.scan.ter.hierarchy)) # single satellite scan + print "NIM: ", config.scan.nims.value + print config.scan.satselection if (config.scan.type.value == 1): - pass + print config.scan.satselection[config.scan.nims.value] + self.list.append(getConfigListEntry("Satellite", config.scan.satselection[config.scan.nims.value])) + # multi sat scan if (config.scan.type.value == 2): -- 2.30.2