comparison layer/SpectrogramLayer.h @ 1103:d84a0033b305 spectrogram-minor-refactor

Turn BinDisplay and BinScale into enum classes

     ColourScale::Scale getColourScale() const;
 
     /**
      * Specify the scale for the y axis.
      */
-    void setBinScale(Colour3DPlotRenderer::BinScale);
-    Colour3DPlotRenderer::BinScale getBinScale() const;
+    void setBinScale(BinScale);
+    BinScale getBinScale() const;
 
     /**
      * Specify the processing of frequency bins for the y axis.
      */
-    void setBinDisplay(Colour3DPlotRenderer::BinDisplay);
-    Colour3DPlotRenderer::BinDisplay getBinDisplay() const;
+    void setBinDisplay(BinDisplay);
+    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;
-    Colour3DPlotRenderer::BinScale m_binScale;
-    Colour3DPlotRenderer::BinDisplay m_binDisplay;
+    BinScale m_binScale;
+    BinDisplay m_binDisplay;
     ColumnOp::Normalization m_normalization;
     int                 m_lastEmittedZoomStep;
     bool                m_synchronous;
 
     mutable bool        m_haveDetailedScale;