Diffusion MITK 07ab9193f8b2

Merge remote-tracking branch 'origin/personal/fetzer/cgs2015.06-release-xnat'…
07ab9193f8b2
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

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

Conflicts:
Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt
CMakeExternals/CTK.cmake
CMakeExternals/MITKData.cmake
CMakeLists.txt
Modules/Core/include/mitkAffineInteractor.h
Modules/Core/include/mitkDisplayGeometry.h
Modules/Core/include/mitkModeOperation.h
Modules/Core/include/mitkMoveBaseDataInteractor.h
Modules/Core/include/mitkPointSetInteractor.h
Modules/Core/include/mitkPositionTracker.h
Modules/Core/include/mitkSlicesRotator.h
Modules/Core/include/mitkSlicesSwiveller.h
Modules/InputDevices/SpaceNavigator/mitkSpaceNavigatorAddOn.h
Modules/InputDevices/SpaceNavigator/mitkSpaceNavigatorEvent.h
Modules/InputDevices/SpaceNavigator/mitkSpaceNavigatorVtkCameraController.h
Modules/InputDevices/WiiMote/mitkKalmanFilter.h
Modules/InputDevices/WiiMote/mitkWiiMoteAddOn.h
Modules/InputDevices/WiiMote/mitkWiiMoteAllDataEvent.h
Modules/InputDevices/WiiMote/mitkWiiMoteButtonEvent.h
Modules/InputDevices/WiiMote/mitkWiiMoteCalibrationEvent.h
Modules/InputDevices/WiiMote/mitkWiiMoteIREvent.h
Modules/InputDevices/WiiMote/mitkWiiMoteMultiIREvent.h
Modules/InputDevices/WiiMote/mitkWiiMoteThread.h
Modules/InputDevices/WiiMote/mitkWiiMoteVtkCameraController.h
Modules/QtWidgets/include/QmitkStdMultiWidget.h
Modules/Segmentation/Interactions/mitkContourInteractor.h
Modules/Segmentation/Interactions/mitkExtrudedContourInteractor.h
Modules/Segmentation/Interactions/mitkRegionGrow3DTool.h
Modules/SegmentationUI/Qmitk/QmitkRegionGrow3DToolGUI.h

Details

Provenance

Authored on Feb 19 2016, 10:58 PM

Parents

rMITK02be6cc24d88: Fixed build errors
rMITK339d503088c0: Merge branch 'bug-19570-locale-switch-in-labelsetImageIO'

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITK07ab9193f8b2: Merge remote-tracking branch 'origin/personal/fetzer/cgs2015.06-release-xnat'… (authored by • fetzer).Feb 19 2016, 10:58 PM

Merged Changes

02be6cc24d88 Fixed build errors
Author
• fetzer
Browse Repository
No Builds
No Audits
7852ea62181a Update CTK again
Author
• fetzer
Browse Repository
No Builds
No Audits
f91a60924f92 Merge branch 'bug-18156-xnat-upload-feature' into personal/fetzer/cgs2015.06…
Author
• fetzer
Browse Repository
No Builds
No Audits
93755afb3bb9 Improved icons
Author
• fetzer
Browse Repository
No Builds
No Audits
cab7b842b333 Finished upload to XNAT via QmitkXnatTreeBrowser
Author
• fetzer
Browse Repository
No Builds
No Audits
6d433d23d849 Usability improvements
Author
• fetzer
Browse Repository
No Builds
No Audits
fd44c7360676 Added upload and download buttons
Author
• fetzer
Browse Repository
No Builds
No Audits
c8402dc44fb2 Updated CTK
Author
• fetzer
Browse Repository
No Builds
No Audits
6b5e0a340a9e Fixed treebrowser context menu
Author
• fetzer
Browse Repository
No Builds
No Audits
e3c764b83a51 CTK Update
Author
• fetzer
Browse Repository
No Builds
No Audits
6f8de191eda2 Merge remote-tracking branch 'origin/bug-19143…
Author
• fetzer
Browse Repository
No Builds
No Audits
2c1a2df400f8 Merge remote-tracking branch 'origin/bug-19095…
Author
• fetzer
Browse Repository
No Builds
No Audits
62b406233513 Merge remote-tracking branch 'origin/bug-19051…
Author
• fetzer
Browse Repository
No Builds
No Audits
4f97e54cfb7b Merge remote-tracking branch 'origin/bug-18156-xnat-upload-feature' into…
Author
• fetzer
Browse Repository
No Builds
No Audits
4ab928204b9f updated the test image in the mitk-data repository
Author
riecker
Browse Repository
No Builds
No Audits
b5ae303a1949 Merge remote-tracking branch 'origin/bug-17844-RT-Refactoring…
Author
• metzger
Browse Repository
No Builds
No Audits
80046448a497 Added a completer for a lineedit to use all session types of an experiment.
Author
• knorr
Browse Repository
No Builds
No Audits
e4ef5acde6c7 deleted name row in experiment widget.
Author
• knorr
Browse Repository
No Builds
No Audits
8b04110a03fe Update Treeview after create new object is now executed. Change order of…
Author
• knorr
Browse Repository
No Builds
No Audits
3b87fe96ab18 MITK 2015.05.0 version update
Author
kislinsk
Browse Repository
No Builds
No Audits
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
f736e30bc465 Merge branch 'bug-19110-AddDecpratedDeclarations' into releases/2015-05
Author
• webechr
Browse Repository
No Builds
No Audits
7210c89f7380 Mark Functions and Classes as deprecated that will be removed in near future…
Author
• webechr
Browse Repository
No Builds
No Audits
46b701027e6a Added functionality that on right click a new xnat object is created. Renamed…
Author
• knorr
Browse Repository
No Builds
No Audits
0309d793eac4 Merge branch 'bug-15886-UploadTubeGraphTestData' into releases/2015-05
Author
• metzger
Browse Repository
No Builds
No Audits
ed7a432b64f0 Merge branch 'bug-19108-contourmodel-to-image-windows-crash' into releases/2015…
Author
• fetzer
Browse Repository
No Builds
No Audits
5e386f4cb0ef Merge branch 'bug-5922-coronal-shift-blueberry-tab-issue-macosx' into…
Author
• fetzer
Browse Repository
No Builds
No Audits
194c27cc6ab6 Merge branch 'bug-19103-wrong-cpp11-nullptr-replacement' into releases/2015-05
Author
• fetzer
Browse Repository
No Builds
No Audits
be48cc26741a Merge branch 'bug-19059-HideNewMenuAndNewEditorMenuEntries' into releases/2015…
Author
kislinsk
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
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 (38)

Path

Size

Packages

Applications/

PluginGenerator/

ProjectTemplate/

CMakeExternals/

Modules/

QtWidgets/

include/

QmitkStdMultiWidget.h

O3: MITK Reviewer Group II

Segmentation/

DataManagement/

mitkExtrudedContour.h

O1: MITK Reviewer Group I

XNAT/

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

include/

QmitkXnatCreateObjectDialog.h

O4: MITK Reviewer Group III

QmitkXnatExperimentWidget.h

O4: MITK Reviewer Group III

QmitkXnatProjectWidget.h

O4: MITK Reviewer Group III

QmitkXnatSubjectWidget.h

O4: MITK Reviewer Group III

QmitkXnatTreeModel.h

O4: MITK Reviewer Group III

QmitkXnatUploadFromDataStorageDialog.h

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

src/

QmitkXnatCreateObjectDialog.cpp

O4: MITK Reviewer Group III

QmitkXnatExperimentWidget.cpp

O4: MITK Reviewer Group III

QmitkXnatExperimentWidgetControls.ui

O4: MITK Reviewer Group III

QmitkXnatProjectWidget.cpp

O4: MITK Reviewer Group III

QmitkXnatProjectWidgetControls.ui

O4: MITK Reviewer Group III

QmitkXnatSubjectWidget.cpp

O4: MITK Reviewer Group III

QmitkXnatSubjectWidgetControls.ui

O4: MITK Reviewer Group III

QmitkXnatTreeModel.cpp

O4: MITK Reviewer Group III

QmitkXnatUploadFromDataStorageDialog.cpp

O4: MITK Reviewer Group III

QmitkXnatUploadFromDataStorageDialog.ui

O4: MITK Reviewer Group III

Plugins/

org.mitk.gui.qt.xnat/

O3: MITK Reviewer Group II

resources/

xnat-download.png

O3: MITK Reviewer Group II

xnat-folder.png

O3: MITK Reviewer Group II

xnat-upload.png

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

src/

internal/

QmitkXnatConnectionPreferencePage.cpp

O3: MITK Reviewer Group II

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

QmitkXnatTreeBrowserViewControls.ui

O3: MITK Reviewer Group II

rMITK07ab9193f8b2

Applications/PluginGenerator/ProjectTemplate/CMakeExternals/MITK.cmake

Loading...

Modules/QtWidgets/include/QmitkStdMultiWidget.h

Loading...

Modules/Segmentation/DataManagement/mitkExtrudedContour.h

Loading...

Modules/XNAT/CMakeLists.txt

Loading...

Modules/XNAT/files.cmake

Loading...

Modules/XNAT/include/QmitkXnatCreateObjectDialog.h

Loading...

Modules/XNAT/include/QmitkXnatExperimentWidget.h

Loading...

Modules/XNAT/include/QmitkXnatProjectWidget.h

Loading...

Modules/XNAT/include/QmitkXnatSubjectWidget.h

Loading...

Modules/XNAT/include/QmitkXnatTreeModel.h

Loading...

Modules/XNAT/include/QmitkXnatUploadFromDataStorageDialog.h

Loading...

Modules/XNAT/resources/experiment.ico

Loading...

Modules/XNAT/resources/project.ico

Loading...

Modules/XNAT/resources/server.ico

Loading...

Modules/XNAT/resources/subject.ico

Loading...

Modules/XNAT/resources/xnat.qrc

Loading...

Modules/XNAT/src/QmitkXnatCreateObjectDialog.cpp

Loading...

Modules/XNAT/src/QmitkXnatExperimentWidget.cpp

Loading...

Modules/XNAT/src/QmitkXnatExperimentWidgetControls.ui

Loading...

Modules/XNAT/src/QmitkXnatProjectWidget.cpp

Loading...

Modules/XNAT/src/QmitkXnatProjectWidgetControls.ui

Loading...

Modules/XNAT/src/QmitkXnatSubjectWidget.cpp

Loading...

Modules/XNAT/src/QmitkXnatSubjectWidgetControls.ui

Loading...

Modules/XNAT/src/QmitkXnatTreeModel.cpp

Loading...

Modules/XNAT/src/QmitkXnatUploadFromDataStorageDialog.cpp

Loading...

Modules/XNAT/src/QmitkXnatUploadFromDataStorageDialog.ui

Loading...

Plugins/org.mitk.gui.qt.xnat/files.cmake

Loading...

Plugins/org.mitk.gui.qt.xnat/resources/xnat-download.png

Loading...

Plugins/org.mitk.gui.qt.xnat/resources/xnat-folder.png

Loading...

Plugins/org.mitk.gui.qt.xnat/resources/xnat-upload.png

Loading...

Plugins/org.mitk.gui.qt.xnat/resources/xnat.qrc

Loading...

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

Loading...

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

Loading...

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

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...