diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2012-12-07 10:06:29 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2012-12-07 10:07:52 -0800 |
| commit | ddb6ada4dbd0fa8db97ba6f2f4d2d8cb4149c8f1 (patch) | |
| tree | 5faf735022d164b5f222a2d1b6e11b0b901f8a28 /grc/python/convert_hier.py | |
| parent | 583ba9b96ce3c3e52173cd847a0c00ff10c1cf85 (diff) | |
| parent | 52ca5e2765b7a4532d26502b5b76b7c85c5019d7 (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/lib/runtime/gr_basic_block.h
Diffstat (limited to 'grc/python/convert_hier.py')
| -rw-r--r-- | grc/python/convert_hier.py | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/grc/python/convert_hier.py b/grc/python/convert_hier.py index b609af24ae..508ec63b2b 100644 --- a/grc/python/convert_hier.py +++ b/grc/python/convert_hier.py @@ -25,6 +25,8 @@ def convert_hier(flow_graph, python_file): #extract info from the flow graph input_sigs = flow_graph.get_io_signaturev('in') output_sigs = flow_graph.get_io_signaturev('out') + input_msgp = flow_graph.get_msg_pad_sources(); + output_msgp = flow_graph.get_msg_pad_sinks(); parameters = flow_graph.get_parameters() block_key = flow_graph.get_option('id') block_name = flow_graph.get_option('title') or flow_graph.get_option('id').replace('_', ' ').title() @@ -55,7 +57,7 @@ def convert_hier(flow_graph, python_file): param_n['type'] = 'raw' params_n.append(param_n) block_n['param'] = params_n - #sink data + #sink data stream ports block_n['sink'] = list() for input_sig in input_sigs: sink_n = odict() @@ -64,7 +66,14 @@ def convert_hier(flow_graph, python_file): sink_n['vlen'] = input_sig['vlen'] if input_sig['optional']: sink_n['optional'] = '1' block_n['sink'].append(sink_n) - #source data + #sink data msg ports + for input_sig in input_msgp: + sink_n = odict() + sink_n['name'] = input_sig.get_param("label").get_value(); + sink_n['type'] = "message" + sink_n['optional'] = input_sig.get_param("optional").get_value(); + block_n['sink'].append(sink_n) + #source data stream ports block_n['source'] = list() for output_sig in output_sigs: source_n = odict() @@ -73,6 +82,13 @@ def convert_hier(flow_graph, python_file): source_n['vlen'] = output_sig['vlen'] if output_sig['optional']: source_n['optional'] = '1' block_n['source'].append(source_n) + #source data msg ports + for output_sig in output_msgp: + source_n = odict() + source_n['name'] = output_sig.get_param("label").get_value(); + source_n['type'] = "message" + source_n['optional'] = output_sig.get_param("optional").get_value(); + block_n['source'].append(source_n) #doc data block_n['doc'] = "%s\n%s\n%s"%(block_author, block_desc, python_file) block_n['grc_source'] = "%s"%(flow_graph.grc_file_path) |