Diffusion MITK 4f97e54cfb7b

Merge remote-tracking branch 'origin/bug-18156-xnat-upload-feature' into…
4f97e54cfb7b
Actions

Description

Merge remote-tracking branch 'origin/bug-18156-xnat-upload-feature' into personal/fetzer/cgs2015.06-release-xnat

Conflicts:
CMakeExternals/CTK.cmake
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatEditor.cpp
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp

Details

Provenance

• fetzer

Authored on Jul 6 2015, 1:48 PM

Parents

rMITKc189be8d0ba6: WIP Upload file
rMITK4ab928204b9f: updated the test image in the mitk-data repository

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITK4f97e54cfb7b: Merge remote-tracking branch 'origin/bug-18156-xnat-upload-feature' into… (authored by • fetzer).Jul 6 2015, 1:48 PM

Merged Changes

c189be8d0ba6 WIP Upload file
Author
• fetzer
Browse Repository
No Builds
No Audits
b3e28c709cdf Cosmetic changes
Author
• fetzer
Browse Repository
No Builds
No Audits
7a8b6812d9df Enhance QmitkXnatTreeModel for drag and drop support
Author
• fetzer
Browse Repository
No Builds
No Audits
3db9c37cc080 Created QmitkXnatTreeModel. Added icons to xnatTreeBrowserView for dataModel…
Author
• fetzer
Browse Repository
No Builds
No Audits
340ec1314de8 Use QListView instead of QTreeView
Author
• fetzer
Browse Repository
No Builds
No Audits

Changes (15)

Path

Size

Packages

CMakeExternals/

CTK.cmake

O1: MITK Reviewer Group I

Modules/

XNAT/

CMakeLists.txt

O4: MITK Reviewer Group III

files.cmake

O4: MITK Reviewer Group III

include/

QmitkXnatTreeModel.h

O4: MITK Reviewer Group III

resources

O4: MITK Reviewer Group III

project.ico

O4: MITK Reviewer Group III

server.ico

O4: MITK Reviewer Group III

subject.ico

O4: MITK Reviewer Group III

xnat.qrc

O4: MITK Reviewer Group III

src/

QmitkXnatTreeModel.cpp

O4: MITK Reviewer Group III

	Modules/	XNAT/	resources/	experiment.ico/
	Documentation/	Doxygen/	3-DeveloperManual/	Starting/	GettingToKnow/	Tutorial/


	step3a_result.png

O4: MITK Reviewer Group III

Plugins/

org.mitk.gui.qt.xnat/

src/

internal/

QmitkXnatEditor.cpp

O3: MITK Reviewer Group II

QmitkXnatEditorControls.ui

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserView.cpp

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserView.h

O3: MITK Reviewer Group II

rMITK4f97e54cfb7b

View Options

CMakeExternals/CTK.cmake

View Options

Modules/XNAT/CMakeLists.txt

View Options

Modules/XNAT/files.cmake

View Options

Modules/XNAT/include/QmitkXnatTreeModel.h

View Options

Modules/XNAT/resources/experiment.ico

View Options

Modules/XNAT/resources/project.ico

View Options

Modules/XNAT/resources/server.ico

View Options

Modules/XNAT/resources/subject.ico

View Options

Modules/XNAT/resources/xnat.qrc

View Options

Modules/XNAT/src/QmitkXnatTreeModel.cpp

View Options

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

View Options

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

View Options

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

View Options

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

Merge remote-tracking branch 'origin/bug-18156-xnat-upload-feature' into…4f97e54cfb7bActions

Description

Details

Event Timeline

Merged Changes

Changes (15)

rMITK4f97e54cfb7b

CMakeExternals/CTK.cmake

Modules/XNAT/CMakeLists.txt

Modules/XNAT/files.cmake

Modules/XNAT/include/QmitkXnatTreeModel.h

Modules/XNAT/resources/experiment.ico

Modules/XNAT/resources/project.ico

Modules/XNAT/resources/server.ico

Modules/XNAT/resources/subject.ico

Modules/XNAT/resources/xnat.qrc

Modules/XNAT/src/QmitkXnatTreeModel.cpp

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

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

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

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

Merge remote-tracking branch 'origin/bug-18156-xnat-upload-feature' into…
4f97e54cfb7b
Actions