From b9a9f3cc46538a4d7e637a118ee184b402f1d3b0 Mon Sep 17 00:00:00 2001
From: Spiros
Date: Wed, 5 Jun 2024 22:48:06 +0300
Subject: [PATCH] Fix saving to a file
---
mainwindow.cpp | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 72e3bde..4cdb9ed 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -136,22 +136,22 @@ void MainWindow::scanDevices()
}
QJsonDocument localDoc = QJsonDocument::fromJson(allOutput.toUtf8());
- deviceJson = localDoc.object();
+ QJsonObject localObj = localDoc.object();
- QString modelName = deviceJson["model_name"].toString();
- QJsonArray attributes = deviceJson["ata_smart_attributes"].toObject()["table"].toArray();
- QJsonObject nvmeLog = deviceJson["nvme_smart_health_information_log"].toObject();
+ QString modelName = localObj["model_name"].toString();
+ QJsonArray attributes = localObj["ata_smart_attributes"].toObject()["table"].toArray();
+ QJsonObject nvmeLog = localObj["nvme_smart_health_information_log"].toObject();
QString temperature = "-- °C";
- bool healthPassed = deviceJson["smart_status"].toObject()["passed"].toBool();
+ bool healthPassed = localObj["smart_status"].toObject()["passed"].toBool();
bool caution = false;
bool bad = false;
QString health;
QColor healthColor;
- QString protocol = deviceJson["device"].toObject()["protocol"].toString();
+ QString protocol = localObj["device"].toObject()["protocol"].toString();
bool isNvme = (protocol == "NVMe");
- int temperatureInt = deviceJson["temperature"].toObject()["current"].toInt();
+ int temperatureInt = localObj["temperature"].toObject()["current"].toInt();
if (temperatureInt > 0) {
temperature = QString::number(temperatureInt) + " °C";
}
@@ -219,15 +219,15 @@ void MainWindow::scanDevices()
connect(button, &QPushButton::clicked, this, [=]() {
if (isNvme) {
- populateWindow(deviceJson, health, nvmeSmartOrdered);
+ populateWindow(localObj, health, nvmeSmartOrdered);
} else {
- populateWindow(deviceJson, health);
+ populateWindow(localObj, health);
}
updateNavigationButtons(buttonGroup->buttons().indexOf(button));
});
if (firstTime) {
- globalObj = deviceJson;
+ globalObj = localObj;
globalHealth = health;
button->setChecked(true);
firstTime = false;
@@ -268,6 +268,8 @@ void MainWindow::populateWindow(const QJsonObject &localObj, const QString &heal
bool isNvme = (protocol == "NVMe");
+ deviceJson = localObj;
+
diskName->setText("" + modelName + " " + userCapacityString + "
");
firmwareLineEdit->setText(firmwareVersion);
serialNumberLineEdit->setText(serialNumber);