Commit 7603d6d6 authored by olliw42's avatar olliw42

correct CameraManager displayed available memory

QGCCameraControl::storageFreeStr(): use QGCMapEngine::storageFreeSizeToString()
parent 9fd5cbcb
......@@ -263,7 +263,7 @@ QGCCameraControl::photoStatus()
QString
QGCCameraControl::storageFreeStr()
{
return QGCMapEngine::bigSizeToString(static_cast<quint64>(_storageFree) * 1024 * 1024);
return QGCMapEngine::storageFreeSizeToString(static_cast<quint64>(_storageFree));
}
//-----------------------------------------------------------------------------
......
......@@ -471,6 +471,18 @@ QGCMapEngine::bigSizeToString(quint64 size)
return kLocale.toString(static_cast<double>(size) / (1024.0 * 1024.0 * 1024.0 * 1024), 'f', 1) + "TB";
}
//-----------------------------------------------------------------------------
QString
QGCMapEngine::storageFreeSizeToString(quint64 size_MB)
{
if(size_MB < 1024)
return kLocale.toString(static_cast<double>(size_MB) , 'f', 0) + " MB";
else if(size_MB < 1024.0 * 1024.0)
return kLocale.toString(static_cast<double>(size_MB) / (1024.0), 'f', 2) + " GB";
else
return kLocale.toString(static_cast<double>(size_MB) / (1024.0 * 1024), 'f', 2) + " TB";
}
//-----------------------------------------------------------------------------
QString
QGCMapEngine::numberToString(quint64 number)
......
......@@ -99,6 +99,7 @@ public:
static QString getTileHash (UrlFactory::MapType type, int x, int y, int z);
static UrlFactory::MapType getTypeFromName (const QString &name);
static QString bigSizeToString (quint64 size);
static QString storageFreeSizeToString(quint64 size_MB);
static QString numberToString (quint64 number);
static int concurrentDownloads (UrlFactory::MapType type);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment