Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: remove QString::number() in arg() arguments #1604

Merged
merged 1 commit into from
Nov 7, 2024
+13 −16
Merged

refactor: remove QString::number() in arg() arguments #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/widgets/scopes/audiowaveformscopewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,15 +259,15 @@ void AudioWaveformScopeWidget::mouseMoveEvent(QMouseEvent *event)

qreal position = (qreal)event->pos().x() / (qreal)width();
int sample = (qreal)samples * position;
QString text = tr("Sample: %1\n").arg(QString::number(sample + 1));
QString text = tr("Sample: %1\n").arg(sample + 1);

for (int c = 0; c < channels; c++) {
const int16_t *q = audio + (channels * sample) + c;
qreal scaledValue = (qreal) * q / MAX_AMPLITUDE;
qreal dbValue = 20 * log(fabs(scaledValue));
if (dbValue < 0.01 && dbValue > -0.01) dbValue = 0.0;
text += tr("Ch: %1: %2 (%3 dBFS)").arg(QString::number(c + 1), QString::number(scaledValue, 'f', 2),
QString::number(dbValue, 'f', 2));
text += tr("Ch: %1: %2 (%3 dBFS)").arg(c + 1).arg(scaledValue, 0, 'f', 2)
.arg(dbValue, 0, 'f', 2);
if ( c != channels - 1 ) {
text += "\n";
}
Expand Down
7 changes: 3 additions & 4 deletions src/widgets/scopes/videohistogramscopewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@ void VideoHistogramScopeWidget::drawHistogram(QPainter &p, QString title, QColor
p.setPen(pen);
QString text;
if (maxLevel > minValue)
text = QStringLiteral("%1\tMin: %2\tMax: %3").arg(title, QString::number(minValue),
QString::number(maxValue));
text = QStringLiteral("%1\tMin: %2\tMax: %3").arg(title).arg(minValue).arg(maxValue);
else
text = title;
p.drawText(textpad, rect.y() + fm.height() + textpad, text);
Expand Down Expand Up @@ -196,9 +195,9 @@ void VideoHistogramScopeWidget::mouseMoveEvent(QMouseEvent *event)
qreal ire0x = width() * IRE0 / 256;
qreal ireStep = (ire0x - ire100x) / 100.0;
int ire = (ire0x - event->pos().x()) / ireStep;
text = tr("Value: %1\nIRE: %2").arg(QString::number(value), QString::number(ire));
text = tr("Value: %1\nIRE: %2").arg(value).arg(ire);
} else {
text = tr("Value: %1").arg(QString::number(value));
text = tr("Value: %1").arg(value);
}

QToolTip::showText(event->globalPosition().toPoint(), text);
Expand Down
5 changes: 2 additions & 3 deletions src/widgets/scopes/videorgbparadescopewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,9 @@ void VideoRgbParadeScopeWidget::mouseMoveEvent(QMouseEvent *event)

if (frameWidth != 0) {
int pixel = frameWidth * channelX / channelWidth;
text = tr("Channel: %1\nPixel: %2\nValue: %3").arg(channelLabel).arg(QString::number(
pixel)).arg(QString::number(value));
text = tr("Channel: %1\nPixel: %2\nValue: %3").arg(channelLabel).arg(pixel).arg(value);
} else {
text = tr("Channel: %1\nValue: %2").arg(channelLabel).arg(QString::number(value));
text = tr("Channel: %1\nValue: %2").arg(channelLabel).arg(value);
}
QToolTip::showText(event->globalPosition().toPoint(), text);
}
Expand Down
4 changes: 2 additions & 2 deletions src/widgets/scopes/videorgbwaveformscopewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ void VideoRgbWaveformScopeWidget::mouseMoveEvent(QMouseEvent *event)

if (frameWidth != 0) {
int pixel = frameWidth * event->pos().x() / width();
text = tr("Pixel: %1\nValue: %2").arg(QString::number(pixel)).arg(QString::number(value));
text = tr("Pixel: %1\nValue: %2").arg(pixel).arg(value);
} else {
text = tr("Value: %1").arg(QString::number(value));
text = tr("Value: %1").arg(value);
}
QToolTip::showText(event->globalPosition().toPoint(), text);
}
Expand Down
3 changes: 1 addition & 2 deletions src/widgets/scopes/videovectorscopewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,7 @@ void VideoVectorScopeWidget::mouseMoveEvent(QMouseEvent *event)
qreal realY = (qreal)event->pos().y() - ((qreal)height() - squareRect.height()) / 2;
qreal u = realX * 255.0 / squareRect.width();
qreal v = (squareRect.height() - realY) * 255.0 / squareRect.height();
QString text = tr("U: %1\nV: %2").arg(QString::number(qRound(u)),
QString::number(qRound(v)));
QString text = tr("U: %1\nV: %2").arg(qRound(u)).arg(qRound(v));
QToolTip::showText(event->globalPosition().toPoint(), text);
}

Expand Down
4 changes: 2 additions & 2 deletions src/widgets/scopes/videowaveformscopewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ void VideoWaveformScopeWidget::mouseMoveEvent(QMouseEvent *event)

if (frameWidth != 0) {
int pixel = frameWidth * event->pos().x() / width();
text = tr("Pixel: %1\nIRE: %2").arg(QString::number(pixel), QString::number(ire));
text = tr("Pixel: %1\nIRE: %2").arg(pixel).arg(ire);
} else {
text = tr("IRE: %1").arg(QString::number(ire));
text = tr("IRE: %1").arg(ire);
}
QToolTip::showText(event->globalPosition().toPoint(), text);
}
Expand Down