git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
835d4ae
)
revert some no more needed bug_258_sorting_of_configsatlist changes
author
ghost
<andreas.monzner@multimedia-labs.de>
Sat, 7 Nov 2009 13:26:34 +0000
(14:26 +0100)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Sat, 7 Nov 2009 13:26:34 +0000
(14:26 +0100)
lib/python/Components/NimManager.py
patch
|
blob
|
history
lib/python/Components/config.py
patch
|
blob
|
history
lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
patch
|
blob
|
history
lib/python/Screens/ScanSetup.py
patch
|
blob
|
history
diff --git
a/lib/python/Components/NimManager.py
b/lib/python/Components/NimManager.py
index 1dff777af3189fa1f4f404cfa1ecbbecbdda2702..8d6cff165b9cd4182800040499d51b220612c038 100644
(file)
--- 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:
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:
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:
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:
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)
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 baa6c35ba77ae41922c6d8cdbf8b3e90874312e0..e249caf4d3e80029a09d19c6f77066147c7a03f4 100755
(executable)
--- 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)
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 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)
orbital_position = property(getOrbitalPosition)
diff --git
a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index ea62550b8af1f76bc2e95d8d2a5cbc5db0318963..fa533c0b4d478aa08a4be245b7f1cf9336e2200d 100644
(file)
--- 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):
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:
tps = []
cnt=0
for x in transponderlist:
diff --git
a/lib/python/Screens/ScanSetup.py
b/lib/python/Screens/ScanSetup.py
index aed9026844c87acbbdc53eac35f4294c5d697086..d0af8f7ecadf90ac05a19a20f304c02c453432b3 100644
(file)
--- 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]
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):
# 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:
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":
self.scan_sat.pilot.value)
removeAll = False
elif self.scan_type.value == "single_satellite":
- sat = self.s
can_satselection[index_to_scan].getSat()
+ sat = self.s
atList[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)
getInitialTransponderList(tlist, sat[0])
elif self.scan_type.value.find("multisat") != -1:
SatList = nimmanager.getSatListForNim(index_to_scan)