[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 12/22: grc: port connections by domain, blo
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 12/22: grc: port connections by domain, block name in generated code |
Date: |
Tue, 23 Dec 2014 09:38:58 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit a4e0154373510695741f840298f4ea7c2cbb217a
Author: Sebastian Koslowski <address@hidden>
Date: Mon Dec 8 22:36:47 2014 +0100
grc: port connections by domain, block name in generated code
---
grc/python/Generator.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/grc/python/Generator.py b/grc/python/Generator.py
index a1f8457..7512cfb 100644
--- a/grc/python/Generator.py
+++ b/grc/python/Generator.py
@@ -164,8 +164,12 @@ class TopBlockGenerator(object):
)
# list of regular blocks (all blocks minus the special ones)
blocks = filter(lambda b: b not in (imports + parameters), blocks)
- # list of connections where each endpoint is enabled
+ # list of connections where each endpoint is enabled (sorted by
domains, block names)
connections = filter(lambda c: not (c.is_bus() or c.is_msg()),
self._flow_graph.get_enabled_connections())
+ connections.sort(key=lambda c: (
+ c.get_source().get_domain(), c.get_sink().get_domain(),
+ c.get_source().get_parent().get_id(),
c.get_sink().get_parent().get_id()
+ ))
connection_templates =
self._flow_graph.get_parent().get_connection_templates()
msgs = filter(lambda c: c.is_msg(),
self._flow_graph.get_enabled_connections())
# list of variable names
- [Commit-gnuradio] [gnuradio] branch master updated (3427a66 -> 2402ccc), git, 2014/12/23
- [Commit-gnuradio] [gnuradio] 07/22: grc: per element line styles (for custom domain ports and message connections), git, 2014/12/23
- [Commit-gnuradio] [gnuradio] 08/22: grc: add gr_message domain, git, 2014/12/23
- [Commit-gnuradio] [gnuradio] 12/22: grc: port connections by domain, block name in generated code,
git <=
- [Commit-gnuradio] [gnuradio] 10/22: grc: add multiple_sources flag to domain.dtd, git, 2014/12/23
- [Commit-gnuradio] [gnuradio] 13/22: runtime: whitespace fixes, git, 2014/12/23
- [Commit-gnuradio] [gnuradio] 15/22: runtime: add tests for new decorators in hier_block2, git, 2014/12/23
- [Commit-gnuradio] [gnuradio] 14/22: runtime: refactor top/hier block python wrappers, git, 2014/12/23
- [Commit-gnuradio] [gnuradio] 17/22: grc: fix connections error log and color, git, 2014/12/23
- [Commit-gnuradio] [gnuradio] 11/22: grc: PEP8 fixes in Generator, git, 2014/12/23
- [Commit-gnuradio] [gnuradio] 16/22: grc: add domain property color and use it for connections, git, 2014/12/23
- [Commit-gnuradio] [gnuradio] 06/22: grc: domain-specific port keys, git, 2014/12/23
- [Commit-gnuradio] [gnuradio] 09/22: grc: make Generator use gr_message domain, git, 2014/12/23
- [Commit-gnuradio] [gnuradio] 03/22: grc: draw ports with custom domain differently, git, 2014/12/23