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

Convert ColourScaleType into an enum class

     }
 
     m_mappedMin = m_params.minValue;
     m_mappedMax = m_params.maxValue;
 
-    if (m_params.scale == LogColourScale) {
+    if (m_params.scale == ColourScaleType::Log) {
 
 	LogRange::mapRange(m_mappedMin, m_mappedMax);
 	
-    } else if (m_params.scale == PlusMinusOneScale) {
+    } else if (m_params.scale == ColourScaleType::PlusMinusOne) {
 	
 	m_mappedMin = -1.0;
 	m_mappedMax =  1.0;
 
-    } else if (m_params.scale == AbsoluteScale) {
+    } else if (m_params.scale == ColourScaleType::Absolute) {
 
 	m_mappedMin = fabs(m_mappedMin);
 	m_mappedMax = fabs(m_mappedMax);
 	if (m_mappedMin >= m_mappedMax) {
 	    std::swap(m_mappedMin, m_mappedMax);

 
 ColourScale::~ColourScale()
 {
 }
 
-ColourScale::Scale
+ColourScaleType
 ColourScale::getScale() const
 {
     return m_params.scale;
 }
 
 int
 ColourScale::getPixel(double value) const
 {
     double maxPixF = m_maxPixel;
 
-    if (m_params.scale == PhaseColourScale) {
+    if (m_params.scale == ColourScaleType::Phase) {
 	double half = (maxPixF - 1.f) / 2.f;
 	return 1 + int((value * half) / M_PI + half);
     }
     
     value *= m_params.gain;
 
     if (value < m_params.threshold) return 0;
 
     double mapped = value;
 
-    if (m_params.scale == LogColourScale) {
+    if (m_params.scale == ColourScaleType::Log) {
 	mapped = LogRange::map(value);
-    } else if (m_params.scale == PlusMinusOneScale) {
+    } else if (m_params.scale == ColourScaleType::PlusMinusOne) {
 	if (mapped < -1.f) mapped = -1.f;
 	if (mapped > 1.f) mapped = 1.f;
-    } else if (m_params.scale == AbsoluteScale) {
+    } else if (m_params.scale == ColourScaleType::Absolute) {
 	if (mapped < 0.f) mapped = -mapped;
     }
 	
     if (mapped < m_mappedMin) {
 	mapped = m_mappedMin;

 
     double proportion = (mapped - m_mappedMin) / (m_mappedMax - m_mappedMin);
 
     int pixel = 0;
 
-    if (m_params.scale == MeterColourScale) {
+    if (m_params.scale == ColourScaleType::Meter) {
 	pixel = AudioLevel::multiplier_to_preview(proportion, m_maxPixel-1) + 1;
     } else {
 	pixel = int(proportion * maxPixF) + 1;
     }