Diffusion MITK 7cea55b56c35

Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05'…
7cea55b56c35
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05' into xnat-test

Conflicts:
Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt
CMakeExternals/CTK.cmake
CMakeLists.txt
Modules/Core/src/DataManagement/mitkDataNode.cpp
Modules/ImageStatistics/mitkIntensityProfile.cpp
Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp
Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp
Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h

Details

Provenance

Authored on Feb 19 2016, 11:41 PM

Parents

rMITK45b670bfe770: Merge remote-tracking branch 'origin/personal/metzger/XNATRefreshOnIndex'…
rMITK07ab9193f8b2: Merge remote-tracking branch 'origin/personal/fetzer/cgs2015.06-release-xnat'…

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITK7cea55b56c35: Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05'… (authored by • fetzer).Feb 19 2016, 11:41 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

45b670bfe770 Merge remote-tracking branch 'origin/personal/metzger/XNATRefreshOnIndex' into…
Author
• fetzer
Browse Repository
No Builds
No Audits
aa4be05cfd9c Fixed XNAT preferences
Author
• fetzer
Browse Repository
No Builds
No Audits
9282f1457100 Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05'…
Author
• fetzer
Browse Repository
No Builds
No Audits
124aa2c5412f Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05'…
Author
• fetzer
Browse Repository
No Builds
No Audits
0a59e4eccbd8 Added preference listener
Author
• fetzer
Browse Repository
No Builds
No Audits
430d37159ddf Added directory button to xnat preference page
Author
• fetzer
Browse Repository
No Builds
No Audits
c5dae2eada17 Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05'…
Author
• fetzer
Browse Repository
No Builds
No Audits
f72896e63817 Use regular qRestAPI again, since all changes are integrated
Author
• fetzer
Browse Repository
No Builds
No Audits
46b04bd66216 Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05'…
Author
• fetzer
Browse Repository
No Builds
No Audits
e2fe02ec8dc9 Allow bigger input values for double spinboxes in the property view in case of…
Author
• fetzer
Browse Repository
No Builds
No Audits
87049c595686 Add refresh option to contextmenu. User can refresh xnat-tree item by right…
Author
• metzger
Browse Repository
No Builds
No Audits
9db4661671c6 Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05'…
Author
• fetzer
Browse Repository
No Builds
No Audits
f45f52771c4e COMP: Copy only if source directory exists
Author
• goch
Browse Repository
No Builds
No Audits
2b6e3f03d6b2 added documentation
Author
• goch
Browse Repository
No Builds
No Audits
1605f9a448c2 Adapted copy destination for OS X
Author
• fetzer
Browse Repository
No Builds
No Audits
cccf13e9cdca Copy the CTK Qt plugin files to the binary tree
Author
• goch
Browse Repository
No Builds
No Audits
5a1e4dec21bd Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05'…
Author
• fetzer
Browse Repository
No Builds
No Audits
fcfd246e0794 Added possibility to set http proxy for XNAT connections
Author
• fetzer
Browse Repository
No Builds
No Audits
ab3496301df4 Use proxy settings of the system when connecting to XNAT
Author
• fetzer
Browse Repository
No Builds
No Audits
9735adfc9340 Merge remote-tracking branch 'origin/releases/2015-05-02' into…
Author
• fetzer
Browse Repository
No Builds
No Audits
55224bea7692 Merge remote-tracking branch 'origin/bug-19216-nsis-installer-does-not-produce…
Author
• goch
Browse Repository
No Builds
No Audits
02c4f06dad8d Merge remote-tracking branch 'origin/releases/2015-05-02' into…
Author
• fetzer
Browse Repository
No Builds
No Audits
40d42b116b3a Fixed crash due to invalid session
Author
• fetzer
Browse Repository
No Builds
No Audits
c1a48e4451ed Added handling for session timeout
Author
• fetzer
Browse Repository
No Builds
No Audits
86eb5683501f Fixed include
Author
• fetzer
Browse Repository
No Builds
No Audits
62a4f9b050e5 Merge remote-tracking branch 'origin/bug-19233-EnableSurfaces-In-PointBasedReg'…
Author
• fetzer
Browse Repository
No Builds
No Audits
d835bfeb6d2b Merge remote-tracking branch 'origin/bug-19233-EnableSurfaces-In-PointBasedReg'…
Author
• fetzer
Browse Repository
No Builds
No Audits
e069f411b5bc Added copy url to clipboard entry to XNAT context menu
Author
• fetzer
Browse Repository
No Builds
No Audits
025458d1fa61 Updating version to 2015.05.2
Author
• goch
Browse Repository
No Builds
No Audits
da856fb4dd56 Merge remote-tracking branch 'origin/bug-19216-nsis-installer-does-not-produce…
Author
• goch
Browse Repository
No Builds
No Audits
89d015e5e7bb Merge branch 'personal/metzger/CGS-Workbench-2015.05-xnat' into…
Author
• metzger
Browse Repository
No Builds
No Audits
05e4a5e66e1b Change xnat tree view button icons.
Author
• metzger
Browse Repository
No Builds
No Audits
62655d86e27d Remove Redland from library search paths
Author
• fetzer
Browse Repository
No Builds
No Audits
38aebc2b13ef Merge remote-tracking branch 'origin/bug-18500…
Author
• fetzer
Browse Repository
No Builds
No Audits
febd885ef341 Merge remote-tracking branch 'origin/bug-18500…
Author
• fetzer
Browse Repository
No Builds
No Audits
122a5bb22188 Merge remote-tracking branch 'origin/releases/2015-05-02' into…
Author
• fetzer
Browse Repository
No Builds
No Audits
2e8ce6acf322 Set some properties for loading DICOM RT data with the predefined values…
Author
• metzger
Browse Repository
No Builds
No Audits
6f301e60a46a Merge branch 'bug-19163-ReleaseBasedBugfix' into releases/2015-05-02
Author
• fetzer
Browse Repository
No Builds
No Audits
33235d9ec5b1 Deactivated unified TitleAndToolBarOnMac again
Author
• fetzer
Browse Repository
No Builds
No Audits
02d52e46701d Merge branch 'bug-19270-ExpandPointSetGeometryInsertOperation' into…
Author
• kolbch
Browse Repository
No Builds
No Audits
e18ffc853dc5 Merge remote-tracking branch 'origin/bug-19245-expand-new-nodes-in-datamanager'…
Author
• goch
Browse Repository
No Builds
No Audits
0ccfae8d9b4f Merge remote-tracking branch 'origin/bug-16115-store-geometry-in-pointset-file'…
Author
• goch
Browse Repository
No Builds
No Audits
e6630f898bf0 Merge remote-tracking branch 'origin/bug-19203-NavigatorViewsCrashOnOpen' into…
Author
• goch
Browse Repository
No Builds
No Audits
3750d001a52f Merge branch 'bug-19140-pre-loaded-library-sring-list' into releases/2015-05-02
Author
• goch
Browse Repository
No Builds
No Audits
11c10b9f775d Merge remote-tracking branch 'origin/bug-19097-fix-incomplete-preferences-list'…
Author
• goch
Browse Repository
No Builds
No Audits
77035433c4c0 Enable matrix saving
Author
• hering
Browse Repository
No Builds
No Audits
5af72ddcb2e4 Basic UI Infrastructure for export
Author
• hering
Browse Repository
No Builds
No Audits
a05850b261ae Allow also surfaces to be selected in pointb.reg.
Author
• hering
Browse Repository
No Builds
No Audits
63c9cfd8b2e3 Merge branch 'bug-18859-fix-interaction-with-interpolated-planarfigures…
Author
kislinsk
Browse Repository
No Builds
No Audits
fef3ba1dba3f Merge remote-tracking branch 'origin/bug-19188…
Author
• kolbch
Browse Repository
No Builds
No Audits

Changes (40)

Path

Size

Packages

Applications/

PluginGenerator/

ProjectTemplate/

CMakeExternals/

CMake/

mitkFunctionGetLibrarySearchPaths.cmake

O1: MITK Reviewer Group I

Modules/

XNAT/

O4: MITK Reviewer Group III

include/

QmitkSelectXnatUploadDestinationDialog.h

O4: MITK Reviewer Group III

QmitkXnatTreeModel.h

O4: MITK Reviewer Group III

QmitkXnatUploadFromDataStorageDialog.h

O4: MITK Reviewer Group III

resources/

O4: MITK Reviewer Group III

	folder.ico
	project.ico

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/

QmitkSelectXnatUploadDestinationDialog.cpp

O4: MITK Reviewer Group III

QmitkSelectXnatUploadDestinationDialog.ui

O4: MITK Reviewer Group III

QmitkXnatTreeModel.cpp

O4: MITK Reviewer Group III

QmitkXnatUploadFromDataStorageDialog.cpp

O4: MITK Reviewer Group III

Plugins/

org.mitk.gui.qt.datamanager/

resources/

datamanager.qrc

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

src/

QmitkDataManagerView.cpp

O1: MITK Reviewer Group I

org.mitk.gui.qt.properties/

src/

internal/

QmitkPropertyItemDelegate.cpp

O1: MITK Reviewer Group I

org.mitk.gui.qt.registration/

src/

internal/

QmitkPointBasedRegistrationView.cpp

QmitkPointBasedRegistrationView.h

QmitkPointBasedRegistrationViewControls.ui

org.mitk.gui.qt.xnat/

O3: MITK Reviewer Group II

manifest_headers.cmake

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

resources/

xnat-download.png

O3: MITK Reviewer Group II

xnat-folder.png

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

xnat-upload.png

O3: MITK Reviewer Group II

src/

internal/

QmitkUploadToXNATAction.cpp

O3: MITK Reviewer Group II

QmitkUploadToXNATAction.h

O3: MITK Reviewer Group II

QmitkXnatConnectionPreferencePage.cpp

O3: MITK Reviewer Group II

QmitkXnatConnectionPreferencePage.h

O3: MITK Reviewer Group II

QmitkXnatConnectionPreferencePageControls.ui

O3: MITK Reviewer Group II

QmitkXnatSessionManager.cpp

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserView.cpp

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserView.h

O3: MITK Reviewer Group II

org_mitk_gui_qt_xnatinterface_Activator.cpp

O3: MITK Reviewer Group II

rMITK7cea55b56c35

Applications/PluginGenerator/ProjectTemplate/CMakeExternals/MITK.cmake

Loading...

CMake/mitkFunctionGetLibrarySearchPaths.cmake

Loading...

Modules/XNAT/files.cmake

Loading...

Modules/XNAT/include/QmitkSelectXnatUploadDestinationDialog.h

Loading...

Modules/XNAT/include/QmitkXnatTreeModel.h

Loading...

Modules/XNAT/include/QmitkXnatUploadFromDataStorageDialog.h

Loading...

Modules/XNAT/resources/file.png

Loading...

Modules/XNAT/resources/folder.ico

Loading...

Modules/XNAT/resources/project.ico

Loading...

Modules/XNAT/resources/project.png

Loading...

Modules/XNAT/resources/resource.png

Loading...

Modules/XNAT/resources/scan.png

Loading...

Modules/XNAT/resources/xnat.qrc

Loading...

Modules/XNAT/src/QmitkSelectXnatUploadDestinationDialog.cpp

Loading...

Modules/XNAT/src/QmitkSelectXnatUploadDestinationDialog.ui

Loading...

Modules/XNAT/src/QmitkXnatTreeModel.cpp

Loading...

Modules/XNAT/src/QmitkXnatUploadFromDataStorageDialog.cpp

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.datamanager/resources/xnat-icon.png

Loading...

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

Loading...

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemDelegate.cpp

Loading...

Plugins/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationView.cpp

Loading...

Plugins/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationView.h

Loading...

Plugins/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationViewControls.ui

Loading...

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

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.xnat/plugin.xml

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatSessionManager.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/org_mitk_gui_qt_xnatinterface_Activator.cpp

Loading...