comparison layer/SpectrogramLayer.h @ 1092:9b826dd23c84 spectrogram-minor-refactor

Colour scales (partly)

 #include "data/model/DenseTimeValueModel.h"
 #include "data/model/FFTModel.h"
 
 #include "ScrollableImageCache.h"
 #include "VerticalBinLayer.h"
+#include "ColourScale.h"
 
 #include <QMutex>
 #include <QWaitCondition>
 #include <QImage>
 #include <QPixmap>

     int getMinFrequency() const;
 
     void setMaxFrequency(int); // 0 -> no maximum
     int getMaxFrequency() const;
 
-    enum ColourScale {
-	LinearColourScale,
-	MeterColourScale,
-        dBSquaredColourScale,
-	dBColourScale,
-	PhaseColourScale
-    };
-
-    /**
-     * Specify the scale for sample levels.  See WaveformLayer for
-     * details of meter and dB scaling.  The default is dBColourScale.
-     */
-    void setColourScale(ColourScale);
-    ColourScale getColourScale() const;
+    /**
+     * Specify the scale for sample levels.  See ColourScale and
+     * WaveformLayer for comparison and details of meter and dB
+     * scaling.  The default is LogColourScale.
+     */
+    void setColourScale(ColourScale::Scale);
+    ColourScale::Scale getColourScale() const;
 
     enum FrequencyScale {
 	LinearFrequencyScale,
 	LogFrequencyScale
     };

     int                 m_colourRotation;
     int                 m_initialRotation;
     int                 m_minFrequency;
     int                 m_maxFrequency;
     int                 m_initialMaxFrequency;
-    ColourScale         m_colourScale;
+    ColourScale::Scale  m_colourScale;
     int                 m_colourMap;
     QColor              m_crosshairColour;
     FrequencyScale      m_frequencyScale;
     BinDisplay          m_binDisplay;
     ColumnOp::Normalization m_normalization;