diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-02-05 16:44:10 +0100 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-02-17 19:55:17 +0100 |
| commit | 9023d2ad1ad5d1704bbe7fe942e42156a1f273a4 (patch) | |
| tree | cd1b46eaa3a8f38a8eed424be6d6bab330024221 /grc/core/Platform.py | |
| parent | 412df3a17ec35277f5a1d2f21c6f9a287f9ef8ad (diff) | |
grc-refactor: cmake fixes and more reorganizing
Diffstat (limited to 'grc/core/Platform.py')
| -rw-r--r-- | grc/core/Platform.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/grc/core/Platform.py b/grc/core/Platform.py index f04dd04e90..7aa1caedd1 100644 --- a/grc/core/Platform.py +++ b/grc/core/Platform.py @@ -21,14 +21,14 @@ import os import sys from gnuradio import gr -from . import ParseXML, extract_docs +from . import ParseXML from .Constants import ( BLOCK_TREE_DTD, FLOW_GRAPH_DTD, DOMAIN_DTD, HIER_BLOCKS_LIB_DIR, BLOCK_DTD, DEFAULT_FLOW_GRAPH, BLOCKS_DIRS, PREFS_FILE, CORE_TYPES, PREFS_FILE_OLD, ) from .Element import Element -from .odict import odict +from .utils import odict, extract_docs from ..gui import Messages from .generator import Generator @@ -70,7 +70,7 @@ class Platform(Element): Element.__init__(self) self._name = 'GNU Radio Companion' - # Save the verion string to the first + # Save the version string to the first version = (gr.version(), gr.major_version(), gr.api_version(), gr.minor_version()) self._version = version[0] self._version_major = version[1] @@ -88,6 +88,7 @@ class Platform(Element): self._colors = [(name, color) for name, key, sizeof, color in CORE_TYPES] # Create a dummy flow graph for the blocks self._flow_graph = Element(self) + self._flow_graph.connections = [] self._blocks = None self._blocks_n = None @@ -206,6 +207,7 @@ class Platform(Element): # print >> sys.stderr, 'Warning: Block validation failed:\n\t%s\n\tIgnoring: %s' % (e, xml_file) pass except Exception as e: + raise print >> sys.stderr, 'Warning: XML parsing failed:\n\t%r\n\tIgnoring: %s' % (e, xml_file) def iter_xml_files(self): |