Further cleanup

Libs/XNAT/Core/ctkXnatFile.cpp

@@ -21,12 +21,9 @@
 
 #include "ctkXnatFile.h"
 
-#include "ctkXnatException.h"
 #include "ctkXnatObjectPrivate.h"
 #include "ctkXnatSession.h"
 
-#include <QDebug>
-
 const QString ctkXnatFile::FILE_NAME = "Name";
 const QString ctkXnatFile::FILE_TAGS = "file_tags";
 const QString ctkXnatFile::FILE_FORMAT = "file_format";

Libs/XNAT/Core/ctkXnatObject.cpp

@@ -236,7 +236,6 @@ void ctkXnatObject::add(ctkXnatObject* child)
     {
       d->children.replace(d->children.indexOf(existingChild), child);
       childExists = true;
-      qWarning() << "ctkXnatObject::add(): Child already exists -> Replaced child!";
     }
   }
   if (!childExists)
@@ -383,7 +382,7 @@ void ctkXnatObject::saveImpl(bool /*overwrite*/)
     // If the object has been modified on the server, perform an update
     if (d->lastModifiedTime < remoteModTime)
     {
-      qDebug()<<"Object maybe overwritten on server!";
+      qWarning()<<"Uploaded object maybe overwritten on server!";
       // TODO update from server, since modification time is not really supported
       // by xnat right now this is not of high priority
       // something like this->updateImpl + setLastModifiedTime()

Libs/XNAT/Core/ctkXnatResource.cpp

@@ -27,8 +27,8 @@
 const QString ctkXnatResource::TAGS = "tags";
 const QString ctkXnatResource::FORMAT = "format";
 const QString ctkXnatResource::CONTENT = "content";
-
 const QString ctkXnatResource::ID = "xnat_abstractresource_id";
+
 //----------------------------------------------------------------------------
 class ctkXnatResourcePrivate : public ctkXnatObjectPrivate
 {

Libs/XNAT/Core/ctkXnatSession.cpp

@@ -63,7 +63,7 @@ public:
   QScopedPointer<ctkXnatAPI> xnat;
   QScopedPointer<ctkXnatDataModel> dataModel;
   QString sessionId;
-  QString defaultFilePath;
+  QString defaultDownloadDir;
 
   QMap<QString, QString> sessionProperties;
 
@@ -90,7 +90,7 @@ ctkXnatSessionPrivate::ctkXnatSessionPrivate(const ctkXnatLoginProfile& loginPro
                                              ctkXnatSession* q)
   : loginProfile(loginProfile)
   , xnat(new ctkXnatAPI())
-  , defaultFilePath("")
+  , defaultDownloadDir("")
   , q(q)
 {
   // TODO This is a workaround for connecting to sites with self-signed
@@ -478,27 +478,27 @@ QString ctkXnatSession::sessionId() const
 }
 
 //----------------------------------------------------------------------------
-void ctkXnatSession::setDefaultFilePath(const QString &path)
+void ctkXnatSession::setDefaultDownloadDir(const QString &path)
 {
   Q_D(ctkXnatSession);
 
   QDir directory(path);
   if (directory.exists() && path.size() != 0)
   {
-    d->defaultFilePath = path;
+    d->defaultDownloadDir = path;
   }
   else
   {
-    d->defaultFilePath = QDir::currentPath();
-    qWarning() << "Specified directory: ["<<path<<"] does not exists! Setting default filepath to :"<<d->defaultFilePath;
+    d->defaultDownloadDir = QDir::currentPath();
+    qWarning() << "Specified directory: ["<<path<<"] does not exists! Setting default filepath to :"<<d->defaultDownloadDir;
   }
 }
 
 //----------------------------------------------------------------------------
-QString ctkXnatSession::defaultFilePath() const
+QString ctkXnatSession::defaultDownloadDir() const
 {
   Q_D(const ctkXnatSession);
-  return d->defaultFilePath;
+  return d->defaultDownloadDir;
 }
 
 //----------------------------------------------------------------------------
@@ -639,13 +639,13 @@ void ctkXnatSession::upload(ctkXnatFile *xnatFile,
   // of the parent resource. Unfortunately for XNAT versions <= 1.6.4
   // this is the only way to get the file's MD5 hash form the server.
   QString md5Query = xnatFile->parent()->resourceUri();
-  QUuid md5ID = this->httpGet(md5Query);
-  QList<QVariantMap> result = this->httpSync(md5ID);
+  QUuid md5QueryID = this->httpGet(md5Query);
+  QList<QVariantMap> result = this->httpSync(md5QueryID);
 
   QString md5ChecksumRemote ("0");
   // Newly added files are usually at the end of the catalog
-  // and hence at the end of the result list. So iterating backwards
-  // is for performance reasons.
+  // and hence at the end of the result list.
+  // So iterating backward is for performance reasons.
   QList<QVariantMap>::const_iterator it = result.constEnd()-1;
   while (it != result.constBegin()-1)
   {
@@ -683,7 +683,6 @@ void ctkXnatSession::upload(ctkXnatFile *xnatFile,
   {
     qWarning()<<"Could not validate file upload! Remote MD5: "<<md5ChecksumRemote;
   }
-  // End file validation
 }
 
 //----------------------------------------------------------------------------

Libs/XNAT/Core/ctkXnatSession.h

@@ -147,23 +147,23 @@ public:
   QString sessionId() const;
 
   /**
-    * @brief Sets the default location where files will be save after being downloaded
+    * @brief Sets the default location where files will be saved after being downloaded
     *
     * Sets the default directory into which file downloads will be saved.
-    * By default this value is empty and files will be stored into the directory
-    * of the executable.
+    * By default this value is empty and files will be stored into the current
+    * working directory.
     * If the path does not exists a warning will be printed and the path will be
-    * set to the current working directory
+    * set to the current working directory.
     *
     * @param path the path to the download location
     */
-  void setDefaultFilePath(const QString& path);
+  void setDefaultDownloadDir(const QString& path);
 
   /**
     * @brief returns the default download location
     * @return the default download directory as string
     */
-  QString defaultFilePath() const;
+  QString defaultDownloadDir() const;
 
   ctkXnatDataModel* dataModel() const;
 
@@ -268,7 +268,7 @@ public:
    */
   Q_SIGNAL void sessionAboutToBeClosed();
 
-  Q_SIGNAL void uploadFinished();
+//  Q_SIGNAL void uploadFinished();
 
   Q_SIGNAL void progress(QUuid, double);
 

Libs/XNAT/Widgets/ctkXnatLoginDialog.cpp

@@ -212,7 +212,7 @@ void ctkXnatLoginDialog::accept()
     return;
     }
   d->Session = session.take();
-  d->Session->setDefaultFilePath(ui->edtDownloadDir->text());
+  d->Session->setDefaultDownloadDir(ui->edtDownloadDir->text());
 
   QDialog::accept();
 }