From 95f61281fd291b53fef425eca97b3e778f0cef79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Fri, 25 Aug 2023 09:49:34 +0200 Subject: [PATCH] cleanup --- gui/resultsview.cpp | 11 ++++++++--- gui/resultsview.h | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp index 454aca13478..942ab5974f2 100644 --- a/gui/resultsview.cpp +++ b/gui/resultsview.cpp @@ -123,6 +123,8 @@ void ResultsView::clear(bool results) mUI->mProgress->setFormat("%p%"); mUI->mLabelCriticalErrors->setVisible(false); + + mSuccess = false; } void ResultsView::clear(const QString &filename) @@ -282,6 +284,7 @@ QString ResultsView::getCheckDirectory() void ResultsView::checkingStarted(int count) { + mSuccess = true; mUI->mProgress->setVisible(true); mUI->mProgress->setMaximum(PROGRESS_MAX); mUI->mProgress->setValue(0); @@ -290,8 +293,6 @@ void ResultsView::checkingStarted(int count) void ResultsView::checkingFinished() { - mSuccess = !mUI->mLabelCriticalErrors->isVisible(); - mUI->mProgress->setVisible(false); mUI->mProgress->setFormat("%p%"); @@ -356,6 +357,8 @@ void ResultsView::disableProgressbar() void ResultsView::readErrorsXml(const QString &filename) { + mSuccess = false; // Don't know if results come from an aborted analysis + const int version = XmlReport::determineVersion(filename); if (version == 0) { QMessageBox msgBox; @@ -517,6 +520,7 @@ void ResultsView::on_mListLog_customContextMenuRequested(const QPoint &pos) void ResultsView::stopAnalysis() { + mSuccess = false; mUI->mLabelCriticalErrors->setText(tr("Analysis was stopped")); mUI->mLabelCriticalErrors->setVisible(true); } @@ -541,9 +545,10 @@ void ResultsView::handleCriticalError(const ErrorItem &item) msg += ". " + tr("Analysis was aborted."); mUI->mLabelCriticalErrors->setText(msg); mUI->mLabelCriticalErrors->setVisible(true); + mSuccess = false; } } bool ResultsView::isSuccess() const { - return mSuccess && !mUI->mLabelCriticalErrors->isVisible(); + return mSuccess; } diff --git a/gui/resultsview.h b/gui/resultsview.h index 4a66dbc0930..70c8ddfa2b9 100644 --- a/gui/resultsview.h +++ b/gui/resultsview.h @@ -353,8 +353,11 @@ public slots: private: + /** + * If provided ErrorItem is a critical error then display warning message + * in the resultsview + */ void handleCriticalError(const ErrorItem& item); - bool mHasCriticalError = false; /** * @brief Should we show a "No errors found dialog" every time no errors were found?