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

Convert ColourScaleType into an enum class

 #ifndef COLOUR_SCALE_H
 #define COLOUR_SCALE_H
 
 #include "ColourMapper.h"
 
+enum class ColourScaleType {
+    Linear,
+    Meter,
+    Log,
+    Phase,
+    PlusMinusOne,
+    Absolute
+};
+
 /**
  * Map values within a range onto a set of colours, with a given
  * distribution (linear, log etc) and optional colourmap rotation.
  */
 class ColourScale
 {
 public:
-    enum Scale {
-	LinearColourScale,
-	MeterColourScale,
-	LogColourScale,
-	PhaseColourScale,
-        PlusMinusOneScale,
-        AbsoluteScale
-    };
-
     struct Parameters {
-	Parameters() : colourMap(0), scale(LinearColourScale),
+	Parameters() : colourMap(0), scale(ColourScaleType::Linear),
 		       minValue(0.0), maxValue(1.0),
 		       threshold(0.0), gain(1.0) { }
 
 	/** A colour map index as used by ColourMapper */
 	int colourMap;
 	
 	/** Distribution for the scale */
-	Scale scale;
+	ColourScaleType scale;
 	
 	/** Minimum value in source range */
 	double minValue;
 	
 	/** Maximum value in source range. Must be > minValue */

     ColourScale &operator=(const ColourScale &) = default;
 
     /**
      * Return the general type of scale this is.
      */
-    Scale getScale() const;
+    ColourScaleType getScale() const;
     
     /**
      * Return a pixel number (in the range 0-255 inclusive)
      * corresponding to the given value.  The pixel 0 is used only for
      * values below the threshold supplied in the constructor. All