From: ghost <andreas.monzner@multimedia-labs.de>
Date: Fri, 12 Dec 2008 11:19:01 +0000 (+0100)
Subject: PositionerSetup/plugin.py: use data from currently tuned transponder as initial data
X-Git-Tag: 2.6.0~543^2~6
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/74fd4c361824405e95670254a6a98356f16c04c4

PositionerSetup/plugin.py: use data from currently tuned transponder as initial data
---

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index 13871f9c..88aac481 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -49,22 +49,54 @@ class PositionerSetup(Screen):
 		Screen.__init__(self, session)
 		self.feid = feid
 		self.oldref = None
-		
+
+		cur = { }
 		if not self.openFrontend():
 			self.oldref = session.nav.getCurrentlyPlayingServiceReference()
+			service = session.nav.getCurrentService()
+			feInfo = service and service.frontendInfo()
+			if feInfo:
+				cur = feInfo.getTransponderData(True)
+			del feInfo
+			del service
 			session.nav.stopService() # try to disable foreground service
 			if not self.openFrontend():
 				if session.pipshown: # try to disable pip
+					service = self.session.pip.pipservice
+					feInfo = service and service.frontendInfo()
+					if feInfo:
+						cur = feInfo.getTransponderData()
+					del feInfo
+					del service
 					session.pipshown = False
 					del session.pip
 					if not self.openFrontend():
 						self.frontend = None # in normal case this should not happen
-
+		
 		self.frontendStatus = { }
-
 		self.diseqc = Diseqc(self.frontend)
 		self.tuner = Tuner(self.frontend)
-		self.tuner.tune((0,0,0,0,0,0,0,0,0,0))
+
+		tp = ( cur.get("frequency", 0) / 1000,
+			cur.get("symbol_rate", 0) / 1000,
+			{ "HORIZONTAL" : 0, "VERTICAL" : 1,
+				"CIRCULAR_LEFT" : 2, "CIRCULAR_RIGHT" : 3 }[cur.get("polarization", "HORIZONTAL")],
+			{ "FEC_AUTO" : 0, "FEC_1_2" : 1, "FEC_2_3" : 2, "FEC_3_4" : 3,
+				"FEC_5_6" : 4, "FEC_7_8" : 5, "FEC_8_9" : 6, "FEC_3_5" : 7,
+				"FEC_4_5" : 8, "FEC_9_10" : 9, "FEC_NONE" : 15 }[cur.get("fec_inner", "FEC_AUTO")],
+			{ "INVERSION_OFF" : 0,
+				"INVERSION_ON" : 1,
+				"INVERSION_AUTO" : 2 }[cur.get("inversion", "INVERSION_AUTO")],
+			cur.get("orbital_position", 0),
+			{ "DVB-S" : 0, "DVB-S2" : 1 }[cur.get("system", "DVB-S")],
+			{ "QPSK" : 1, "8PSK" : 2 }[cur.get("modulation", "QPSK")],
+			{ "ROLLOFF_0_35" : 0, "ROLLOFF_0_25" : 1,
+				"ROLLOFF_0_20" : 2 }[cur.get("rolloff", "ROLLOFF_0_35")],
+			{ "PILOT_OFF" : 0, "PILOT_ON" : 1,
+				"PILOT_AUTO" : 2 }[cur.get("pilot", "PILOT_AUTO")]
+		)
+
+		self.tuner.tune(tp)
 		
 		self.createConfig()
 		
@@ -249,7 +281,12 @@ class PositionerSetup(Screen):
 		elif entry == "limits":
 			self.diseqccommand("limitOff")
 		elif entry == "tune":
-			self.session.openWithCallback(self.tune, TunerScreen, self.feid)
+			fe_data = { }
+			self.frontend.getFrontendData(fe_data)
+			self.frontend.getTransponderData(fe_data, True)
+			feparm = self.tuner.lastparm.getDVBS()
+			fe_data["orbital_position"] = feparm.orbital_position
+			self.session.openWithCallback(self.tune, TunerScreen, self.feid, fe_data)
 		elif entry == "goto0":
 			print "move to position 0"
 			self.diseqccommand("moveTo", 0)
@@ -272,6 +309,7 @@ class PositionerSetup(Screen):
 		elif entry == "storage":
 			print "store at position", int(self.positioner_storage.value)
 			self.diseqccommand("store", int(self.positioner_storage.value))
+			
 		elif entry == "limits":
 			self.diseqccommand("limitWest")
 
@@ -417,8 +455,9 @@ class TunerScreen(ScanSetup):
 			<widget name="introduction" position="20,360" size="350,30" font="Regular;23" />
 		</screen>"""
 
-	def __init__(self, session, feid):
+	def __init__(self, session, feid, fe_data):
 		self.feid = feid
+		self.fe_data = fe_data
 		ScanSetup.__init__(self, session)
 		self["introduction"].setText("")
 
@@ -472,8 +511,10 @@ class TunerScreen(ScanSetup):
 			tuning.sat = ConfigSatlist(list=nimmanager.getRotorSatListForNim(self.feid))
 			tuning.sat.addNotifier(self.tuningSatChanged)
 			self.updateTransponders()
-			TunerScreenConfigCreated = True
-		ScanSetup.createConfig(self, None)
+		orb_pos = self.fe_data.get("orbital_position", None)
+		if orb_pos:
+			tuning.sat.value = str(orb_pos)
+		ScanSetup.createConfig(self, self.fe_data)
 
 	def tuningSatChanged(self, *parm):
 		self.updateTransponders()
@@ -552,7 +593,7 @@ class TunerScreen(ScanSetup):
 				self.scan_sat.pilot.index)
 		elif tuning.type.value == "predefined_transponder":
 			transponder = nimmanager.getTransponders(satpos)[tuning.transponder.index]
-			returnvalue = (int(transponder[1] / 1000), int(transponder[2] / 1000),
+			returnvalue = (transponder[1] / 1000, transponder[2] / 1000,
 				transponder[3], transponder[4], 2, satpos, transponder[5], transponder[6], transponder[8], transponder[9])
 		self.close(returnvalue)