Make reference level of VUMeter and LRAMeter adjustable.

[nageru] / lrameter.cpp

diff --git a/lrameter.cpp b/lrameter.cpp
index 79a702dd7ca24c4a2d11e8259bed53c3f22c7a57..ab3c5c2b925dee19e3045a940eb61e500e6a8075 100644 (file)
--- a/lrameter.cpp
+++ b/lrameter.cpp
@@ -1,70 +1,56 @@
+#include "lrameter.h"
+
 #include <QPainter>
+#include <QPalette>
+#include <QPen>
+#include "vu_common.h"
 
-#include "lrameter.h"
+class QPaintEvent;
 
 using namespace std;
 
-namespace {
-
-int lufs_to_pos(float level_lu, int height)
+LRAMeter::LRAMeter(QWidget *parent)
+       : QWidget(parent)
 {
-       const float min_level = 9.0f;    // y=0 is top of screen, so “min” is the loudest level.
-       const float max_level = -18.0f;
-       int y = lrintf(height * (level_lu - min_level) / (max_level - min_level));
-       y = std::max(y, 0);
-       y = std::min(y, height - 1);
-       return y;
 }
 
-}  // namespace
-
-LRAMeter::LRAMeter(QWidget *parent)
-       : QWidget(parent)
+void LRAMeter::resizeEvent(QResizeEvent *event)
 {
+       recalculate_pixmaps();
 }
 
 void LRAMeter::paintEvent(QPaintEvent *event)
 {
        QPainter painter(this);
-       const int margin = 5;
-
-       painter.fillRect(0, 0, width(), height(), parentWidget()->palette().window());
-       painter.fillRect(margin, 0, width() - 2 * margin, height(), Qt::black);
-
-       // TODO: QLinearGradient is not gamma-correct; we might want to correct for that.
-       QLinearGradient on(0, 0, 0, height());
-        on.setColorAt(0.0f, QColor(255, 0, 0));
-        on.setColorAt(0.5f, QColor(255, 255, 0));
-        on.setColorAt(1.0f, QColor(0, 255, 0));
-       QColor off(80, 80, 80);
 
        float level_lufs;
+       float range_low_lufs;
+       float range_high_lufs;
        {
                unique_lock<mutex> lock(level_mutex);
                level_lufs = this->level_lufs;
+               range_low_lufs = this->range_low_lufs;
+               range_high_lufs = this->range_high_lufs;
        }
 
-       float level_lu = level_lufs + 23.0f;
-       int y = lufs_to_pos(level_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()));
 
-       // Draw bars colored up until the level, then gray from there.
-       for (int level = -18; level < 9; ++level) {
-               int min_y = lufs_to_pos(level + 1.0f, height()) + 1;
-               int max_y = lufs_to_pos(level, height()) - 1;
+       QRect top_off_rect(0, 0, width(), range_high_pos);
+       QRect on_rect(0, range_high_pos, width(), range_low_pos - range_high_pos);
+       QRect bottom_off_rect(0, range_low_pos, width(), height() - range_low_pos);
 
-               if (y > max_y) {
-                       painter.fillRect(margin, min_y, width() - 2 * margin, max_y - min_y, off);
-               } else if (y < min_y) {
-                       painter.fillRect(margin, min_y, width() - 2 * margin, max_y - min_y, on);
-               } else {
-                       painter.fillRect(margin, min_y, width() - 2 * margin, y - min_y, off);
-                       painter.fillRect(margin, y, width() - 2 * margin, max_y - y, on);
-               }
-       }
+       painter.drawPixmap(top_off_rect, off_pixmap, top_off_rect);
+       painter.drawPixmap(on_rect, on_pixmap, on_rect);
+       painter.drawPixmap(bottom_off_rect, off_pixmap, bottom_off_rect);
 
        // Draw the target area (+/-1 LU is allowed EBU range).
-       int min_y = lufs_to_pos(1.0f, height());
-       int max_y = lufs_to_pos(-1.0f, height());
+       // It turns green when we're within.
+       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.
        {
@@ -84,4 +70,39 @@ void LRAMeter::paintEvent(QPaintEvent *event)
                painter.setPen(pen);
                painter.drawRect(2, min_y, width() - 5, max_y - min_y);
        }
+
+       // Draw the integrated loudness meter, in the same color as the target area.
+       int y = lrint(lufs_to_pos(level_lu, height()));
+       {
+               QPen pen(Qt::black);
+               pen.setWidth(5);
+               painter.setPen(pen);
+               painter.drawRect(2, y, width() - 5, 1);
+       }
+       {
+               QPen pen;
+               if (level_lu >= -1.0f && level_lu <= 1.0f) {
+                       pen.setColor(Qt::green);
+               } else {
+                       pen.setColor(Qt::red);
+               }
+               pen.setWidth(3);
+               painter.setPen(pen);
+               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, true, min_level, max_level);
+
+       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, min_level, max_level);
 }