Schema type stored in ctkXnatObject

Libs/XNAT/Core/ctkXnatExperiment.cpp

@@ -42,8 +42,8 @@ public:
 };
 
 
-ctkXnatExperiment::ctkXnatExperiment()
-: ctkXnatObject(*new ctkXnatExperimentPrivate())
+ctkXnatExperiment::ctkXnatExperiment(const QString& schemaType)
+: ctkXnatObject(*new ctkXnatExperimentPrivate(), schemaType)
 {
 }
 

Libs/XNAT/Core/ctkXnatExperiment.h

@@ -48,7 +48,9 @@ public:
 private:
   
   friend class qRestResult;
-  explicit ctkXnatExperiment();
+
+  explicit ctkXnatExperiment(const QString& schemaType = "xnat:experimentData");
+
   virtual void fetchImpl();
   
   Q_DECLARE_PRIVATE(ctkXnatExperiment);

Libs/XNAT/Core/ctkXnatObject.cpp

@@ -29,17 +29,21 @@
 #include <QVariant>
 
 
-ctkXnatObject::ctkXnatObject(ctkXnatObjectPrivate& d)
-: d_ptr(&d)
+ctkXnatObject::ctkXnatObject(const QString& schemaType)
+: d_ptr(new ctkXnatObjectPrivate())
 {
+  Q_D(ctkXnatObject);
+  d->schemaType = schemaType;
 }
 
-
-ctkXnatObject::ctkXnatObject()
-: d_ptr(new ctkXnatObjectPrivate())
+ctkXnatObject::ctkXnatObject(ctkXnatObjectPrivate& dd, const QString& schemaType)
+: d_ptr(&dd)
 {
+  Q_D(ctkXnatObject);
+  d->schemaType = schemaType;
 }
 
+
 ctkXnatObject::~ctkXnatObject()
 {
 }
@@ -64,16 +68,10 @@ void ctkXnatObject::setUri(const QString& uri)
   setProperty("URI", uri);
 }
 
-QString ctkXnatObject::xsiType() const
+QString ctkXnatObject::schemaType() const
 {
   Q_D(const ctkXnatObject);
-  return d->xsiType;
-}
-
-void ctkXnatObject::setXsiType(const QString& xsiType)
-{
-  Q_D(ctkXnatObject);
-  d->xsiType = xsiType;
+  return d->schemaType;
 }
 
 QString ctkXnatObject::name() const

Libs/XNAT/Core/ctkXnatObject.h

@@ -56,7 +56,7 @@ public:
   QString uri() const;
 
   /// Gets the XML Schema type of the object.
-  QString xsiType() const;
+  QString schemaType() const;
 
   /// Gets the name of the object.
   QString name() const;
@@ -109,10 +109,10 @@ public:
 protected:
 
   /// Constructs the ctkXnatObject.
-  ctkXnatObject();
+  ctkXnatObject(const QString& schemaType = QString());
 
   /// Constructs the ctkXnatObject with the given private part.
-  ctkXnatObject(ctkXnatObjectPrivate& dd);
+  ctkXnatObject(ctkXnatObjectPrivate& dd, const QString& schemaType = QString());
 
   /// Gets the object that represents the connection to the XNAT server
   /// that stores the current object.
@@ -125,9 +125,6 @@ protected:
   /// the REST API.
   void setUri(const QString& uri);
 
-  /// Sets the XML Schema type of the object.
-  void setXsiType(const QString& xsiType);
-
   /// Sets the name of the object.
   void setName(const QString& name);
 

Libs/XNAT/Core/ctkXnatObjectPrivate.h

@@ -46,7 +46,7 @@ private:
 
   friend class ctkXnatObject;
 
-  QString xsiType;
+  QString schemaType;
 
   QMap<QString,QString> properties;
 

Libs/XNAT/Core/ctkXnatProject.cpp

@@ -47,8 +47,8 @@ public:
 //  QString uri;
 };
 
-ctkXnatProject::ctkXnatProject()
-: ctkXnatObject(*new ctkXnatProjectPrivate())
+ctkXnatProject::ctkXnatProject(const QString& schemaType)
+: ctkXnatObject(*new ctkXnatProjectPrivate(), schemaType)
 {
 }
 

Libs/XNAT/Core/ctkXnatProject.h

@@ -59,7 +59,7 @@ private:
 
   friend class qRestResult;
 
-  explicit ctkXnatProject();
+  explicit ctkXnatProject(const QString& schemaType = "xnat:projectData");
 
   virtual void fetchImpl();
 

Libs/XNAT/Core/ctkXnatReconstruction.cpp

@@ -42,8 +42,8 @@ public:
 };
 
 
-ctkXnatReconstruction::ctkXnatReconstruction()
-: ctkXnatObject(*new ctkXnatReconstructionPrivate())
+ctkXnatReconstruction::ctkXnatReconstruction(const QString& schemaType)
+: ctkXnatObject(*new ctkXnatReconstructionPrivate(), schemaType)
 {
 }
 

Libs/XNAT/Core/ctkXnatReconstruction.h

@@ -48,7 +48,7 @@ public:
 private:
   
   friend class qRestResult;
-  explicit ctkXnatReconstruction();
+  explicit ctkXnatReconstruction(const QString& schemaType = "xnat:reconstructedImageData");
   virtual void fetchImpl();
   
   Q_DECLARE_PRIVATE(ctkXnatReconstruction);

Libs/XNAT/Core/ctkXnatScan.cpp

@@ -42,8 +42,8 @@ public:
 };
 
 
-ctkXnatScan::ctkXnatScan()
-: ctkXnatObject(*new ctkXnatScanPrivate())
+ctkXnatScan::ctkXnatScan(const QString& schemaType)
+: ctkXnatObject(*new ctkXnatScanPrivate(), schemaType)
 {
 }
 

Libs/XNAT/Core/ctkXnatScan.h

@@ -48,7 +48,7 @@ public:
 private:
   
   friend class qRestResult;
-  explicit ctkXnatScan();
+  explicit ctkXnatScan(const QString& schemaType = "xnat:imageScanData");
   virtual void fetchImpl();
   
   Q_DECLARE_PRIVATE(ctkXnatScan);

Libs/XNAT/Core/ctkXnatSubject.cpp

@@ -50,8 +50,8 @@ public:
   QList<ctkXnatProject::WeakPointer> projects;
 };
 
-ctkXnatSubject::ctkXnatSubject()
-: ctkXnatObject(*new ctkXnatSubjectPrivate())
+ctkXnatSubject::ctkXnatSubject(const QString& schemaType)
+: ctkXnatObject(*new ctkXnatSubjectPrivate(), schemaType)
 {
 }
 

Libs/XNAT/Core/ctkXnatSubject.h

@@ -59,7 +59,7 @@ private:
 
   friend class qRestResult;
 
-  explicit ctkXnatSubject();
+  explicit ctkXnatSubject(const QString& schemaType = "xnat:subjectData");
 
   virtual void fetchImpl();