Diffusion MITK 2c1a2df400f8

Merge remote-tracking branch 'origin/bug-19095…
2c1a2df400f8
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

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

Conflicts:
Modules/XNAT/files.cmake
Modules/XNAT/src/QmitkXnatProjectInfoWidget.cpp
Modules/XNAT/src/QmitkXnatSubjectInfoWidget.cpp
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, 2:02 PM

Parents

rMITK80046448a497: Added a completer for a lineedit to use all session types of an experiment.
rMITK62b406233513: Merge remote-tracking branch 'origin/bug-19051…

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITK2c1a2df400f8: Merge remote-tracking branch 'origin/bug-19095… (authored by • fetzer).Jul 6 2015, 2:02 PM

Merged Changes

Changes (23)

Path

Size

Packages

Modules/

XNAT/

O4: MITK Reviewer Group III

include/

QmitkXnatCreateObjectDialog.h

O4: MITK Reviewer Group III

QmitkXnatExperimentInfoWidget.h

O4: MITK Reviewer Group III

	QmitkXnatExperimentWidget.h
	QmitkXnatExperimentInfoWidget.h

O4: MITK Reviewer Group III

QmitkXnatProjectInfoWidget.h

O4: MITK Reviewer Group III

	QmitkXnatProjectWidget.h
	QmitkXnatProjectInfoWidget.h

O4: MITK Reviewer Group III

QmitkXnatSubjectInfoWidget.h

O4: MITK Reviewer Group III

	QmitkXnatSubjectWidget.h
	QmitkXnatSubjectInfoWidget.h

O4: MITK Reviewer Group III

src/

QmitkXnatCreateObjectDialog.cpp

O4: MITK Reviewer Group III

QmitkXnatExperimentInfoWidget.cpp

O4: MITK Reviewer Group III

QmitkXnatExperimentInfoWidgetControls.ui

O4: MITK Reviewer Group III

QmitkXnatExperimentWidget.cpp

O4: MITK Reviewer Group III

QmitkXnatExperimentWidgetControls.ui

O4: MITK Reviewer Group III

QmitkXnatProjectInfoWidget.cpp

O4: MITK Reviewer Group III

QmitkXnatProjectInfoWidgetControls.ui

O4: MITK Reviewer Group III

QmitkXnatProjectWidget.cpp

O4: MITK Reviewer Group III

QmitkXnatProjectWidgetControls.ui

O4: MITK Reviewer Group III

QmitkXnatSubjectInfoWidget.cpp

O4: MITK Reviewer Group III

QmitkXnatSubjectInfoWidgetControls.ui

O4: MITK Reviewer Group III

QmitkXnatSubjectWidget.cpp

O4: MITK Reviewer Group III

QmitkXnatSubjectWidgetControls.ui

O4: MITK Reviewer Group III

Plugins/

org.mitk.gui.qt.xnat/

src/

internal/

QmitkXnatTreeBrowserView.cpp

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserView.h

O3: MITK Reviewer Group II

rMITK2c1a2df400f8

Modules/XNAT/files.cmake

Loading...

Modules/XNAT/include/QmitkXnatCreateObjectDialog.h

Loading...

Modules/XNAT/include/QmitkXnatExperimentInfoWidget.h

Loading...

Modules/XNAT/include/QmitkXnatExperimentWidget.h

Loading...

Modules/XNAT/include/QmitkXnatProjectInfoWidget.h

Loading...

Modules/XNAT/include/QmitkXnatProjectWidget.h

Loading...

Modules/XNAT/include/QmitkXnatSubjectInfoWidget.h

Loading...

Modules/XNAT/include/QmitkXnatSubjectWidget.h

Loading...

Modules/XNAT/src/QmitkXnatCreateObjectDialog.cpp

Loading...

Modules/XNAT/src/QmitkXnatExperimentInfoWidget.cpp

Loading...

Modules/XNAT/src/QmitkXnatExperimentInfoWidgetControls.ui

Loading...

Modules/XNAT/src/QmitkXnatExperimentWidget.cpp

Loading...

Modules/XNAT/src/QmitkXnatExperimentWidgetControls.ui

Loading...

Modules/XNAT/src/QmitkXnatProjectInfoWidget.cpp

Loading...

Modules/XNAT/src/QmitkXnatProjectInfoWidgetControls.ui

Loading...

Modules/XNAT/src/QmitkXnatProjectWidget.cpp

Loading...

Modules/XNAT/src/QmitkXnatProjectWidgetControls.ui

Loading...

Modules/XNAT/src/QmitkXnatSubjectInfoWidget.cpp

Loading...

Modules/XNAT/src/QmitkXnatSubjectInfoWidgetControls.ui

Loading...

Modules/XNAT/src/QmitkXnatSubjectWidget.cpp

Loading...

Modules/XNAT/src/QmitkXnatSubjectWidgetControls.ui

Loading...

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

Loading...

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

Loading...