diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-03-08 20:12:05 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-03-08 20:12:05 -0700 |
| commit | b720b61cbd6b9a231b5ff05dbb262aadc5ce2522 (patch) | |
| tree | 097c165be6520ba628eb6e22a778713db91ac580 | |
| parent | 86b12479d5179645e0d7b0367dbae2bf531bbca8 (diff) | |
wavelet: Enabling uninstalled python imports.
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/__init__.py | 1 | ||||
| -rw-r--r-- | gr-wavelet/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-wavelet/python/wavelet/CMakeLists.txt (renamed from gr-wavelet/python/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gr-wavelet/python/wavelet/__init__.py (renamed from gr-wavelet/python/__init__.py) | 9 | ||||
| -rwxr-xr-x | gr-wavelet/python/wavelet/qa_classify.py (renamed from gr-wavelet/python/qa_classify.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 03a104ab52..c78e39b8c4 100644 --- a/gnuradio-core/src/python/gnuradio/__init__.py +++ b/gnuradio-core/src/python/gnuradio/__init__.py @@ -33,3 +33,4 @@ if path.endswith(path_ending): __path__.append(os.path.join(build_path, 'gr-fft', 'python')) __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')) diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt index 1eb536f9d9..da0ac45b58 100644 --- a/gr-wavelet/CMakeLists.txt +++ b/gr-wavelet/CMakeLists.txt @@ -88,7 +88,7 @@ add_subdirectory(include/wavelet) add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(swig) - add_subdirectory(python) + add_subdirectory(python/wavelet) # add_subdirectory(grc) endif(ENABLE_PYTHON) #add_subdirectory(examples) diff --git a/gr-wavelet/python/CMakeLists.txt b/gr-wavelet/python/wavelet/CMakeLists.txt index 7f7fd99ecf..7f7fd99ecf 100644 --- a/gr-wavelet/python/CMakeLists.txt +++ b/gr-wavelet/python/wavelet/CMakeLists.txt diff --git a/gr-wavelet/python/__init__.py b/gr-wavelet/python/wavelet/__init__.py index cf86408e95..7f3d9afa53 100644 --- a/gr-wavelet/python/__init__.py +++ b/gr-wavelet/python/wavelet/__init__.py @@ -22,6 +22,11 @@ ''' Processing blocks for wavelet transforms. ''' +import os -from wavelet_swig import * - +try: + from wavelet_swig import * +except ImportError: + dirname, filename = os.path.split(os.path.abspath(__file__)) + __path__.append(os.path.join(dirname, "..", "..", "swig")) + from wavelet_swig import * diff --git a/gr-wavelet/python/qa_classify.py b/gr-wavelet/python/wavelet/qa_classify.py index c2972c92f2..c2972c92f2 100755 --- a/gr-wavelet/python/qa_classify.py +++ b/gr-wavelet/python/wavelet/qa_classify.py |