diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-03-07 23:22:22 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-03-07 23:22:22 -0700 |
| commit | e8b4e619479dd23d87c3aef042f2452f867a1e18 (patch) | |
| tree | d764b31492566f39b63b6c49a0b776faa81d90ac /gr-fft | |
| parent | b91a9bbfb20c5bd1849c8f8e91468bc161595c4c (diff) | |
fft: Enabling uninstalled python imports.
Diffstat (limited to 'gr-fft')
| -rw-r--r-- | gr-fft/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-fft/python/fft/CMakeLists.txt (renamed from gr-fft/python/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gr-fft/python/fft/__init__.py (renamed from gr-fft/python/__init__.py) | 9 | ||||
| -rw-r--r-- | gr-fft/python/fft/logpwrfft.py (renamed from gr-fft/python/logpwrfft.py) | 0 | ||||
| -rwxr-xr-x | gr-fft/python/fft/qa_fft.py (renamed from gr-fft/python/qa_fft.py) | 0 | ||||
| -rwxr-xr-x | gr-fft/python/fft/qa_goertzel.py (renamed from gr-fft/python/qa_goertzel.py) | 0 | ||||
| -rw-r--r-- | gr-fft/python/fft/window.py (renamed from gr-fft/python/window.py) | 0 |
7 files changed, 9 insertions, 2 deletions
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt index 6b37bd3caa..aad510ff72 100644 --- a/gr-fft/CMakeLists.txt +++ b/gr-fft/CMakeLists.txt @@ -89,7 +89,7 @@ add_subdirectory(include/fft) add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(swig) - add_subdirectory(python) + add_subdirectory(python/fft) add_subdirectory(grc) endif(ENABLE_PYTHON) #add_subdirectory(examples) diff --git a/gr-fft/python/CMakeLists.txt b/gr-fft/python/fft/CMakeLists.txt index 415d87e2e8..415d87e2e8 100644 --- a/gr-fft/python/CMakeLists.txt +++ b/gr-fft/python/fft/CMakeLists.txt diff --git a/gr-fft/python/__init__.py b/gr-fft/python/fft/__init__.py index 093cc3c696..acb70a2947 100644 --- a/gr-fft/python/__init__.py +++ b/gr-fft/python/fft/__init__.py @@ -23,6 +23,13 @@ This is the gr-fft package. This package provides GNU Radio processing blocks for FFT and related functions. ''' +import os + +try: + from fft_swig import * +except ImportError: + dirname, filename = os.path.split(os.path.abspath(__file__)) + __path__.append(os.path.join(dirname, "..", "..", "swig")) + from fft_swig import * -from fft_swig import * from window import * diff --git a/gr-fft/python/logpwrfft.py b/gr-fft/python/fft/logpwrfft.py index 98303b1e1e..98303b1e1e 100644 --- a/gr-fft/python/logpwrfft.py +++ b/gr-fft/python/fft/logpwrfft.py diff --git a/gr-fft/python/qa_fft.py b/gr-fft/python/fft/qa_fft.py index 0a66a2c1fc..0a66a2c1fc 100755 --- a/gr-fft/python/qa_fft.py +++ b/gr-fft/python/fft/qa_fft.py diff --git a/gr-fft/python/qa_goertzel.py b/gr-fft/python/fft/qa_goertzel.py index 27f9d370e1..27f9d370e1 100755 --- a/gr-fft/python/qa_goertzel.py +++ b/gr-fft/python/fft/qa_goertzel.py diff --git a/gr-fft/python/window.py b/gr-fft/python/fft/window.py index 0065a08a61..0065a08a61 100644 --- a/gr-fft/python/window.py +++ b/gr-fft/python/fft/window.py |