diff options
| author | jblum | 2008-11-06 00:44:17 +0000 |
|---|---|---|
| committer | jblum | 2008-11-06 00:44:17 +0000 |
| commit | 40c2af7d07383cbcf6cc1cc4f994784cc9823d32 (patch) | |
| tree | d88a5e8a003649f0393c3e3165b55f804c7bd25e /grc/src/platforms | |
| parent | b58218aea0738646bb576739779b5c8d0b18ac18 (diff) | |
| download | gnuradio-40c2af7d07383cbcf6cc1cc4f994784cc9823d32.tar.gz gnuradio-40c2af7d07383cbcf6cc1cc4f994784cc9823d32.tar.bz2 gnuradio-40c2af7d07383cbcf6cc1cc4f994784cc9823d32.zip | |
inject block wrapper path
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9940 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc/src/platforms')
| -rw-r--r-- | grc/src/platforms/base/Block.py | 22 | ||||
| -rw-r--r-- | grc/src/platforms/base/Platform.py | 2 |
2 files changed, 9 insertions, 15 deletions
diff --git a/grc/src/platforms/base/Block.py b/grc/src/platforms/base/Block.py index fe24d5666..89a4c4383 100644 --- a/grc/src/platforms/base/Block.py +++ b/grc/src/platforms/base/Block.py @@ -56,19 +56,16 @@ class Block(Element): @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 @@ class Block(Element): 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 diff --git a/grc/src/platforms/base/Platform.py b/grc/src/platforms/base/Platform.py index ee6cd3ba3..1a96594bb 100644 --- a/grc/src/platforms/base/Platform.py +++ b/grc/src/platforms/base/Platform.py @@ -74,6 +74,8 @@ class Platform(_Element): 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 |