X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=lrameter.cpp;h=8121ee4b1dfdd3b3fced4565e23b78bce34c11d5;hb=54067dbc70999d936adf9d263b5ff2b1efb4dfd0;hp=9ca7b016000d4170ef887d11f8e79ff74f366895;hpb=82e711de31a86ce697ebe80720f92db748272d62;p=nageru

diff --git a/lrameter.cpp b/lrameter.cpp
index 9ca7b01..8121ee4 100644
--- a/lrameter.cpp
+++ b/lrameter.cpp
@@ -16,17 +16,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, width(), height(), margin, true);
-
-	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, false);
+	recalculate_pixmaps();
 }
 
 void LRAMeter::paintEvent(QPaintEvent *event)
@@ -43,11 +33,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 +49,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 +72,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 +91,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);
+}