comparison layer/SpectrogramLayer.cpp @ 487:6a5327c0a40f

* Re-enable column normalization

         for (int x = 0; x < bufwid; ++x) {
             float s0 = 0, s1 = 0;
             if (getXBinRange(v, x + x0, s0, s1)) {
                 binforx[x] = int(s0 + 0.0001);
             } else {
-                binforx[x] = 0; //???
+                binforx[x] = -1; //???
             }
         }
         if (m_drawBuffer.width() < bufwid || m_drawBuffer.height() < h) {
             m_drawBuffer = QImage(bufwid, h, QImage::Format_Indexed8);
         }
         usePeaksCache = (increment * 8) < zoomLevel;
+        if (m_colourScale == PhaseColourScale) usePeaksCache = false;
     }
 
     m_drawBuffer.setNumColors(256);
     for (int pixel = 0; pixel < 256; ++pixel) {
         m_drawBuffer.setColor(pixel, m_palette.getColour(pixel).rgb());

 
     for (int x = 0; x < w; ++x) {
         
         if (binforx[x] < 0) continue;
 
+        float columnGain = m_gain;
+        float columnMax = 0.f;
+
         int sx0 = binforx[x] / divisor;
         int sx1 = sx0;
         if (x+1 < w) sx1 = binforx[x+1] / divisor;
         if (sx0 < 0) sx0 = sx1 - 1;
         if (sx0 < 0) continue;

             if (sx != psx) {
                 if (fft) {
 #ifdef DEBUG_SPECTROGRAM_REPAINT
                     cerr << "Retrieving column " << sx << " from fft directly" << endl;
 #endif
-                    fft->getMagnitudesAt(sx, values, minbin, maxbin - minbin + 1);
+                    if (m_colourScale == PhaseColourScale) {
+                        fft->getPhasesAt(sx, values, minbin, maxbin - minbin + 1);
+                    } else if (m_normalizeColumns) {
+                        fft->getNormalizedMagnitudesAt(sx, values, minbin, maxbin - minbin + 1);
+                    } else {
+                        fft->getMagnitudesAt(sx, values, minbin, maxbin - minbin + 1);
+                    }
                 } else {
 #ifdef DEBUG_SPECTROGRAM_REPAINT
                     cerr << "Retrieving column " << sx << " from peaks cache" << endl;
 #endif
                     c = sourceModel->getColumn(sx);
+                    if (m_normalizeColumns) {
+                        for (int y = 0; y < h; ++y) {
+                            if (c[y] > columnMax) columnMax = c[y];
+                        }
+                    }
                 }
                 psx = sx;
             }
 
             for (int y = 0; y < h; ++y) {

                     if (value > peaks[y]) peaks[y] = value; //!!! not right for phase!
                 }
             }
         }
 
+        if (m_normalizeColumns && columnMax > 0.f) {
+            columnGain /= columnMax;
+        }
+
         for (int y = 0; y < h; ++y) {
 
             float peak = peaks[y];
             
             if (m_colourScale != PhaseColourScale) {
                 if (!m_normalizeColumns) {
                     peak /= (m_fftSize/2.f);
                 }
 //!!!                        mag.sample(value);
-                peak *= m_gain;
+                peak *= columnGain;
             }
             
             unsigned char peakpix = getDisplayValue(v, peak);
 
             m_drawBuffer.setPixel(x, h-y-1, peakpix);