comparison layer/Colour3DPlotRenderer.cpp @ 1103:d84a0033b305 spectrogram-minor-refactor

Turn BinDisplay and BinScale into enum classes

     // but we want to ensure the cache is coherent without having to
     // worry about vertical matching of required and valid areas as
     // well as horizontal. That's why this function didn't take any
     // y/height parameters.
 
-    if (bufferIsBinResolution && (m_params.binDisplay != PeakFrequencies)) {
+    if (bufferIsBinResolution && (m_params.binDisplay != BinDisplay::PeakFrequencies)) {
         renderToCacheBinResolution(v, x0, x1 - x0);
     } else {
         renderToCachePixelResolution(v, x0, x1 - x0, rightToLeft, timeConstrained);
     }
 

         binfory[y] = m_sources.verticalBinLayer->getBinForY(v, h - y - 1);
     }
 
     int attainedWidth;
 
-    if (m_params.binDisplay == PeakFrequencies) {
+    if (m_params.binDisplay == BinDisplay::PeakFrequencies) {
         attainedWidth = renderDrawBufferPeakFrequencies(v,
                                                         repaintWidth,
                                                         h,
                                                         binforx,
                                                         binfory,

 
 //                if (m_colourScale != PhaseColourScale) {
                     column = ColumnOp::normalize(column, m_params.normalization);
 //                }
 
-                if (m_params.binDisplay == PeakBins) {
+                if (m_params.binDisplay == BinDisplay::PeakBins) {
                     column = ColumnOp::peakPick(column);
                 }
 
                 preparedColumn =
                     ColumnOp::distribute(column, //!!! gain? ColumnOp::applyGain(column, m_gain),

     cerr << "modelWidth " << modelWidth << endl;
 
     double minFreq = (double(minbin) * fft->getSampleRate()) / fft->getFFTSize();
     double maxFreq = (double(maxbin) * fft->getSampleRate()) / fft->getFFTSize();
 
-    bool logarithmic = (m_params.binScale == LogBinScale);
+    bool logarithmic = (m_params.binScale == BinScale::Log);
     
     for (int x = start; x != finish; x += step) {
         
         // x is the on-canvas pixel coord; sx (later) will be the
         // source column index