diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-01-13 12:48:16 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-01-13 12:48:16 -0800 |
| commit | 885fd55189b3a7da21771ee546b27196b124996e (patch) | |
| tree | fc4df7bc90c7ad5c774542c286aca21d17cb49ea /grc/python | |
| parent | 1581681c8ad8b150c7b417eb2fef21ff27ba5942 (diff) | |
| parent | 6c121388075c9d7624bef832a5dd835da73798cc (diff) | |
Merge branch 'maint'
Diffstat (limited to 'grc/python')
| -rw-r--r-- | grc/python/Connection.py | 2 | ||||
| -rw-r--r-- | grc/python/Port.py | 1 | ||||
| -rw-r--r-- | grc/python/flow_graph.tmpl | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/grc/python/Connection.py b/grc/python/Connection.py index 0a6cf5fa46..822876a0ae 100644 --- a/grc/python/Connection.py +++ b/grc/python/Connection.py @@ -38,8 +38,8 @@ class Connection(_Connection, _GUIConnection): Validate the connections. The ports must match in io size. """ + _Connection.validate(self) source_size = Constants.TYPE_TO_SIZEOF[self.get_source().get_type()] * self.get_source().get_vlen() sink_size = Constants.TYPE_TO_SIZEOF[self.get_sink().get_type()] * self.get_sink().get_vlen() if source_size != sink_size: self.add_error_message('Source IO size "%s" does not match sink IO size "%s".'%(source_size, sink_size)) - _Connection.validate(self) diff --git a/grc/python/Port.py b/grc/python/Port.py index 4cd07a9721..765e1d7423 100644 --- a/grc/python/Port.py +++ b/grc/python/Port.py @@ -140,7 +140,6 @@ class Port(_Port, _GUIPort): Handle the port cloning for virtual blocks. """ if self.is_type_empty(): - self._type_evaluated = None try: #clone type and vlen source = self.resolve_empty_type() self._type = str(source.get_type()) diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl index d66c2581de..2526f087eb 100644 --- a/grc/python/flow_graph.tmpl +++ b/grc/python/flow_graph.tmpl @@ -211,7 +211,7 @@ gr.io_signaturev($(len($io_sigs)), $(len($io_sigs)), [$(', '.join($size_strs))]) #set global $sink = $con.get_sink() ##resolve virtual sources to the actual sources #if $source.get_parent().is_virtual_source() - #set $source = $source.resolve_virtual_source() + #set global $source = $source.resolve_virtual_source() #end if ##do not generate connections with virtual sinks #if not $sink.get_parent().is_virtual_sink() |