comparison layer/SpectrumLayer.h @ 1282:f90a3c2f2930

Merge from branch horizontal-scale

 
 #include "base/Window.h"
 
 #include "data/model/DenseTimeValueModel.h"
 
-#include "PianoScale.h"
+#include "HorizontalScaleProvider.h"
 
 #include <QColor>
 #include <QMutex>
 
 class FFTModel;
 
 class SpectrumLayer : public SliceLayer,
-                      public PianoScale::HorizontalScaleProvider
+                      public HorizontalScaleProvider
 {
     Q_OBJECT
 
 public:
     SpectrumLayer();

 
     virtual bool getCrosshairExtents(LayerGeometryProvider *, QPainter &, QPoint cursorPos,
                                      std::vector<QRect> &extents) const override;
     virtual void paintCrosshairs(LayerGeometryProvider *, QPainter &, QPoint) const override;
 
+    virtual int getHorizontalScaleHeight(LayerGeometryProvider *, QPainter &) const;
+    virtual void paintHorizontalScale(LayerGeometryProvider *, QPainter &, int xorigin) const;
+    
     virtual QString getFeatureDescription(LayerGeometryProvider *v, QPoint &) const override;
 
     virtual void paint(LayerGeometryProvider *v, QPainter &paint, QRect rect) const override;
 
     virtual VerticalPosition getPreferredFrameCountPosition() const override {

     bool getShowPeaks() const { return m_showPeaks; }
 
     virtual void toXml(QTextStream &stream, QString indent = "",
                        QString extraAttributes = "") const override;
 
-    virtual double getFrequencyForX(const LayerGeometryProvider *,
-                                    double x) const override;
-    virtual double getXForFrequency(const LayerGeometryProvider *,
-                                    double freq) const override;
+    virtual double getFrequencyForX(const LayerGeometryProvider *, double x)
+        const override;
+    virtual double getXForFrequency(const LayerGeometryProvider *, double freq)
+        const override;
 
 protected slots:
     void preferenceChanged(PropertyContainer::PropertyName name);
 
 protected: