@@ -79,7 +79,7 @@ static QString getstr(const QDomElement element, const QString &tagName)
7979 return child.isNull () ? QString () : child.text ();
8080}
8181
82- bool ResultsModel::load (const QString &fileName)
82+ bool ResultsModel::load (const QString &fileName, const QString &projectPath )
8383{
8484 QFile file (fileName);
8585 if (!file.open (QIODevice::ReadOnly | QIODevice::Text))
@@ -107,13 +107,15 @@ bool ResultsModel::load(const QString &fileName)
107107 if (!rootNode)
108108 rootNode = new Node;
109109
110- new Node (rootNode,
111- getstr (element," file" ),
112- getstr (element," line" ),
113- getstr (element," severity" ),
114- getstr (element," text" ),
115- getstr (element," id" ),
116- getstr (element," triage" ));
110+ Node *node = new Node (rootNode,
111+ getstr (element," file" ),
112+ getstr (element," line" ),
113+ getstr (element," severity" ),
114+ getstr (element," text" ),
115+ getstr (element," id" ),
116+ getstr (element," triage" ));
117+ if (!node->filename .isEmpty ())
118+ node->fullfilename = projectPath + " /" + node->filename ;
117119 }
118120 }
119121
@@ -212,7 +214,7 @@ int ResultsModel::rowCount(const QModelIndex &parent) const
212214
213215int ResultsModel::columnCount (const QModelIndex & /* parent */ ) const
214216{
215- return 5 ;
217+ return 6 ;
216218}
217219
218220QModelIndex ResultsModel::parent (const QModelIndex &child) const
@@ -250,6 +252,13 @@ QVariant ResultsModel::data(const QModelIndex &index, int role) const
250252 return node->text ;
251253 case 4 :
252254 return node->id ;
255+ case 5 :
256+ if (node->triage == ResultsModel::Node::TRUE_POSITIVE )
257+ return " True positive" ;
258+ else if (node->triage == ResultsModel::Node::FALSE_POSITIVE )
259+ return " False positive" ;
260+ else
261+ return QVariant ();
253262 default :
254263 return QVariant ();
255264 }
@@ -269,6 +278,8 @@ QVariant ResultsModel::headerData(int section, Qt::Orientation orientation, int
269278 return tr (" Text" );
270279 case 4 :
271280 return tr (" Id" );
281+ case 5 :
282+ return tr (" Triage" );
272283 default :
273284 return QVariant ();
274285 }
0 commit comments