From 597d64c2e00be8759286e37fd15823b1c1518845 Mon Sep 17 00:00:00 2001 From: ghost Date: Tue, 27 Oct 2009 19:10:42 +0100 Subject: disable unicable for release 2.6 --- lib/python/Components/NimManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 70cde47c..5154e2b0 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -939,7 +939,7 @@ def InitNimManager(nimmgr): lnb_choices = { "universal_lnb": _("Universal LNB"), - "unicable": _("Unicable"), +# "unicable": _("Unicable"), "c_band": _("C-Band"), "user_defined": _("User defined")} -- cgit v1.2.3 From d66c36f6534f32c7362c45965051cf84ccf84ba9 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Fri, 6 Nov 2009 16:23:29 +0100 Subject: fixes bug #258 removed some wrong ConfigSatList handling --- lib/python/Components/NimManager.py | 8 ++++---- lib/python/Components/config.py | 12 +++++++++++- lib/python/Screens/ScanSetup.py | 5 ++--- 3 files changed, 17 insertions(+), 8 deletions(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 5154e2b0..47325327 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -799,15 +799,15 @@ class NimManager: dm = nim.diseqcMode.value if dm in ("single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"): if nim.diseqcA.orbital_position != 3601: - list.append(self.satList[nim.diseqcA.index-1]) + list.append(nim.diseqcA.getSat()) if dm in ("toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"): if nim.diseqcB.orbital_position != 3601: - list.append(self.satList[nim.diseqcB.index-1]) + list.append(nim.diseqcB.getSat()) if dm == "diseqc_a_b_c_d": if nim.diseqcC.orbital_position != 3601: - list.append(self.satList[nim.diseqcC.index-1]) + list.append(nim.diseqcC.getSat()) if nim.diseqcD.orbital_position != 3601: - list.append(self.satList[nim.diseqcD.index-1]) + list.append(nim.diseqcD.getSat()) if dm == "positioner": for x in self.satList: list.append(x) diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 49501f95..cf2c5e29 100755 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -1148,15 +1148,25 @@ class ConfigSatlist(ConfigSelection): def __init__(self, list, default = None): if default is not None: default = str(default) + list.sort(key = lambda x: int(x[0])) + self._satList = list choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list] - choices.sort(key = lambda x: int(x[0])) ConfigSelection.__init__(self, choices = choices, default = default) + # use this function to get the orbital position, don't rely on .index def getOrbitalPosition(self): if self.value == "": return None return int(self.value) + + def getSatList(self): + return self._satList + + def getSat(self): + return self.satList[self.index] + + satList = property(getSatList) orbital_position = property(getOrbitalPosition) diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index d0af8f7e..aed90268 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -729,11 +729,10 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport): assert len(self.scan_satselection) > index_to_scan nimsats = self.satList[index_to_scan] - selsatidx = self.scan_satselection[index_to_scan].index + orbpos = self.scan_satselection[index_to_scan].getOrbitalPosition() # however, the satList itself could be empty. in that case, "index" is 0 (for "None"). if len(nimsats): - orbpos = nimsats[selsatidx][0] if self.scan_sat.system.value == eDVBFrontendParametersSatellite.System_DVB_S: fec = self.scan_sat.fec.value else: @@ -751,7 +750,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport): self.scan_sat.pilot.value) removeAll = False elif self.scan_type.value == "single_satellite": - sat = self.satList[index_to_scan][self.scan_satselection[index_to_scan].index] + sat = self.scan_satselection[index_to_scan].getSat() getInitialTransponderList(tlist, sat[0]) elif self.scan_type.value.find("multisat") != -1: SatList = nimmanager.getSatListForNim(index_to_scan) -- cgit v1.2.3 From 835d4ae513afbbb62c7739070ef3c23eade22e62 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Sat, 7 Nov 2009 13:51:48 +0100 Subject: fixes bug #258 (again) sorting of satlist moved to another, not so destructive state --- lib/python/Components/NimManager.py | 7 ++++--- lib/python/Components/config.py | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 47325327..1dff777a 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -565,9 +565,10 @@ class NimManager: if self.hasNimType("DVB-S"): print "Reading satellites.xml" db.readSatellites(self.satList, self.satellites, self.transponders) -# print "SATLIST", self.satList -# print "SATS", self.satellites -# print "TRANSPONDERS", self.transponders + self.satList.sort(key = lambda x: x[0]) # sort by orbpos + #print "SATLIST", self.satList + #print "SATS", self.satellites + #print "TRANSPONDERS", self.transponders if self.hasNimType("DVB-C"): print "Reading cables.xml" diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index cf2c5e29..baa6c35b 100755 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -1148,7 +1148,6 @@ class ConfigSatlist(ConfigSelection): def __init__(self, list, default = None): if default is not None: default = str(default) - list.sort(key = lambda x: int(x[0])) self._satList = list choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list] -- cgit v1.2.3 From 513239a74d5abdc0c22fdd8d4dcb892703ef8c27 Mon Sep 17 00:00:00 2001 From: ghost Date: Sat, 7 Nov 2009 14:26:34 +0100 Subject: revert some no more needed bug_258_sorting_of_configsatlist changes --- lib/python/Components/NimManager.py | 8 ++++---- lib/python/Components/config.py | 14 +------------- lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py | 4 ++-- lib/python/Screens/ScanSetup.py | 5 +++-- 4 files changed, 10 insertions(+), 21 deletions(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 1dff777a..8d6cff16 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -800,15 +800,15 @@ class NimManager: dm = nim.diseqcMode.value if dm in ("single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"): if nim.diseqcA.orbital_position != 3601: - list.append(nim.diseqcA.getSat()) + list.append(self.satList[nim.diseqcA.index-1]) if dm in ("toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"): if nim.diseqcB.orbital_position != 3601: - list.append(nim.diseqcB.getSat()) + list.append(self.satList[nim.diseqcB.index-1]) if dm == "diseqc_a_b_c_d": if nim.diseqcC.orbital_position != 3601: - list.append(nim.diseqcC.getSat()) + list.append(self.satList[nim.diseqcC.index-1]) if nim.diseqcD.orbital_position != 3601: - list.append(nim.diseqcD.getSat()) + list.append(self.satList[nim.diseqcD.index-1]) if dm == "positioner": for x in self.satList: list.append(x) diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index baa6c35b..e249caf4 100755 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -1148,24 +1148,12 @@ class ConfigSatlist(ConfigSelection): def __init__(self, list, default = None): if default is not None: default = str(default) - self._satList = list - choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list] - - ConfigSelection.__init__(self, choices = choices, default = default) + ConfigSelection.__init__(self, choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list], default = default) - # use this function to get the orbital position, don't rely on .index def getOrbitalPosition(self): if self.value == "": return None return int(self.value) - - def getSatList(self): - return self._satList - - def getSat(self): - return self.satList[self.index] - - satList = property(getSatList) orbital_position = property(getOrbitalPosition) diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py index ea62550b..fa533c0b 100644 --- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py @@ -484,8 +484,8 @@ class TunerScreen(ScanSetup): self.updateTransponders() def updateTransponders(self): - if len(tuning.sat.satList): - transponderlist = nimmanager.getTransponders(tuning.sat.orbital_position) + if len(tuning.sat.choices): + transponderlist = nimmanager.getTransponders(int(tuning.sat.value)) tps = [] cnt=0 for x in transponderlist: diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index aed90268..d0af8f7e 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -729,10 +729,11 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport): assert len(self.scan_satselection) > index_to_scan nimsats = self.satList[index_to_scan] - orbpos = self.scan_satselection[index_to_scan].getOrbitalPosition() + selsatidx = self.scan_satselection[index_to_scan].index # however, the satList itself could be empty. in that case, "index" is 0 (for "None"). if len(nimsats): + orbpos = nimsats[selsatidx][0] if self.scan_sat.system.value == eDVBFrontendParametersSatellite.System_DVB_S: fec = self.scan_sat.fec.value else: @@ -750,7 +751,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport): self.scan_sat.pilot.value) removeAll = False elif self.scan_type.value == "single_satellite": - sat = self.scan_satselection[index_to_scan].getSat() + sat = self.satList[index_to_scan][self.scan_satselection[index_to_scan].index] getInitialTransponderList(tlist, sat[0]) elif self.scan_type.value.find("multisat") != -1: SatList = nimmanager.getSatListForNim(index_to_scan) -- cgit v1.2.3 From 406b024501ad0bf0473d08b345de5e94c370804b Mon Sep 17 00:00:00 2001 From: ghost Date: Sun, 8 Nov 2009 10:55:25 +0100 Subject: NimManager.py: another fix of satellite sort order .. now we sort from the westernmost to the easternmost satellite --- lib/python/Components/NimManager.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 8d6cff16..05204a74 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -554,6 +554,13 @@ class NimManager: def getSatDescription(self, pos): return self.satellites[pos] + def sortFunc(self, x): + orbpos = x[0] + if orbpos > 1800: + return orbpos - 3600 + else: + return orbpos + 1800 + def readTransponders(self): # read initial networks from file. we only read files which we are interested in, # which means only these where a compatible tuner exists. @@ -565,7 +572,7 @@ class NimManager: if self.hasNimType("DVB-S"): print "Reading satellites.xml" db.readSatellites(self.satList, self.satellites, self.transponders) - self.satList.sort(key = lambda x: x[0]) # sort by orbpos + self.satList.sort(key = self.sortFunc) # sort by orbpos #print "SATLIST", self.satList #print "SATS", self.satellites #print "TRANSPONDERS", self.transponders -- cgit v1.2.3