Browse Source

correct CameraManager displayed available memory

QGCCameraControl::storageFreeStr(): use QGCMapEngine::storageFreeSizeToString()
QGC4.4
olliw42 6 years ago
parent
commit
7603d6d69e
  1. 2
      src/Camera/QGCCameraControl.cc
  2. 12
      src/QtLocationPlugin/QGCMapEngine.cpp
  3. 1
      src/QtLocationPlugin/QGCMapEngine.h

2
src/Camera/QGCCameraControl.cc

@ -263,7 +263,7 @@ QGCCameraControl::photoStatus() @@ -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));
}
//-----------------------------------------------------------------------------

12
src/QtLocationPlugin/QGCMapEngine.cpp

@ -473,6 +473,18 @@ QGCMapEngine::bigSizeToString(quint64 size) @@ -473,6 +473,18 @@ QGCMapEngine::bigSizeToString(quint64 size)
//-----------------------------------------------------------------------------
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)
{
return kLocale.toString(number);

1
src/QtLocationPlugin/QGCMapEngine.h

@ -99,6 +99,7 @@ public: @@ -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);

Loading…
Cancel
Save