Added virtual sink and logic to clone port.

[debian/gnuradio] / grc / base / Block.py

diff --git a/grc/base/Block.py b/grc/base/Block.py
index d5e1047852b7df5bfcd71b89135483debc183f18..491c594cc8bf71aeb31c1fbf3593cccd00a6671d 100644 (file)
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -47,7 +47,9 @@ class TemplateArg(UserDict):
                return self._param.get_evaluated()
 
 def _get_keys(lst): return [elem.get_key() for elem in lst]
-def _get_elem(lst, key): return lst[_get_keys(lst).index(key)]
+def _get_elem(lst, key):
+       try: return lst[_get_keys(lst).index(key)]
+       except ValueError: raise ValueError, 'Key "%s" not found in %s.'%(key, _get_keys(lst))
 
 class Block(Element):
 
@@ -98,7 +100,7 @@ class Block(Element):
                        self.get_params().append(param)
                #create the source objects
                self._sources = list()
-               for source in map(lambda n: self.get_parent().get_parent().Source(self, n), sources):
+               for source in map(lambda n: self.get_parent().get_parent().Port(self, n, dir='source'), sources):
                        key = source.get_key()
                        #test against repeated keys
                        try: assert key not in self.get_source_keys()
@@ -107,7 +109,7 @@ class Block(Element):
                        self.get_sources().append(source)
                #create the sink objects
                self._sinks = list()
-               for sink in map(lambda n: self.get_parent().get_parent().Sink(self, n), sinks):
+               for sink in map(lambda n: self.get_parent().get_parent().Port(self, n, dir='sink'), sinks):
                        key = sink.get_key()
                        #test against repeated keys
                        try: assert key not in self.get_sink_keys()
@@ -143,13 +145,12 @@ class Block(Element):
                Validate the block.
                All ports and params must be valid.
                All checks must evaluate to true.
+               Validate the params, ports, and the connections to this block.
                """
                Element.validate(self)
                for c in self.get_params() + self.get_ports() + self.get_connections():
-                       try:
-                               c.validate()
-                               assert c.is_valid()
-                       except AssertionError:
+                       c.validate()
+                       if not c.is_valid():
                                for msg in c.get_error_messages():
                                        self.add_error_message('>>> %s:\n\t%s'%(c, msg))