diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-06-14 09:19:03 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-06-14 09:19:03 -0700 |
| commit | 7ee2f91d3c51498a6d1923fb47f47b882c9a77e5 (patch) | |
| tree | 525e79df13a027722b88fc0f031696833fed46ec /grc/python | |
| parent | a80edf4570d75f1325dce7e026e166956bb1db5f (diff) | |
| parent | 91dd2fce59ba81d4dc22b9dcdc909211cafe9f5f (diff) | |
Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'
Diffstat (limited to 'grc/python')
| -rw-r--r-- | grc/python/Block.py | 3 | ||||
| -rw-r--r-- | grc/python/Generator.py | 2 | ||||
| -rw-r--r-- | grc/python/block.dtd | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/grc/python/Block.py b/grc/python/Block.py index 191b03b452..5d52e2bf3c 100644 --- a/grc/python/Block.py +++ b/grc/python/Block.py @@ -52,7 +52,6 @@ class Block(_Block, _GUIBlock): self._var_make = n.find('var_make') self._checks = n.findall('check') self._callbacks = n.findall('callback') - self._throttle = n.find('throttle') or '' self._bus_structure_source = n.find('bus_structure_source') or '' self._bus_structure_sink = n.find('bus_structure_sink') or '' #build the block @@ -78,8 +77,6 @@ class Block(_Block, _GUIBlock): except: return '' - def throttle(self): return bool(self._throttle) - def validate(self): """ Validate this block. diff --git a/grc/python/Generator.py b/grc/python/Generator.py index fc1dd56f50..33807c5b95 100644 --- a/grc/python/Generator.py +++ b/grc/python/Generator.py @@ -86,7 +86,7 @@ class TopBlockGenerator(object): def write(self): """generate output and write it to files""" # do throttle warning - throttling_blocks = filter(lambda b: b.throttle(), self._flow_graph.get_enabled_blocks()) + throttling_blocks = filter(lambda b: b.throtteling(), self._flow_graph.get_enabled_blocks()) if not throttling_blocks and self._generate_options != 'hb': Messages.send_warning("This flow graph may not have flow control: " "no audio or RF hardware blocks found. " diff --git a/grc/python/block.dtd b/grc/python/block.dtd index 8cfd3dd392..145f4d8610 100644 --- a/grc/python/block.dtd +++ b/grc/python/block.dtd @@ -25,7 +25,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Top level element. A block contains a name, ...parameters list, and list of IO ports. --> -<!ELEMENT block (name, key, category?, throttle?, import*, var_make?, var_value?, make, callback*, param_tab_order?, param*, bus_sink?, bus_source?, check*, sink*, source*, bus_structure_sink?, bus_structure_source?, doc?, grc_source?)> +<!ELEMENT block (name, key, category?, throttle?, flags?, import*, var_make?, var_value?, + make, callback*, param_tab_order?, param*, bus_sink?, bus_source?, check*, + sink*, source*, bus_structure_sink?, bus_structure_source?, doc?, grc_source?)> <!-- Sub level elements. --> @@ -64,3 +66,4 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA <!ELEMENT callback (#PCDATA)> <!ELEMENT optional (#PCDATA)> <!ELEMENT throttle (#PCDATA)> +<!ELEMENT flags (#PCDATA)> |