diff options
Diffstat (limited to 'grc/core/generator')
| -rw-r--r-- | grc/core/generator/FlowGraphProxy.py | 6 | ||||
| -rw-r--r-- | grc/core/generator/Generator.py | 4 | ||||
| -rw-r--r-- | grc/core/generator/flow_graph.tmpl | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/grc/core/generator/FlowGraphProxy.py b/grc/core/generator/FlowGraphProxy.py index a23c6d84ab..d5d31c0dce 100644 --- a/grc/core/generator/FlowGraphProxy.py +++ b/grc/core/generator/FlowGraphProxy.py @@ -90,7 +90,7 @@ class FlowGraphProxy(object): Returns: a list of pad source blocks in this flow graph """ - pads = [b for b in self.get_enabled_blocks() if b.get_key() == 'pad_source'] + pads = [b for b in self.get_enabled_blocks() if b.key == 'pad_source'] return sorted(pads, lambda x, y: cmp(x.get_id(), y.get_id())) def get_pad_sinks(self): @@ -100,7 +100,7 @@ class FlowGraphProxy(object): Returns: a list of pad sink blocks in this flow graph """ - pads = [b for b in self.get_enabled_blocks() if b.get_key() == 'pad_sink'] + pads = [b for b in self.get_enabled_blocks() if b.key == 'pad_sink'] return sorted(pads, lambda x, y: cmp(x.get_id(), y.get_id())) def get_pad_port_global_key(self, port): @@ -121,7 +121,7 @@ class FlowGraphProxy(object): if is_message_pad: key = pad.get_param('label').get_value() else: - key = str(key_offset + int(port.get_key())) + key = str(key_offset + int(port.key)) return key else: # assuming we have either only sources or sinks diff --git a/grc/core/generator/Generator.py b/grc/core/generator/Generator.py index 9c7d07e76b..3664d083e9 100644 --- a/grc/core/generator/Generator.py +++ b/grc/core/generator/Generator.py @@ -98,7 +98,7 @@ class TopBlockGenerator(object): "Add a Misc->Throttle block to your flow " "graph to avoid CPU congestion.") if len(throttling_blocks) > 1: - keys = set([b.get_key() for b in throttling_blocks]) + keys = set([b.key for b in throttling_blocks]) if len(keys) > 1 and 'blocks_throttle' in keys: Messages.send_warning("This flow graph contains a throttle " "block and another rate limiting block, " @@ -156,7 +156,7 @@ class TopBlockGenerator(object): blocks = [b for b in blocks_all if b not in imports and b not in parameters] for block in blocks: - key = block.get_key() + key = block.key file_path = os.path.join(self._dirname, block.get_id() + '.py') if key == 'epy_block': src = block.get_param('_source_code').get_value() diff --git a/grc/core/generator/flow_graph.tmpl b/grc/core/generator/flow_graph.tmpl index 5eef3d2042..34178ebc66 100644 --- a/grc/core/generator/flow_graph.tmpl +++ b/grc/core/generator/flow_graph.tmpl @@ -241,12 +241,12 @@ 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.parent.get_key() in ('pad_source', 'pad_sink') + #if $port.parent.key in ('pad_source', 'pad_sink') #set block = 'self' #set key = $flow_graph.get_pad_port_global_key($port) #else #set block = 'self.' + $port.parent.get_id() - #set key = $port.get_key() + #set key = $port.key #end if #if not $key.isdigit() #set key = repr($key) |