Diffusion MITK 62b406233513

Merge remote-tracking branch 'origin/bug-19051…
62b406233513
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'origin/bug-19051-VisualizationOfMetaInformationForXnatObjects' into personal/fetzer/cgs2015.06-release-xnat

Conflicts:
Modules/XNAT/CMakeLists.txt
Modules/XNAT/files.cmake
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h

Details

Provenance

Authored on Jul 6 2015, 1:53 PM

Parents

rMITK1cc63231956a: Fixed warnings
rMITK4f97e54cfb7b: Merge remote-tracking branch 'origin/bug-18156-xnat-upload-feature' into…

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITK62b406233513: Merge remote-tracking branch 'origin/bug-19051… (authored by • fetzer).Jul 6 2015, 1:53 PM

Merged Changes

1cc63231956a Fixed warnings
Author
• fetzer
Browse Repository
No Builds
No Audits
11b9069a7f73 Fixed Qt 4 compatibility for mac
Author
• fetzer
Browse Repository
No Builds
No Audits
4d1f52635f2a minibreadcrumbs in the widgets.
Author
• knorr
Browse Repository
No Builds
No Audits
84ca180b7481 Moved Files from XNATUI to XNAT Module.
Author
• knorr
Browse Repository
No Builds
No Audits
0877d88d122f Added the functionality to get additional information about some xnat objects.
Author
• knorr
Browse Repository
No Builds
No Audits
a0884243ce29 Added a new module with three widgets for xnat objects. For detailed…
Author
• knorr
Browse Repository
No Builds
No Audits
1a0c1c7332b0 Adjusted specific Widget for a project.
Author
• knorr
Browse Repository
No Builds
No Audits
3f8c20e33a4c Adjusted CMakeLists to use QWidget.
Author
• knorr
Browse Repository
No Builds
No Audits
206d7ecda40f Created a new module for xnat widgets. Added first widget for xnat project.
Author
• knorr
Browse Repository
No Builds
No Audits

Changes (15)

Path

Size

Packages

Modules/

XNAT/

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

include/

QmitkXnatExperimentInfoWidget.h

O4: MITK Reviewer Group III

QmitkXnatProjectInfoWidget.h

O4: MITK Reviewer Group III

QmitkXnatSubjectInfoWidget.h

O4: MITK Reviewer Group III

src/

QmitkXnatExperimentInfoWidget.cpp

O4: MITK Reviewer Group III

QmitkXnatExperimentInfoWidgetControls.ui

O4: MITK Reviewer Group III

QmitkXnatProjectInfoWidget.cpp

O4: MITK Reviewer Group III

QmitkXnatProjectInfoWidgetControls.ui

O4: MITK Reviewer Group III

QmitkXnatSubjectInfoWidget.cpp

O4: MITK Reviewer Group III

QmitkXnatSubjectInfoWidgetControls.ui

O4: MITK Reviewer Group III

Plugins/

org.mitk.gui.qt.xnat/

src/

internal/

QmitkXnatConnectionPreferencePage.cpp

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserView.cpp

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserView.h

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserViewControls.ui

O3: MITK Reviewer Group II

rMITK62b406233513

Modules/XNAT/CMakeLists.txt

Loading...

Modules/XNAT/files.cmake

Loading...

Modules/XNAT/include/QmitkXnatExperimentInfoWidget.h

Loading...

Modules/XNAT/include/QmitkXnatProjectInfoWidget.h

Loading...

Modules/XNAT/include/QmitkXnatSubjectInfoWidget.h

Loading...

Modules/XNAT/src/QmitkXnatExperimentInfoWidget.cpp

Loading...

Modules/XNAT/src/QmitkXnatExperimentInfoWidgetControls.ui

Loading...

Modules/XNAT/src/QmitkXnatProjectInfoWidget.cpp

Loading...

Modules/XNAT/src/QmitkXnatProjectInfoWidgetControls.ui

Loading...

Modules/XNAT/src/QmitkXnatSubjectInfoWidget.cpp

Loading...

Modules/XNAT/src/QmitkXnatSubjectInfoWidgetControls.ui

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.cpp

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserViewControls.ui

Loading...