diff --git a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.cpp b/Modules/XNATUI/Qmitk/QmitkXnatExperimentInfoWidget.cpp similarity index 53% copy from Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.cpp copy to Modules/XNATUI/Qmitk/QmitkXnatExperimentInfoWidget.cpp index b884f743d2..039926cb5a 100644 --- a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.cpp +++ b/Modules/XNATUI/Qmitk/QmitkXnatExperimentInfoWidget.cpp @@ -1,42 +1,41 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ -#include "QmitkXnatProjectInfoWidget.h" +#include "QmitkXnatExperimentInfoWidget.h" -#include +#include -QmitkXnatProjectInfoWidget::QmitkXnatProjectInfoWidget(QWidget* parent, ctkXnatProject* project) +QmitkXnatExperimentInfoWidget::QmitkXnatExperimentInfoWidget(ctkXnatExperiment* experiment, QWidget* parent) : QWidget(parent) - , m_Project(project) + , m_Experiment(experiment) { // Create GUI widgets from the Qt Designer's .ui file - m_Controls.setupUi(parent); + m_Controls.setupUi(this); } -QmitkXnatProjectInfoWidget::~QmitkXnatProjectInfoWidget() +QmitkXnatExperimentInfoWidget::~QmitkXnatExperimentInfoWidget() { - delete m_Project; } -void QmitkXnatProjectInfoWidget::SetProject(ctkXnatProject* project) +void QmitkXnatExperimentInfoWidget::SetExperiment(ctkXnatExperiment* experiment) { - m_Project = project; + m_Experiment = experiment; } -ctkXnatProject* QmitkXnatProjectInfoWidget::GetProject() const +ctkXnatExperiment* QmitkXnatExperimentInfoWidget::GetExperiment() const { - return m_Project; + return m_Experiment; } diff --git a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.h b/Modules/XNATUI/Qmitk/QmitkXnatExperimentInfoWidget.h similarity index 52% copy from Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.h copy to Modules/XNATUI/Qmitk/QmitkXnatExperimentInfoWidget.h index 33ad7240d1..f7294e136e 100644 --- a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.h +++ b/Modules/XNATUI/Qmitk/QmitkXnatExperimentInfoWidget.h @@ -1,48 +1,48 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ -#ifndef QMITKXNATPROJECTINFOWIDGET_H -#define QMITKXNATPROJECTINFOWIDGET_H +#ifndef QMITKXNATEXPERIMENTINFOWIDGET_H +#define QMITKXNATEXPERIMENTINFOWIDGET_H // XNATUI -#include "ui_QmitkXnatProjectInfoWidgetControls.h" +#include "ui_QmitkXnatExperimentInfoWidgetControls.h" #include "MitkXNATUIExports.h" // Qt #include // CTK XNAT Core -class ctkXnatProject; +class ctkXnatExperiment; -class MITKXNATUI_EXPORT QmitkXnatProjectInfoWidget : public QWidget +class MITKXNATUI_EXPORT QmitkXnatExperimentInfoWidget : public QWidget { Q_OBJECT public: - QmitkXnatProjectInfoWidget(QWidget* parent = 0, ctkXnatProject* project = 0); - ~QmitkXnatProjectInfoWidget(); + QmitkXnatExperimentInfoWidget(ctkXnatExperiment* experiment = 0, QWidget* parent = 0); + ~QmitkXnatExperimentInfoWidget(); - void SetProject(ctkXnatProject* project); - ctkXnatProject* GetProject() const; + void SetExperiment(ctkXnatExperiment* experiment); + ctkXnatExperiment* GetExperiment() const; protected: - Ui::QmitkXnatProjectInfoWidgetControls m_Controls; + Ui::QmitkXnatExperimentInfoWidgetControls m_Controls; private: - ctkXnatProject* m_Project; + ctkXnatExperiment* m_Experiment; }; -#endif // QMITKXNATPROJECTINFOWIDGET_H +#endif // QMITKXNATEXPERIMENTINFOWIDGET_H diff --git a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidgetControls.ui b/Modules/XNATUI/Qmitk/QmitkXnatExperimentInfoWidgetControls.ui similarity index 60% copy from Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidgetControls.ui copy to Modules/XNATUI/Qmitk/QmitkXnatExperimentInfoWidgetControls.ui index b5434c82af..32eb56ba88 100644 --- a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidgetControls.ui +++ b/Modules/XNATUI/Qmitk/QmitkXnatExperimentInfoWidgetControls.ui @@ -1,93 +1,97 @@ - QmitkXnatProjectInfoWidgetControls - + QmitkXnatExperimentInfoWidgetControls + true 0 0 350 - 150 + 107 Qmitk Template - - - - Qt::Vertical - - - - 20 - 40 - - - - - - + + - + - Description: + Time: - + - ID: + Date: - - + + - + - Keywords: + Scanner: - + - PI: + Acquisition Site: - - + + - - + + + + + + + 75 + false + true + + + + Experiment Information + + + Qt::AlignCenter + + + diff --git a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.cpp b/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.cpp index b884f743d2..72ea87cf1c 100644 --- a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.cpp +++ b/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.cpp @@ -1,42 +1,44 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "QmitkXnatProjectInfoWidget.h" #include -QmitkXnatProjectInfoWidget::QmitkXnatProjectInfoWidget(QWidget* parent, ctkXnatProject* project) - : QWidget(parent) - , m_Project(project) +QmitkXnatProjectInfoWidget::QmitkXnatProjectInfoWidget(ctkXnatProject* project, QWidget* parent) + : m_Project(project) + , QWidget(parent) { // Create GUI widgets from the Qt Designer's .ui file - m_Controls.setupUi(parent); + m_Controls.setupUi(this); + + // Set the UI labels + m_Controls.idLabel->setText(m_Project->property("ID")); + m_Controls.descriptionLabel->setText(m_Project->property("description")); + if (!m_Project->property("pi_lastname").isEmpty()) + { + m_Controls.piLabel->setText(m_Project->property("pi_lastname") + ", " + m_Project->property("pi_firstname")); + } } QmitkXnatProjectInfoWidget::~QmitkXnatProjectInfoWidget() { - delete m_Project; -} - -void QmitkXnatProjectInfoWidget::SetProject(ctkXnatProject* project) -{ - m_Project = project; } ctkXnatProject* QmitkXnatProjectInfoWidget::GetProject() const { return m_Project; } diff --git a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.h b/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.h index 33ad7240d1..05aa9687df 100644 --- a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.h +++ b/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.h @@ -1,48 +1,47 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef QMITKXNATPROJECTINFOWIDGET_H #define QMITKXNATPROJECTINFOWIDGET_H // XNATUI #include "ui_QmitkXnatProjectInfoWidgetControls.h" #include "MitkXNATUIExports.h" // Qt #include // CTK XNAT Core class ctkXnatProject; class MITKXNATUI_EXPORT QmitkXnatProjectInfoWidget : public QWidget { Q_OBJECT public: - QmitkXnatProjectInfoWidget(QWidget* parent = 0, ctkXnatProject* project = 0); + QmitkXnatProjectInfoWidget(ctkXnatProject* project, QWidget* parent = 0); ~QmitkXnatProjectInfoWidget(); - void SetProject(ctkXnatProject* project); ctkXnatProject* GetProject() const; protected: Ui::QmitkXnatProjectInfoWidgetControls m_Controls; private: ctkXnatProject* m_Project; }; #endif // QMITKXNATPROJECTINFOWIDGET_H diff --git a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidgetControls.ui b/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidgetControls.ui index b5434c82af..9d7b6d3521 100644 --- a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidgetControls.ui +++ b/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidgetControls.ui @@ -1,93 +1,82 @@ QmitkXnatProjectInfoWidgetControls true 0 0 350 - 150 + 88 Qmitk Template - - - - Qt::Vertical - - - - 20 - 40 - - - - - + - + Description: - + ID: - + - - - - Keywords: - - - PI: - - + + - - + + + + + 75 + true + + - + Project Information + + + Qt::AlignCenter diff --git a/Modules/XNATUI/Qmitk/QmitkXnatSubjectInfoWidget.cpp b/Modules/XNATUI/Qmitk/QmitkXnatSubjectInfoWidget.cpp new file mode 100644 index 0000000000..8551b8868e --- /dev/null +++ b/Modules/XNATUI/Qmitk/QmitkXnatSubjectInfoWidget.cpp @@ -0,0 +1,48 @@ +/*=================================================================== + +The Medical Imaging Interaction Toolkit (MITK) + +Copyright (c) German Cancer Research Center, +Division of Medical and Biological Informatics. +All rights reserved. + +This software is distributed WITHOUT ANY WARRANTY; without +even the implied warranty of MERCHANTABILITY or FITNESS FOR +A PARTICULAR PURPOSE. + +See LICENSE.txt or http://www.mitk.org for details. + +===================================================================*/ + +#include "QmitkXnatSubjectInfoWidget.h" + +#include +#include + +QmitkXnatSubjectInfoWidget::QmitkXnatSubjectInfoWidget(ctkXnatSubject* subject, QWidget* parent) + : m_Subject(subject) + , QWidget(parent) +{ + // Create GUI widgets from the Qt Designer's .ui file + m_Controls.setupUi(this); + + // Set the UI labels + for (int i = 0; i < m_Subject->properties().count(); i++) + { + std::cout << "KEY: " << m_Subject->properties().keys().at(i).toStdString() << " --- " << "VALUE: " << m_Subject->properties().values().at(i).toStdString() << "\n"; + } +} + +QmitkXnatSubjectInfoWidget::~QmitkXnatSubjectInfoWidget() +{ +} + +void QmitkXnatSubjectInfoWidget::SetSubject(ctkXnatSubject* subject) +{ + m_Subject = subject; +} + +ctkXnatSubject* QmitkXnatSubjectInfoWidget::GetSubject() const +{ + return m_Subject; +} diff --git a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.h b/Modules/XNATUI/Qmitk/QmitkXnatSubjectInfoWidget.h similarity index 54% copy from Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.h copy to Modules/XNATUI/Qmitk/QmitkXnatSubjectInfoWidget.h index 33ad7240d1..805888b4c2 100644 --- a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidget.h +++ b/Modules/XNATUI/Qmitk/QmitkXnatSubjectInfoWidget.h @@ -1,48 +1,48 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ -#ifndef QMITKXNATPROJECTINFOWIDGET_H -#define QMITKXNATPROJECTINFOWIDGET_H +#ifndef QMITKXNATSUBJECTINFOWIDGET_H +#define QMITKXNATSUBJECTINFOWIDGET_H // XNATUI -#include "ui_QmitkXnatProjectInfoWidgetControls.h" +#include "ui_QmitkXnatSubjectInfoWidgetControls.h" #include "MitkXNATUIExports.h" // Qt #include // CTK XNAT Core -class ctkXnatProject; +class ctkXnatSubject; -class MITKXNATUI_EXPORT QmitkXnatProjectInfoWidget : public QWidget +class MITKXNATUI_EXPORT QmitkXnatSubjectInfoWidget : public QWidget { Q_OBJECT public: - QmitkXnatProjectInfoWidget(QWidget* parent = 0, ctkXnatProject* project = 0); - ~QmitkXnatProjectInfoWidget(); + QmitkXnatSubjectInfoWidget(ctkXnatSubject* subject, QWidget* parent = 0); + ~QmitkXnatSubjectInfoWidget(); - void SetProject(ctkXnatProject* project); - ctkXnatProject* GetProject() const; + void SetSubject(ctkXnatSubject* subject); + ctkXnatSubject* GetSubject() const; protected: - Ui::QmitkXnatProjectInfoWidgetControls m_Controls; + Ui::QmitkXnatSubjectInfoWidgetControls m_Controls; private: - ctkXnatProject* m_Project; + ctkXnatSubject* m_Subject; }; -#endif // QMITKXNATPROJECTINFOWIDGET_H +#endif // QMITKXNATSUBJECTINFOWIDGET_H diff --git a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidgetControls.ui b/Modules/XNATUI/Qmitk/QmitkXnatSubjectInfoWidgetControls.ui similarity index 53% copy from Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidgetControls.ui copy to Modules/XNATUI/Qmitk/QmitkXnatSubjectInfoWidgetControls.ui index b5434c82af..78db5d5064 100644 --- a/Modules/XNATUI/Qmitk/QmitkXnatProjectInfoWidgetControls.ui +++ b/Modules/XNATUI/Qmitk/QmitkXnatSubjectInfoWidgetControls.ui @@ -1,93 +1,110 @@ - QmitkXnatProjectInfoWidgetControls - + QmitkXnatSubjectInfoWidgetControls + true 0 0 350 - 150 + 126 Qmitk Template - - - - Qt::Vertical - - - - 20 - 40 - - - - - - + + - + - Description: + Gender: - + - ID: + Birthyear: - - + + - + - Keywords: + Handedness: - + - PI: + Heigth (inches): - - + + - - + + + + + + Weight (lbs) + + + + + + + + + + + + + + + 75 + true + + + + Subject Information + + + Qt::AlignCenter + + + diff --git a/Modules/XNATUI/files.cmake b/Modules/XNATUI/files.cmake index 14995a7fbc..538165d622 100644 --- a/Modules/XNATUI/files.cmake +++ b/Modules/XNATUI/files.cmake @@ -1,11 +1,17 @@ set( CPP_FILES Qmitk/QmitkXnatProjectInfoWidget.cpp +Qmitk/QmitkXnatSubjectInfoWidget.cpp +Qmitk/QmitkXnatExperimentInfoWidget.cpp ) set(MOC_H_FILES Qmitk/QmitkXnatProjectInfoWidget.h +Qmitk/QmitkXnatSubjectInfoWidget.h +Qmitk/QmitkXnatExperimentInfoWidget.h ) set(UI_FILES Qmitk/QmitkXnatProjectInfoWidgetControls.ui +Qmitk/QmitkXnatSubjectInfoWidgetControls.ui +Qmitk/QmitkXnatExperimentInfoWidgetControls.ui ) diff --git a/Plugins/org.mitk.gui.qt.xnat/CMakeLists.txt b/Plugins/org.mitk.gui.qt.xnat/CMakeLists.txt index 8a4a4fa2db..b221c1d9cb 100644 --- a/Plugins/org.mitk.gui.qt.xnat/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.xnat/CMakeLists.txt @@ -1,8 +1,8 @@ project(org_mitk_gui_qt_xnat) mitk_create_plugin( PACKAGE_DEPENDS Poco|Zip - MODULE_DEPENDS MitkXNAT + MODULE_DEPENDS MitkXNAT MitkXNATUI EXPORT_DIRECTIVE XNAT_EXPORT EXPORTED_INCLUDE_SUFFIXES src ) diff --git a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.cpp b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.cpp index e53676181a..eef0543255 100644 --- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.cpp +++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.cpp @@ -1,280 +1,277 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "QmitkXnatConnectionPreferencePage.h" #include "org_mitk_gui_qt_xnatinterface_Activator.h" #include "berryIPreferencesService.h" #include "berryPlatform.h" #include #include #include #include #include #include #include #include "ctkXnatSession.h" #include "ctkXnatLoginProfile.h" #include "ctkXnatException.h" #include using namespace berry; QmitkXnatConnectionPreferencePage::QmitkXnatConnectionPreferencePage() : m_Control(0) { - } -void QmitkXnatConnectionPreferencePage::Init(berry::IWorkbench::Pointer ) +void QmitkXnatConnectionPreferencePage::Init(berry::IWorkbench::Pointer) { - } void QmitkXnatConnectionPreferencePage::CreateQtControl(QWidget* parent) { IPreferencesService* prefService = Platform::GetPreferencesService(); berry::IPreferences::Pointer _XnatConnectionPreferencesNode = prefService->GetSystemPreferences()->Node("/XnatConnection"); m_XnatConnectionPreferencesNode = _XnatConnectionPreferencesNode; m_Controls.setupUi(parent); m_Control = new QWidget(parent); m_Control->setLayout(m_Controls.gridLayout); ctkXnatSession* session; try { session = mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetService( mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetServiceReference()); } - catch(std::invalid_argument) + catch (std::invalid_argument) { session = 0; } - if(session != 0) + if (session != 0) { - if(session->isOpen()) + if (session->isOpen()) { m_Controls.testConnectionButton->setText("Disconnect"); } else { m_Controls.testConnectionButton->setText("Connect"); } } const QIntValidator *portV = new QIntValidator(0, 65535, parent); m_Controls.inPort->setValidator(portV); const QRegExp hostRx("^(https?)://[^ /](\\S)+$"); const QRegExpValidator *hostV = new QRegExpValidator(hostRx, parent); m_Controls.inHostAddress->setValidator(hostV); - connect( m_Controls.testConnectionButton, SIGNAL(clicked()), this, SLOT(ToggleConnection()) ); + connect(m_Controls.testConnectionButton, SIGNAL(clicked()), this, SLOT(ToggleConnection())); connect(m_Controls.inHostAddress, SIGNAL(editingFinished()), this, SLOT(UrlChanged())); connect(m_Controls.inDownloadPath, SIGNAL(editingFinished()), this, SLOT(DownloadPathChanged())); this->Update(); } QWidget* QmitkXnatConnectionPreferencePage::GetQtControl() const { return m_Control; } bool QmitkXnatConnectionPreferencePage::PerformOk() { - if(!UserInformationEmpty()) + if (!UserInformationEmpty()) { IPreferences::Pointer _XnatConnectionPreferencesNode = m_XnatConnectionPreferencesNode.Lock(); - if(_XnatConnectionPreferencesNode.IsNotNull()) + if (_XnatConnectionPreferencesNode.IsNotNull()) { _XnatConnectionPreferencesNode->Put(m_Controls.hostAddressLabel->text(), m_Controls.inHostAddress->text()); _XnatConnectionPreferencesNode->Put(m_Controls.portLabel->text(), m_Controls.inPort->text()); _XnatConnectionPreferencesNode->Put(m_Controls.usernameLabel->text(), m_Controls.inUsername->text()); _XnatConnectionPreferencesNode->Put(m_Controls.passwortLabel->text(), m_Controls.inPassword->text()); _XnatConnectionPreferencesNode->Put(m_Controls.downloadPathLabel->text(), m_Controls.inDownloadPath->text()); _XnatConnectionPreferencesNode->Flush(); return true; } } else { QMessageBox::critical(QApplication::activeWindow(), "Saving Preferences failed", "The connection parameters in XNAT Preferences were empty.\nPlease use the 'Connect' button to validate the connection parameters."); } return false; } void QmitkXnatConnectionPreferencePage::PerformCancel() { - } bool QmitkXnatConnectionPreferencePage::UserInformationEmpty() { // To check empty QLineEdits in the following QString errString; - if(m_Controls.inHostAddress->text().isEmpty()) + if (m_Controls.inHostAddress->text().isEmpty()) { errString += "Server Address is empty.\n"; } - if(m_Controls.inUsername->text().isEmpty()) + if (m_Controls.inUsername->text().isEmpty()) { errString += "Username is empty.\n"; } - if(m_Controls.inPassword->text().isEmpty()) + if (m_Controls.inPassword->text().isEmpty()) { errString += "Password is empty.\n"; } // if something is empty - if(!errString.isEmpty()) + if (!errString.isEmpty()) { m_Controls.testConnectionLabel->setStyleSheet("QLabel { color: red; }"); m_Controls.testConnectionLabel->setText("Connecting failed.\n" + errString); return true; } else { return false; } } void QmitkXnatConnectionPreferencePage::Update() { IPreferences::Pointer _XnatConnectionPreferencesNode = m_XnatConnectionPreferencesNode.Lock(); - if(_XnatConnectionPreferencesNode.IsNotNull()) + if (_XnatConnectionPreferencesNode.IsNotNull()) { m_Controls.inHostAddress->setText(_XnatConnectionPreferencesNode->Get( m_Controls.hostAddressLabel->text(), m_Controls.inHostAddress->text())); m_Controls.inPort->setText(_XnatConnectionPreferencesNode->Get( m_Controls.portLabel->text(), m_Controls.inPort->text())); m_Controls.inUsername->setText(_XnatConnectionPreferencesNode->Get( m_Controls.usernameLabel->text(), m_Controls.inUsername->text())); m_Controls.inPassword->setText(_XnatConnectionPreferencesNode->Get( m_Controls.passwortLabel->text(), m_Controls.inPassword->text())); m_Controls.inDownloadPath->setText(_XnatConnectionPreferencesNode->Get( m_Controls.downloadPathLabel->text(), m_Controls.inDownloadPath->text())); } } void QmitkXnatConnectionPreferencePage::UrlChanged() { m_Controls.inHostAddress->setStyleSheet("QLineEdit { background-color: white; }"); QString str = m_Controls.inHostAddress->text(); - while(str.endsWith("/")) + while (str.endsWith("/")) { - str = str.left(str.length()-1); + str = str.left(str.length() - 1); } m_Controls.inHostAddress->setText(str); QUrl url(m_Controls.inHostAddress->text()); - if(!url.isValid()) + if (!url.isValid()) { m_Controls.inHostAddress->setStyleSheet("QLineEdit { background-color: red; }"); } } void QmitkXnatConnectionPreferencePage::DownloadPathChanged() { m_Controls.inDownloadPath->setStyleSheet("QLineEdit { background-color: white; }"); QString downloadPath = m_Controls.inDownloadPath->text(); - if(!downloadPath.isEmpty()) + if (!downloadPath.isEmpty()) { - if (downloadPath.lastIndexOf("/") != downloadPath.size()-1) + if (downloadPath.lastIndexOf("/") != downloadPath.size() - 1) { downloadPath.append("/"); m_Controls.inDownloadPath->setText(downloadPath); } QFileInfo path(m_Controls.inDownloadPath->text()); - if(!path.isDir()) + if (!path.isDir()) { m_Controls.inDownloadPath->setStyleSheet("QLineEdit { background-color: red; }"); } } } void QmitkXnatConnectionPreferencePage::ToggleConnection() { ctkXnatSession* session = 0; try { session = mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetService( mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetServiceReference()); } - catch(std::invalid_argument) + catch (std::invalid_argument) { - if(!UserInformationEmpty()) + if (!UserInformationEmpty()) { PerformOk(); mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatSessionManager()->CreateXnatSession(); session = mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetService( mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetServiceReference()); } } - if(session != 0 && session->isOpen()) + if (session != 0 && session->isOpen()) { mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatSessionManager()->CloseXnatSession(); m_Controls.testConnectionButton->setText("Connect"); m_Controls.testConnectionLabel->clear(); } - else if(session != 0 && !session->isOpen()) + else if (session != 0 && !session->isOpen()) { m_Controls.testConnectionButton->setEnabled(false); try { mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatSessionManager()->OpenXnatSession(); m_Controls.testConnectionButton->setText("Disconnect"); m_Controls.testConnectionLabel->setStyleSheet("QLabel { color: green; }"); m_Controls.testConnectionLabel->setText("Connecting successful."); } - catch(const ctkXnatAuthenticationException& auth) + catch (const ctkXnatAuthenticationException& auth) { m_Controls.testConnectionLabel->setStyleSheet("QLabel { color: red; }"); m_Controls.testConnectionLabel->setText("Connecting failed:\nAuthentication error."); MITK_INFO << auth.message().toStdString(); mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatSessionManager()->CloseXnatSession(); } - catch(const ctkException& e) + catch (const ctkException& e) { m_Controls.testConnectionLabel->setStyleSheet("QLabel { color: red; }"); m_Controls.testConnectionLabel->setText("Connecting failed:\nInvalid Server Adress"); MITK_INFO << e.message().toStdString(); mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatSessionManager()->CloseXnatSession(); } m_Controls.testConnectionButton->setEnabled(true); } } diff --git a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp index 4b0d7cfba1..2e36acdbaa 100644 --- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp +++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp @@ -1,325 +1,369 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "QmitkXnatTreeBrowserView.h" // Qmitk #include "QmitkXnatObjectEditorInput.h" #include "QmitkXnatEditor.h" #include "org_mitk_gui_qt_xnatinterface_Activator.h" // Blueberry #include #include // CTK XNAT Core -#include "ctkXnatFile.h" +#include +#include +#include +#include + +// MITK XNAT UI +#include +#include +#include // Qt #include #include #include #include // MITK #include #include // Poco #include const std::string QmitkXnatTreeBrowserView::VIEW_ID = "org.mitk.views.xnat.treebrowser"; QmitkXnatTreeBrowserView::QmitkXnatTreeBrowserView() : m_TreeModel(new ctkXnatTreeModel()), m_Tracker(0), m_DownloadPath(berry::Platform::GetPreferencesService()->GetSystemPreferences()->Node("/XnatConnection")->Get("Download Path", "")), m_DataStorageServiceTracker(mitk::org_mitk_gui_qt_xnatinterface_Activator::GetContext()) { m_DataStorageServiceTracker.open(); // Set DownloadPath if (m_DownloadPath.isEmpty()) { QString xnatFolder = "XNAT_DOWNLOADS"; QDir dir(mitk::org_mitk_gui_qt_xnatinterface_Activator::GetContext()->getDataFile("").absoluteFilePath()); dir.mkdir(xnatFolder); dir.setPath(dir.path() + "/" + xnatFolder); m_DownloadPath = dir.path() + "/"; } } QmitkXnatTreeBrowserView::~QmitkXnatTreeBrowserView() { + m_DataStorageServiceTracker.close(); delete m_TreeModel; delete m_Tracker; } void QmitkXnatTreeBrowserView::SetFocus() { } void QmitkXnatTreeBrowserView::CreateQtPartControl(QWidget *parent) { // Create GUI widgets from the Qt Designer's .ui file m_Controls.setupUi(parent); m_Controls.treeView->setModel(m_TreeModel); m_Controls.treeView->header()->hide(); m_Controls.labelError->setText("Please use the 'Connect' button in the Preferences."); m_Controls.labelError->setStyleSheet("QLabel { color: red; }"); m_SelectionProvider = new berry::QtSelectionProvider(); this->SetSelectionProvider(); m_Controls.treeView->setSelectionMode(QAbstractItemView::SingleSelection); m_Controls.treeView->setContextMenuPolicy(Qt::CustomContextMenu); m_Tracker = new mitk::XnatSessionTracker(mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()); m_NodeMenu = new QMenu(m_Controls.treeView); + connect(m_Controls.treeView, SIGNAL(clicked(const QModelIndex&)), SLOT(itemSelected(const QModelIndex&))); connect(m_Controls.treeView, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(NodeTableViewContextMenuRequested(const QPoint&))); connect(m_Tracker, SIGNAL(AboutToBeClosed(ctkXnatSession*)), this, SLOT(CleanTreeModel(ctkXnatSession*))); connect(m_Tracker, SIGNAL(Opened(ctkXnatSession*)), this, SLOT(UpdateSession(ctkXnatSession*))); m_Tracker->Open(); ctkXnatSession* session; try { session = mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetService( mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetServiceReference()); } catch (std::invalid_argument) { session = 0; } if (session != 0) { m_Controls.labelError->setVisible(false); } else { m_Controls.labelError->setVisible(true); } connect(m_Controls.treeView, SIGNAL(activated(const QModelIndex&)), this, SLOT(OnActivatedNode(const QModelIndex&))); } void QmitkXnatTreeBrowserView::OnActivatedNode(const QModelIndex& index) { if (!index.isValid()) return; berry::IWorkbenchPage::Pointer page = GetSite()->GetPage(); QmitkXnatObjectEditorInput::Pointer oPtr(new QmitkXnatObjectEditorInput(index.data(Qt::UserRole).value())); berry::IEditorInput::Pointer editorInput(oPtr); berry::IEditorPart::Pointer reuseEditor = page->FindEditor(editorInput); if (reuseEditor) { // Just set it activ page->Activate(reuseEditor); } else { QList editors = page->FindEditors(berry::IEditorInput::Pointer(0), QmitkXnatEditor::EDITOR_ID, berry::IWorkbenchPage::MATCH_ID); if (editors.isEmpty()) { ctkXnatFile* file = dynamic_cast(oPtr->GetXnatObject()); if (file != NULL) { // If the selected node is a file, so show it in MITK InternalFileDownload(index, true); } else { // No XnatEditor is currently open, create a new one page->OpenEditor(editorInput, QmitkXnatEditor::EDITOR_ID); } } else { // Reuse an existing editor reuseEditor = editors.front()->GetEditor(true); page->ReuseEditor(reuseEditor.Cast(), editorInput); page->Activate(reuseEditor); } } } void QmitkXnatTreeBrowserView::SetSelectionProvider() { GetSite()->SetSelectionProvider(m_SelectionProvider); } void QmitkXnatTreeBrowserView::UpdateSession(ctkXnatSession* session) { if (session != 0 && session->isOpen()) { m_Controls.labelError->setVisible(false); // Fill model and show in the GUI m_TreeModel->addDataModel(session->dataModel()); m_Controls.treeView->reset(); m_SelectionProvider->SetItemSelectionModel(m_Controls.treeView->selectionModel()); } } void QmitkXnatTreeBrowserView::CleanTreeModel(ctkXnatSession* session) { if (session != 0) { m_TreeModel->removeDataModel(session->dataModel()); m_Controls.treeView->reset(); } } void QmitkXnatTreeBrowserView::InternalFileDownload(const QModelIndex& index, bool loadData) { QVariant variant = m_TreeModel->data(index, Qt::UserRole); if (variant.isValid()) { ctkXnatFile* file = dynamic_cast(variant.value()); if (file != NULL) { QDir downDir(m_DownloadPath); QString filePath = m_DownloadPath + file->name(); // Testing if the file exists already if (downDir.exists(file->name())) { MITK_INFO << "File '" << file->name().toStdString() << "' already exists!"; } else { if (file->property("collection") == QString("DICOM")) { ctkXnatObject* parent = file->parent(); filePath = m_DownloadPath + parent->property("label") + ".zip"; parent->download(filePath); std::ifstream in(filePath.toStdString().c_str(), std::ios::binary); poco_assert(in); // decompress to XNAT_DOWNLOAD dir Poco::Zip::Decompress dec(in, Poco::Path(m_DownloadPath.toStdString())); dec.decompressAllFiles(); in.close(); QFile::remove(filePath); } else { MITK_INFO << "Download started ..."; MITK_INFO << "..."; file->download(filePath); // Testing if the file exists now if (downDir.exists(file->name())) { MITK_INFO << "Download of " << file->name().toStdString() << " was completed!"; } else { MITK_INFO << "Download of " << file->name().toStdString() << " failed!"; } } } if (downDir.exists(file->name()) || file->property("collection") == "DICOM") { if (loadData) { if (file->property("collection") == "DICOM") { // Search for the downloaded file an its file path QDirIterator it(m_DownloadPath, QStringList() << file->name(), QDir::Files, QDirIterator::Subdirectories); while (it.hasNext()) { it.next(); filePath = it.filePath(); } } if (filePath.isEmpty()) { MITK_INFO << "Decompressing failed!"; return; } else if (!QFile(filePath).exists()) { MITK_INFO << "Decompressing failed!"; return; } mitk::IDataStorageService* dsService = m_DataStorageServiceTracker.getService(); mitk::DataStorage::Pointer dataStorage = dsService->GetDataStorage()->GetDataStorage(); QStringList list; list << filePath; try { QmitkIOUtil::Load(list, *dataStorage); } catch (const mitk::Exception& e) { MITK_INFO << e; return; } mitk::RenderingManager::GetInstance()->InitializeViewsByBoundingObjects( dsService->GetDataStorage()->GetDataStorage()); } } } else { MITK_INFO << "Selection was not a file!"; } } } void QmitkXnatTreeBrowserView::OnContextMenuDownloadFile() { QModelIndex index = m_Controls.treeView->currentIndex(); InternalFileDownload(index, false); } void QmitkXnatTreeBrowserView::OnContextMenuDownloadAndOpenFile() { QModelIndex index = m_Controls.treeView->currentIndex(); InternalFileDownload(index, true); } void QmitkXnatTreeBrowserView::NodeTableViewContextMenuRequested(const QPoint & pos) { m_NodeMenu->clear(); QModelIndex index = m_Controls.treeView->indexAt(pos); QVariant variant = m_TreeModel->data(index, Qt::UserRole); if (variant.isValid()) { ctkXnatFile* file = dynamic_cast(variant.value()); if (file != NULL) { QAction* actShow = new QAction("Download and Open", m_NodeMenu); QAction* actDownload = new QAction("Download", m_NodeMenu); m_NodeMenu->addAction(actShow); m_NodeMenu->addAction(actDownload); connect(actShow, SIGNAL(triggered()), this, SLOT(OnContextMenuDownloadAndOpenFile())); connect(actDownload, SIGNAL(triggered()), this, SLOT(OnContextMenuDownloadFile())); m_NodeMenu->popup(QCursor::pos()); } } } + +void QmitkXnatTreeBrowserView::itemSelected(const QModelIndex& index) +{ + QLayout* layout = m_Controls.infoVerticalLayout; + QLayoutItem *child; + while ((child = layout->takeAt(0)) != 0) { + delete child->widget(); + } + + QVariant variant = m_TreeModel->data(index, Qt::UserRole); + if (variant.isValid()) + { + ctkXnatObject* object = variant.value(); + ctkXnatProject* project = dynamic_cast(object); + ctkXnatSubject* subject = dynamic_cast(object); + ctkXnatExperiment* experiment = dynamic_cast(object); + + if (project != NULL) + { + QmitkXnatProjectInfoWidget* widget = new QmitkXnatProjectInfoWidget(project); + layout->addWidget(widget); + } + else if (subject != NULL) + { + QmitkXnatSubjectInfoWidget* widget = new QmitkXnatSubjectInfoWidget(subject); + layout->addWidget(widget); + } + else if (experiment != NULL) + { + QmitkXnatExperimentInfoWidget* widget = new QmitkXnatExperimentInfoWidget(experiment); + layout->addWidget(widget); + } + } +} diff --git a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h index 93b72ad1f7..5c44a77dbc 100644 --- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h +++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h @@ -1,99 +1,100 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef QMITKXNATTREEBROWSERVIEW_H #define QMITKXNATTREEBROWSERVIEW_H #include #include #include "ui_QmitkXnatTreeBrowserViewControls.h" // ctkXnatCore #include "ctkXnatSession.h" // ctkXnatWidget #include "ctkXnatTreeModel.h" // MitkXNAT Module #include "mitkXnatSessionTracker.h" #include #include class QMenu; /*! \brief QmitkXnatTreeBrowserView \warning This class is not yet documented. Use "git blame" and ask the author to provide basic documentation. \sa QmitkFunctionality \ingroup ${plugin_target}_internal */ class QmitkXnatTreeBrowserView : public QmitkAbstractView { // this is needed for all Qt objects that should have a Qt meta-object // (everything that derives from QObject and wants to have signal/slots) Q_OBJECT public: QmitkXnatTreeBrowserView(); ~QmitkXnatTreeBrowserView(); static const std::string VIEW_ID; virtual void CreateQtPartControl(QWidget *parent); protected slots: /// \brief Opens or reuses the xnat editor with the activated node as root item. void OnActivatedNode(const QModelIndex& index); /// \brief Updates the ctkXnatSession and the user interface void UpdateSession(ctkXnatSession* session); /// \brief Cleans the tree model void CleanTreeModel(ctkXnatSession* session); + void itemSelected(const QModelIndex& index); void NodeTableViewContextMenuRequested(const QPoint & pos); void OnContextMenuDownloadAndOpenFile(); void OnContextMenuDownloadFile(); protected: virtual void SetFocus(); Ui::QmitkXnatTreeBrowserViewControls m_Controls; private: void InternalFileDownload(const QModelIndex& index, bool loadData); berry::QtSelectionProvider::Pointer m_SelectionProvider; void SetSelectionProvider(); ctkServiceTracker m_DataStorageServiceTracker; ctkXnatTreeModel* m_TreeModel; mitk::XnatSessionTracker* m_Tracker; QString m_DownloadPath; QMenu* m_NodeMenu; }; #endif // QMITKXNATTREEBROWSERVIEW_H diff --git a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserViewControls.ui b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserViewControls.ui index 326b50c01a..a8e0c93d34 100644 --- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserViewControls.ui +++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserViewControls.ui @@ -1,54 +1,66 @@ QmitkXnatTreeBrowserViewControls 0 0 455 975 0 0 QmitkTemplate - + + 0 + + + 0 + + + 0 + + 0 Qt::AlignCenter 5 0 - - - - + + + + + + 6 +