Merge branch 'master' of mitk.org:MITK
6e50c5c0fe29
Actions

Description

Merge branch 'master' of mitk.org:MITK

Details

Provenance

Authored on Mar 11 2015, 5:21 PM

Parents

rMITKdbd70485fa99: Merge branch 'bug-18839-osx-version-warning'
rMITKc4c82385c0e0: Merge branch 'master' of mitk.org:MITK

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITK6e50c5c0fe29: Merge branch 'master' of mitk.org:MITK (authored by • fetzer).Mar 11 2015, 5:21 PM

Merged Changes

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

dbd70485fa99 Merge branch 'bug-18839-osx-version-warning'
Author
• fetzer
Browse Repository
No Builds
No Audits
51400fe1b952 Added CMake warning for Mac OS X version less than 10.9
Author
• fetzer
Browse Repository
No Builds
No Audits
4118f23da75d Merge branch 'bug-18835-secondDeactivation'
Author
franza
Browse Repository
No Builds
No Audits
1fbf4931f283 COMP: Deactivated test again, still doesn't work on dart client
Author
franza
Browse Repository
No Builds
No Audits
4f635b398f64 Merge branch 'bug-18835-fixNavigationToolReader'
Author
franza
Browse Repository
No Builds
No Audits
047e4393c453 fixed navigation tool reader class: now also using temp directory
Author
franza
Browse Repository
No Builds
No Audits
b73d53fb448c Merge branch 'bug-18809-FixCrashInPaint'
Author
• webechr
Browse Repository
No Builds
No Audits
fee6bd39854d Merge branch 'bug-18003-remove-ld-warning'
Author
• cordes
Browse Repository
No Builds
No Audits
c3d51e10c069 Merge branch 'bug-18835-teststillfails'
Author
franza
Browse Repository
No Builds
No Audits
a581bd3e83d8 COMP: Commented out test until bug is fixed
Author
franza
Browse Repository
No Builds
No Audits
4f4252a4ed08 reinit working slice on tool change removed dead code nullprt
Author
• webechr
Browse Repository
No Builds
No Audits
17a81715bc60 remove additional vigra runtime path environment variables
Author
• cordes
Browse Repository
No Builds
No Audits
9abfc32c4046 remove additional vigra link directories, to avoid linking against non existing…
Author
• cordes
Browse Repository
No Builds
No Audits
c833a60a1bae Merge branch 'bug-18835-testFail'
Author
franza
Browse Repository
No Builds
No Audits
c3217fde151c COMP(#18835): Fixed the bug... now using a temp dir.
Author
franza
Browse Repository
No Builds
No Audits
03990bc0a848 Merge branch 'bug-18767-BlbtBoostProblem'
Author
neher
Browse Repository
No Builds
No Audits
ac858d2f127c COMP: using Q_MOC_RUN
Author
neher
Browse Repository
No Builds
No Audits
35f14aa5a015 Merge branch 'bug-18767-BlbtBoostProblem'
Author
neher
Browse Repository
No Builds
No Audits
9b155438a5ae COMP: remove unnecessary boost include
Author
neher
Browse Repository
No Builds
No Audits
1839ee73701f Merge branch 'bug-18767-MLBT_OpenSource'
Author
neher
Browse Repository
No Builds
No Audits
daa9ff3a44a0 Merge branch 'bug-18765-VtkItkHdf5'
Author
neher
Browse Repository
No Builds
No Audits
6507354157df COMP: ITK and VTK are not using MITK HDF5 anymore
Author
neher
Browse Repository
No Builds
No Audits
b01542f3b070 Merge branch 'bug-18765-HelpVTKFindHDF5Libraries'
Author
kislinsk
Browse Repository
No Builds
No Audits
bae7719741cb COMP: Help VTK find the right HDF5 libraries on Windows.
Author
kislinsk
Browse Repository
No Builds
No Audits
71e59e0bc314 Merge branch 'bug-18765-HelpITKFindHDF5Libraries'
Author
kislinsk
Browse Repository
No Builds
No Audits
66a1484819f6 COMP: Help ITK find right HDF5 libraries.
Author
kislinsk
Browse Repository
No Builds
No Audits
ea7ef3a600e2 Merge branch 'bug-18737-opencv-build-fails-on-yosemite'
Author
• fetzer
Browse Repository
No Builds
No Audits
ea2b6118f829 COMP Fixed cdash script path for windows
Author
• fetzer
Browse Repository
No Builds
No Audits
3e5ea8f74cbf COMP Added patch for: invalid suffix on literal; C++11 requires a space between…
Author
• fetzer
Browse Repository
No Builds
No Audits
b27eae2e566a Merge branch 'bug-18765-TempDisableVigra'
Author
neher
Browse Repository
No Builds
No Audits
c6ca1607d129 COMP: temporarily added vigra and hdf5 to package excludes to unlock dashboard
Author
neher
Browse Repository
No Builds
No Audits
f541716f421f fixed sh image export
Author
neher
Browse Repository
No Builds
No Audits
a0f5cb44051d using miccai paper formula
Author
neher
Browse Repository
No Builds
No Audits
f47484519a76 added flags for fiber removal and curvthreshold. using fixed sampling pattern.
Author
neher
Browse Repository
No Builds
No Audits
8f727f462cd3 removing fibers that still end in the white matter
Author
neher
Browse Repository
No Builds
No Audits
251fbd85540d moved MLBT tracking from MBI to MITK
Author
neher
Browse Repository
No Builds
No Audits
72258cae0d1f Merge branch 'bug-18765-VigraOpenSourceWin'
Author
neher
Browse Repository
No Builds
No Audits
0de14c815b9b Merge branch 'bug-18765-VigraOpenSource'
Author
neher
Browse Repository
No Builds
No Audits
50b9f545efb0 Merge branch 'bug-18737-opencv-build-fails-on-yosemite'
Author
• fetzer
Browse Repository
No Builds
No Audits
1ed4eae07da3 Adapted patch to new opencv version
Author
• fetzer
Browse Repository
No Builds
No Audits
e68997c8f888 Merge branch 'bug-18693-Qt5Installer'
Author
kislinsk
Browse Repository
No Builds
No Audits
e446022f8854 Merge branch 'bug-18765-VigraOpenSource'
Author
• brehler
Browse Repository
No Builds
No Audits
dc673643bf8c changes to cmake files for integration
Author
• brehler
Browse Repository
No Builds
No Audits
4c69a0f56ee4 Fixed tarball and reactivated patch again
Author
• fetzer
Browse Repository
No Builds
No Audits
e4052aaec910 Updated OpenCV version to 2.4.11.
Author
• fetzer
Browse Repository
No Builds
No Audits
812fbe4d964c added vigra tree depth to patch
Author
neher
Browse Repository
No Builds
No Audits
c8882829ec9f replaced hardcoded path in patch with HDF5_DIR
Author
neher
Browse Repository
No Builds
No Audits
17e745e7e14e updated vigra patch
Author
neher
Browse Repository
No Builds
No Audits
19042d9e4752 added vigra patch for build system and tree depth
Author
neher
Browse Repository
No Builds
No Audits
88bfb9528875 using ep directory for hdf5 and vigra. vtk and itk are using the system hdf5…
Author
neher
Browse Repository
No Builds
No Audits

Changes (39)

Path

Size

Packages

CMake/

MITKDashboardSetup.cmake

O1: MITK Reviewer Group I

PackageDepends/

MITK_HDF5_Config.cmake

O1: MITK Reviewer Group I

MITK_Vigra_Config.cmake

O1: MITK Reviewer Group I

mitkFunctionGetLibrarySearchPaths.cmake

O1: MITK Reviewer Group I

mitkInstallRules.cmake

O1: MITK Reviewer Group I

CMakeExternals/

ChangeHDF5LibsInstallNameForMac.cmake.in

O1: MITK Reviewer Group I

HDF5.cmake

O1: MITK Reviewer Group I

ITK.cmake

O1: MITK Reviewer Group I

	OpenCV-2.4.11.patch
	OpenCV-2.4.8.2.patch

O1: MITK Reviewer Group I

OpenCV-2.4.8.2.patch

O1: MITK Reviewer Group I

OpenCV.cmake

O1: MITK Reviewer Group I

VTK.cmake

O1: MITK Reviewer Group I

Vigra.cmake

O1: MITK Reviewer Group I

Vigra.patch

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Modules/

DiffusionImaging/

FiberTracking/

Algorithms/

MLTracking/

itkMLBSTrackingFilter.cpp

itkMLBSTrackingFilter.h

mitkTrackingForestHandler.cpp

mitkTrackingForestHandler.h

MiniApps/

TractometerMetrics.cpp

IGT/

IO/

mitkNavigationToolReader.cpp

Testing/

files.cmake

mitkNavigationToolReaderAndWriterTest.cpp

Segmentation/

Interactions/

mitkPaintbrushTool.cpp

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.diffusionimaging/

resources/

src/

internal/

QmitkMLBTView.cpp

QmitkMLBTView.h

QmitkMLBTViewControls.ui

mitkPluginActivator.cpp

rMITK6e50c5c0fe29

View Options

CMake/MITKDashboardSetup.cmake

View Options

CMake/PackageDepends/MITK_HDF5_Config.cmake

View Options

CMake/PackageDepends/MITK_Vigra_Config.cmake

View Options

CMake/mitkFunctionGetLibrarySearchPaths.cmake

View Options

CMake/mitkInstallRules.cmake

View Options

CMakeExternals/ChangeHDF5LibsInstallNameForMac.cmake.in

View Options

CMakeExternals/HDF5.cmake

View Options

CMakeExternals/ITK.cmake

View Options

CMakeExternals/OpenCV-2.4.11.patch

View Options

CMakeExternals/OpenCV-2.4.8.2.patch

View Options

CMakeExternals/OpenCV.cmake

View Options

CMakeExternals/VTK.cmake

View Options

CMakeExternals/Vigra.cmake

View Options

CMakeExternals/Vigra.patch

View Options

CMakeLists.txt

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/MLTracking/itkMLBSTrackingFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/MLTracking/itkMLBSTrackingFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/MLTracking/mitkTrackingForestHandler.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/MLTracking/mitkTrackingForestHandler.h

View Options

Modules/DiffusionImaging/FiberTracking/CMakeLists.txt

View Options

Modules/DiffusionImaging/FiberTracking/files.cmake

View Options

Modules/DiffusionImaging/MiniApps/CMakeLists.txt

View Options

Modules/DiffusionImaging/MiniApps/DFTracking.cpp

View Options

Modules/DiffusionImaging/MiniApps/DFTraining.cpp

View Options

Modules/DiffusionImaging/MiniApps/ExportShImage.cpp

View Options

Modules/DiffusionImaging/MiniApps/TractometerMetrics.cpp

View Options

Modules/IGT/IO/mitkNavigationToolReader.cpp

View Options

Modules/IGT/Testing/files.cmake

View Options

Modules/IGT/Testing/mitkNavigationToolReaderAndWriterTest.cpp

View Options

Modules/Segmentation/Interactions/mitkPaintbrushTool.cpp

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/resources/fiberTracking1.png

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkMLBTView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkMLBTView.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkMLBTViewControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp

Merge branch 'master' of mitk.org:MITK6e50c5c0fe29Actions

Description

Details

Event Timeline

Merged Changes

Changes (39)

rMITK6e50c5c0fe29

CMake/MITKDashboardSetup.cmake

CMake/PackageDepends/MITK_HDF5_Config.cmake

CMake/PackageDepends/MITK_Vigra_Config.cmake

CMake/mitkFunctionGetLibrarySearchPaths.cmake

CMake/mitkInstallRules.cmake

CMakeExternals/ChangeHDF5LibsInstallNameForMac.cmake.in

CMakeExternals/HDF5.cmake

CMakeExternals/ITK.cmake

CMakeExternals/OpenCV-2.4.11.patch

CMakeExternals/OpenCV-2.4.8.2.patch

CMakeExternals/OpenCV.cmake

CMakeExternals/VTK.cmake

CMakeExternals/Vigra.cmake

CMakeExternals/Vigra.patch

CMakeLists.txt

Modules/DiffusionImaging/FiberTracking/Algorithms/MLTracking/itkMLBSTrackingFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/MLTracking/itkMLBSTrackingFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/MLTracking/mitkTrackingForestHandler.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/MLTracking/mitkTrackingForestHandler.h

Modules/DiffusionImaging/FiberTracking/CMakeLists.txt

Modules/DiffusionImaging/FiberTracking/files.cmake

Modules/DiffusionImaging/MiniApps/CMakeLists.txt

Modules/DiffusionImaging/MiniApps/DFTracking.cpp

Modules/DiffusionImaging/MiniApps/DFTraining.cpp

Modules/DiffusionImaging/MiniApps/ExportShImage.cpp

Modules/DiffusionImaging/MiniApps/TractometerMetrics.cpp

Modules/IGT/IO/mitkNavigationToolReader.cpp

Modules/IGT/Testing/files.cmake

Modules/IGT/Testing/mitkNavigationToolReaderAndWriterTest.cpp

Modules/Segmentation/Interactions/mitkPaintbrushTool.cpp

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

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

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

Plugins/org.mitk.gui.qt.diffusionimaging/resources/fiberTracking1.png

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkMLBTView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkMLBTView.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkMLBTViewControls.ui

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp

Merge branch 'master' of mitk.org:MITK
6e50c5c0fe29
Actions