comparison layer/SpectrogramLayer.cpp @ 221:9e739f92c0b8

* Add fuzzy interpolation option as an alternative to zero padding in
  spectrogram (looks terrible though)
* Make spectrogram appear more quickly by having the FFT server notify of
  updates more often near the start of its run

 
     if (name == "Window Type") {
         setWindowType(Preferences::getInstance()->getWindowType());
         return;
     }
-    if (name == "Smooth Spectrogram") {
+    if (name == "Spectrogram Smoothing") {
         invalidatePixmapCaches();
         invalidateMagnitudes();
         emit layerParametersChanged();
     }
     if (name == "Tuning Frequency") {

 SpectrogramLayer::getZeroPadLevel(const View *v) const
 {
     //!!! tidy all this stuff
 
     if (m_binDisplay != AllBins) return 0;
-    if (!Preferences::getInstance()->getSmoothSpectrogram()) return 0;
+
+    Preferences::SpectrogramSmoothing smoothing = 
+        Preferences::getInstance()->getSpectrogramSmoothing();
+    
+    if (smoothing == Preferences::NoSpectrogramSmoothing ||
+        smoothing == Preferences::SpectrogramInterpolated) return 0;
+
     if (m_frequencyScale == LogFrequencyScale) return 3;
 
     int sr = m_model->getSampleRate();
     
     size_t maxbin = m_fftSize / 2;

     MagnitudeRange overallMag = m_viewMags[v];
     bool overallMagChanged = false;
 
     bool fftSuspended = false;
 
+    bool interpolate = false;
+    Preferences::SpectrogramSmoothing smoothing = 
+        Preferences::getInstance()->getSpectrogramSmoothing();
+    if (smoothing == Preferences::SpectrogramInterpolated ||
+        smoothing == Preferences::SpectrogramZeroPaddedAndInterpolated) {
+        interpolate = true;
+    }
+
+
 #ifdef DEBUG_SPECTROGRAM_REPAINT
     std::cerr << (float(v->getFrameForX(1) - v->getFrameForX(0)) / increment) << " bins per pixel" << std::endl;
 #endif
 
     for (int x = 0; x < w; ++x) {

                     value = fft->getMagnitudeAt(s, q);
                     mag.sample(value);
                     value *= m_gain;
                 }
 
-		for (int y = y0i; y <= y1i; ++y) {
+                if (interpolate) {
+                    
+                    int ypi = y0i;
+                    if (q < maxbin - 1) ypi = int(yval[q + 2]);
+
+                    for (int y = ypi; y <= y1i; ++y) {
+                    
+                        if (y < 0 || y >= h) continue;
+                    
+                        float yprop = sprop;
+                        float iprop = yprop;
+
+                        if (ypi < y0i && y <= y0i) {
+
+                            float half = float(y0i - ypi) / 2;
+                            float dist = y - (ypi + half);
+
+                            if (dist >= 0) {
+                                iprop = (iprop * dist) / half;
+                                ymag[y] += iprop * value;
+                            }
+                        } else {
+                            if (y1i > y0i) {
+
+                                float half = float(y1i - y0i) / 2;
+                                float dist = y - (y0i + half);
+                                
+                                if (dist >= 0) {
+                                    iprop = (iprop * (half - dist)) / half;
+                                }
+                            }
+
+                            ymag[y] += iprop * value;
+                            ydiv[y] += yprop;
+                        }
+                    }
+
+                } else {
+
+                    for (int y = y0i; y <= y1i; ++y) {
+                    
+                        if (y < 0 || y >= h) continue;
+                    
+                        float yprop = sprop;
+                        if (y == y0i) yprop *= (y + 1) - y0;
+                        if (y == y1i) yprop *= y1 - y;
+
+                        for (int y = y0i; y <= y1i; ++y) {
 		    
-		    if (y < 0 || y >= h) continue;
-
-		    float yprop = sprop;
-		    if (y == y0i) yprop *= (y + 1) - y0;
-		    if (y == y1i) yprop *= y1 - y;
-		    ymag[y] += yprop * value;
-		    ydiv[y] += yprop;
-		}
+                            if (y < 0 || y >= h) continue;
+
+                            float yprop = sprop;
+                            if (y == y0i) yprop *= (y + 1) - y0;
+                            if (y == y1i) yprop *= y1 - y;
+                            ymag[y] += yprop * value;
+                            ydiv[y] += yprop;
+                        }
+                    }
+                }
 	    }
 
             if (mag.isSet()) {
-
 
                 if (s >= m_columnMags.size()) {
                     std::cerr << "INTERNAL ERROR: " << s << " >= "
                               << m_columnMags.size() << " at SpectrogramLayer.cpp:2087" << std::endl;
                 }