mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 05:15:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Make compactFormatDouble a bit smarter.

Browse source
This commit is contained in:
Klaas Freitag 2013-07-24 14:36:38 +02:00
parent aee0f0c882
commit 6552a48639
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mirall/utility.cpp
View file

@ -108,10 +108,19 @@ QString Utility::octetsToString( qint64 octets )
static const qint64 tb = 1024 * gb;
if (octets >= tb) {
if (octets < 10*tb) {
return compactFormatDouble(double(octets)/double(tb), 1, QLatin1String("TB"));
}
return QString::number(octets/tb) + QLatin1String(" TB");
} else if (octets >= gb) {
if (octets < 10*gb) {
return compactFormatDouble(double(octets)/double(gb), 1, QLatin1String("GB"));
}
return QString::number(octets/gb) + QLatin1String(" GB");
} else if (octets >= mb) {
if (octets < 10*mb) {
return compactFormatDouble(double(octets)/double(mb), 1, QLatin1String("MB"));
}
return QString::number(octets/mb) + QLatin1String(" MB");
} else if (octets >= kb) {
return QString::number(octets/kb) + QLatin1String(" KB");
@ -319,7 +328,7 @@ qint64 Utility::freeDiskSpace(const QString &path, bool *ok)
#endif
}
QString Utility::compactFormatDouble(double value, int prec)
QString Utility::compactFormatDouble(double value, int prec, const QString& unit)
{
QLocale locale = QLocale::system();
QChar decPoint = locale.decimalPoint();
@ -331,6 +340,8 @@ QString Utility::compactFormatDouble(double value, int prec)
}
str.chop(1);
}
if( !unit.isEmpty() )
str += (QLatin1Char(' ')+unit);
return str;
}

11
src/mirall/utility.h
View file

@ -33,7 +33,16 @@ namespace Utility
void setLaunchOnStartup(const QString &appName, const QString& guiName, bool launch);
qint64 freeDiskSpace(const QString &path, bool *ok = 0);
/** Like QLocale::toString(double, 'f', prec), but drops trailing zeros after the decimal point */
QString compactFormatDouble(double value, int prec);
/**
* @brief compactFormatDouble - formats a double value human readable.
*
* @param value the value to format.
* @param prec the precision.
* @param unit an optional unit that is appended if present.
* @return the formatted string.
*/
QString compactFormatDouble(double value, int prec, const QString& unit = QString::null);
}
}