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)
return y;
}
-void draw_vu_meter(QPainter &painter, float range_low_lu, float range_high_lu, int width, int height, int margin)
+void draw_vu_meter(QPainter &painter, int width, int height, int margin, bool is_on)
{
painter.fillRect(margin, 0, width - 2 * margin, height, Qt::black);
on.setColorAt(1.0f, QColor(0, 255, 0));
QColor off(80, 80, 80);
- int min_on_y = lufs_to_pos(range_high_lu, height);
- int max_on_y = lufs_to_pos(range_low_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;
- painter.fillRect(margin, min_y, width - 2 * margin, max_y - min_y, off);
- int min_draw_y = max(min_y, min_on_y);
- int max_draw_y = min(max_y, max_on_y);
- if (min_draw_y < max_draw_y) {
- painter.fillRect(margin, min_draw_y, width - 2 * margin, max_draw_y - min_draw_y, on);
+ if (is_on) {
+ painter.fillRect(margin, min_y, width - 2 * margin, max_y - min_y, on);
+ } else {
+ painter.fillRect(margin, min_y, width - 2 * margin, max_y - min_y, off);
}
}
}
int lufs_to_pos(float level_lu, int height);
-// TODO: Now that we precalculate these as pixmaps, perhaps we don't need the
-// high/low range anymore, just a yes/no.
-void draw_vu_meter(QPainter &painter, float range_low_lu, float range_high_lu, int width, int height, int margin);
+void draw_vu_meter(QPainter &painter, int width, int height, int margin, bool is_on);
#endif // !defined(_VU_COMMON_H)
{
on_pixmap = QPixmap(width(), height());
QPainter on_painter(&on_pixmap);
- draw_vu_meter(on_painter, -HUGE_VAL, HUGE_VAL, width(), height(), 0);
+ draw_vu_meter(on_painter, width(), height(), 0, true);
off_pixmap = QPixmap(width(), height());
QPainter off_painter(&off_pixmap);
- draw_vu_meter(off_painter, -HUGE_VAL, -HUGE_VAL, width(), height(), 0);
+ draw_vu_meter(off_painter, width(), height(), 0, false);
}
void VUMeter::paintEvent(QPaintEvent *event)