comparison layer/Colour3DPlotRenderer.cpp @ 1105:ea5ae9dd10ba spectrogram-minor-refactor

Convert ColourScaleType into an enum class

 
         binsPerPeak = m_sources.peaks->getColumnsPerPeak();
         usePeaksCache = (binResolution * binsPerPeak) < zoomLevel;
         
         if (m_params.colourScale.getScale() ==
-            ColourScale::PhaseColourScale) {
+            ColourScaleType::Phase) {
             usePeaksCache = false;
         }
     }
 
     cerr << "[PIX] zoomLevel = " << zoomLevel

                 
                 ColumnOp::Column column =
                     vector<float>(fullColumn.data() + minbin,
                                   fullColumn.data() + maxbin + 1);
 
-//!!! fft scale                if (m_colourScale != PhaseColourScale) {
+//!!! fft scale                if (m_colourScale != ColourScaleType::Phase) {
 //                    column = ColumnOp::fftScale(column, m_fftSize);
 //                }
 
 //!!! extents                recordColumnExtents(column,
 //                                    sx,
 //                                    overallMag,
 //                                    overallMagChanged);
 
-//                if (m_colourScale != PhaseColourScale) {
+//                if (m_colourScale != ColourScaleType::Phase) {
                     column = ColumnOp::normalize(column, m_params.normalization);
 //                }
 
                 if (m_params.binDisplay == BinDisplay::PeakBins) {
                     column = ColumnOp::peakPick(column);

                 
                 ColumnOp::Column column =
                     vector<float>(fullColumn.data() + minbin,
                                   fullColumn.data() + maxbin + 1);
 
-//!!! fft scale                if (m_colourScale != ColourScale::PhaseColourScale) {
+//!!! fft scale                if (m_colourScale != ColourScaleType::Phase) {
 //                    column = ColumnOp::fftScale(column, getFFTSize());
 //                }
 
 //!!! extents                recordColumnExtents(column,
 //                                    sx,
 //                                    overallMag,
 //                                    overallMagChanged);
 
-//!!!                if (m_colourScale != ColourScale::PhaseColourScale) {
+//!!!                if (m_colourScale != ColourScaleType::Phase) {
                     column = ColumnOp::normalize(column, m_params.normalization);
 //!!!                }
 
                     preparedColumn = column;
 //!!! gain?                preparedColumn = ColumnOp::applyGain(column, m_params.gain);