comparison layer/SpectrogramLayer.h @ 197:6b023411087b

* Work on harmonising colour and scale ranges between types of layer
* Add normalize options to colour 3d plot layer

     bool getNormalizeColumns() const;
 
     void setNormalizeVisibleArea(bool n);
     bool getNormalizeVisibleArea() const;
 
-    void setColourScheme(int scheme);
-    int getColourScheme() const;
+    void setColourMap(int map);
+    int getColourMap() const;
 
     /**
      * Specify the colourmap rotation for the colour scale.
      */
     void setColourRotation(int);

     int                 m_colourRotation;
     size_t              m_minFrequency;
     size_t              m_maxFrequency;
     size_t              m_initialMaxFrequency;
     ColourScale         m_colourScale;
-    int                 m_colourScheme;
+    int                 m_colourMap;
     QColor              m_crosshairColour;
     FrequencyScale      m_frequencyScale;
     BinDisplay          m_binDisplay;
     bool                m_normalizeColumns;
     bool                m_normalizeVisibleArea;
     int                 m_lastEmittedZoomStep;
 
     enum { NO_VALUE = 0 }; // colour index for unused pixels
 
-    class ColourMap
+    class Palette
     {
     public:
         QColor getColour(unsigned char index) const {
             return m_colours[index];
         }

 
     private:
         QColor m_colours[256];
     };
 
-    ColourMap m_colourMap;
+    Palette m_palette;
 
     struct PixmapCache
     {
         QPixmap pixmap;
         QRect validArea;

     mutable QTimer *m_updateTimer;
 
     mutable size_t m_candidateFillStartFrame;
     bool m_exiting;
 
-    void setColourmap();
-    void rotateColourmap(int distance);
+    void initialisePalette();
+    void rotatePalette(int distance);
 
     static float calculateFrequency(size_t bin,
 				    size_t windowSize,
 				    size_t windowIncrement,
 				    size_t sampleRate,