[Commit-gnuradio] r9940 - gnuradio/trunk/grc/src/platforms/base

[jblum]

Author: jblum
Date: 2008-11-05 17:44:17 -0700 (Wed, 05 Nov 2008)
New Revision: 9940

Modified:
   gnuradio/trunk/grc/src/platforms/base/Block.py
   gnuradio/trunk/grc/src/platforms/base/Platform.py
Log:
inject block wrapper path

Modified: gnuradio/trunk/grc/src/platforms/base/Block.py
===================================================================
--- gnuradio/trunk/grc/src/platforms/base/Block.py      2008-11-05 23:49:32 UTC 
(rev 9939)
+++ gnuradio/trunk/grc/src/platforms/base/Block.py      2008-11-06 00:44:17 UTC 
(rev 9940)
@@ -56,19 +56,16 @@
                @param n the nested odict
                @return block a new block
                """
+               #build the block
+               Element.__init__(self, flow_graph)
                #grab the data
-               name = n['name']
-               key = n['key']
-               category = utils.exists_or_else(n, 'category', '')
                params = utils.listify(n, 'param')
                sources = utils.listify(n, 'source')
                sinks = utils.listify(n, 'sink')
-               #build the block
-               Element.__init__(self, flow_graph)
-               #store the data
-               self._name = name
-               self._key = key
-               self._category = category
+               self._name = n['name']
+               self._key = n['key']
+               self._category = utils.exists_or_else(n, 'category', '')
+               self._block_wrapper_path = n['block_wrapper_path']
                #create the param objects
                self._params = odict()
                #add the id param
@@ -155,18 +152,13 @@
        def __str__(self): return 'Block - %s - %s(%s)'%(self.get_id(), 
self.get_name(), self.get_key())
 
        def get_id(self): return self.get_param('id').get_value()
-
        def is_block(self): return True
-
        def get_name(self): return self._name
-
        def get_key(self): return self._key
-
        def get_category(self): return self._category
-
        def get_doc(self): return ''
-
        def get_ports(self): return self.get_sources() + self.get_sinks()
+       def get_block_wrapper_path(self): return self._block_wrapper_path
 
        ##############################################
        # Access Params

Modified: gnuradio/trunk/grc/src/platforms/base/Platform.py
===================================================================
--- gnuradio/trunk/grc/src/platforms/base/Platform.py   2008-11-05 23:49:32 UTC 
(rev 9939)
+++ gnuradio/trunk/grc/src/platforms/base/Platform.py   2008-11-06 00:44:17 UTC 
(rev 9940)
@@ -74,6 +74,8 @@
                try: ParseXML.validate_dtd(f, self._block_dtd)
                except ParseXML.XMLSyntaxError, e: self._exit_with_error('Block 
definition "%s" failed: \n\t%s'%(f, e))
                for n in utils.listify(ParseXML.from_file(f), 'block'):
+                       #inject block wrapper path
+                       n['block_wrapper_path'] = f
                        block = self.Block(self._flow_graph, n)
                        key = block.get_key()
                        #test against repeated keys