comparison layer/SpectrogramLayer.cpp @ 491:c74e511a3c96

* Fix overall mag range management in normalise-visible-area mode

                 binfory[y] = q0;
 //                cerr << "binfory[" << y << "] = " << binfory[y] << endl;
             }
         }
 
-        paintDrawBuffer(v, bufwid, h, binforx, binfory, usePeaksCache);
+        paintDrawBuffer(v, bufwid, h, binforx, binfory, usePeaksCache,
+                        overallMag, overallMagChanged);
 
     } else {
 
         paintDrawBufferPeakFrequencies(v, bufwid, h, binforx,
                                        minbin, maxbin,
                                        displayMinFreq, displayMaxFreq,
-                                       logarithmic);
+                                       logarithmic,
+                                       overallMag, overallMagChanged);
     }
 
 /*
     for (int x = 0; x < w / xPixelRatio; ++x) {
 

                                                  int *binforx,
                                                  int minbin,
                                                  int maxbin,
                                                  float displayMinFreq,
                                                  float displayMaxFreq,
-                                                 bool logarithmic) const
+                                                 bool logarithmic,
+                                                 MagnitudeRange &overallMag,
+                                                 bool &overallMagChanged) const
 {
     Profiler profiler("SpectrogramLayer::paintDrawBufferPeakFrequencies");
 
 #ifdef DEBUG_SPECTROGRAM_REPAINT
     cerr << "minbin " << minbin << ", maxbin " << maxbin << "; w " << w << ", h " << h << endl;

                               << m_columnMags.size()
                               << " at SpectrogramLayer.cpp::paintDrawBuffer"
                               << std::endl;
                 } else {
                     m_columnMags[sx].sample(mag);
+                    if (overallMag.sample(mag)) overallMagChanged = true;
                 }
             }
         }
     }
 

 SpectrogramLayer::paintDrawBuffer(View *v,
                                   int w,
                                   int h,
                                   int *binforx,
                                   float *binfory,
-                                  bool usePeaksCache) const
+                                  bool usePeaksCache,
+                                  MagnitudeRange &overallMag,
+                                  bool &overallMagChanged) const
 {
     Profiler profiler("SpectrogramLayer::paintDrawBuffer");
 
     int minbin = int(binfory[0] + 0.0001);
     int maxbin = binfory[h-1];

                               << m_columnMags.size()
                               << " at SpectrogramLayer.cpp::paintDrawBuffer"
                               << std::endl;
                 } else {
                     m_columnMags[sx].sample(mag);
+                    if (overallMag.sample(mag)) overallMagChanged = true;
                 }
             }
         }
 
         for (int y = 0; y < h; ++y) {