X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=lrameter.cpp;h=62b4a9f923134b101f91254bdae5bff4398a88ed;hb=327534a3031a332423411c9599c741f2f81657df;hp=d0304e1a9e5a05082938ae817b4b21b9df5840b0;hpb=3376a2309e8b682f8e8d0a96bbda9ccaa19c53c0;p=nageru

diff --git a/lrameter.cpp b/lrameter.cpp
index d0304e1..62b4a9f 100644
--- a/lrameter.cpp
+++ b/lrameter.cpp
@@ -3,9 +3,12 @@
 #include <QPainter>
 #include <QPalette>
 #include <QPen>
+#include <QRect>
+
 #include "vu_common.h"
 
 class QPaintEvent;
+class QResizeEvent;
 
 using namespace std;
 
@@ -16,17 +19,7 @@ LRAMeter::LRAMeter(QWidget *parent)
 
 void LRAMeter::resizeEvent(QResizeEvent *event)
 {
-	const int margin = 5;
-
-	on_pixmap = QPixmap(width(), height());
-	QPainter on_painter(&on_pixmap);
-	on_painter.fillRect(0, 0, width(), height(), parentWidget()->palette().window());
-	draw_vu_meter(on_painter, -HUGE_VAL, HUGE_VAL, width(), height(), margin);
-
-	off_pixmap = QPixmap(width(), height());
-	QPainter off_painter(&off_pixmap);
-	off_painter.fillRect(0, 0, width(), height(), parentWidget()->palette().window());
-	draw_vu_meter(off_painter, -HUGE_VAL, -HUGE_VAL, width(), height(), margin);
+	recalculate_pixmaps();
 }
 
 void LRAMeter::paintEvent(QPaintEvent *event)
@@ -43,11 +36,11 @@ void LRAMeter::paintEvent(QPaintEvent *event)
 		range_high_lufs = this->range_high_lufs;
 	}
 
-	float level_lu = level_lufs + 23.0f;
-	float range_low_lu = range_low_lufs + 23.0f;
-	float range_high_lu = range_high_lufs + 23.0f;
-	int range_low_pos = lufs_to_pos(range_low_lu, height());
-	int range_high_pos = lufs_to_pos(range_high_lu, height());
+	float level_lu = level_lufs - ref_level_lufs;
+	float range_low_lu = range_low_lufs - ref_level_lufs;
+	float range_high_lu = range_high_lufs - ref_level_lufs;
+	int range_low_pos = lrint(lufs_to_pos(range_low_lu, height()));
+	int range_high_pos = lrint(lufs_to_pos(range_high_lu, height()));
 
 	QRect top_off_rect(0, 0, width(), range_high_pos);
 	QRect on_rect(0, range_high_pos, width(), range_low_pos - range_high_pos);
@@ -59,8 +52,8 @@ void LRAMeter::paintEvent(QPaintEvent *event)
 
 	// Draw the target area (+/-1 LU is allowed EBU range).
 	// It turns green when we're within.
-	int min_y = lufs_to_pos(1.0f, height());
-	int max_y = lufs_to_pos(-1.0f, height());
+	int min_y = lrint(lufs_to_pos(1.0f, height()));
+	int max_y = lrint(lufs_to_pos(-1.0f, height()));
 
 	// FIXME: This outlining isn't so pretty.
 	{
@@ -82,7 +75,7 @@ void LRAMeter::paintEvent(QPaintEvent *event)
 	}
 
 	// Draw the integrated loudness meter, in the same color as the target area.
-	int y = lufs_to_pos(level_lu, height());
+	int y = lrint(lufs_to_pos(level_lu, height()));
 	{
 		QPen pen(Qt::black);
 		pen.setWidth(5);
@@ -101,3 +94,18 @@ void LRAMeter::paintEvent(QPaintEvent *event)
 		painter.drawRect(2, y, width() - 5, 1);
 	}
 }
+
+void LRAMeter::recalculate_pixmaps()
+{
+	const int margin = 5;
+
+	on_pixmap = QPixmap(width(), height());
+	QPainter on_painter(&on_pixmap);
+	on_painter.fillRect(0, 0, width(), height(), parentWidget()->palette().window());
+	draw_vu_meter(on_painter, width(), height(), margin, 2.0, true, min_level, max_level, /*flip=*/false);
+
+	off_pixmap = QPixmap(width(), height());
+	QPainter off_painter(&off_pixmap);
+	off_painter.fillRect(0, 0, width(), height(), parentWidget()->palette().window());
+	draw_vu_meter(off_painter, width(), height(), margin, 2.0, false, min_level, max_level, /*flip=*/false);
+}