git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
translate a single letter
[enigma2.git]
/
lib
/
python
/
Components
/
NimManager.py
diff --git
a/lib/python/Components/NimManager.py
b/lib/python/Components/NimManager.py
index 38047cbdd96efa28749a0193cbb6b583a33197c9..0452adbe7adccbe3c2c02ab9f039dcebc7f31124 100644
(file)
--- a/
lib/python/Components/NimManager.py
+++ b/
lib/python/Components/NimManager.py
@@
-127,7
+127,9
@@
class NimManager:
def startElement(self, name, attrs):
if (name == "sat"):
#print "found sat " + attrs.get('name',"") + " " + str(attrs.get('position',""))
def startElement(self, name, attrs):
if (name == "sat"):
#print "found sat " + attrs.get('name',"") + " " + str(attrs.get('position',""))
- tpos = attrs.get('position',"")
+ tpos = int(attrs.get('position',""))
+ if tpos < 0:
+ tpos = 3600 + tpos
tname = attrs.get('name',"")
self.satellites[tpos] = tname
self.satList.append( (tname, tpos) )
tname = attrs.get('name',"")
self.satellites[tpos] = tname
self.satList.append( (tname, tpos) )
@@
-166,7
+168,7
@@
class NimManager:
else:
self.transponders[self.parsedCab] = [ ]
else:
self.transponders[self.parsedCab] = [ ]
- self.transponders[self.parsedCab].append((
0
, freq, sr, mod, fec))
+ self.transponders[self.parsedCab].append((
1
, freq, sr, mod, fec))
class parseTerrestrials(ContentHandler):
def __init__(self, terrestrialsList, transponders):
class parseTerrestrials(ContentHandler):
def __init__(self, terrestrialsList, transponders):
@@
-197,7
+199,7
@@
class NimManager:
else:
self.transponders[self.parsedTer] = [ ]
else:
self.transponders[self.parsedTer] = [ ]
- self.transponders[self.parsedTer].append((
0
, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
+ self.transponders[self.parsedTer].append((
2
, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
def getTransponders(self, pos):
return self.transponders[pos]
def getTransponders(self, pos):
return self.transponders[pos]
@@
-206,7
+208,7
@@
class NimManager:
return self.sec.getSatList()
def getSatDescription(self, pos):
return self.sec.getSatList()
def getSatDescription(self, pos):
- return self.satellites[
str(pos)
]
+ return self.satellites[
pos
]
def readSatsfromFile(self):
self.satellites = { }
def readSatsfromFile(self):
self.satellites = { }