comparison layer/SpectrogramLayer.h @ 1063:a0f234acd6e7 spectrogram-minor-refactor

Pull out column ops into ColumnOp

      * Specify the processing of frequency bins for the y axis.
      */
     void setBinDisplay(BinDisplay);
     BinDisplay getBinDisplay() const;
 
-    enum Normalization {
-        NoNormalization,
-        NormalizeColumns,
-        NormalizeVisibleArea,
-        NormalizeHybrid
-    };
-
     /**
      * Specify the normalization mode for bin values.
      */
-    void setNormalization(Normalization);
-    Normalization getNormalization() const;
+    void setNormalization(ColumnOp::Normalization);
+    ColumnOp::Normalization getNormalization() const;
 
     /**
      * Specify the colour map. See ColourMapper for the colour map
      * values.
      */

     ColourScale         m_colourScale;
     int                 m_colourMap;
     QColor              m_crosshairColour;
     FrequencyScale      m_frequencyScale;
     BinDisplay          m_binDisplay;
-    Normalization       m_normalization;
+    ColumnOp::Normalization m_normalization;
     int                 m_lastEmittedZoomStep;
     bool                m_synchronous;
 
     mutable bool        m_haveDetailedScale;
 

     std::vector<float> getColumnFromGenericModel(DenseThreeDimensionalModel *model,
                                                  int sx,
                                                  int minbin,
                                                  int bincount) const;
 
-    std::vector<float> scaleColumn(const std::vector<float> &in) const;
-
-    std::vector<float> distributeColumn(const std::vector<float> &in,
-                                        int h,
-                                        const std::vector<double> &binfory,
-                                        int minbin,
-                                        bool interpolate) const;
-
     void recordColumnExtents(const std::vector<float> &col,
                              int sx,
                              MagnitudeRange &overallMag,
                              bool &overallMagChanged) const;
-
-    std::vector<float> normalizeColumn(const std::vector<float> &in) const;
-
-    std::vector<float> peakPickColumn(const std::vector<float> &in) const;
-
-    std::vector<float> applyDisplayGain(const std::vector<float> &in) const;
     
     virtual void updateMeasureRectYCoords(LayerGeometryProvider *v,
                                           const MeasureRect &r) const;
     virtual void setMeasureRectYCoord(LayerGeometryProvider *v,
                                       MeasureRect &r, bool start, int y) const;