From d0cf1dde7e0e01e4ac9deb710f42273d210ec18f Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Fri, 20 Jan 2023 10:31:12 +0100
Subject: [PATCH] JobItem: change error message
---
GUI/Model/Job/JobItem.cpp | 11 +++++------
GUI/Model/Model/ApplicationModels.cpp | 6 +++---
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 5481f090509..900655dcb9b 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -643,15 +643,14 @@ void JobItem::readFrom(QXmlStreamReader* r, const QString& projectDir,
// Handling corrupted file on disk
if (!realError.isEmpty() || !simError.isEmpty()) {
- QString addition;
+ errorMessage = QString("Load of the data from disk failed with:\n");
+
if (!realError.isEmpty() && simError.isEmpty())
- addition = realError;
+ errorMessage += QString("'%1'").arg(realError);
else if (realError.isEmpty() && !simError.isEmpty())
- addition = simError;
+ errorMessage += QString("'%1'").arg(simError);
else
- addition = realError + "\n" + simError;
-
- errorMessage = QString("Load of the data from disk failed with '%1'").arg(addition);
+ errorMessage += QString("'%1',\n'%2'").arg(realError, simError);
}
// Handling previous crash of GUI during job run
diff --git a/GUI/Model/Model/ApplicationModels.cpp b/GUI/Model/Model/ApplicationModels.cpp
index 52ddd7519cc..e35dfb90ad4 100644
--- a/GUI/Model/Model/ApplicationModels.cpp
+++ b/GUI/Model/Model/ApplicationModels.cpp
@@ -100,10 +100,10 @@ QVector<DataItem*> ApplicationModels::dataItems() const
QStringList ApplicationModels::collectDataNames()
{
- QStringList list;
+ QStringList result;
for (DataItem* item : dataItems())
- list << item->fileName();
- return list;
+ result << item->fileName();
+ return result;
}
void ApplicationModels::cleanOldFiles(const QString& projectDir)
--
GitLab