YShuvakin/StandBatteryView
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added linux build and some UI minor fixes

Browse Source
This commit is contained in:
Yury Shuvakin
2025-07-03 21:13:16 +09:00
parent 6cf2010c08
commit 978f6ee04d
9 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
BatteryController.cpp
View File

@@ -184,14 +184,20 @@ void BatteryController::setStatuses(const QVariantList& statuses)
void BatteryController::addStatus(const quint16 status)
{
QString description;
auto appendDescription = [&description](const QString& subStatus)
// QString description;
// auto appendDescription = [&description](const QString& subStatus)
// {
// if (!description.isEmpty())
// {
// description += ", ";
// }
// description += subStatus;
// };
QStringList descriptionList;
auto appendDescription = [&descriptionList](const QString& subStatus)
{
if (!description.isEmpty())
{
description += ", ";
}
description += subStatus;
descriptionList.append(subStatus);
};
std::bitset<16> descriptionBitset(status);
@@ -252,18 +258,23 @@ void BatteryController::addStatus(const quint16 status)
appendDescription("Разночтение в токах");
}
if (description.isEmpty())
if (descriptionList.isEmpty())
{
appendDescription("Штатный режим");
}
QVariantMap statusMap;
statusMap.insert("time", QDateTime::currentDateTime().toString("hh:mm:ss dd-MM-yyyy"));
statusMap.insert("status", "0x" + QString::number(status, 16).toUpper().rightJustified(2, '0'));
statusMap.insert("description", description);
statuses_.clear();
statuses_.append(statusMap);
for (const auto& description: descriptionList)
{
QVariantMap statusMap;
statusMap.insert("time", QDateTime::currentDateTime().toString("hh:mm:ss dd-MM-yyyy"));
statusMap.insert("status", "0x" + QString::number(status, 16).toUpper().rightJustified(2, '0'));
statusMap.insert("description", description);
statuses_.append(statusMap);
}
emit statusesChanged();
// if (statuses_.isEmpty() || statuses_.first().toMap()["status"] != statusMap["status"])