ctkXnatScanResourceFile and ctkXnatReconstructionResourceFile unified to a single ctkXnatFile class

Libs/XNAT/Core/CMakeLists.txt

@@ -11,17 +11,16 @@ set(KIT_SRCS
   ctkXnatConnectionFactory.cpp
   ctkXnatException.cpp
   ctkXnatExperiment.cpp
+  ctkXnatFile.cpp
   ctkXnatObject.cpp
   ctkXnatObjectPrivate.cpp
   ctkXnatProject.cpp
   ctkXnatScan.cpp
   ctkXnatScanFolder.cpp
   ctkXnatScanResource.cpp
-  ctkXnatScanResourceFile.cpp
   ctkXnatReconstruction.cpp
   ctkXnatReconstructionFolder.cpp
   ctkXnatReconstructionResource.cpp
-  ctkXnatReconstructionResourceFile.cpp
   ctkXnatServer.cpp
   ctkXnatSettings.cpp
   ctkXnatSubject.cpp

Libs/XNAT/Core/ctkXnatConnection.cpp

@@ -23,17 +23,16 @@
 
 #include "ctkXnatException.h"
 #include "ctkXnatExperiment.h"
+#include "ctkXnatFile.h"
 #include "ctkXnatObject.h"
 #include "ctkXnatObjectPrivate.h"
 #include "ctkXnatProject.h"
 #include "ctkXnatReconstruction.h"
 #include "ctkXnatReconstructionFolder.h"
 #include "ctkXnatReconstructionResource.h"
-#include "ctkXnatReconstructionResourceFile.h"
 #include "ctkXnatScan.h"
 #include "ctkXnatScanFolder.h"
 #include "ctkXnatScanResource.h"
-#include "ctkXnatScanResourceFile.h"
 #include "ctkXnatServer.h"
 #include "ctkXnatSubject.h"
 
@@ -332,25 +331,25 @@ void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatScanResource>& scanRes
   QUuid queryId = d->xnat->get(scanResourceFilesUri);
   qRestResult* restResult = d->xnat->takeResult(queryId);
   
-  QList<ctkXnatScanResourceFile*> scanResourceFiles = restResult->results<ctkXnatScanResourceFile>();
+  QList<ctkXnatFile*> files = restResult->results<ctkXnatFile>();
 
-  foreach (ctkXnatScanResourceFile* scanResourceFile, scanResourceFiles)
+  foreach (ctkXnatFile* file, files)
   {
-    QString uri = scanResourceFile->property("URI");
+    QString uri = file->property("URI");
     if (uri.size())
     {
-      scanResourceFile->setUri(uri);
+      file->setUri(uri);
     }
 
-    QString label = scanResourceFile->property("Name");
+    QString label = file->property("Name");
     if (label.size())
     {
-      scanResourceFile->setProperty("ID", label);
+      file->setProperty("ID", label);
     }
 
-    scanResourceFile->setUri(scanResourceFilesUri + "/" + label);
+    file->setUri(scanResourceFilesUri + "/" + label);
 
-    ctkXnatObject::Pointer ptr(scanResourceFile);
+    ctkXnatObject::Pointer ptr(file);
     ptr->d_func()->selfPtr = ptr;
     scanResource->addChild(ptr);
   }
@@ -413,25 +412,25 @@ void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatReconstructionResource
   QUuid queryId = d->xnat->get(reconstructionResourceFilesUri);
   qRestResult* restResult = d->xnat->takeResult(queryId);
 
-  QList<ctkXnatReconstructionResourceFile*> reconstructionResourceFiles = restResult->results<ctkXnatReconstructionResourceFile>();
+  QList<ctkXnatFile*> files = restResult->results<ctkXnatFile>();
 
-  foreach (ctkXnatReconstructionResourceFile* reconstructionResourceFile, reconstructionResourceFiles)
+  foreach (ctkXnatFile* file, files)
   {
-    QString uri = reconstructionResourceFile->property("URI");
+    QString uri = file->property("URI");
     if (uri.size())
     {
-      reconstructionResourceFile->setUri(uri);
+      file->setUri(uri);
     }
 
-    QString label = reconstructionResourceFile->property("Name");
+    QString label = file->property("Name");
     if (label.size())
     {
-      reconstructionResourceFile->setProperty("ID", label);
+      file->setProperty("ID", label);
     }
 
-    reconstructionResourceFile->setUri(reconstructionResourceFilesUri + "/" + label);
+    file->setUri(reconstructionResourceFilesUri + "/" + label);
 
-    ctkXnatObject::Pointer ptr(reconstructionResourceFile);
+    ctkXnatObject::Pointer ptr(file);
     ptr->d_func()->selfPtr = ptr;
     reconstructionResource->addChild(ptr);
   }
@@ -650,10 +649,10 @@ void ctkXnatConnection::download(ctkXnatScanResource* scanResource, const QStrin
   d->xnat->sync(queryId);
 }
 
-void ctkXnatConnection::download(ctkXnatScanResourceFile* scanResourceFile, const QString& fileName)
+void ctkXnatConnection::download(ctkXnatFile* file, const QString& fileName)
 {
   Q_D(ctkXnatConnection);
-  QString query = scanResourceFile->uri();
+  QString query = file->uri();
 
   QUuid queryId = d->xnat->download(fileName, query);
   d->xnat->sync(queryId);
@@ -670,15 +669,6 @@ void ctkXnatConnection::download(ctkXnatReconstructionResource* reconstructionRe
   d->xnat->sync(queryId);
 }
 
-void ctkXnatConnection::download(ctkXnatReconstructionResourceFile* reconstructionResourceFile, const QString& fileName)
-{
-  Q_D(ctkXnatConnection);
-  QString query = reconstructionResourceFile->uri();
-
-  QUuid queryId = d->xnat->download(fileName, query);
-  d->xnat->sync(queryId);
-}
-
 void ctkXnatConnection::processResult(QUuid queryId, QList<QVariantMap> parameters)
 {
   Q_UNUSED(queryId)

Libs/XNAT/Core/ctkXnatConnection.h

@@ -35,17 +35,16 @@
 class ctkXnatConnectionPrivate;
 
 class ctkXnatExperiment;
+class ctkXnatFile;
 class ctkXnatObject;
 class ctkXnatProject;
 class ctkXnatReconstruction;
 class ctkXnatReconstructionFolder;
 class ctkXnatReconstructionResource;
-class ctkXnatReconstructionResourceFile;
 class ctkXnatRoot;
 class ctkXnatScan;
 class ctkXnatScanFolder;
 class ctkXnatScanResource;
-class ctkXnatScanResourceFile;
 class ctkXnatServer;
 class ctkXnatSubject;
 
@@ -89,6 +88,8 @@ public:
 
   void remove(ctkXnatObject* object);
 
+  void download(ctkXnatFile* file, const QString& fileName);
+
   /* void downloadScanFiles(ctkXnatExperiment* experiment, const QString& zipFileName); */
   /* void downloadReconstructionFiles(ctkXnatExperiment* experiment, const QString& zipFileName); */
   /* void addReconstruction(ctkXnatExperiment* experiment, const QString& categoryEntry); */
@@ -96,9 +97,7 @@ public:
   /* void download(ctkXnatScan* scan, const QString& zipFileName); */
 
   void download(ctkXnatScanResource* scanResource, const QString& zipFileName);
-  void download(ctkXnatScanResourceFile* scanResourceFile, const QString& fileName);
   void download(ctkXnatReconstructionResource* reconstructionResource, const QString& zipFileName);
-  void download(ctkXnatReconstructionResourceFile* reconstructionResourceFile, const QString& fileName);
 
   /* void downloadReconstruction(ctkXnatReconstruction* reconstruction, const QString& zipFilename); */
   /* void addReconstructionResource(ctkXnatReconstruction* reconstruction, const QString& resource); */

Libs/XNAT/Core/ctkXnatScanResourceFile.cpp

@@ -19,17 +19,17 @@
 
 =============================================================================*/
 
-#include "ctkXnatScanResourceFile.h"
+#include "ctkXnatFile.h"
 
 #include "ctkXnatConnection.h"
 #include "ctkXnatObjectPrivate.h"
 
 
-class ctkXnatScanResourceFilePrivate : public ctkXnatObjectPrivate
+class ctkXnatFilePrivate : public ctkXnatObjectPrivate
 {
 public:
 
-  ctkXnatScanResourceFilePrivate()
+  ctkXnatFilePrivate()
   : ctkXnatObjectPrivate()
   {
   }
@@ -42,49 +42,49 @@ public:
 //  QString uri;
 };
 
-ctkXnatScanResourceFile::ctkXnatScanResourceFile()
-: ctkXnatObject(*new ctkXnatScanResourceFilePrivate())
+ctkXnatFile::ctkXnatFile()
+: ctkXnatObject(*new ctkXnatFilePrivate())
 {
 }
 
-ctkXnatScanResourceFile::Pointer ctkXnatScanResourceFile::Create()
+ctkXnatFile::Pointer ctkXnatFile::Create()
 {
-  Pointer ptr(new ctkXnatScanResourceFile());
+  Pointer ptr(new ctkXnatFile());
   ptr->d_func()->selfPtr = ptr;
   return ptr;
 }
 
-ctkXnatScanResourceFile::~ctkXnatScanResourceFile()
+ctkXnatFile::~ctkXnatFile()
 {
 }
 
-//const QString& ctkXnatScanResourceFile::uri() const
+//const QString& ctkXnatFile::uri() const
 //{
-//  Q_D(const ctkXnatScanResourceFile);
+//  Q_D(const ctkXnatFile);
 //  return d->uri;
 //}
 
-//void ctkXnatScanResourceFile::setUri(const QString& uri)
+//void ctkXnatFile::setUri(const QString& uri)
 //{
-//  Q_D(ctkXnatScanResourceFile);
+//  Q_D(ctkXnatFile);
 //  d->uri = uri;
 //}
 
-void ctkXnatScanResourceFile::download(const QString& filename)
+void ctkXnatFile::download(const QString& filename)
 {
   this->connection()->download(this, filename);
 }
 
-void ctkXnatScanResourceFile::upload(const QString& /*filename*/)
+void ctkXnatFile::upload(const QString& /*filename*/)
 {
 }
 
 
-void ctkXnatScanResourceFile::reset()
+void ctkXnatFile::reset()
 {
   ctkXnatObject::reset();
 }
 
-void ctkXnatScanResourceFile::fetchImpl()
+void ctkXnatFile::fetchImpl()
 {
 }

Libs/XNAT/Core/ctkXnatScanResourceFile.h

@@ -19,26 +19,26 @@
 
 =============================================================================*/
 
-#ifndef ctkXnatScanResourceFile_h
-#define ctkXnatScanResourceFile_h
+#ifndef ctkXnatFile_h
+#define ctkXnatFile_h
 
 #include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
 class ctkXnatConnection;
-class ctkXnatScanResourceFilePrivate;
+class ctkXnatFilePrivate;
 
-class CTK_XNAT_CORE_EXPORT ctkXnatScanResourceFile : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatFile : public ctkXnatObject
 {
 
 public:
 
-  typedef QSharedPointer<ctkXnatScanResourceFile> Pointer;
-  typedef QWeakPointer<ctkXnatScanResourceFile> WeakPointer;
+  typedef QSharedPointer<ctkXnatFile> Pointer;
+  typedef QWeakPointer<ctkXnatFile> WeakPointer;
   
   static Pointer Create();
-  virtual ~ctkXnatScanResourceFile();
+  virtual ~ctkXnatFile();
   
 //  const QString& uri() const;
 //  void setUri(const QString& uri);
@@ -51,11 +51,11 @@ public:
 private:
   
   friend class qRestResult;
-  explicit ctkXnatScanResourceFile();
+  explicit ctkXnatFile();
   virtual void fetchImpl();
   
-  Q_DECLARE_PRIVATE(ctkXnatScanResourceFile);
-  Q_DISABLE_COPY(ctkXnatScanResourceFile);
+  Q_DECLARE_PRIVATE(ctkXnatFile);
+  Q_DISABLE_COPY(ctkXnatFile);
 };
 
 #endif

Libs/XNAT/Core/ctkXnatReconstructionResource.cpp

@@ -22,7 +22,6 @@
 #include "ctkXnatReconstructionResource.h"
 
 #include "ctkXnatConnection.h"
-#include "ctkXnatReconstructionResourceFile.h"
 #include "ctkXnatObjectPrivate.h"
 
 class ctkXnatReconstructionResourcePrivate : public ctkXnatObjectPrivate

Libs/XNAT/Core/ctkXnatReconstructionResourceFile.cpp

@@ -1,91 +0,0 @@
-/*=============================================================================
-
-  Plugin: org.commontk.xnat
-
-  Copyright (c) University College London,
-    Centre for Medical Image Computing
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-#include "ctkXnatReconstructionResourceFile.h"
-
-#include "ctkXnatConnection.h"
-#include "ctkXnatObjectPrivate.h"
-
-
-class ctkXnatReconstructionResourceFilePrivate : public ctkXnatObjectPrivate
-{
-public:
-
-  ctkXnatReconstructionResourceFilePrivate()
-  : ctkXnatObjectPrivate()
-  {
-  }
-
-  void reset()
-  {
-//    uri.clear();
-  }
-  
-//  QString uri;
-};
-
-ctkXnatReconstructionResourceFile::ctkXnatReconstructionResourceFile()
-: ctkXnatObject(*new ctkXnatReconstructionResourceFilePrivate())
-{
-}
-
-ctkXnatReconstructionResourceFile::Pointer ctkXnatReconstructionResourceFile::Create()
-{
-  Pointer ptr(new ctkXnatReconstructionResourceFile());
-  ptr->d_func()->selfPtr = ptr;
-  return ptr;
-}
-
-ctkXnatReconstructionResourceFile::~ctkXnatReconstructionResourceFile()
-{
-}
-
-//const QString& ctkXnatReconstructionResourceFile::uri() const
-//{
-//  Q_D(const ctkXnatReconstructionResourceFile);
-//  return d->uri;
-//}
-
-//void ctkXnatReconstructionResourceFile::setUri(const QString& uri)
-//{
-//  Q_D(ctkXnatReconstructionResourceFile);
-//  d->uri = uri;
-//}
-
-void ctkXnatReconstructionResourceFile::download(const QString& fileName)
-{
-  this->connection()->download(this, fileName);
-}
-
-void ctkXnatReconstructionResourceFile::upload(const QString& /*fileName*/)
-{
-}
-
-
-void ctkXnatReconstructionResourceFile::reset()
-{
-  ctkXnatObject::reset();
-}
-
-void ctkXnatReconstructionResourceFile::fetchImpl()
-{
-
-}

Libs/XNAT/Core/ctkXnatReconstructionResourceFile.h

@@ -1,61 +0,0 @@
-/*=============================================================================
-
-  Plugin: org.commontk.xnat
-
-  Copyright (c) University College London,
-    Centre for Medical Image Computing
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-#ifndef ctkXnatReconstructionResourceFile_h
-#define ctkXnatReconstructionResourceFile_h
-
-#include "ctkXNATCoreExport.h"
-
-#include "ctkXnatObject.h"
-
-class ctkXnatConnection;
-class ctkXnatReconstructionResourceFilePrivate;
-
-class CTK_XNAT_CORE_EXPORT ctkXnatReconstructionResourceFile : public ctkXnatObject
-{
-
-public:
-
-  typedef QSharedPointer<ctkXnatReconstructionResourceFile> Pointer;
-  typedef QWeakPointer<ctkXnatReconstructionResourceFile> WeakPointer;
-  
-  static Pointer Create();
-  virtual ~ctkXnatReconstructionResourceFile();
-  
-//  const QString& uri() const;
-//  void setUri(const QString& uri);
-
-  void download(const QString& filename);
-  void upload(const QString& filename);
-
-  void reset();
-  
-private:
-  
-  friend class qRestResult;
-  explicit ctkXnatReconstructionResourceFile();
-  virtual void fetchImpl();
-  
-  Q_DECLARE_PRIVATE(ctkXnatReconstructionResourceFile);
-  Q_DISABLE_COPY(ctkXnatReconstructionResourceFile);
-};
-
-#endif

Libs/XNAT/Core/ctkXnatScanResource.cpp

@@ -22,7 +22,6 @@
 #include "ctkXnatScanResource.h"
 
 #include "ctkXnatConnection.h"
-#include "ctkXnatScanResourceFile.h"
 #include "ctkXnatObjectPrivate.h"
 
 class ctkXnatScanResourcePrivate : public ctkXnatObjectPrivate