Minor : machineinfo change RAM informations MB to GB

This commit is contained in:
Laurent Trinques
2022-04-26 07:54:41 +02:00
parent 17290ae3b3
commit 34a7e0f3fe

View File

@@ -232,8 +232,8 @@ void MachineInfo::init_get_cpu_info_linux()
p.waitForFinished(); p.waitForFinished();
QString memory = p.readAllStandardOutput(); QString memory = p.readAllStandardOutput();
//compilation_info += "<br>" //compilation_info += "<br>"
pc.ram.Total=QString("RAM Total : %1 MB").arg( pc.ram.Total=QString("RAM Total : %1 GB").arg(
memory.toLong() / 1024); memory.toLong() / (1024 * 1000));
p.close(); p.close();
QProcess qp; QProcess qp;
@@ -243,8 +243,8 @@ void MachineInfo::init_get_cpu_info_linux()
<< "/proc/meminfo"); << "/proc/meminfo");
qp.waitForFinished(); qp.waitForFinished();
QString AvailableMemory = qp.readAllStandardOutput(); QString AvailableMemory = qp.readAllStandardOutput();
pc.ram.Available=QString("RAM Available : %1 MB").arg( pc.ram.Available=QString("RAM Available : %1 GB").arg(
AvailableMemory.toLong() / 1024); AvailableMemory.toLong() / (1024 * 1000));
qp.close(); qp.close();
QProcess linuxgpuinfo; QProcess linuxgpuinfo;
@@ -313,11 +313,11 @@ void MachineInfo::init_get_cpu_info_winnt()
memory_status.dwLength = sizeof(MEMORYSTATUSEX); memory_status.dwLength = sizeof(MEMORYSTATUSEX);
if (GlobalMemoryStatusEx(&memory_status)) { if (GlobalMemoryStatusEx(&memory_status)) {
pc.ram.Total .append( pc.ram.Total .append(
QString("RAM Total : %1 MB") QString("RAM Total : %1 GB")
.arg(memory_status.ullTotalPhys / (1024 * 1024))); .arg(memory_status.ullTotalPhys / ((1024 * 1024) * 1000)));
pc.ram.Available .append( pc.ram.Available .append(
QString("RAM Available : %1 MB") QString("RAM Available : %1 GB")
.arg(memory_status.ullAvailPhys / (1024 * 1024))); .arg(memory_status.ullAvailPhys / ((1024 * 1024) * 1000)));
} else { } else {
pc.ram.Total.append("Unknown RAM"); pc.ram.Total.append("Unknown RAM");
pc.ram.Available.append("Unknown RAM"); pc.ram.Available.append("Unknown RAM");
@@ -346,8 +346,8 @@ void MachineInfo::init_get_cpu_info_macos()
<< "sysctl -n hw.memsize"); << "sysctl -n hw.memsize");
macosraminfo.waitForFinished(); macosraminfo.waitForFinished();
QString macosRAMOutput = macosraminfo.readAllStandardOutput(); QString macosRAMOutput = macosraminfo.readAllStandardOutput();
pc.ram.Total=QString("RAM Total : %1 MB").arg( pc.ram.Total=QString("RAM Total : %1 GB").arg(
macosRAMOutput.toLongLong() /1024 / 1024); macosRAMOutput.toLongLong() / (1024 * 1024) * 1000);
macosraminfo.close(); macosraminfo.close();
} }