Replace FFTW library with the PFFFT library #126
Conversation
…the code associated with the FFTW library. Added in new code that utilizes the PFFFT library in order to perform Fast Fourier Transforms needed. I updated CMakeLists.txt to include the PFFFT library.
…o perform the Fast Fourier Transform. Changed the first parameter of the fillSamples function to be a float* buffer instead of fftw_complex* buffer.
…parameter from fftw_complex* buffer to float* buffer, as the PFFFT library makes use of float buffers.
…size given is not divisible by 16, the FFT size will be increased to the next number divisble by 16.
… gathering the FFT Size from the user.
|
I need to update the CentOS7 docker container to have pffft (that's why it's failing in azure). You might need to make changes to the CMake stuff after I do that in order to get that behaving correctly. I'm not sure why the Ubuntu build failed. |
src/hobbits-plugins/displays/Spectrogram/spectrogramcontrols.cpp
Outdated
Show resolved
Hide resolved
|
looks like there are still references to |
…/main.cpp and hobbits-runner/main.cpp
I removed them now and it looks like the checks were all successful. I will message you about how I should get other mentions of FFTW taken out other files I've seen it mentioned in. |
src/hobbits-gui/CMakeLists.txt
Outdated
| @@ -17,7 +17,7 @@ file(GLOB RCFILES "${CMAKE_CURRENT_SOURCE_DIR}/*.qrc" "${CMAKE_CURRENT_SOURCE_DI | |||
|
|
|||
|
|
|||
| if (BUILDING_WITH_CONAN) | |||
| set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core CONAN_PKG::qt CONAN_PKG::fftw) | |||
| set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core CONAN_PKG::qt CONAN_PKG::pffft) | |||
There was a problem hiding this comment.
I think that hobbits-gui and hobbits-runner actually no longer need to link to the fft library because they don't need to do that "make planner thread safe" call.
src/hobbits-runner/CMakeLists.txt
Outdated
| @@ -17,7 +17,7 @@ file(GLOB RCFILES "${CMAKE_CURRENT_SOURCE_DIR}/*.qrc" "${CMAKE_CURRENT_SOURCE_DI | |||
| add_executable("hobbits-runner" "${SRCFILES}" "${HDRFILES}" "${RCFILES}") | |||
|
|
|||
| if (BUILDING_WITH_CONAN) | |||
| set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core CONAN_PKG::qt CONAN_PKG::fftw) | |||
| set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core CONAN_PKG::qt CONAN_PKG::pffft) | |||
There was a problem hiding this comment.
the fft lib link is no longer necessary in the hobbits-runner
…rom pull request.
|
🎉 This PR is included in version 0.53.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
The FFTW library was utilized in two Hobbits plugins, the Spectrogram and the Width Framer. Due to licensing conflicts, the FFTW library could no longer be used in Hobbits. After researching different libraries, @hello-adam and I decided to use the PFFFT library.
I have refactored the code for both the Spectrogram and the Width Framer. Also, I implemented a QComboBox that allows users to change the FFT Size within the Spectrogram. Prior to adding this, FFT Size was a QSpinBox that allowed users to manually enter the FFT size or use up and down arrows to increment. The QComboBox allows users to choose FFT sizes in powers of two, ranging from 2^5 to 2^14 (or, 32 to 16,384).