comparison layer/SpectrogramLayer.h @ 1104:46cc4644206d spectrogram-minor-refactor

Convert ColumnNormalization to an enum class, and separate out normalize-visible

      */
     void setBinDisplay(BinDisplay);
     BinDisplay getBinDisplay() const;
 
     /**
-     * Specify the normalization mode for bin values.
-     */
-    void setNormalization(ColumnOp::Normalization);
-    ColumnOp::Normalization getNormalization() const;
+     * Specify the normalization mode for individual columns.
+     */
+    void setNormalization(ColumnNormalization);
+    ColumnNormalization getNormalization() const;
+
+    /**
+     * Specify whether to normalize the visible area.
+     */
+    void setNormalizeVisibleArea(bool);
+    bool getNormalizeVisibleArea() const;
 
     /**
      * Specify the colour map. See ColourMapper for the colour map
      * values.
      */

     int                 m_maxFrequency;
     int                 m_initialMaxFrequency;
     ColourScale::Scale  m_colourScale;
     int                 m_colourMap;
     QColor              m_crosshairColour;
-    BinScale m_binScale;
-    BinDisplay m_binDisplay;
-    ColumnOp::Normalization m_normalization;
+    BinScale            m_binScale;
+    BinDisplay          m_binDisplay;
+    ColumnNormalization m_normalization; // of individual columns
+    bool                m_normalizeVisibleArea;
     int                 m_lastEmittedZoomStep;
     bool                m_synchronous;
 
     mutable bool        m_haveDetailedScale;
+
+    static ColourScale::Scale convertToColourScale(int value);
+    static int convertFromColourScale(ColourScale::Scale);
+    static std::pair<ColumnNormalization, bool> convertToColumnNorm(int value);
+    static int convertFromColumnNorm(ColumnNormalization norm, bool visible);
 
     enum { NO_VALUE = 0 }; // colour index for unused pixels
 
     class Palette
     {