GUI: Add errors read from XML report to GUI.

kimmov · kimmov · commit f894b192093d · 2010-07-11T02:02:08.000+03:00
diff --git a/gui/report.cpp b/gui/report.cpp
@@ -17,6 +17,7 @@
  */
 
 #include <QFile>
+#include "erroritem.h"
 #include "report.h"
 
 Report::Report(const QString &filename, QObject * parent) :
diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
@@ -229,10 +229,11 @@ void ResultsView::DisableProgressbar()
 void ResultsView::ReadErrorsXml(const QString &filename)
 {
     XmlReport *report = new XmlReport(filename, this);
+    QList<ErrorLine> errors;
     if (report)
     {
         if (report->Open())
-            report->Read();
+            errors = report->Read();
         else
         {
             QMessageBox msgBox;
@@ -250,4 +251,11 @@ void ResultsView::ReadErrorsXml(const QString &filename)
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.exec();
     }
+
+    ErrorLine line;
+    foreach(line, errors)
+    {
+        ErrorItem item(line);
+        mUI.mTree->AddErrorItem(item);
+    }
 }
diff --git a/gui/xmlreport.cpp b/gui/xmlreport.cpp
@@ -19,6 +19,7 @@
 #include <QFile>
 #include <QXmlStreamWriter>
 #include <qdebug>
+#include "erroritem.h"
 #include "xmlreport.h"
 
 static const char ResultElementName[] = "results";
@@ -96,13 +97,14 @@ void XmlReport::WriteError(const ErrorItem &error)
     mXmlWriter->writeEndElement();
 }
 
-void XmlReport::Read()
+QList<ErrorLine> XmlReport::Read()
 {
+    QList<ErrorLine> errors;
     bool insideResults = false;
     if (!mXmlReader)
     {
         qDebug() << "You must Open() the file before reading it!";
-        return;
+        return errors;
     }
     while (!mXmlReader->atEnd())
     {
@@ -114,7 +116,10 @@ void XmlReport::Read()
 
             // Read error element from inside result element
             if (insideResults && mXmlReader->name() == ErrorElementName)
-                ReadError(mXmlReader);
+            {
+                ErrorLine line = ReadError(mXmlReader);
+                errors.append(line);
+            }
             break;
 
         case QXmlStreamReader::EndElement:
@@ -135,18 +140,20 @@ void XmlReport::Read()
             break;
         }
     }
+    return errors;
 }
 
-void XmlReport::ReadError(QXmlStreamReader *reader)
+ErrorLine XmlReport::ReadError(QXmlStreamReader *reader)
 {
+    ErrorLine line;
     if (reader->name().toString() == ErrorElementName)
     {
         QXmlStreamAttributes attribs = reader->attributes();
-        QString filename = attribs.value("", FilenameAttribute).toString();
-        QString line = attribs.value("", LineAttribute).toString();
-        QString id = attribs.value("", IdAttribute).toString();
-        QString severity = attribs.value("", SeverityAttribute).toString();
-        QString msg = attribs.value("", MsgAttribute).toString();
-        qDebug() << "Error: " << filename << " " << line << " " << id << " " << severity << " " << msg;
+        line.file = attribs.value("", FilenameAttribute).toString();
+        line.line = attribs.value("", LineAttribute).toString();
+        line.id = attribs.value("", IdAttribute).toString();
+        line.severity = attribs.value("", SeverityAttribute).toString();
+        line.msg = attribs.value("", MsgAttribute).toString();
     }
+    return line;
 }
diff --git a/gui/xmlreport.h b/gui/xmlreport.h
@@ -72,14 +72,14 @@ class XmlReport : public Report
     /**
     * @brief Read contents of the report file.
     */
-    void Read();
+    QList<ErrorLine> Read();
 
 protected:
     /**
     * @brief Read and parse error item from XML stream.
     * @param reader XML stream reader to use.
     */
-    void ReadError(QXmlStreamReader *reader);
+    ErrorLine ReadError(QXmlStreamReader *reader);
 
 private:
     /**

Original file line number	Diff line number	Diff line change
`@@ -229,10 +229,11 @@ void ResultsView::DisableProgressbar()`
`229`	`229`	`void ResultsView::ReadErrorsXml(const QString &filename)`
`230`	`230`	`{`
`231`	`231`	`XmlReport *report = new XmlReport(filename, this);`
	`232`	`+ QList<ErrorLine> errors;`
`232`	`233`	`if (report)`
`233`	`234`	`{`
`234`	`235`	`if (report->Open())`
`235`		`- report->Read();`
	`236`	`+ errors = report->Read();`
`236`	`237`	`else`
`237`	`238`	`{`
`238`	`239`	`QMessageBox msgBox;`
`@@ -250,4 +251,11 @@ void ResultsView::ReadErrorsXml(const QString &filename)`
`250`	`251`	`msgBox.setIcon(QMessageBox::Critical);`
`251`	`252`	`msgBox.exec();`
`252`	`253`	`}`
	`254`	`+`
	`255`	`+ ErrorLine line;`
	`256`	`+ foreach(line, errors)`
	`257`	`+ {`
	`258`	`+ ErrorItem item(line);`
	`259`	`+ mUI.mTree->AddErrorItem(item);`
	`260`	`+ }`
`253`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#include <QFile>`
`20`	`20`	`#include <QXmlStreamWriter>`
`21`	`21`	`#include <qdebug>`
	`22`	`+#include "erroritem.h"`
`22`	`23`	`#include "xmlreport.h"`
`23`	`24`
`24`	`25`	`static const char ResultElementName[] = "results";`
`@@ -96,13 +97,14 @@ void XmlReport::WriteError(const ErrorItem &error)`
`96`	`97`	`mXmlWriter->writeEndElement();`
`97`	`98`	`}`
`98`	`99`
`99`		`-void XmlReport::Read()`
	`100`	`+QList<ErrorLine> XmlReport::Read()`
`100`	`101`	`{`
	`102`	`+ QList<ErrorLine> errors;`
`101`	`103`	`bool insideResults = false;`
`102`	`104`	`if (!mXmlReader)`
`103`	`105`	`{`
`104`	`106`	`qDebug() << "You must Open() the file before reading it!";`
`105`		`- return;`
	`107`	`+ return errors;`
`106`	`108`	`}`
`107`	`109`	`while (!mXmlReader->atEnd())`
`108`	`110`	`{`
`@@ -114,7 +116,10 @@ void XmlReport::Read()`
`114`	`116`
`115`	`117`	`// Read error element from inside result element`
`116`	`118`	`if (insideResults && mXmlReader->name() == ErrorElementName)`
`117`		`- ReadError(mXmlReader);`
	`119`	`+ {`
	`120`	`+ ErrorLine line = ReadError(mXmlReader);`
	`121`	`+ errors.append(line);`
	`122`	`+ }`
`118`	`123`	`break;`
`119`	`124`
`120`	`125`	`case QXmlStreamReader::EndElement:`
`@@ -135,18 +140,20 @@ void XmlReport::Read()`
`135`	`140`	`break;`
`136`	`141`	`}`
`137`	`142`	`}`
	`143`	`+ return errors;`
`138`	`144`	`}`
`139`	`145`
`140`		`-void XmlReport::ReadError(QXmlStreamReader *reader)`
	`146`	`+ErrorLine XmlReport::ReadError(QXmlStreamReader *reader)`
`141`	`147`	`{`
	`148`	`+ ErrorLine line;`
`142`	`149`	`if (reader->name().toString() == ErrorElementName)`
`143`	`150`	`{`
`144`	`151`	`QXmlStreamAttributes attribs = reader->attributes();`
`145`		`- QString filename = attribs.value("", FilenameAttribute).toString();`
`146`		`- QString line = attribs.value("", LineAttribute).toString();`
`147`		`- QString id = attribs.value("", IdAttribute).toString();`
`148`		`- QString severity = attribs.value("", SeverityAttribute).toString();`
`149`		`- QString msg = attribs.value("", MsgAttribute).toString();`
`150`		`- qDebug() << "Error: " << filename << " " << line << " " << id << " " << severity << " " << msg;`
	`152`	`+ line.file = attribs.value("", FilenameAttribute).toString();`
	`153`	`+ line.line = attribs.value("", LineAttribute).toString();`
	`154`	`+ line.id = attribs.value("", IdAttribute).toString();`
	`155`	`+ line.severity = attribs.value("", SeverityAttribute).toString();`
	`156`	`+ line.msg = attribs.value("", MsgAttribute).toString();`
`151`	`157`	`}`
	`158`	`+ return line;`
`152`	`159`	`}`