diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-29 15:44:07 -0800 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-29 15:44:07 -0800 |
commit | 16bed38aef25df384dca56143f298e081eac1972 (patch) | |
tree | 330045e04d51bae0faa1f3c25408bac9431b3eeb /grc/python/Generator.py | |
parent | e5046cdd23e3c6a9aa584ae353f56cb19861d358 (diff) | |
parent | 92cfb0240005675f4e7a55a81552f4c7a5128cd8 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'grc/python/Generator.py')
-rw-r--r-- | grc/python/Generator.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/grc/python/Generator.py b/grc/python/Generator.py index f8490227a7..912ce13752 100644 --- a/grc/python/Generator.py +++ b/grc/python/Generator.py @@ -122,8 +122,9 @@ Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''') #list of regular blocks (all blocks minus the special ones) blocks = filter(lambda b: b not in (imports + parameters), blocks) #list of connections where each endpoint is enabled - connections = filter(lambda c: not c.is_msg(), self._flow_graph.get_enabled_connections()) + connections = filter(lambda c: not (c.is_msg() or c.is_message()), self._flow_graph.get_enabled_connections()) messages = filter(lambda c: c.is_msg(), self._flow_graph.get_enabled_connections()) + messages2 = filter(lambda c: c.is_message(), self._flow_graph.get_enabled_connections()) #list of variable names var_ids = [var.get_id() for var in parameters + variables] #prepend self. @@ -148,6 +149,7 @@ Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''') 'blocks': blocks, 'connections': connections, 'messages': messages, + 'messages2': messages2, 'generate_options': self._generate_options, 'var_id2cbs': var_id2cbs, } |