diff layer/PianoScale.cpp @ 1324:13d9b422f7fe zoom

Merge from default branch

--- a/layer/PianoScale.cpp	Mon Dec 12 15:18:52 2016 +0000
+++ b/layer/PianoScale.cpp	Mon Sep 17 13:51:31 2018 +0100
@@ -22,13 +22,17 @@
 #include "base/Pitch.h"
 
 #include "LayerGeometryProvider.h"
+#include "HorizontalScaleProvider.h"
+
+#include <iostream>
+using namespace std;
 
 void
 PianoScale::paintPianoVertical(LayerGeometryProvider *v,
-			       QPainter &paint,
-			       QRect r,
-			       double minf,
-			       double maxf)
+                               QPainter &paint,
+                               QRect r,
+                               double minf,
+                               double maxf)
 {
     int x0 = r.x(), y0 = r.y(), x1 = r.x() + r.width(), y1 = r.y() + r.height();
 
@@ -39,47 +43,119 @@
 
     for (int i = 0; i < 128; ++i) {
 
-	double f = Pitch::getFrequencyForPitch(i);
-	int y = int(lrint(v->getYForFrequency(f, minf, maxf, true)));
+        double f = Pitch::getFrequencyForPitch(i);
+        int y = int(lrint(v->getYForFrequency(f, minf, maxf, true)));
 
-	if (y < y0 - 2) break;
-	if (y > y1 + 2) {
-	    continue;
-	}
-	
-	int n = (i % 12);
-	
-	if (n == 1) {
-	    // C# -- fill the C from here
-	    QColor col = Qt::gray;
-	    if (i == 61) { // filling middle C
-		col = Qt::blue;
-		col = col.light(150);
-	    }
-	    if (ppy - y > 2) {
-		paint.fillRect(x0 + 1,
-			       y,
-			       x1 - x0,
-			       (py + ppy) / 2 - y,
-			       col);
-	    }
-	}
-	
-	if (n == 1 || n == 3 || n == 6 || n == 8 || n == 10) {
-	    // black notes
-	    paint.drawLine(x0 + 1, y, x1, y);
-	    int rh = ((py - y) / 4) * 2;
-	    if (rh < 2) rh = 2;
-	    paint.drawRect(x0 + 1, y - (py-y)/4, (x1 - x0) / 2, rh);
-	} else if (n == 0 || n == 5) {
-	    // C, F
-	    if (py < y1) {
-		paint.drawLine(x0 + 1, (y + py) / 2, x1, (y + py) / 2);
-	    }
-	}
-	
-	ppy = py;
-	py = y;
+        if (y < y0 - 2) break;
+        if (y > y1 + 2) {
+            continue;
+        }
+        
+        int n = (i % 12);
+        
+        if (n == 1) {
+            // C# -- fill the C from here
+            QColor col = Qt::gray;
+            if (i == 61) { // filling middle C
+                col = Qt::blue;
+                col = col.light(150);
+            }
+            if (ppy - y > 2) {
+                paint.fillRect(x0 + 1,
+                               y,
+                               x1 - x0,
+                               (py + ppy) / 2 - y,
+                               col);
+            }
+        }
+        
+        if (n == 1 || n == 3 || n == 6 || n == 8 || n == 10) {
+            // black notes
+            paint.drawLine(x0 + 1, y, x1, y);
+            int rh = ((py - y) / 4) * 2;
+            if (rh < 2) rh = 2;
+            paint.drawRect(x0 + 1, y - (py-y)/4, (x1 - x0) / 2, rh);
+        } else if (n == 0 || n == 5) {
+            // C, F
+            if (py < y1) {
+                paint.drawLine(x0 + 1, (y + py) / 2, x1, (y + py) / 2);
+            }
+        }
+        
+        ppy = py;
+        py = y;
     }
 }
 
+void
+PianoScale::paintPianoHorizontal(LayerGeometryProvider *v,
+                                 const HorizontalScaleProvider *p,
+                                 QPainter &paint,
+                                 QRect r)
+{
+    int x0 = r.x(), y0 = r.y(), x1 = r.x() + r.width(), y1 = r.y() + r.height();
+
+    paint.drawLine(x0, y0, x1, y0);
+
+    int px = x0, ppx = x0;
+    paint.setBrush(paint.pen().color());
+
+    for (int i = 0; i < 128; ++i) {
+
+        double f = Pitch::getFrequencyForPitch(i);
+        int x = int(lrint(p->getXForFrequency(v, f)));
+
+        if (i == 0) {
+            px = ppx = x;
+        }
+        if (i == 1) {
+            ppx = px - (x - px);
+        }
+        
+        if (x < x0) {
+            ppx = px;
+            px = x;
+            continue;
+        }
+        
+        if (x > x1) {
+            break;
+        }
+
+        int n = (i % 12);
+
+        if (n == 1) {
+            // C# -- fill the C from here
+            QColor col = Qt::gray;
+            if (i == 61) { // filling middle C
+                col = Qt::blue;
+                col = col.light(150);
+            }
+            if (x - ppx > 2) {
+                paint.fillRect((px + ppx) / 2 + 1,
+                               y0 + 1,
+                               x - (px + ppx) / 2 - 1,
+                               y1 - y0,
+                               col);
+            }
+        }
+
+        if (n == 1 || n == 3 || n == 6 || n == 8 || n == 10) {
+            // black notes
+            paint.drawLine(x, y0, x, y1);
+            int rw = int(lrint(double(x - px) / 4) * 2);
+            if (rw < 2) rw = 2;
+            paint.drawRect(x - rw/2, (y0 + y1) / 2, rw, (y1 - y0) / 2);
+        } else if (n == 0 || n == 5) {
+            // C, F
+            if (px < x1) {
+                paint.drawLine((x + px) / 2, y0, (x + px) / 2, y1);
+            }
+        }
+        
+        ppx = px;
+        px = x;
+    }
+}
+
+