#include "audiospectrum.h"
-#include "ffttools.h"
-#include "kiss_fft/tools/kiss_fftr.h"
+#include "lib/audio/fftTools.h"
+#include "lib/external/kiss_fft/tools/kiss_fftr.h"
#include <QMenu>
#include <QPainter>
#define MAX_OVM_COLOR 0.7
AudioSpectrum::AudioSpectrum(QWidget *parent) :
- AbstractAudioScopeWidget(true, parent),
- m_fftTools(),
- m_lastFFT(),
- m_lastFFTLock(1),
- m_peaks()
+ AbstractAudioScopeWidget(true, parent)
+ , m_fftTools()
+ , m_lastFFT()
+ , m_lastFFTLock(1)
+ , m_peaks()
#ifdef DEBUG_AUDIOSPEC
- ,m_timeTotal(0)
- ,m_showTotal(0)
+ , m_timeTotal(0)
+ , m_showTotal(0)
#endif
- ,colorizeFactor(0)
+ , m_dBmin(-70)
+ , m_dBmax(0)
+ , m_freqMax(0)
+ , m_customFreq(false)
+ ,colorizeFactor(0)
{
ui = new Ui::AudioSpectrum_UI;
ui->setupUi(this);
bool overmodulated = false;
int overmodulateCount = 0;
- for (int i = 0; i < audioFrame.size(); i++) {
+ for (int i = 0; i < audioFrame.size(); ++i) {
if (
audioFrame[i] == std::numeric_limits<int16_t>::max()
|| audioFrame[i] == std::numeric_limits<int16_t>::min()) {
davinci.setPen(QPen(QBrush(spectrumColor.rgba()), 1, Qt::SolidLine));
#endif
- for (uint i = 0; i < w; i++) {
+ for (uint i = 0; i < w; ++i) {
yMax = (dbMap[i] - m_dBmin) / (m_dBmax-m_dBmin) * (h-1);
if (yMax < 0) {
yMax = 0;
if (m_peaks.size() != fftWindow/2) {
m_peaks = QVector<float>(m_lastFFT);
} else {
- for (int i = 0; i < fftWindow/2; i++) {
+ for (int i = 0; i < fftWindow/2; ++i) {
if (m_lastFFT[i] > m_peaks[i]) {
m_peaks[i] = m_lastFFT[i];
} else {
}
int prev = 0;
m_peakMap = FFTTools::interpolatePeakPreserving(m_peaks, m_innerScopeRect.width(), 0, right, -180);
- for (uint i = 0; i < w; i++) {
+ for (uint i = 0; i < w; ++i) {
yMax = (m_peakMap[i] - m_dBmin) / (m_dBmax-m_dBmin) * (h-1);
if (yMax < 0) {
yMax = 0;
} else {
x = leftDist + m_innerScopeRect.width();
davinci.drawLine(x, topDist, x, topDist + m_innerScopeRect.height()+6);
- davinci.drawText(x-10, y, i18n("%1 kHz").arg((double)m_freqMax/1000, 0, 'f', 1));
+ davinci.drawText(x-10, y, i18n("%1 kHz", QString("%1").arg((double)m_freqMax/1000, 0, 'f', 1)));
}
if (hz > 0) {
davinci.drawRect(rect);
davinci.drawText(textRect, QString(
i18n("%1 dB", QString("%1").arg(db, 0, 'f', 2))
- + "\n"
+ + '\n'
+ i18n("%1 kHz", QString("%1").arg(freq/1000, 0, 'f', 2))));
}