GUI: Output debug errors to log view.

kimmov · kimmov · commit 20a4f1e19514 · 2010-08-28T20:37:21.000+03:00
Debug errors were not shown anywhere in the GUI, they were just ignored. This commit adds new signal for those debug errors and directs them to checking log. Solves ticket danmar#1898 (GUI: Handle internal errors from lib)
diff --git a/gui/erroritem.cpp b/gui/erroritem.cpp
@@ -37,3 +37,12 @@ ErrorItem::ErrorItem(const ErrorLine &line)
     severity = line.severity;
     msg = line.msg;
 }
+
+QString ErrorItem::ToString() const
+{
+    QString str = file + " - " + id + " - " + severity +"\n";
+    str += "  " + msg;
+    for (int i = 0; i < files.size(); i++)
+        str += "  " + files[i] + ": " + lines[i] + "\n";
+    return str;
+}
diff --git a/gui/erroritem.h b/gui/erroritem.h
@@ -39,6 +39,12 @@ class ErrorItem
     ErrorItem(const ErrorLine &line);
     ~ErrorItem() { }
 
+    /**
+    * @brief Convert error item to string.
+    * @return Error item as string.
+    */
+    QString ToString() const;
+
     QString file;
     QStringList files;
     QList<unsigned int> lines;
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -819,6 +819,14 @@ void MainWindow::Log(const QString &logline)
     }
 }
 
+void MainWindow::DebugError(const ErrorItem &item)
+{
+    if (mLogView)
+    {
+        mLogView->AppendLine(item.ToString());
+    }
+}
+
 void MainWindow::EnableProjectActions(bool enable)
 {
     mUI.mActionCloseProjectFile->setEnabled(enable);
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
@@ -36,6 +36,7 @@ class ThreadHandler;
 class LogView;
 class HelpWindow;
 class Project;
+class ErrorItem;
 
 /// @addtogroup GUI
 /// @{
@@ -218,6 +219,12 @@ protected slots:
     */
     void Log(const QString &logline);
 
+    /**
+    * @brief Handle new debug error.
+    *
+    */
+    void DebugError(const ErrorItem &item);
+
 protected:
 
     /**
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
@@ -146,6 +146,9 @@ void ThreadHandler::Initialize(ResultsView *view)
 
     connect(&mResults, SIGNAL(Log(const QString &)),
             parent(), SLOT(Log(const QString &)));
+
+    connect(&mResults, SIGNAL(Error(const ErrorItem &)),
+            parent(), SLOT(Error(const ErrorItem &)));
 }
 
 void ThreadHandler::LoadSettings(QSettings &settings)
diff --git a/gui/threadresult.cpp b/gui/threadresult.cpp
@@ -71,7 +71,10 @@ void ThreadResult::reportErr(const ErrorLogger::ErrorMessage &msg)
     item.msg = QString(msg._msg.c_str());
     item.severity = QString::fromStdString(Severity::toString(msg._severity));
 
-    emit Error(item);
+    if (msg._severity != Severity::debug)
+        emit Error(item);
+    else
+        emit DebugError(item);
 }
 
 QString ThreadResult::GetNextFile()
diff --git a/gui/threadresult.h b/gui/threadresult.h
@@ -100,6 +100,13 @@ public slots:
     */
     void Log(const QString &logline);
 
+    /**
+    * @brief Signal of a debug error
+    *
+    * @param item Error data
+    */
+    void DebugError(const ErrorItem &item);
+
 protected:
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -819,6 +819,14 @@ void MainWindow::Log(const QString &logline)`
`819`	`819`	`}`
`820`	`820`	`}`
`821`	`821`
	`822`	`+void MainWindow::DebugError(const ErrorItem &item)`
	`823`	`+{`
	`824`	`+ if (mLogView)`
	`825`	`+ {`
	`826`	`+ mLogView->AppendLine(item.ToString());`
	`827`	`+ }`
	`828`	`+}`
	`829`	`+`
`822`	`830`	`void MainWindow::EnableProjectActions(bool enable)`
`823`	`831`	`{`
`824`	`832`	`mUI.mActionCloseProjectFile->setEnabled(enable);`
Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,9 @@ void ThreadHandler::Initialize(ResultsView *view)`
`146`	`146`
`147`	`147`	`connect(&mResults, SIGNAL(Log(const QString &)),`
`148`	`148`	`parent(), SLOT(Log(const QString &)));`
	`149`	`+`
	`150`	`+ connect(&mResults, SIGNAL(Error(const ErrorItem &)),`
	`151`	`+ parent(), SLOT(Error(const ErrorItem &)));`
`149`	`152`	`}`
`150`	`153`
`151`	`154`	`void ThreadHandler::LoadSettings(QSettings &settings)`