diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2014-06-13 10:42:29 +0200 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-06-13 14:33:05 -0700 |
| commit | e620fa41fcddc467be6ddde777e702a3d4c399a9 (patch) | |
| tree | 0ad2d8e5adf0fa240d0dbba94cf9f6df4bf04168 /grc/python | |
| parent | a8d28ad5338a5044acbbc5c84abb20b7365c9afa (diff) | |
grc: fix pad port keys in connect()
Diffstat (limited to 'grc/python')
| -rw-r--r-- | grc/python/FlowGraph.py | 17 | ||||
| -rw-r--r-- | grc/python/flow_graph.tmpl | 6 |
2 files changed, 19 insertions, 4 deletions
diff --git a/grc/python/FlowGraph.py b/grc/python/FlowGraph.py index bf98c7ab38..8573f33fc4 100644 --- a/grc/python/FlowGraph.py +++ b/grc/python/FlowGraph.py @@ -107,6 +107,23 @@ class FlowGraph(_FlowGraph, _GUIFlowGraph): pads = filter(lambda b: b.get_key() == 'pad_sink', self.get_enabled_blocks()) return sorted(pads, lambda x, y: cmp(x.get_id(), y.get_id())) + def get_pad_port_global_key(self, port): + """ + Get the key for a port of a pad source/sink to use in connect() + This takes into account that pad blocks may have multiple ports + + Returns: + the key (str) + """ + key_offset = 0 + pads = self.get_pad_sources() if port.is_source() else self.get_pad_sinks() + for pad in pads: + if port.get_parent() == pad: + return str(key_offset + int(port.get_key())) + # assuming we have either only sources or sinks + key_offset += len(pad.get_ports()) + return -1 + def get_msg_pad_sources(self): ps = self.get_pad_sources(); return filter(lambda b: b.get_param('type').get_evaluated() == 'message', ps); diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl index 7c6998ab73..885fa7534d 100644 --- a/grc/python/flow_graph.tmpl +++ b/grc/python/flow_graph.tmpl @@ -178,10 +178,8 @@ gr.io_signaturev($(len($io_sigs)), $(len($io_sigs)), [$(', '.join($size_strs))]) ## However, port names for IO pads should be self. ######################################################## #def make_port_sig($port) - #if $port.get_parent().get_key() == 'pad_source' -(self, $flow_graph.get_pad_sources().index($port.get_parent()))#slurp - #elif $port.get_parent().get_key() == 'pad_sink' -(self, $flow_graph.get_pad_sinks().index($port.get_parent()))#slurp + #if $port.get_parent().get_key() in ('pad_source', 'pad_sink') +(self, $flow_graph.get_pad_port_global_key($port))#slurp #else (self.$port.get_parent().get_id(), $port.get_key())#slurp #end if |