diff options
Diffstat (limited to 'gr-qtgui')
| -rw-r--r-- | gr-qtgui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-qtgui/python/qtgui/CMakeLists.txt (renamed from gr-qtgui/python/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gr-qtgui/python/qtgui/__init__.py (renamed from gr-qtgui/python/__init__.py) | 9 | ||||
| -rwxr-xr-x | gr-qtgui/python/qtgui/qa_qtgui.py (renamed from gr-qtgui/python/qa_qtgui.py) | 0 |
4 files changed, 8 insertions, 3 deletions
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index a2485b8921..22cc2d7bf3 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -114,7 +114,7 @@ add_subdirectory(doc) if(ENABLE_PYTHON) add_subdirectory(grc) add_subdirectory(swig) - add_subdirectory(python) + add_subdirectory(python/qtgui) add_subdirectory(examples) add_subdirectory(apps) endif(ENABLE_PYTHON) diff --git a/gr-qtgui/python/CMakeLists.txt b/gr-qtgui/python/qtgui/CMakeLists.txt index 5822858082..5822858082 100644 --- a/gr-qtgui/python/CMakeLists.txt +++ b/gr-qtgui/python/qtgui/CMakeLists.txt diff --git a/gr-qtgui/python/__init__.py b/gr-qtgui/python/qtgui/__init__.py index 82e36597be..aaea875f04 100644 --- a/gr-qtgui/python/__init__.py +++ b/gr-qtgui/python/qtgui/__init__.py @@ -25,6 +25,11 @@ sinks. ''' # The presence of this file turns this directory into a Python package +import os -from qtgui_swig import * -#import qtgui_swig as qtgui # to preserve the old interface +try: + from qtgui_swig import * +except ImportError: + dirname, filename = os.path.split(os.path.abspath(__file__)) + __path__.append(os.path.join(dirname, "..", "..", "swig")) + from qtgui_swig import * diff --git a/gr-qtgui/python/qa_qtgui.py b/gr-qtgui/python/qtgui/qa_qtgui.py index 0761ed3be9..0761ed3be9 100755 --- a/gr-qtgui/python/qa_qtgui.py +++ b/gr-qtgui/python/qtgui/qa_qtgui.py |