comparison data/model/FFTModel.cpp @ 1575:054bbf17ac17 spectrogramparam

Slightly simplify median-window size calculation - but this is not the best way to do this for spectrum views, need to reconsider

 
 FFTModel::PeakLocationSet
 FFTModel::getPeaks(PeakPickType type, int x, int ymin, int ymax) const
 {
     Profiler profiler("FFTModel::getPeaks");
-
+    
     FFTModel::PeakLocationSet peaks;
     if (!isOK()) return peaks;
 
     if (ymax == 0 || ymax > getHeight() - 1) {
         ymax = getHeight() - 1;

     double binfreq = (sampleRate * bin) / m_fftSize;
     double hifreq = Pitch::getFrequencyForPitch(73, 0, binfreq);
 
     int hibin = int(lrint((hifreq * m_fftSize) / sampleRate));
     int medianWinSize = hibin - bin;
-    if (medianWinSize < 3) medianWinSize = 3;
+    if (medianWinSize < 3) {
+        medianWinSize = 3;
+    }
+    if (medianWinSize > 20) {
+        medianWinSize = (1 + medianWinSize / 10) * 10;
+    }
+    if (medianWinSize > 500) {
+        medianWinSize = 500;
+    }
 
     percentile = 0.5f + float(binfreq / sampleRate);
-
+    if (percentile > 0.9f) percentile = 0.9f;
+    
     return medianWinSize;
 }
 
 FFTModel::PeakSet
 FFTModel::getPeakFrequencies(PeakPickType type, int x,