diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-03-08 20:18:56 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-03-08 20:18:56 -0700 |
| commit | 931817973a1bec623e5b77cb87ea56d51ccd888f (patch) | |
| tree | 41f74bb5b29856abb8cd6c3d2435168a6a121a12 | |
| parent | b720b61cbd6b9a231b5ff05dbb262aadc5ce2522 (diff) | |
qtgui: Enabling uninstalled python imports.
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/__init__.py | 1 | ||||
| -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 |
5 files changed, 9 insertions, 3 deletions
diff --git a/gnuradio-core/src/python/gnuradio/__init__.py b/gnuradio-core/src/python/gnuradio/__init__.py index c78e39b8c4..e17978c76a 100644 --- a/gnuradio-core/src/python/gnuradio/__init__.py +++ b/gnuradio-core/src/python/gnuradio/__init__.py @@ -34,3 +34,4 @@ if path.endswith(path_ending): __path__.append(os.path.join(build_path, 'gr-analog', 'python')) __path__.append(os.path.join(build_path, 'gr-trellis', 'python')) __path__.append(os.path.join(build_path, 'gr-wavelet', 'python')) + __path__.append(os.path.join(build_path, 'gr-qtgui', 'python')) 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 |