Mercurial > hg > svgui

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Convert ColourScaleType into an enum class
author Chris Cannam
date Thu, 14 Jul 2016 16:52:16 +0100
parents d84a0033b305
children 477521f95a84
line wrap: on
line diff
--- a/layer/Colour3DPlotRenderer.cpp	Thu Jul 14 16:12:05 2016 +0100
+++ b/layer/Colour3DPlotRenderer.cpp	Thu Jul 14 16:52:16 2016 +0100
@@ -263,7 +263,7 @@
         usePeaksCache = (binResolution * binsPerPeak) < zoomLevel;
         
         if (m_params.colourScale.getScale() ==
-            ColourScale::PhaseColourScale) {
+            ColourScaleType::Phase) {
             usePeaksCache = false;
         }
     }
@@ -534,7 +534,7 @@
                     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);
 //                }
 
@@ -543,7 +543,7 @@
 //                                    overallMag,
 //                                    overallMagChanged);
 
-//                if (m_colourScale != PhaseColourScale) {
+//                if (m_colourScale != ColourScaleType::Phase) {
                     column = ColumnOp::normalize(column, m_params.normalization);
 //                }
 
@@ -670,7 +670,7 @@
                     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());
 //                }
 
@@ -679,7 +679,7 @@
 //                                    overallMag,
 //                                    overallMagChanged);
 
-//!!!                if (m_colourScale != ColourScale::PhaseColourScale) {
+//!!!                if (m_colourScale != ColourScaleType::Phase) {
                     column = ColumnOp::normalize(column, m_params.normalization);
 //!!!                }