diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-07-12 11:51:30 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-07-13 16:35:50 +0200 |
| commit | cac9487e9bd0a9fa4bf50407af09d2665c4b7cd0 (patch) | |
| tree | b3da85296400af1ed16a17dcedf8c95f2fd3a916 /grc/core | |
| parent | 971a7e2bd780c4dd40bfca55a437e2a3487631f9 (diff) | |
grc: refactor: remote port domain getter
Diffstat (limited to 'grc/core')
| -rw-r--r-- | grc/core/Block.py | 2 | ||||
| -rw-r--r-- | grc/core/Connection.py | 4 | ||||
| -rw-r--r-- | grc/core/Port.py | 17 | ||||
| -rw-r--r-- | grc/core/generator/Generator.py | 2 | ||||
| -rw-r--r-- | grc/core/generator/flow_graph.tmpl | 2 |
5 files changed, 12 insertions, 15 deletions
diff --git a/grc/core/Block.py b/grc/core/Block.py index 013f2cdbd8..db71f4a8c9 100644 --- a/grc/core/Block.py +++ b/grc/core/Block.py @@ -249,7 +249,7 @@ class Block(Element): # Renumber non-message/message ports domain_specific_port_index = collections.defaultdict(int) for port in [p for p in ports if p.key.isdigit()]: - domain = port.get_domain() + domain = port.domain port.key = str(domain_specific_port_index[domain]) domain_specific_port_index[domain] += 1 diff --git a/grc/core/Connection.py b/grc/core/Connection.py index 44e3b6b5d8..7820603360 100644 --- a/grc/core/Connection.py +++ b/grc/core/Connection.py @@ -96,8 +96,8 @@ class Connection(Element): Element.validate(self) platform = self.parent_platform - source_domain = self.source_port.get_domain() - sink_domain = self.sink_port.get_domain() + source_domain = self.source_port.domain + sink_domain = self.sink_port.domain if (source_domain, sink_domain) not in platform.connection_templates: self.add_error_message('No connection known for domains "{}", "{}"'.format( diff --git a/grc/core/Port.py b/grc/core/Port.py index bb1e1fa9f2..10d021b315 100644 --- a/grc/core/Port.py +++ b/grc/core/Port.py @@ -133,7 +133,7 @@ class Port(Element): self._name = n['name'] self.key = n['key'] self._type = n.get('type', '') - self._domain = n.get('domain') + self.domain = n.get('domain') self._hide = n.get('hide', '') self._dir = dir self._hide_evaluated = False # Updated on rewrite() @@ -161,8 +161,8 @@ class Port(Element): if self.get_type() not in self.get_types(): self.add_error_message('Type "{}" is not a possible type.'.format(self.get_type())) platform = self.parent.parent.parent - if self.get_domain() not in platform.domains: - self.add_error_message('Domain key "{}" is not registered.'.format(self.get_domain())) + if self.domain not in platform.domains: + self.add_error_message('Domain key "{}" is not registered.'.format(self.domain)) if not self.get_enabled_connections() and not self.get_optional(): self.add_error_message('Port is not connected.') # Message port logic @@ -193,11 +193,11 @@ class Port(Element): # Update domain if was deduced from (dynamic) port type type_ = self.get_type() - if self._domain == Constants.GR_STREAM_DOMAIN and type_ == "message": - self._domain = Constants.GR_MESSAGE_DOMAIN + if self.domain == Constants.GR_STREAM_DOMAIN and type_ == "message": + self.domain = Constants.GR_MESSAGE_DOMAIN self.key = self._name - if self._domain == Constants.GR_MESSAGE_DOMAIN and type_ != "message": - self._domain = Constants.GR_STREAM_DOMAIN + if self.domain == Constants.GR_MESSAGE_DOMAIN and type_ != "message": + self.domain = Constants.GR_STREAM_DOMAIN self.key = '0' # Is rectified in rewrite() def resolve_virtual_source(self): @@ -334,9 +334,6 @@ class Port(Element): def get_type(self): return self.parent_block.resolve_dependencies(self._type) - def get_domain(self): - return self._domain - def get_hide(self): return self._hide_evaluated diff --git a/grc/core/generator/Generator.py b/grc/core/generator/Generator.py index 2486d68ec0..e3f6bf38c9 100644 --- a/grc/core/generator/Generator.py +++ b/grc/core/generator/Generator.py @@ -211,7 +211,7 @@ class TopBlockGenerator(object): # List of connections where each endpoint is enabled (sorted by domains, block names) connections.sort(key=lambda c: ( - c.source_port.get_domain(), c.sink_port.get_domain(), + c.source_port.domain, c.sink_port.domain, c.source_block.get_id(), c.sink_block.get_id() )) diff --git a/grc/core/generator/flow_graph.tmpl b/grc/core/generator/flow_graph.tmpl index 4e6a918872..7074aa0004 100644 --- a/grc/core/generator/flow_graph.tmpl +++ b/grc/core/generator/flow_graph.tmpl @@ -262,7 +262,7 @@ gr.io_signaturev($(len($io_sigs)), $(len($io_sigs)), [$(', '.join($size_strs))]) #for $con in $connections #set global $source = $con.source_port #set global $sink = $con.sink_port - #include source=$connection_templates[($source.get_domain(), $sink.get_domain())] + #include source=$connection_templates[($source.domain, $sink.domain)] #end for ######################################################## |