arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-07 02:45:51 +00:00
Code Issues Projects Releases Wiki Activity

fix network speed calculation for $down and $up tags

Browse Source
This commit is contained in:
arcan1s
2015-07-14 00:18:29 +03:00
parent 4e78e0e1dd
commit 467a3bf508
6 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -553,11 +553,11 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
} else if (sourceName.contains(netRecRegExp)) {
// download speed
QString device = sourceName;
float value = data[QString("value")].toFloat();
device.remove(QString("network/interfaces/")).remove(QString("/receiver/data"));
QStringList allNetworkDevices = networkDevices;
for (int i=0; i<allNetworkDevices.count(); i++) {
if (allNetworkDevices[i] != device) continue;
float value = data[QString("value")].toFloat();
if (value > 1000.0)
values[QString("down%1").arg(i)] = QString("%1").arg(value / 1024.0, 4, 'f', 1);
else
@ -565,17 +565,20 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
break;
}
if (device == values[QString("netdev")]) {
values[QString("down")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
if (toolTip != nullptr) toolTip->setData(QString("downTooltip"), data[QString("value")].toFloat());
if (value > 1000.0)
values[QString("down")] = QString("%1").arg(value / 1024.0, 4, 'f', 1);
else
values[QString("down")] = QString("%1").arg(value, 4, 'f', 0);
if (toolTip != nullptr) toolTip->setData(QString("downTooltip"), value);
}
} else if (sourceName.contains(netTransRegExp)) {
// upload speed
QString device = sourceName;
float value = data[QString("value")].toFloat();
device.remove(QString("network/interfaces/")).remove(QString("/transmitter/data"));
QStringList allNetworkDevices = networkDevices;
for (int i=0; i<allNetworkDevices.count(); i++) {
if (allNetworkDevices[i] != device) continue;
float value = data[QString("value")].toFloat();
if (value > 1000.0)
values[QString("up%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 4, 'f', 1);
else
@ -583,7 +586,10 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
break;
}
if (device == values[QString("netdev")]) {
values[QString("up")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
if (value > 1000.0)
values[QString("up")] = QString("%1").arg(value / 1024.0, 4, 'f', 1);
else
values[QString("up")] = QString("%1").arg(value, 4, 'f', 0);
if (toolTip != nullptr) toolTip->setData(QString("upTooltip"), data[QString("value")].toFloat());
}
} else if (sourceName == QString("pkg")) {