mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 11:32:46 +01:00
Merge bitcoin-core/gui#248: Fix: For values of "Bytes transferred" and "Bytes/s" with 1000-based prefix names use 1000-based divisor instead of 1024-based
d09ebc47233187ab8dd5a70df4d261353958978c Fix wrong(1024) divisor for 1000-based prefixes (wodry)
Pull request description:
v.0.21.0
I saw in the GUI peer window in the "received" column `1007 KB`, and after increasing to >=1024 I guess, it switched to `1 MB`. I would have expected the display unit to change from KB to MB already at value >=1000.
I looked into the code, and the values appear to be power-of-2 byte values, so the switching at >=1024 and not >=1000 seems correct.
But the unit display is not precisely correct, binary prefixes should be used for power-of-2 byte values.
To be correct, this PR changes ~~KB/MB/GB to KiB/MiB/GiB.~~ KB to kB and the divisor from 1024 to 1000.
ACKs for top commit:
hebasto:
ACK d09ebc47233187ab8dd5a70df4d261353958978c, tested on Linux Mint 20.1 (Qt 5.12.8) the both "Network Traffic" and "Peers" tabs of the "Node Window".
jarolrod:
ACK d09ebc47233187ab8dd5a70df4d261353958978c
leonardojobim:
Tested ACK d09ebc4723
on Ubuntu 20.04 Qt 5.12.8
Tree-SHA512: 8f830b08cc3fd36dc8a18f1192959fe55d1644938044bf31d770f7c3bf8475fba6da5019a2d2024d5b2c81a8dab112f360c555367814a14f4d05c89d130f25b0
This commit is contained in:
parent
63b18006a3
commit
48d66fd1ab
@ -1785,14 +1785,14 @@ QString formatNiceTimeOffset(qint64 secs)
|
|||||||
|
|
||||||
QString formatBytes(uint64_t bytes)
|
QString formatBytes(uint64_t bytes)
|
||||||
{
|
{
|
||||||
if(bytes < 1024)
|
if (bytes < 1'000)
|
||||||
return QObject::tr("%1 B").arg(bytes);
|
return QObject::tr("%1 B").arg(bytes);
|
||||||
if(bytes < 1024 * 1024)
|
if (bytes < 1'000'000)
|
||||||
return QObject::tr("%1 KB").arg(bytes / 1024);
|
return QObject::tr("%1 kB").arg(bytes / 1'000);
|
||||||
if(bytes < 1024 * 1024 * 1024)
|
if (bytes < 1'000'000'000)
|
||||||
return QObject::tr("%1 MB").arg(bytes / 1024 / 1024);
|
return QObject::tr("%1 MB").arg(bytes / 1'000'000);
|
||||||
|
|
||||||
return QObject::tr("%1 GB").arg(bytes / 1024 / 1024 / 1024);
|
return QObject::tr("%1 GB").arg(bytes / 1'000'000'000);
|
||||||
}
|
}
|
||||||
|
|
||||||
qreal calculateIdealFontSize(int width, const QString& text, QFont font, qreal minPointSize, qreal font_size) {
|
qreal calculateIdealFontSize(int width, const QString& text, QFont font, qreal minPointSize, qreal font_size) {
|
||||||
|
@ -98,7 +98,7 @@ void TrafficGraphWidget::paintEvent(QPaintEvent *)
|
|||||||
float val = pow(10.0f, base);
|
float val = pow(10.0f, base);
|
||||||
float val2 = val;
|
float val2 = val;
|
||||||
|
|
||||||
const QString units = tr("KB/s");
|
const QString units = tr("kB/s");
|
||||||
const float yMarginText = 2.0;
|
const float yMarginText = 2.0;
|
||||||
|
|
||||||
// draw lines
|
// draw lines
|
||||||
|
Loading…
Reference in New Issue
Block a user