feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Timeline: Use the 'g' format for timestamp formatting

Browse Source 
This has the nice property of dropping trailing zeroes and allows us
to simplify the code a bit.

Change-Id: I4ac98743960ba552c8e3e72e02f594ba910ab81b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2017-01-05 10:16:07 +01:00
parent 48570a754e
commit dba7333bef
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libs/timeline/timelineformattime.cpp
View File

@@ -35,19 +35,9 @@ QString formatTime(qint64 timestamp, qint64 reference)
static const double minute = 60; static const double minute = 60;
static const double hour = 60; static const double hour = 60;
int round = 0; int round = 1;
qint64 barrier = 1; qint64 barrier = 1;
auto roundTo3 = [](double time, int round) {
// always show at least 3 significant digits
if (time < 10 && round < 2)
return 2;
else if (time < 100 && round < 1)
return 1;
else
return round;
};
for (uint i = 0, end = sizeof(decimalUnits) / sizeof(char *); i < end; ++i) { for (uint i = 0, end = sizeof(decimalUnits) / sizeof(char *); i < end; ++i) {
const double dividend = barrier; const double dividend = barrier;
if (reference < barrier) { if (reference < barrier) {
@@ -66,32 +56,27 @@ QString formatTime(qint64 timestamp, qint64 reference)
} }
} }
if (timestamp < barrier) { if (timestamp < barrier) {
double time = timestamp; return QString::number(timestamp / dividend, 'g', qMax(round, 3))
if (dividend > 1) {
time /= dividend;
round = roundTo3(time, round);
}
return QString::number(time, 'f', round)
+ QString::fromLatin1(decimalUnits[i]); + QString::fromLatin1(decimalUnits[i]);
} }
} }
double seconds = timestamp / second; double seconds = timestamp / second;
if (seconds < minute) { if (seconds < minute) {
return QString::number(seconds, 'f', roundTo3(seconds, round)) + "s"; return QString::number(seconds, 'g', qMax(round, 3)) + "s";
} else { } else {
int minutes = seconds / minute; int minutes = seconds / minute;
seconds -= minutes * minute; seconds -= minutes * minute;
if (minutes < hour) { if (minutes < hour) {
return QString::fromLatin1("%1m %2s").arg(QString::number(minutes), return QString::fromLatin1("%1m %2s").arg(QString::number(minutes),
QString::number(seconds, 'f', round)); QString::number(seconds, 'g', round));
} else { } else {
int hours = minutes / hour; int hours = minutes / hour;
minutes -= hours * hour; minutes -= hours * hour;
if (reference < barrier * minute) { if (reference < barrier * minute) {
return QString::fromLatin1("%1h %2m %3s").arg(QString::number(hours), return QString::fromLatin1("%1h %2m %3s").arg(QString::number(hours),
QString::number(minutes), QString::number(minutes),
QString::number(seconds, 'f', round)); QString::number(seconds, 'g', round));
} else { } else {
return QString::fromLatin1("%1h %2m").arg(QString::number(hours), return QString::fromLatin1("%1h %2m").arg(QString::number(hours),
QString::number(minutes)); QString::number(minutes));