Diffusion MITK 2d2753b82215

Merge branch 'bug-18051-UseMicroServicesForXnatSession'
2d2753b82215
Actions

Description

Merge branch 'bug-18051-UseMicroServicesForXnatSession'

Conflicts:
Modules/CMakeLists.txt

Details

Provenance

• fetzer

Authored on Sep 25 2014, 1:25 PM

Parents

rMITKdd56b84d9440: Little fixes to the validation.
rMITKee8902f6d3ef: Merge branch 'bug-18144-vtk-leaks-in-pointsetdatainteractortest'

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITK2d2753b82215: Merge branch 'bug-18051-UseMicroServicesForXnatSession' (authored by • fetzer).Sep 25 2014, 1:25 PM

Merged Changes

dd56b84d9440 Little fixes to the validation.
Author
• knorr
Browse Repository
No Builds
No Audits
4f5b47c9edf1 Changed Xnat Plugin for the xnat session as a micro service. Some few changes…
Author
• knorr
Browse Repository
No Builds
No Audits
74338ba31eb3 Added a new Module for XNAT. Added a wrapper file for ctkXnatSession.h with…
Author
• knorr
Browse Repository
No Builds
No Audits

Changes (19)

Path

Size

Packages

Modules/

CMakeLists.txt

XNAT

O4: MITK Reviewer Group III

CMakeLists.txt

O4: MITK Reviewer Group III

files.cmake

O4: MITK Reviewer Group III

mitkXnatSessionTracker.cpp

O4: MITK Reviewer Group III

mitkXnatSessionTracker.h

O4: MITK Reviewer Group III

	Modules/	XNAT/	mitkXnatSession.h/
	Core/	Code/	DataManagement/


	mitkQuaternion.h

O4: MITK Reviewer Group III

Plugins/

org.mitk.gui.qt.xnat/

CMakeLists.txt

O3: MITK Reviewer Group II

src/

internal/

QmitkXnatConnectionPreferencePage.cpp

O3: MITK Reviewer Group II

QmitkXnatConnectionPreferencePage.h

O3: MITK Reviewer Group II

QmitkXnatConnectionPreferencePageControls.ui

O3: MITK Reviewer Group II

QmitkXnatEditor.cpp

O3: MITK Reviewer Group II

QmitkXnatSessionManager.cpp

O3: MITK Reviewer Group II

QmitkXnatSessionManager.h

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

org_mitk_gui_qt_xnatinterface_Activator.cpp

O3: MITK Reviewer Group II

org_mitk_gui_qt_xnatinterface_Activator.h

O3: MITK Reviewer Group II

rMITK2d2753b82215

View Options

Modules/CMakeLists.txt

View Options

Modules/XNAT/CMakeLists.txt

View Options

Modules/XNAT/files.cmake

View Options

Modules/XNAT/mitkXnatSession.h

View Options

Modules/XNAT/mitkXnatSessionTracker.cpp

View Options

Modules/XNAT/mitkXnatSessionTracker.h

View Options

Plugins/org.mitk.gui.qt.xnat/CMakeLists.txt

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'bug-18051-UseMicroServicesForXnatSession'2d2753b82215Actions

Description

Details

Event Timeline

Merged Changes

Changes (19)

rMITK2d2753b82215

Modules/CMakeLists.txt

Modules/XNAT/CMakeLists.txt

Modules/XNAT/files.cmake

Modules/XNAT/mitkXnatSession.h

Modules/XNAT/mitkXnatSessionTracker.cpp

Modules/XNAT/mitkXnatSessionTracker.h

Plugins/org.mitk.gui.qt.xnat/CMakeLists.txt

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

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

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

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

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

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

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

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

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

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

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

Merge branch 'bug-18051-UseMicroServicesForXnatSession'
2d2753b82215
Actions