diff --git a/Modules/XNAT/src/QmitkXnatExperimentInfoWidget.cpp b/Modules/XNAT/src/QmitkXnatExperimentInfoWidget.cpp index 48fba39b8a..b56af509d9 100644 --- a/Modules/XNAT/src/QmitkXnatExperimentInfoWidget.cpp +++ b/Modules/XNAT/src/QmitkXnatExperimentInfoWidget.cpp @@ -1,47 +1,50 @@ /*=================================================================== 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 "QmitkXnatExperimentInfoWidget.h" #include QmitkXnatExperimentInfoWidget::QmitkXnatExperimentInfoWidget(ctkXnatExperiment* experiment, QWidget* parent) : QWidget(parent) , m_Experiment(experiment) { // Create GUI widgets from the Qt Designer's .ui file m_Controls.setupUi(this); // Set the UI labels + m_Controls.breadcrumbLabel->setText("Project:" + m_Experiment->parent()->parent()->property("name") + + " > Subject:" + m_Experiment->parent()->property("label")); + m_Controls.nameLabel->setText(m_Experiment->property("label")); m_Controls.modalityLabel->setText(m_Experiment->property("modality")); m_Controls.dateLabel->setText(m_Experiment->property("date")); m_Controls.timeLabel->setText(m_Experiment->property("time")); m_Controls.scannerLabel->setText(m_Experiment->property("scanner")); } QmitkXnatExperimentInfoWidget::~QmitkXnatExperimentInfoWidget() { } void QmitkXnatExperimentInfoWidget::SetExperiment(ctkXnatExperiment* experiment) { m_Experiment = experiment; } ctkXnatExperiment* QmitkXnatExperimentInfoWidget::GetExperiment() const { return m_Experiment; } diff --git a/Modules/XNAT/src/QmitkXnatExperimentInfoWidgetControls.ui b/Modules/XNAT/src/QmitkXnatExperimentInfoWidgetControls.ui index a66c097e16..4b9a6e4312 100644 --- a/Modules/XNAT/src/QmitkXnatExperimentInfoWidgetControls.ui +++ b/Modules/XNAT/src/QmitkXnatExperimentInfoWidgetControls.ui @@ -1,97 +1,123 @@ QmitkXnatExperimentInfoWidgetControls true 0 0 350 - 107 + 145 Qmitk Template - + - + Time: - + Date: - + - + Scanner: - + - + - + 75 false true Experiment Information Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - + Modality: + + + + Name: + + + + + + + + + + + + + + + true + + + + + + + diff --git a/Modules/XNAT/src/QmitkXnatProjectInfoWidget.cpp b/Modules/XNAT/src/QmitkXnatProjectInfoWidget.cpp index 72ea87cf1c..f010ee5230 100644 --- a/Modules/XNAT/src/QmitkXnatProjectInfoWidget.cpp +++ b/Modules/XNAT/src/QmitkXnatProjectInfoWidget.cpp @@ -1,44 +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(ctkXnatProject* project, QWidget* parent) : m_Project(project) , QWidget(parent) { // Create GUI widgets from the Qt Designer's .ui file m_Controls.setupUi(this); // Set the UI labels - m_Controls.idLabel->setText(m_Project->property("ID")); + m_Controls.idLabel->setText(m_Project->property("name")); 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() { } ctkXnatProject* QmitkXnatProjectInfoWidget::GetProject() const { return m_Project; } diff --git a/Modules/XNAT/src/QmitkXnatProjectInfoWidgetControls.ui b/Modules/XNAT/src/QmitkXnatProjectInfoWidgetControls.ui index 5121ae8e43..b288021548 100644 --- a/Modules/XNAT/src/QmitkXnatProjectInfoWidgetControls.ui +++ b/Modules/XNAT/src/QmitkXnatProjectInfoWidgetControls.ui @@ -1,82 +1,82 @@ QmitkXnatProjectInfoWidgetControls true 0 0 350 88 Qmitk Template Description: - ID: + Name: PI: 75 true Project Information Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter diff --git a/Modules/XNAT/src/QmitkXnatSubjectInfoWidget.cpp b/Modules/XNAT/src/QmitkXnatSubjectInfoWidget.cpp index b3045f881c..284773a517 100644 --- a/Modules/XNAT/src/QmitkXnatSubjectInfoWidget.cpp +++ b/Modules/XNAT/src/QmitkXnatSubjectInfoWidget.cpp @@ -1,49 +1,51 @@ /*=================================================================== 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 + m_Controls.breadcrumbLabel->setText("Project:" + m_Subject->parent()->property("name")); + m_Controls.nameLabel->setText(m_Subject->property("label")); m_Controls.birthyearLabel->setText(m_Subject->property("dob")); m_Controls.genderLabel->setText(m_Subject->property("gender")); m_Controls.handednessLabel->setText(m_Subject->property("handedness")); m_Controls.heightLabel->setText(m_Subject->property("height")); m_Controls.weightLabel->setText(m_Subject->property("weight")); } QmitkXnatSubjectInfoWidget::~QmitkXnatSubjectInfoWidget() { } void QmitkXnatSubjectInfoWidget::SetSubject(ctkXnatSubject* subject) { m_Subject = subject; } ctkXnatSubject* QmitkXnatSubjectInfoWidget::GetSubject() const { return m_Subject; } diff --git a/Modules/XNAT/src/QmitkXnatSubjectInfoWidgetControls.ui b/Modules/XNAT/src/QmitkXnatSubjectInfoWidgetControls.ui index 06ec58bdc9..e23bfce1b8 100644 --- a/Modules/XNAT/src/QmitkXnatSubjectInfoWidgetControls.ui +++ b/Modules/XNAT/src/QmitkXnatSubjectInfoWidgetControls.ui @@ -1,110 +1,136 @@ QmitkXnatSubjectInfoWidgetControls true 0 0 350 - 126 + 164 Qmitk Template - + - + Gender: - + Birthdate: - + - + Handedness: - + Heigth (inches): - + - + - + Weight (lbs) - + - + 75 true Subject Information Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + Name: + + + + + + + + true + + + + + + +