Merged changes from svn repository trunk.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11601 221aa14e-8319-0410-a670-987f0aec2ac5

Signed-off-by: Johnathan Corgan <jcorgan@corganenterprises.com>

7 files changed, 59 insertions, 34 deletions

diff --git a/grc/python/Block.py b/grc/python/Block.py
index 957fee18e..47fe13a3c 100644
--- a/grc/python/Block.py
+++ b/grc/python/Block.py
@@ -66,16 +66,16 @@ class Block(_Block):
 				except AssertionError: self.add_error_message('Check "%s" failed.'%check)
 			except: self.add_error_message('Check "%s" did not evaluate.'%check)
 		#adjust nports
-		for ports, Port in (
-			(self._sources, self.get_parent().get_parent().Source),
-			(self._sinks, self.get_parent().get_parent().Sink),
+		for get_ports, get_port in (
+			(self.get_sources, self.get_source),
+			(self.get_sinks, self.get_sink),
 		):
-			#how many ports?
-			num_ports = len(ports)
+			#how many streaming (non-message) ports?
+			num_ports = len(filter(lambda p: p.get_type() != 'msg', get_ports()))
 			#do nothing for 0 ports
 			if not num_ports: continue
 			#get the nports setting
-			port0 = ports[str(0)]
+			port0 = get_port(str(0))
 			nports = port0.get_nports()
 			#do nothing for no nports
 			if not nports: continue
@@ -85,19 +85,21 @@ class Block(_Block):
 			if nports < num_ports:
 				#remove the connections
 				for key in map(str, range(nports, num_ports)):
-					port = ports[key]
+					port = get_port(key)
 					for connection in port.get_connections():
 						self.get_parent().remove_element(connection)
 				#remove the ports
-				for key in map(str, range(nports, num_ports)): ports.pop(key)
+				for key in map(str, range(nports, num_ports)):
+					get_ports().remove(get_port(key))
 				continue
 			#add more ports
 			if nports > num_ports:
 				for key in map(str, range(num_ports, nports)):
-					n = port0._n
-					n['key'] = key
-					port = Port(self, n)
-					ports[key] = port
+					prev_port = get_port(str(int(key)-1))
+					get_ports().insert(
+						get_ports().index(prev_port)+1,
+						prev_port.copy(new_key=key),
+					)
 				continue
 
 	def port_controller_modify(self, direction):
diff --git a/grc/python/Connection.py b/grc/python/Connection.py
index d8a894bb1..5eba9f24d 100644
--- a/grc/python/Connection.py
+++ b/grc/python/Connection.py
@@ -21,6 +21,9 @@ from .. base.Connection import Connection as _Connection
 
 class Connection(_Connection):
 
+	def is_msg(self):
+		return self.get_source().get_type() == self.get_sink().get_type() == 'msg'
+
 	def validate(self):
 		"""
 		Validate the connections.
diff --git a/grc/python/Constants.py b/grc/python/Constants.py
index 5f203237f..439a52420 100644
--- a/grc/python/Constants.py
+++ b/grc/python/Constants.py
@@ -61,3 +61,4 @@ SHORT_VECTOR_COLOR_SPEC = '#CCCC33'
 BYTE_VECTOR_COLOR_SPEC = '#CC66CC'
 ID_COLOR_SPEC = '#DDDDDD'
 WILDCARD_COLOR_SPEC = '#FFFFFF'
+MSG_COLOR_SPEC = '#777777'
diff --git a/grc/python/Generator.py b/grc/python/Generator.py
index 33be4a726..ed7995716 100644
--- a/grc/python/Generator.py
+++ b/grc/python/Generator.py
@@ -98,7 +98,8 @@ Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''')
 		#list of regular blocks (all blocks minus the special ones)
 		blocks = filter(lambda b: b not in (imports + parameters + variables + probes + notebooks), blocks) + probes
 		#list of connections where each endpoint is enabled
-		connections = self._flow_graph.get_enabled_connections()
+		connections = filter(lambda c: not c.is_msg(), self._flow_graph.get_enabled_connections())
+		messages = filter(lambda c: c.is_msg(), self._flow_graph.get_enabled_connections())
 		#list of variable names
 		var_ids = [var.get_id() for var in parameters + variables]
 		#prepend self.
@@ -124,6 +125,7 @@ Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''')
 			'parameters': parameters,
 			'blocks': blocks,
 			'connections': connections,
+			'messages': messages,
 			'generate_options': self._generate_options,
 			'var_id2cbs': var_id2cbs,
 		}
diff --git a/grc/python/Platform.py b/grc/python/Platform.py
index f56e3fb2d..d55dbf4ce 100644
--- a/grc/python/Platform.py
+++ b/grc/python/Platform.py
@@ -42,7 +42,8 @@ COLORS = (#title, #color spec
 	('Integer Vector', Constants.INT_VECTOR_COLOR_SPEC),
 	('Short Vector', Constants.SHORT_VECTOR_COLOR_SPEC),
 	('Byte Vector', Constants.BYTE_VECTOR_COLOR_SPEC),
-	('Wildcard Type', Constants.WILDCARD_COLOR_SPEC),
+	('Wildcard', Constants.WILDCARD_COLOR_SPEC),
+	('Message', Constants.MSG_COLOR_SPEC),
 )
 
 class Platform(_Platform):
diff --git a/grc/python/Port.py b/grc/python/Port.py
index 5a2b047f0..daf8f9ca3 100644
--- a/grc/python/Port.py
+++ b/grc/python/Port.py
@@ -23,27 +23,23 @@ import Constants
 class Port(_Port):
 
 	##possible port types
-	TYPES = ['complex', 'float', 'int', 'short', 'byte']
+	TYPES = ['complex', 'float', 'int', 'short', 'byte', 'msg']
 
 	def __init__(self, block, n):
 		"""
 		Make a new port from nested data.
 		@param block the parent element
 		@param n the nested odict
-		@return a new port
 		"""
-		vlen = n.find('vlen') or '1'
-		nports = n.find('nports') or ''
-		optional = n.find('optional') or ''
 		#build the port
 		_Port.__init__(
 			self,
 			block=block,
 			n=n,
 		)
-		self._nports = nports
-		self._vlen = vlen
-		self._optional = bool(optional)
+		self._nports = n.find('nports') or ''
+		self._vlen = n.find('vlen') or ''
+		self._optional = bool(n.find('optional'))
 
 	def validate(self):
 		_Port.validate(self)
@@ -51,6 +47,11 @@ class Port(_Port):
 		except AssertionError: self.add_error_message('Port is not connected.')
 		try: assert self.is_source() or len(self.get_enabled_connections()) <= 1
 		except AssertionError: self.add_error_message('Port has too many connections.')
+		if self.get_type() == 'msg':
+			try: assert not self.get_nports()
+			except AssertionError: self.add_error_message('A port of type "msg" cannot have "nports" set.')
+			try: assert self.get_vlen() == 1
+			except AssertionError: self.add_error_message('A port of type "msg" must have a "vlen" of 1.')
 
 	def get_vlen(self):
 		"""
@@ -94,6 +95,7 @@ class Port(_Port):
 					'int': Constants.INT_COLOR_SPEC,
 					'short': Constants.SHORT_COLOR_SPEC,
 					'byte': Constants.BYTE_COLOR_SPEC,
+					'msg': Constants.MSG_COLOR_SPEC,
 				}[self.get_type()]
 			return {#vlen is non 1
 				'complex': Constants.COMPLEX_VECTOR_COLOR_SPEC,
@@ -104,26 +106,27 @@ class Port(_Port):
 			}[self.get_type()]
 		except: return _Port.get_color(self)
 
+	def copy(self, new_key=None):
+		n = self._n.copy()
+		if new_key: n['key'] = new_key
+		return self.__class__(self.get_parent(), n)
+
 class Source(Port):
 
 	def __init__(self, block, n):
 		self._n = n #save n
-		#key is port index
-		n['key'] = str(block._source_count)
-		block._source_count = block._source_count + 1
+		if n['type'] == 'msg': n['key'] = 'msg'
+		if not n.find('key'):
+			n['key'] = str(block._source_count)
+			block._source_count = block._source_count + 1
 		Port.__init__(self, block, n)
 
-	def __del__(self):
-		self.get_parent()._source_count = self.get_parent()._source_count - 1
-
 class Sink(Port):
 
 	def __init__(self, block, n):
 		self._n = n #save n
-		#key is port index
-		n['key'] = str(block._sink_count)
-		block._sink_count = block._sink_count + 1
+		if n['type'] == 'msg': n['key'] = 'msg'
+		if not n.find('key'):
+			n['key'] = str(block._sink_count)
+			block._sink_count = block._sink_count + 1
 		Port.__init__(self, block, n)
-
-	def __del__(self):
-		self.get_parent()._sink_count = self.get_parent()._sink_count - 1
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index b537c43e2..df346dd16 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -10,6 +10,7 @@
 ##@param parameters the paramater blocks
 ##@param blocks the signal blocks
 ##@param connections the connections
+##@param messages the msg type connections
 ##@param generate_options the type of flow graph
 ##@param var_id2cbs variable id map to callback strings
 ########################################################
@@ -125,6 +126,18 @@ class $(class_name)(gr.hier_block2):
 		$indent($ctrl.get_make())
 #end for
 ########################################################
+##Create Message Queues
+########################################################
+#if $messages
+
+		$DIVIDER
+		# Message Queues
+		$DIVIDER
+#end if
+#for $msg in $messages
+		$(msg.get_source().get_parent().get_id())_msgq = $(msg.get_sink().get_parent().get_id())_msgq = gr.msg_queue(2)
+#end for
+########################################################
 ##Create Blocks
 ########################################################
 #if $blocks