X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=lrameter.cpp;h=f4395bec39ceb1094e4a472d67a110e4a05c4515;hb=4c879d05be9112b33245de1a694713dc59ced565;hp=d0304e1a9e5a05082938ae817b4b21b9df5840b0;hpb=3376a2309e8b682f8e8d0a96bbda9ccaa19c53c0;p=nageru diff --git a/lrameter.cpp b/lrameter.cpp index d0304e1..f4395be 100644 --- a/lrameter.cpp +++ b/lrameter.cpp @@ -21,12 +21,12 @@ void LRAMeter::resizeEvent(QResizeEvent *event) 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); + 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, -HUGE_VAL, -HUGE_VAL, width(), height(), margin); + draw_vu_meter(off_painter, width(), height(), margin, false); } void LRAMeter::paintEvent(QPaintEvent *event) @@ -46,8 +46,8 @@ void LRAMeter::paintEvent(QPaintEvent *event) 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()); + 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 +59,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 +82,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);