diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-10 05:45:12 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-10 05:45:12 -0700 |
| commit | e4f0319eced22c112f7e6a4cc45bc2036d285332 (patch) | |
| tree | 92baa4254f47fd0b62d1d3f69e3b1ddb96dd32d3 /gr-fft | |
| parent | 5fd6b62702369e45ef01a02e12bec1afc5b57200 (diff) | |
| parent | 3e052d303874a07237c4e0c31eef3f7f7a192835 (diff) | |
Merged in 'next' branch.
Diffstat (limited to 'gr-fft')
| -rw-r--r-- | gr-fft/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | gr-fft/grc/fft_block_tree.xml | 6 | ||||
| -rw-r--r-- | gr-fft/include/fft/fft_vcc.h | 12 | ||||
| -rw-r--r-- | gr-fft/include/fft/fft_vfc.h | 8 | ||||
| -rw-r--r-- | gr-fft/include/fft/goertzel_fc.h | 8 | ||||
| -rw-r--r-- | gr-fft/swig/CMakeLists.txt | 5 |
6 files changed, 24 insertions, 23 deletions
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt index e9110e2137..c9eb9ddbdc 100644 --- a/gr-fft/CMakeLists.txt +++ b/gr-fft/CMakeLists.txt @@ -57,28 +57,28 @@ CPACK_COMPONENT("fft_runtime" GROUP "FFT" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("fft_devel" GROUP "FFT" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("fft_python" GROUP "FFT" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;fft_runtime" + DEPENDS "runtime_python;fft_runtime" ) CPACK_COMPONENT("fft_swig" GROUP "FFT" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;fft_python;fft_devel" + DEPENDS "runtime_swig;fft_python;fft_devel" ) ######################################################################## diff --git a/gr-fft/grc/fft_block_tree.xml b/gr-fft/grc/fft_block_tree.xml index 5abbc3ef26..ca8ca7876c 100644 --- a/gr-fft/grc/fft_block_tree.xml +++ b/gr-fft/grc/fft_block_tree.xml @@ -29,13 +29,9 @@ <cat> <name></name> <!-- Blank for Root Name --> <cat> - <name>FFT</name> + <name>Fourier Analysis</name> <block>fft_vxx</block> <block>goertzel_fc</block> - </cat> - - <cat> - <name>Operators</name> <block>logpwrfft_x</block> </cat> </cat> diff --git a/gr-fft/include/fft/fft_vcc.h b/gr-fft/include/fft/fft_vcc.h index cb07b166d2..2f5b5a23f0 100644 --- a/gr-fft/include/fft/fft_vcc.h +++ b/gr-fft/include/fft/fft_vcc.h @@ -29,6 +29,10 @@ namespace gr { namespace fft { + /*! + * \brief Compute forward or reverse FFT. complex vector in / complex vector out. + * \ingroup fourier_analysis_blk + */ class FFT_API fft_vcc : virtual public gr_sync_block { public: @@ -36,13 +40,9 @@ namespace gr { // gr::fft::fft_vcc::sptr typedef boost::shared_ptr<fft_vcc> sptr; - /*! - * \brief Compute forward or reverse FFT. complex vector in / complex vector out. - * \ingroup dft_blk - */ static sptr make(int fft_size, bool forward, - const std::vector<float> &window, - bool shift=false, int nthreads=1); + const std::vector<float> &window, + bool shift=false, int nthreads=1); virtual void set_nthreads(int n) = 0; diff --git a/gr-fft/include/fft/fft_vfc.h b/gr-fft/include/fft/fft_vfc.h index ec441d66a8..89491113b6 100644 --- a/gr-fft/include/fft/fft_vfc.h +++ b/gr-fft/include/fft/fft_vfc.h @@ -29,6 +29,10 @@ namespace gr { namespace fft { + /*! + * \brief Compute forward or reverse FFT. float vector in / complex vector out. + * \ingroup fourier_analysis_blk + */ class FFT_API fft_vfc : virtual public gr_sync_block { public: @@ -36,10 +40,6 @@ namespace gr { // gr::fft::fft_vfc::sptr typedef boost::shared_ptr<fft_vfc> sptr; - /*! - * \brief Compute forward or reverse FFT. float vector in / complex vector out. - * \ingroup dft_blk - */ static sptr make(int fft_size, bool forward, const std::vector<float> &window, int nthreads=1); diff --git a/gr-fft/include/fft/goertzel_fc.h b/gr-fft/include/fft/goertzel_fc.h index 5b3c8f1c49..26b0d0d11c 100644 --- a/gr-fft/include/fft/goertzel_fc.h +++ b/gr-fft/include/fft/goertzel_fc.h @@ -29,6 +29,10 @@ namespace gr { namespace fft { + /*! + * \brief Goertzel single-bin DFT calculation. + * \ingroup fourier_analysis_blk + */ class FFT_API goertzel_fc : virtual public gr_sync_decimator { public: @@ -36,10 +40,6 @@ namespace gr { // gr::fft::goertzel_fc::sptr typedef boost::shared_ptr<goertzel_fc> sptr; - /*! - * \brief Goertzel single-bin DFT calculation. - * \ingroup dft_blk - */ static sptr make(int rate, int len, float freq); virtual void set_freq (float freq) = 0; diff --git a/gr-fft/swig/CMakeLists.txt b/gr-fft/swig/CMakeLists.txt index af2845edcf..7c11b85bb4 100644 --- a/gr-fft/swig/CMakeLists.txt +++ b/gr-fft/swig/CMakeLists.txt @@ -30,6 +30,11 @@ set(GR_SWIG_INCLUDE_DIRS ${FFTW3F_INCLUDE_DIRS} ) +if(ENABLE_GR_CTRLPORT) + list(APPEND GR_SWIG_FLAGS "-DGR_CTRLPORT") + list(APPEND GR_SWIG_INCLUDE_DIRS ${ICE_INCLUDE_DIR}) +endif(ENABLE_GR_CTRLPORT) + set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fft_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/fft) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) |