Mercurial > hg > svcore

diff data/model/FFTModel.cpp @ 1794:71e97de5053f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch time-frequency-boxes
author Chris Cannam
date Wed, 25 Sep 2019 13:47:46 +0100
parents dd51797e528e
children 1b688ab5f1b3
line wrap: on
line diff
--- a/data/model/FFTModel.cpp	Fri Sep 20 11:35:14 2019 +0100
+++ b/data/model/FFTModel.cpp	Wed Sep 25 13:47:46 2019 +0100
@@ -106,12 +106,6 @@
     return c;
 }
 
-sv_samplerate_t
-FFTModel::getSampleRate() const
-{
-    return m_sampleRate;
-}
-
 void
 FFTModel::setMaximumFrequency(double freq)
 {
@@ -143,10 +137,13 @@
 QString
 FFTModel::getBinName(int n) const
 {
-    sv_samplerate_t sr = getSampleRate();
-    if (!sr) return "";
-    QString name = tr("%1 Hz").arg((double(n) * sr) / m_fftSize);
-    return name;
+    return tr("%1 Hz").arg(getBinValue(n));
+}
+
+float
+FFTModel::getBinValue(int n) const
+{
+    return float((m_sampleRate * n) / m_fftSize);
 }
 
 FFTModel::Column