Mercurial > hg > svgui

diff layer/PianoScale.h @ 1282:f90a3c2f2930

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch horizontal-scale
author Chris Cannam
date Thu, 03 May 2018 15:24:14 +0100
parents b4cb11ca8233
children
line wrap: on
line diff
--- a/layer/PianoScale.h	Wed May 02 14:26:51 2018 +0100
+++ b/layer/PianoScale.h	Thu May 03 15:24:14 2018 +0100
@@ -20,18 +20,14 @@
 
 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,