Commit 72327f3a authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Speeding up the get center freq function of third octave spectrum, and...

Speeding up the get center freq function of third octave spectrum, and renaming whole octave spectrum (not completed)
parent b65c0560
......@@ -49,7 +49,7 @@ namespace ITABase
return 31;
};
inline static std::vector< float > GetCenterFrequencies()
inline static const std::vector< float >& GetCenterFrequencies()
{
return ITAConstants::THIRD_OCTAVE_CENTER_FREQUENCIES_ISO_F;
};
......
......@@ -16,8 +16,8 @@
*
*/
#ifndef INCLUDE_WATCHER_ITA_THIRD_OCTAVE_MAGNITUDE_SPECTRUM
#define INCLUDE_WATCHER_ITA_THIRD_OCTAVE_MAGNITUDE_SPECTRUM
#ifndef INCLUDE_WATCHER_ITA_WHOLE_OCTAVE_MAGNITUDE_SPECTRUM
#define INCLUDE_WATCHER_ITA_WHOLE_OCTAVE_MAGNITUDE_SPECTRUM
#include <ITABaseDefinitions.h>
#include <ITAMagnitudeSpectrum.h>
......@@ -36,16 +36,16 @@ namespace ITABase
* @sa
*
*/
class ITA_BASE_API CThirdOctaveMagnitudeSpectrum : public CMagnitudeSpectrum
class ITA_BASE_API CWholeOctaveMagnitudeSpectrum : public CMagnitudeSpectrum
{
public:
inline CThirdOctaveMagnitudeSpectrum()
inline CWholeOctaveMagnitudeSpectrum()
: CMagnitudeSpectrum( 10 )
{
m_vfCenterFrequencies = ITAConstants::OCTAVE_CENTER_FREQUENCIES_ISO_F;
};
virtual inline ~CThirdOctaveMagnitudeSpectrum() {};
virtual inline ~CWholeOctaveMagnitudeSpectrum() {};
protected:
void SetCenterFrequencies( const std::vector<float>& vfCenterFrequencies );
......@@ -53,4 +53,4 @@ namespace ITABase
}
#endif // INCLUDE_WATCHER_ITA_THIRD_OCTAVE_MAGNITUDE_SPECTRUM
#endif // INCLUDE_WATCHER_ITA_WHOLE_OCTAVE_MAGNITUDE_SPECTRUM
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment