X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vu_common.cpp;h=171f50d26a244059abcb1cab0cbd056565f6dbcc;hb=ffd68fbfb90242069af957f2a28908f0559f8348;hp=f1a0619b642045d63d20f5eeac610b69f6f1fb16;hpb=4f44de2a24cb574bfe318f42f9ce6af5eb2fe4b3;p=nageru

diff --git a/vu_common.cpp b/vu_common.cpp
index f1a0619..171f50d 100644
--- a/vu_common.cpp
+++ b/vu_common.cpp
@@ -1,31 +1,28 @@
 #include "vu_common.h"
 
-#include <math.h>
-#include <algorithm>
-
-#include <QBrush>
 #include <QColor>
 #include <QPainter>
+#include <algorithm>
+#include <cmath>
 
 using namespace std;
 
-double lufs_to_pos(float level_lu, int height)
-{       
-	const float min_level = 9.0f;    // y=0 is top of screen, so “min” is the loudest level.
-	const float max_level = -18.0f;
+double lufs_to_pos(float level_lu, int height, float min_level, float max_level)
+{
+	// Note: “max” is the loudest level, but y=0 is top of screen.
 
 	// Handle -inf.
-	if (level_lu < max_level) {
+	if (level_lu < min_level) {
 		return height - 1;
 	}
 
-	double y = height * (level_lu - min_level) / (max_level - min_level);
+	double y = height * (level_lu - max_level) / (min_level - max_level);
 	y = max<double>(y, 0);
 	y = min<double>(y, height - 1);
 
 	// If we are big enough, snap to pixel grid instead of antialiasing
 	// the edges; the unevenness will be less noticeable than the blurriness.
-	double height_per_level = height / (min_level - max_level) - 2.0;
+	double height_per_level = height / (max_level - min_level) - 2.0;
 	if (height_per_level >= 10.0) {
 		y = round(y);
 	}
@@ -33,16 +30,16 @@ double lufs_to_pos(float level_lu, int height)
 	return y;
 }
 
-void draw_vu_meter(QPainter &painter, int width, int height, int margin, bool is_on)
+void draw_vu_meter(QPainter &painter, int width, int height, int horizontal_margin, double segment_margin, bool is_on, float min_level, float max_level, bool flip, int y_offset)
 {
-	painter.fillRect(margin, 0, width - 2 * margin, height, Qt::black);
+	painter.fillRect(horizontal_margin, y_offset, width - 2 * horizontal_margin, height, Qt::black);
 
 	for (int y = 0; y < height; ++y) {
 		// Find coverage of “on” rectangles in this pixel row.
 		double coverage = 0.0;
-		for (int level = -18; level < 9; ++level) {
-			double min_y = lufs_to_pos(level + 1.0, height) + 1.0;
-			double max_y = lufs_to_pos(level, height) - 1.0;
+		for (int level = floor(min_level); level <= ceil(max_level); ++level) {
+			double min_y = lufs_to_pos(level + 1.0, height, min_level, max_level) + segment_margin * 0.5;
+			double max_y = lufs_to_pos(level, height, min_level, max_level) - segment_margin * 0.5;
 			min_y = std::max<double>(min_y, y);
 			min_y = std::min<double>(min_y, y + 1);
 			max_y = std::max<double>(max_y, y);
@@ -70,6 +67,7 @@ void draw_vu_meter(QPainter &painter, int width, int height, int margin, bool is
 		int r = lrintf(255 * pow(on_r * coverage, 1.0 / 2.2));
 		int g = lrintf(255 * pow(on_g * coverage, 1.0 / 2.2));
 		int b = lrintf(255 * pow(on_b * coverage, 1.0 / 2.2));
-		painter.fillRect(margin, y, width - 2 * margin, 1, QColor(r, g, b));
+		int draw_y = flip ? (height - y - 1) : y;
+		painter.fillRect(horizontal_margin, draw_y + y_offset, width - 2 * horizontal_margin, 1, QColor(r, g, b));
 	}
 }