Changed the ctkXNATBrowser models to generic ctkXnatListModel.

Litte Changes to ctkXnatTreeModel.

Applications/ctkXNATBrowser/ctkXNATBrowserMainWindow.cpp

@@ -23,7 +23,7 @@
 #include "ui_ctkXNATBrowserMainWindow.h"
 
 #include "ctkXnatLoginDialog.h"
-#include "ctkXnatProjectListModel.h"
+#include "ctkXnatListModel.h"
 #include "ctkXnatSession.h"
 #include "ctkXnatDataModel.h"
 #include "ctkXnatProject.h"
@@ -34,8 +34,8 @@ ctkXNATBrowserMainWindow::ctkXNATBrowserMainWindow(QWidget *parent) :
   QMainWindow(parent),
   ui(new Ui::ctkXNATBrowserMainWindow),
   m_Session(0),
-  m_ProjectsModel(new ctkXnatProjectListModel()),
-  m_SubjectsModel(new ctkXnatProjectListModel())
+  m_ProjectsModel(new ctkXnatListModel()),
+  m_SubjectsModel(new ctkXnatListModel())
 {
   ui->setupUi(this);
 

Applications/ctkXNATBrowser/ctkXNATBrowserMainWindow.h

@@ -28,7 +28,7 @@ class QModelIndex;
 
 class ctkXnatSession;
 class ctkXnatSessionFactory;
-class ctkXnatProjectListModel;
+class ctkXnatListModel;
 class ctkXnatProject;
 
 namespace Ui {
@@ -54,8 +54,8 @@ private:
 
   ctkXnatSessionFactory* m_SessionFactory;
   ctkXnatSession* m_Session;
-  ctkXnatProjectListModel* m_ProjectsModel;
-  ctkXnatProjectListModel* m_SubjectsModel;
+  ctkXnatListModel* m_ProjectsModel;
+  ctkXnatListModel* m_SubjectsModel;
 };
 
 #endif // CTKXNATBROWSERMAINWINDOW_H

Libs/XNAT/Widgets/ctkXnatTreeModel.cpp

@@ -20,11 +20,8 @@
 =============================================================================*/
 
 #include "ctkXnatTreeModel.h"
-#include "ctkXnatObjectPrivate.h"
 #include "ctkXnatObject.h"
-#include "ctkXnatSubject.h"
 
-#include <QSharedPointer>
 #include <QList>
 
 ctkXnatTreeModel::ctkXnatTreeModel()
@@ -65,7 +62,7 @@ QVariant ctkXnatTreeModel::data(const QModelIndex& index, int role) const
   {
     return this->xnatObject(index)->description();
   }
-  else if (role == Qt::EditRole)
+  else if (role == Qt::UserRole)
   {
     return QVariant::fromValue<ctkXnatObject*>(this->xnatObject(index));
   }
@@ -153,7 +150,7 @@ bool ctkXnatTreeModel::hasChildren(const QModelIndex& index) const
   }
 
   ctkXnatTreeItem* item = this->itemAt(index);
-  return !item->xnatObject()->isFetched() || (item->childCount() > 0) || m_RootItem->child(0)->xnatObject()->children().count() > 0;
+  return !item->xnatObject()->isFetched() || !item->xnatObject()->children().isEmpty();
 }
 
 bool ctkXnatTreeModel::canFetchMore(const QModelIndex& index) const
@@ -177,10 +174,7 @@ void ctkXnatTreeModel::fetchMore(const QModelIndex& index)
 
   ctkXnatObject* xnatObject = item->xnatObject();
 
-  if ( !xnatObject->isFetched() )
-  {
-    xnatObject->fetch();
-  }
+  xnatObject->fetch();
 
   QList<ctkXnatObject*> children = xnatObject->children();
   if (!children.isEmpty())
@@ -271,12 +265,3 @@ void ctkXnatTreeModel::uploadFile(const QModelIndex& index, const QString& zipFi
 
   child->upload(zipFileName);
 }
-
-QVariant ctkXnatTreeModel::headerData(int /*section*/, Qt::Orientation /*orientation*/, int role) const
-{
-  if (role == Qt::DisplayRole)
-  {
-    if (!m_RootItem) return QString("Unavailable");
-  }
-  return QVariant();
-}

Libs/XNAT/Widgets/ctkXnatTreeModel.h

@@ -38,7 +38,6 @@ public:
   explicit ctkXnatTreeModel();
   virtual ~ctkXnatTreeModel();
 
-  QVariant headerData(int /*section*/, Qt::Orientation /*orientation*/, int role) const;
   virtual QVariant data(const QModelIndex& index, int role) const;
   virtual QModelIndex parent(const QModelIndex& child) const;
   virtual QModelIndex index(int row, int column, const QModelIndex& parent) const;