diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-10-05 16:13:02 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-10-05 16:13:02 -0700 |
| commit | 68823d4ee894a06317e4258c38537582188473ec (patch) | |
| tree | a926183cd5d9b23782db7f4556ee29805bea5bdd /grc/python | |
| parent | a84859a19ce707524157d9ba9756e73eb99b2b5b (diff) | |
| parent | f4adf33585df6109bdb45ba969dcada0503e838f (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'grc/python')
| -rw-r--r-- | grc/python/FlowGraph.py | 1 | ||||
| -rw-r--r-- | grc/python/convert_hier.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/grc/python/FlowGraph.py b/grc/python/FlowGraph.py index 9d48401ea0..b68d497e58 100644 --- a/grc/python/FlowGraph.py +++ b/grc/python/FlowGraph.py @@ -72,6 +72,7 @@ class FlowGraph(_FlowGraph, _GUIFlowGraph): 'type': str(pad.get_param('type').get_evaluated()), 'vlen': str(pad.get_param('vlen').get_evaluated()), 'size': pad.get_param('type').get_opt('size'), + 'optional': bool(pad.get_param('optional').get_evaluated()), } for pad in sorted_pads] def get_pad_sources(self): diff --git a/grc/python/convert_hier.py b/grc/python/convert_hier.py index f4d082d596..b609af24ae 100644 --- a/grc/python/convert_hier.py +++ b/grc/python/convert_hier.py @@ -62,6 +62,7 @@ def convert_hier(flow_graph, python_file): sink_n['name'] = input_sig['label'] sink_n['type'] = input_sig['type'] sink_n['vlen'] = input_sig['vlen'] + if input_sig['optional']: sink_n['optional'] = '1' block_n['sink'].append(sink_n) #source data block_n['source'] = list() @@ -70,6 +71,7 @@ def convert_hier(flow_graph, python_file): source_n['name'] = output_sig['label'] source_n['type'] = output_sig['type'] source_n['vlen'] = output_sig['vlen'] + if output_sig['optional']: source_n['optional'] = '1' block_n['source'].append(source_n) #doc data block_n['doc'] = "%s\n%s\n%s"%(block_author, block_desc, python_file) |