Use constants for accessing the properties of an xnat object

Libs/XNAT/Core/ctkXnatAssessorFolder.cpp

@@ -21,11 +21,12 @@
 
 #include "ctkXnatAssessorFolder.h"
 
-#include "ctkXnatSession.h"
-#include "ctkXnatExperiment.h"
-#include "ctkXnatObjectPrivate.h"
 #include "ctkXnatAssessor.h"
+#include "ctkXnatConstants.h"
 #include "ctkXnatDefaultSchemaTypes.h"
+#include "ctkXnatExperiment.h"
+#include "ctkXnatObjectPrivate.h"
+#include "ctkXnatSession.h"
 
 //----------------------------------------------------------------------------
 class ctkXnatAssessorFolderPrivate : public ctkXnatObjectPrivate
@@ -48,8 +49,8 @@ ctkXnatAssessorFolder::ctkXnatAssessorFolder(ctkXnatObject* parent)
   : ctkXnatObject(*new ctkXnatAssessorFolderPrivate(), parent, QString::null)
 {
   
-  this->setProperty("ID", "assessors");
-  this->setProperty("label", "Assessments");
+  this->setProperty(ctkXnatObjectFields::ID, "assessors");
+  this->setProperty(ctkXnatObjectFields::LABEL, "Assessments");
 }
 
 //----------------------------------------------------------------------------

Libs/XNAT/Core/ctkXnatExperiment.cpp

@@ -143,5 +143,4 @@ void ctkXnatExperiment::fetchImpl()
   }
 
   this->fetchResources();
-
 }

Libs/XNAT/Core/ctkXnatListModel.cpp

@@ -20,12 +20,14 @@
 =============================================================================*/
 
 #include "ctkXnatDataModel.h"
+
+#include "ctkXnatConstants.h"
+#include "ctkXnatExperiment.h"
 #include "ctkXnatListModel.h"
 #include "ctkXnatProject.h"
-#include "ctkXnatSubject.h"
-#include "ctkXnatExperiment.h"
-#include "ctkXnatScanFolder.h"
 #include "ctkXnatScan.h"
+#include "ctkXnatScanFolder.h"
+#include "ctkXnatSubject.h"
 
 #include <iostream>
 #include <typeinfo>
@@ -69,7 +71,7 @@ QVariant ctkXnatListModel::data(const QModelIndex& index, int role) const
     QString displayData = child->name();
     if (displayData.isEmpty())
     {
-      displayData = child->property("label");
+      displayData = child->property(ctkXnatObjectFields::LABEL);
     }
     return displayData;
   }

Libs/XNAT/Core/ctkXnatReconstruction.cpp

@@ -21,10 +21,11 @@
 
 #include "ctkXnatReconstruction.h"
 
-#include "ctkXnatSession.h"
+#include "ctkXnatConstants.h"
+#include "ctkXnatDefaultSchemaTypes.h"
 #include "ctkXnatObjectPrivate.h"
 #include "ctkXnatReconstructionFolder.h"
-#include "ctkXnatDefaultSchemaTypes.h"
+#include "ctkXnatSession.h"
 
 
 //----------------------------------------------------------------------------
@@ -81,10 +82,10 @@ void ctkXnatReconstruction::fetchImpl()
 
   foreach (ctkXnatObject* reconstructionResource, reconstructionResources)
   {
-    QString label = reconstructionResource->property("name");
+    QString label = reconstructionResource->property(ctkXnatObjectFields::NAME);
     if (!label.isEmpty())
     {
-      reconstructionResource->setProperty("id", label);
+      reconstructionResource->setProperty(ctkXnatObjectFields::ID, label);
     }
 
     this->add(reconstructionResource);

Libs/XNAT/Core/ctkXnatReconstructionFolder.cpp

@@ -21,11 +21,12 @@
 
 #include "ctkXnatReconstructionFolder.h"
 
-#include "ctkXnatSession.h"
+#include "ctkXnatConstants.h"
+#include "ctkXnatDefaultSchemaTypes.h"
 #include "ctkXnatExperiment.h"
 #include "ctkXnatObjectPrivate.h"
 #include "ctkXnatReconstruction.h"
-#include "ctkXnatDefaultSchemaTypes.h"
+#include "ctkXnatSession.h"
 
 
 //----------------------------------------------------------------------------
@@ -51,7 +52,7 @@ public:
 ctkXnatReconstructionFolder::ctkXnatReconstructionFolder(ctkXnatObject* parent)
   : ctkXnatObject(*new ctkXnatReconstructionFolderPrivate(), parent, QString::null)
 {
-  this->setProperty("id", "reconstructions");
+  this->setProperty(ctkXnatObjectFields::ID, "reconstructions");
 }
 
 //----------------------------------------------------------------------------

Libs/XNAT/Core/ctkXnatResource.cpp

@@ -21,8 +21,9 @@
 
 #include "ctkXnatResource.h"
 
-#include "ctkXnatSession.h"
+#include "ctkXnatConstants.h"
 #include "ctkXnatObjectPrivate.h"
+#include "ctkXnatSession.h"
 
 //----------------------------------------------------------------------------
 class ctkXnatResourcePrivate : public ctkXnatObjectPrivate
@@ -51,7 +52,7 @@ ctkXnatResource::~ctkXnatResource()
 //----------------------------------------------------------------------------
 QString ctkXnatResource::resourceUri() const
 {
-  return QString("%1/resources/%2").arg(parent()->resourceUri(), this->property("label"));
+  return QString("%1/resources/%2").arg(parent()->resourceUri(), this->property(ctkXnatObjectFields::LABEL));
 }
 
 //----------------------------------------------------------------------------
@@ -72,12 +73,12 @@ void ctkXnatResource::fetchImpl()
 
   foreach (ctkXnatObject* file, files)
   {
-    QString label = file->property("name");
+    QString label = file->property(ctkXnatObjectFields::NAME);
     if (label.isEmpty())
     {
       label = "NO NAME";
     }
-    file->setProperty("label", label);
+    file->setProperty(ctkXnatObjectFields::LABEL, label);
     this->add(file);
   }
 }

Libs/XNAT/Core/ctkXnatScanFolder.cpp

@@ -21,11 +21,12 @@
 
 #include "ctkXnatScanFolder.h"
 
-#include "ctkXnatSession.h"
+#include "ctkXnatConstants.h"
+#include "ctkXnatDefaultSchemaTypes.h"
 #include "ctkXnatExperiment.h"
 #include "ctkXnatObjectPrivate.h"
 #include "ctkXnatScan.h"
-#include "ctkXnatDefaultSchemaTypes.h"
+#include "ctkXnatSession.h"
 
 
 //----------------------------------------------------------------------------
@@ -51,8 +52,8 @@ public:
 ctkXnatScanFolder::ctkXnatScanFolder(ctkXnatObject* parent)
   : ctkXnatObject(*new ctkXnatScanFolderPrivate(), parent, QString::null)
 {
-  this->setProperty("id", "scans");
-  this->setProperty("label", "Scans");
+  this->setProperty(ctkXnatObjectFields::ID, "scans");
+  this->setProperty(ctkXnatObjectFields::LABEL, "Scans");
 }
 
 //----------------------------------------------------------------------------
@@ -84,10 +85,10 @@ void ctkXnatScanFolder::fetchImpl()
 
   foreach (ctkXnatObject* scan, scans)
   {
-    QString series_description = scan->property ("series_description");
-    QString label = scan->property ("label");
+    QString series_description = scan->property (ctkXnatObjectFields::SERIES_DESCRIPTION);
+    QString label = scan->property (ctkXnatObjectFields::LABEL);
     label = label.isEmpty() ? series_description : label;
-    scan->setProperty ("label", label);
+    scan->setProperty (ctkXnatObjectFields::LABEL, label);
     
     this->add(scan);
   }

Libs/XNAT/Core/ctkXnatSession.cpp

@@ -21,7 +21,10 @@
 
 #include "ctkXnatSession.h"
 
+#include "ctkXnatAssessor.h"
+#include "ctkXnatConstants.h"
 #include "ctkXnatDataModel.h"
+#include "ctkXnatDefaultSchemaTypes.h"
 #include "ctkXnatException.h"
 #include "ctkXnatExperiment.h"
 #include "ctkXnatFile.h"
@@ -31,9 +34,7 @@
 #include "ctkXnatReconstruction.h"
 #include "ctkXnatResource.h"
 #include "ctkXnatScan.h"
-#include "ctkXnatAssessor.h"
 #include "ctkXnatSubject.h"
-#include "ctkXnatDefaultSchemaTypes.h"
 
 #include <QDateTime>
 #include <QDebug>
@@ -286,7 +287,7 @@ QList<ctkXnatObject*> ctkXnatSessionPrivate::results(qRestResult* restResult, QS
       QString  str = it.key().toLatin1().data();
       QVariant var = it.value();
 
-      object->setProperty(str.toLower(), var);
+      object->setProperty(str, var);
       description.append (str + QString ("\t::\t") + var.toString() + "\n");
     }
 
@@ -365,7 +366,7 @@ void ctkXnatSession::open()
   }
 
   d->dataModel.reset(new ctkXnatDataModel(this));
-  d->dataModel->setProperty("label", this->url().toString());
+  d->dataModel->setProperty(ctkXnatObjectFields::LABEL, this->url().toString());
 }
 
 //----------------------------------------------------------------------------
@@ -566,7 +567,7 @@ void ctkXnatSession::save(ctkXnatObject* object)
   const QList<QVariantMap>& maps = result->results();
   if (maps.size() == 1 && maps[0].size() == 1)
   {
-    QVariant id = maps[0]["ID"];
+    QVariant id = maps[0][ctkXnatObjectFields::ID];
     if (!id.isNull())
     {
       object->setId(id.toString());

Libs/XNAT/Core/ctkXnatTreeModel.cpp

@@ -20,9 +20,11 @@
 =============================================================================*/
 
 #include "ctkXnatTreeModel.h"
+
+#include "ctkXnatConstants.h"
+#include "ctkXnatDataModel.h"
 #include "ctkXnatObject.h"
 #include "ctkXnatTreeItem_p.h"
-#include "ctkXnatDataModel.h"
 
 #include <QList>
 
@@ -76,7 +78,7 @@ QVariant ctkXnatTreeModel::data(const QModelIndex& index, int role) const
     QString displayData = xnatObject->name();
     if (displayData.isEmpty())
     {
-      displayData = xnatObject->property("label");
+      displayData = xnatObject->property(ctkXnatObjectFields::LABEL);
     }
     return displayData;
   }