X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FServiceScan.py;h=78cd758e90af227ab7fce6624f6131f109edf9d2;hp=15b7117684caa9e02ced831794f51536d93345d9;hb=6a2f0acb3f92f433eb1ec4fd29a39532dadbaaca;hpb=757aee86f7f0cfe7508bf27998740f3a4661486c

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 15b7117..78cd758 100644
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -18,6 +18,7 @@ class ServiceScan:
 	def scanStatusChanged(self):
 		if self.state == self.Running:
 			self.progressbar.setValue(self.scan.getProgress())
+			self.lcd_summary.updateProgress(self.scan.getProgress())
 			if self.scan.isDone():
 				errcode = self.scan.getError()
 				
@@ -29,70 +30,72 @@ class ServiceScan:
 				self.network.setText("")
 				self.transponder.setText("")
 			else:
-				self.text.setText(_("scan in progress - %d %% done! %d services found!") % (self.scan.getProgress(), self.foundServices + self.scan.getNumServices()))
+				self.text.setText(_("scan in progress - %d%% done!") % self.scan.getProgress() + ' ' + _("%d services found!") % (self.foundServices + self.scan.getNumServices()))
 				transponder = self.scan.getCurrentTransponder()
 				network = ""
 				tp_text = ""
 				if transponder:
 					tp_type = transponder.getSystem()
-					if not tp_type[0]:
-						tp_type = tp_type[1]
-						if tp_type == iDVBFrontend.feSatellite:
-							network = _("Satellite")
-							tp = transponder.getDVBS()
-							if not tp[0]:
-								tp = tp[1]
-								orb_pos = tp.orbital_position
-								try:
-									sat_name = str(nimmgr.getSatDescription(orb_pos))
-								except KeyError:
-									sat_name = ""
-								if orb_pos > 1800: # west
-									orb_pos = 3600 - orb_pos
-									h = _("W")
-								else:
-									h = _("E")
-								if sat_name.find("%d.%d" % (orb_pos/10, orb_pos%10)) != -1:
-									network = sat_name
-								else:
-									network = ("%s %d.%d %s") % (sat_name, orb_pos / 10, orb_pos % 10, h)
-								tp_text = ("%s %s %d%c / %d / %s") %( { 0 : "DVB-S", 1 : "DVB-S2" }[tp.system],
-									{ 0 : "Auto", 1 : "QPSK", 2 : "M8PSK", 3 : "QAM16" }[tp.modulation],
-									tp.frequency/1000,
-									{ 0 : 'H', 1 : 'V', 2 : 'L', 3 : 'R' }[tp.polarisation],
-									tp.symbol_rate/1000,
-									{ 0 : "AUTO", 1 : "1/2", 2 : "2/3", 3 : "3/4", 4 : "5/6",
-									 5 : "7/8", 6 : "8/9", 7 : "3/5", 8 : "4/5", 9 : "9/10",
-									 15 : "NONE" }[tp.fec] )
-						elif tp_type == iDVBFrontend.feCable:
-							network = _("Cable")
-							tp = transponder.getDVBC()
-							if not tp[0]:
-								tp = tp[1]
-								tp_text = ("DVB-C %s %d / %d / %s") %( { 0 : "AUTO", 1 : "QAM16", 2 : "QAM32", 3 : "QAM64", 4 : "QAM128", 5 : "QAM256" }[tp.modulation],
-									tp.frequency,
-									tp.symbol_rate/1000,
-									{ 0 : "AUTO", 1 : "1/2", 2 : "2/3", 3 : "3/4", 4 : "5/6", 5 : "7/8", 6 : "8/9", 15 : "NONE" }[tp.fec_inner] )
-						elif tp_type == iDVBFrontend.feTerrestrial:
-							network = _("Terrestrial")
-							tp = transponder.getDVBT()
-							if not tp[0]:
-								tp = tp[1]
-								tp_text = ("DVB-T %s %d %s") %( { 0 : "QPSK", 1 : "QAM16", 2 : "QAM64", 3 : "AUTO"}[tp.modulation],
-									tp.frequency,
-									{ 0 : "Bw 8MHz", 1 : "Bw 7MHz", 2 : "Bw 6MHz", 3 : "Bw Auto" }[tp.bandwidth])
+					if tp_type == iDVBFrontend.feSatellite:
+						network = _("Satellite")
+						tp = transponder.getDVBS()
+						orb_pos = tp.orbital_position
+						try:
+							sat_name = str(nimmgr.getSatDescription(orb_pos))
+						except KeyError:
+							sat_name = ""
+						if orb_pos > 1800: # west
+							orb_pos = 3600 - orb_pos
+							h = _("W")
 						else:
-							print "unknown transponder type in scanStatusChanged"
+							h = _("E")
+						if sat_name.find("%d.%d" % (orb_pos/10, orb_pos%10)) != -1:
+							network = sat_name
+						else:
+							network = ("%s %d.%d %s") % (sat_name, orb_pos / 10, orb_pos % 10, h)
+						tp_text = ("%s %s %d%c / %d / %s") %( { tp.System_DVB_S : "DVB-S",
+							tp.System_DVB_S2 : "DVB-S2" }.get(tp.system, tp.System_DVB_S),
+							{ tp.Modulation_Auto : "Auto", tp.Modulation_QPSK : "QPSK",
+								tp.Modulation_8PSK : "8PSK", tp.Modulation_QAM16 : "QAM16" }.get(tp.modulation, tp.Modulation_QPSK),
+							tp.frequency/1000,
+							{ tp.Polarisation_Horizontal : 'H', tp.Polarisation_Vertical : 'V', tp.Polarisation_CircularLeft : 'L',
+								tp.Polarisation_CircularRight : 'R' }.get(tp.polarisation, tp.Polarisation_Horizontal),
+							tp.symbol_rate/1000,
+							{ tp.FEC_Auto : "AUTO", tp.FEC_1_2 : "1/2", tp.FEC_2_3 : "2/3",
+								tp.FEC_3_4 : "3/4", tp.FEC_5_6 : "5/6", tp.FEC_7_8 : "7/8",
+								tp.FEC_8_9 : "8/9", tp.FEC_3_5 : "3/5", tp.FEC_4_5 : "4/5",
+								tp.FEC_9_10 : "9/10", tp.FEC_None : "NONE" }.get(tp.fec, tp.FEC_Auto))
+					elif tp_type == iDVBFrontend.feCable:
+						network = _("Cable")
+						tp = transponder.getDVBC()
+						tp_text = ("DVB-C %s %d / %d / %s") %( { tp.Modulation_Auto : "AUTO",
+							tp.Modulation_QAM16 : "QAM16", tp.Modulation_QAM32 : "QAM32",
+							tp.Modulation_QAM64 : "QAM64", tp.Modulation_QAM128 : "QAM128",
+							tp.Modulation_QAM256 : "QAM256" }.get(tp.modulation, tp.Modulation_Auto),
+							tp.frequency,
+							tp.symbol_rate/1000,
+							{ tp.FEC_Auto : "AUTO", tp.FEC_1_2 : "1/2", tp.FEC_2_3 : "2/3",
+								tp.FEC_3_4 : "3/4", tp.FEC_5_6 : "5/6", tp.FEC_7_8 : "7/8",
+								tp.FEC_8_9 : "8/9", tp.FEC_None : "NONE" }.get(tp.fec_inner, tp.FEC_Auto))
+					elif tp_type == iDVBFrontend.feTerrestrial:
+						network = _("Terrestrial")
+						tp = transponder.getDVBT()
+						tp_text = ("DVB-T %s %d %s") %( { tp.Modulation_QPSK : "QPSK",
+							tp.Modulation_QAM16 : "QAM16", tp.Modulation_QAM64 : "QAM64",
+							tp.Modulation_Auto : "AUTO" }.get(tp.modulation, tp.Modulation_Auto),
+							tp.frequency,
+							{ tp.Bandwidth_8MHz : "Bw 8MHz", tp.Bandwidth_7MHz : "Bw 7MHz", tp.Bandwidth_6MHz : "Bw 6MHz",
+								tp.Bandwidth_Auto : "Bw Auto" }.get(tp.bandwidth, tp.Bandwidth_Auto))
+					else:
+						print "unknown transponder type in scanStatusChanged"
 				self.network.setText(network)
 				self.transponder.setText(tp_text)
 		
 		if self.state == self.Done:
-			if self.scan.getNumServices() == 1:
-				self.text.setText(_("scan done! One service found!"))
-			elif self.scan.getNumServices() == 0:
-				self.text.setText(_("scan done! No service found!"))
+			if self.scan.getNumServices() == 0:
+				self.text.setText(_("scan done!") + ' ' + _("%d services found!") % 0 )
 			else:
-				self.text.setText(_("scan done! %d services found!") % (self.foundServices + self.scan.getNumServices()))
+				self.text.setText(_("scan done!") + ' ' + _("%d services found!") % (self.foundServices + self.scan.getNumServices()))
 		
 		if self.state == self.Error:
 			self.text.setText(_("ERROR - failed to scan (%s)!") % (self.Errors[self.errorcode]) )
@@ -104,7 +107,7 @@ class ServiceScan:
 				self.run += 1
 				self.execBegin()
 	
-	def __init__(self, progressbar, text, servicelist, passNumber, scanList, network, transponder, frontendInfo):
+	def __init__(self, progressbar, text, servicelist, passNumber, scanList, network, transponder, frontendInfo, lcd_summary):
 		self.foundServices = 0
 		self.progressbar = progressbar
 		self.text = text
@@ -115,6 +118,7 @@ class ServiceScan:
 		self.transponder = transponder
 		self.network = network
 		self.run = 0
+		self.lcd_summary = lcd_summary
 
 	def doRun(self):
 		self.scan = eComponentScan()
@@ -160,6 +164,7 @@ class ServiceScan:
 	def newService(self):
 		newServiceName = self.scan.getLastServiceName()
 		self.servicelist.addItem(newServiceName)
+		self.lcd_summary.updateService(self.scan.getLastServiceName())
 
 	def destroy(self):
 		pass