comparison layer/SpectrogramLayer.cpp @ 134:13949a6970ab

* Use peaks instead of means for calculating display values in pixels that
  cover more than one bin

     if (fftSize != m_fftSize) {
         displayMinFreq = getEffectiveMinFrequency();
         displayMaxFreq = getEffectiveMaxFrequency();
     }
 
+    //!!! we will probably only want one of "ymag+ydiv" and "ypeak",
+    //but we leave them both calculated here for test purposes
     float ymag[h];
     float ydiv[h];
+    float ypeak[h];
     float yval[bins + 1]; //!!! cache this?
 
     size_t increment = getWindowIncrement();
     
     bool logarithmic = (m_frequencyScale == LogFrequencyScale);

     fft->suspendWrites();
 
     for (int x = 0; x < w; ++x) {
 
 	for (int y = 0; y < h; ++y) {
-	    ymag[y] = 0.0;
-	    ydiv[y] = 0.0;
+	    ymag[y] = 0.f;
+	    ydiv[y] = 0.f;
+            ypeak[y] = 0.f;
 	}
 
 	float s0 = 0, s1 = 0;
 
 	if (!getXBinRange(v, x0 + x, s0, s1)) {

 		    float yprop = sprop;
 		    if (y == y0i) yprop *= (y + 1) - y0;
 		    if (y == y1i) yprop *= y1 - y;
 		    ymag[y] += yprop * value;
 		    ydiv[y] += yprop;
+                    if (value > ypeak[y]) ypeak[y] = value;
 		}
 	    }
 
             if (mag.isSet()) {
 

 	    if (ydiv[y] > 0.0) {
 
 		unsigned char pixel = 0;
 
 		float avg = ymag[y] / ydiv[y];
-		pixel = getDisplayValue(v, avg);
+//!!!		pixel = getDisplayValue(v, avg);
+		pixel = getDisplayValue(v, ypeak[y]);
 
 		assert(x <= m_drawBuffer.width());
 		QColor c = m_colourMap.getColour(pixel);
 		m_drawBuffer.setPixel(x, y,
                                       qRgb(c.red(), c.green(), c.blue()));