From b79891693bbb29d5f3aa178754a90610b8567691 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Wed, 31 May 2017 13:44:58 +0200 Subject: [PATCH] ui: Fixed errors always shown after indexing --- src/lib/data/access/StorageAccessProxy.cpp | 5 ++++- src/lib/utility/messaging/type/MessageErrorFilterChanged.h | 4 +++- src/lib_gui/qt/view/QtErrorView.cpp | 7 ++++--- src/lib_gui/qt/view/QtErrorView.h | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/lib/data/access/StorageAccessProxy.cpp b/src/lib/data/access/StorageAccessProxy.cpp index 71c7bdb6..6f78f064 100644 --- a/src/lib/data/access/StorageAccessProxy.cpp +++ b/src/lib/data/access/StorageAccessProxy.cpp @@ -418,5 +418,8 @@ void StorageAccessProxy::handleMessage(MessageErrorFilterChanged* message) { setErrorFilter(message->errorFilter); - MessageShowErrors(getErrorCount()).dispatch(); + if (message->showErrors) + { + MessageShowErrors(getErrorCount()).dispatch(); + } } diff --git a/src/lib/utility/messaging/type/MessageErrorFilterChanged.h b/src/lib/utility/messaging/type/MessageErrorFilterChanged.h index 067e50df..3da1ed95 100644 --- a/src/lib/utility/messaging/type/MessageErrorFilterChanged.h +++ b/src/lib/utility/messaging/type/MessageErrorFilterChanged.h @@ -8,8 +8,9 @@ class MessageErrorFilterChanged : public Message { public: - MessageErrorFilterChanged(const ErrorFilter& filter) + MessageErrorFilterChanged(const ErrorFilter& filter, bool showErrors) : errorFilter(filter) + , showErrors(showErrors) { } @@ -19,6 +20,7 @@ public: } const ErrorFilter errorFilter; + const bool showErrors; }; #endif // MESSAGE_ERROR_FILTER_CHANGED_H diff --git a/src/lib_gui/qt/view/QtErrorView.cpp b/src/lib_gui/qt/view/QtErrorView.cpp index d9782ebb..ccf3c7f8 100644 --- a/src/lib_gui/qt/view/QtErrorView.cpp +++ b/src/lib_gui/qt/view/QtErrorView.cpp @@ -183,11 +183,12 @@ void QtErrorView::setErrorCount(ErrorCountInfo info) void QtErrorView::resetErrorLimit() { ErrorFilter filter; + m_errorFilter.limit = filter.limit; - errorFilterChanged(); + errorFilterChanged(0, false); } -void QtErrorView::errorFilterChanged(int i) +void QtErrorView::errorFilterChanged(int i, bool showErrors) { m_table->selectionModel()->clearSelection(); @@ -196,7 +197,7 @@ void QtErrorView::errorFilterChanged(int i) m_errorFilter.unindexedError = m_showNonIndexedErrors->isChecked(); m_errorFilter.unindexedFatal = m_showNonIndexedFatals->isChecked(); - MessageErrorFilterChanged(m_errorFilter).dispatch(); + MessageErrorFilterChanged(m_errorFilter, showErrors).dispatch(); } void QtErrorView::doRefreshView() diff --git a/src/lib_gui/qt/view/QtErrorView.h b/src/lib_gui/qt/view/QtErrorView.h index e7931ba4..0709ce07 100644 --- a/src/lib_gui/qt/view/QtErrorView.h +++ b/src/lib_gui/qt/view/QtErrorView.h @@ -38,7 +38,7 @@ public: virtual void resetErrorLimit(); private slots: - void errorFilterChanged(int i = 0); + void errorFilterChanged(int i = 0, bool showErrors = true); private: enum COLUMN {