Mercurial > hg > svgui

diff layer/SpectrogramLayer.h @ 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 46cc4644206d
children 8abdefce36a6
line wrap: on
line diff
--- a/layer/SpectrogramLayer.h	Thu Jul 14 16:12:05 2016 +0100
+++ b/layer/SpectrogramLayer.h	Thu Jul 14 16:52:16 2016 +0100
@@ -143,8 +143,8 @@
      * WaveformLayer for comparison and details of meter and dB
      * scaling.  The default is LogColourScale.
      */
-    void setColourScale(ColourScale::Scale);
-    ColourScale::Scale getColourScale() const;
+    void setColourScale(ColourScaleType);
+    ColourScaleType getColourScale() const;
 
     /**
      * Specify the scale for the y axis.
@@ -250,7 +250,7 @@
     int                 m_minFrequency;
     int                 m_maxFrequency;
     int                 m_initialMaxFrequency;
-    ColourScale::Scale  m_colourScale;
+    ColourScaleType  m_colourScale;
     int                 m_colourMap;
     QColor              m_crosshairColour;
     BinScale            m_binScale;
@@ -262,8 +262,8 @@
 
     mutable bool        m_haveDetailedScale;
 
-    static ColourScale::Scale convertToColourScale(int value);
-    static int convertFromColourScale(ColourScale::Scale);
+    static ColourScaleType convertToColourScale(int value);
+    static int convertFromColourScale(ColourScaleType);
     static std::pair<ColumnNormalization, bool> convertToColumnNorm(int value);
     static int convertFromColumnNorm(ColumnNormalization norm, bool visible);