comparison layer/SpectrogramLayer.h @ 1093:cd22f74dc159 spectrogram-minor-refactor

Use enums from origin classes

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

 class QImage;
 class QPixmap;
 class QTimer;
 class FFTModel;
 class Dense3DModelPeakCache;
-class Colour3DPlotRenderer;
 
 /**
  * SpectrogramLayer represents waveform data (obtained from a
  * DenseTimeValueModel) in spectrogram form.
  */

      * scaling.  The default is LogColourScale.
      */
     void setColourScale(ColourScale::Scale);
     ColourScale::Scale getColourScale() const;
 
-    enum FrequencyScale {
-	LinearFrequencyScale,
-	LogFrequencyScale
-    };
-    
     /**
      * Specify the scale for the y axis.
      */
-    void setFrequencyScale(FrequencyScale);
-    FrequencyScale getFrequencyScale() const;
-
-    enum BinDisplay {
-	AllBins,
-	PeakBins,
-	PeakFrequencies
-    };
-    
+    void setBinScale(Colour3DPlotRenderer::BinScale);
+    Colour3DPlotRenderer::BinScale getBinScale() const;
+
     /**
      * Specify the processing of frequency bins for the y axis.
      */
-    void setBinDisplay(BinDisplay);
-    BinDisplay getBinDisplay() const;
+    void setBinDisplay(Colour3DPlotRenderer::BinDisplay);
+    Colour3DPlotRenderer::BinDisplay getBinDisplay() const;
 
     /**
      * Specify the normalization mode for bin values.
      */
     void setNormalization(ColumnOp::Normalization);

     int                 m_maxFrequency;
     int                 m_initialMaxFrequency;
     ColourScale::Scale  m_colourScale;
     int                 m_colourMap;
     QColor              m_crosshairColour;
-    FrequencyScale      m_frequencyScale;
-    BinDisplay          m_binDisplay;
+    Colour3DPlotRenderer::BinScale m_binScale;
+    Colour3DPlotRenderer::BinDisplay m_binDisplay;
     ColumnOp::Normalization m_normalization;
     int                 m_lastEmittedZoomStep;
     bool                m_synchronous;
 
     mutable bool        m_haveDetailedScale;