summaryrefslogtreecommitdiff
path: root/grc/python
diff options
context:
space:
mode:
authorJohnathan Corgan2012-10-05 16:12:11 -0700
committerJohnathan Corgan2012-10-05 16:12:11 -0700
commitf4adf33585df6109bdb45ba969dcada0503e838f (patch)
tree62da34256b285d1eb270af41428bc3fa13b077d7 /grc/python
parent08c65795d7a4bb96a5cd7670c988acca14972fdb (diff)
parentb8c64d7db1ca15841cef4601d71d56ea62002996 (diff)
downloadgnuradio-f4adf33585df6109bdb45ba969dcada0503e838f.tar.gz
gnuradio-f4adf33585df6109bdb45ba969dcada0503e838f.tar.bz2
gnuradio-f4adf33585df6109bdb45ba969dcada0503e838f.zip
Merge remote branch 'jblum/grc_optional_pads'
Diffstat (limited to 'grc/python')
-rw-r--r--grc/python/FlowGraph.py1
-rw-r--r--grc/python/convert_hier.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/grc/python/FlowGraph.py b/grc/python/FlowGraph.py
index 89a169355..efe362760 100644
--- a/grc/python/FlowGraph.py
+++ b/grc/python/FlowGraph.py
@@ -64,6 +64,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 f4d082d59..b609af24a 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)