projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'translations' into experimental
[vuplus_dvbapp]
/
lib
/
python
/
Components
/
NimManager.py
diff --git
a/lib/python/Components/NimManager.py
b/lib/python/Components/NimManager.py
index
8d6cff1
..
78e17bb
100644
(file)
--- 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 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.
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)
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
#print "SATLIST", self.satList
#print "SATS", self.satellites
#print "TRANSPONDERS", self.transponders
@@
-940,7
+947,7
@@
def InitNimManager(nimmgr):
lnb_choices = {
"universal_lnb": _("Universal LNB"),
lnb_choices = {
"universal_lnb": _("Universal LNB"),
-
#
"unicable": _("Unicable"),
+
"unicable": _("Unicable"),
"c_band": _("C-Band"),
"user_defined": _("User defined")}
"c_band": _("C-Band"),
"user_defined": _("User defined")}