comparison layer/PianoScale.h @ 1282:f90a3c2f2930

Merge from branch horizontal-scale

 
 #include <QRect>
 
 class QPainter;
 class LayerGeometryProvider;
+class HorizontalScaleProvider;
 
 class PianoScale
 {
 public:
     void paintPianoVertical
-    (LayerGeometryProvider *v, QPainter &paint, QRect rect, double minf, double maxf);
-
-    class HorizontalScaleProvider {
-    public:
-        virtual double getFrequencyForX(const LayerGeometryProvider *, double x) const = 0;
-        virtual double getXForFrequency(const LayerGeometryProvider *, double freq) const = 0;
-    };
+    (LayerGeometryProvider *v, QPainter &paint, QRect rect,
+     double minf, double maxf);
     
     void paintPianoHorizontal
     (LayerGeometryProvider *v, const HorizontalScaleProvider *p,
      QPainter &paint, QRect rect);
 };