diff options
| author | Johnathan Corgan | 2012-09-28 10:30:00 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-09-28 10:30:00 -0700 |
| commit | 9f72b877043cd6e5d8e7cee20c0e4390419a94b7 (patch) | |
| tree | 6153cac52ba96f11ae756a104bbe9b7afd5a5d98 /grc/base | |
| parent | 2d2afd3b387bd3426cc30239f679d48cefe9eb93 (diff) | |
| parent | 515d1b6f91f5dd28997525b1e88006bbfc0f170a (diff) | |
| download | gnuradio-9f72b877043cd6e5d8e7cee20c0e4390419a94b7.tar.gz gnuradio-9f72b877043cd6e5d8e7cee20c0e4390419a94b7.tar.bz2 gnuradio-9f72b877043cd6e5d8e7cee20c0e4390419a94b7.zip | |
Merge branch 'master' into wip/gr-blocks-master
Diffstat (limited to 'grc/base')
| -rw-r--r-- | grc/base/Block.py | 1 | ||||
| -rw-r--r-- | grc/base/Platform.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/grc/base/Block.py b/grc/base/Block.py index fe7ad3c2f..a20be9db9 100644 --- a/grc/base/Block.py +++ b/grc/base/Block.py @@ -67,6 +67,7 @@ class Block(Element): self._name = n.find('name') self._key = n.find('key') self._category = n.find('category') or '' + self._grc_source = n.find('grc_source') or '' self._block_wrapper_path = n.find('block_wrapper_path') #create the param objects self._params = list() diff --git a/grc/base/Platform.py b/grc/base/Platform.py index 94d0077ea..d4b09088b 100644 --- a/grc/base/Platform.py +++ b/grc/base/Platform.py @@ -61,6 +61,10 @@ class Platform(_Element): #create a dummy flow graph for the blocks self._flow_graph = _Element(self) #search for *.xml files in the given search path + + self.loadblocks(); + + def loadblocks(self): xml_files = list() for block_path in self._block_paths: if os.path.isfile(block_path): xml_files.append(block_path) |