[Peak Manager]

- added debug prefix. If debug prefix is empty - no debug output

git-svn-id: http://moon:8086/svn/software/trunk/projects/GnuRadio@532 b431acfa-c32f-4a4a-93f1-934dc6c82436

gr-jay/grc/jay_peak_manager.xml

@@ -4,7 +4,7 @@
   <key>jay_peak_manager</key>
   <category>[jay]</category>
   <import>import jay</import>
-  <make>jay.peak_manager($numPeaksMax)</make>
+  <make>jay.peak_manager($numPeaksMax, $debugPrefix)</make>
 
   <param>
     <name>Num. peaks max.</name>
@@ -13,6 +13,13 @@
     <type>int</type>
   </param>
 
+  <param>
+    <name>Debug Prefix</name>
+    <key>debugPrefix</key>
+    <value>""</value>
+    <type>string</type>
+  </param>
+
    <sink>
     <name>control</name>
     <type>message</type>

gr-jay/python/peak_manager.py

@@ -27,13 +27,14 @@ class peak_manager(gr.basic_block):
 	"""
 	docstring for block peak_manager
 	"""
-	def __init__(self, numPeaksMax):
+	def __init__(self, numPeaksMax, debugPrefix):
 		gr.basic_block.__init__(self,
 								name="peak_manager",
 								in_sig=None,
 								out_sig=None)
 
 		self.numPeaksMax = numPeaksMax
+		self.debugPrefix = debugPrefix
 		self.peak_dict = {}
 		self.ports_avail = []
 		self.ports_used = []
@@ -113,7 +114,8 @@ class peak_manager(gr.basic_block):
 					msg_dict = pmt.dict_add(msg_dict, pmt.intern("gain"), pmt.from_float(1.0))
 					portname = peakEntry['port_name']
 					self.message_port_pub(pmt.intern(portname), msg_dict)
-					print ("Updated peak #{} at {:0.6f} MHz on port {}".format(id, freq_MHz, portname))
+					if len(self.debugPrefix) > 0:
+						print ("{}: Updated peak #{} at {:0.6f} MHz on port {}".format(self.debugPrefix, id, freq_MHz, portname))
 				else:
 					peakEntry = self.peak_add(peak_key, peakMsg)
 					if peakEntry is not None:
@@ -123,14 +125,16 @@ class peak_manager(gr.basic_block):
 						msg_dict = pmt.dict_add(msg_dict, pmt.intern("gain"), pmt.from_float(1.0))
 						portname = peakEntry['port_name']
 						self.message_port_pub(pmt.intern(portname), msg_dict)
-						print ("New peak #{} at {:0.6f} MHz on port {}".format(id, freq_MHz, portname))
+						if len(self.debugPrefix) > 0:
+							print ("{}: New peak #{} at {:0.6f} MHz on port {}".format(self.debugPrefix, id, freq_MHz, portname))
 			else:
 				if peakEntry is not None:
 					pair = pmt.cons(pmt.intern("gain"), pmt.from_float(0.0))
 					portname = peakEntry['port_name']
 					self.message_port_pub(pmt.intern(portname), pair)
 					if self.peak_del(peak_key):
-						print ("Lost peak #{} at {:0.2f} MHz on port {}".format(id, freq_MHz, portname))
+						if len(self.debugPrefix) > 0:
+							print ("{}: Lost peak #{} at {:0.6f} MHz on port {}".format(self.debugPrefix, id, freq_MHz, portname))
 
 
 		else: