Merge remote-tracking branch 'origin/master' into T23077-ProjectShapeComparison2
5a101ba1cd9a
Actions

Description

Merge remote-tracking branch 'origin/master' into T23077-ProjectShapeComparison2

Details

Provenance

• hempe	Authored on Jan 4 2018, 4:20 PM
• hempe	Pushed on Jan 12 2018, 1:21 PM

Parents

rMITKa2880a2a9216: Merge branch 'master' into T23077-ProjectShapeComparison2
rMITK7e5861a39908: Merge branch 'T24002-OpenCVMinorUpgrade'

Branches

Unknown

Tags

Unknown

Event Timeline

• hempe committed rMITK5a101ba1cd9a: Merge remote-tracking branch 'origin/master' into T23077-ProjectShapeComparison2 (authored by • hempe).Jan 4 2018, 4:20 PM

Merged Changes

7e5861a39908 Merge branch 'T24002-OpenCVMinorUpgrade'
Author
kislinsk
Browse Repository
No Builds
No Audits
0772f1858888 Detect minor compiler upgrades in MSVC_VERSION (191[0-9])
Author
kislinsk
Browse Repository
No Builds
No Audits
ed80bb5a4f8f Upgrade OpenCV from version 2.4.13.2 to 2.4.13.5
Author
kislinsk
Browse Repository
No Builds
No Audits
230440d374d3 Merge branch 'T23992-FiberShader'
Author
neher
Browse Repository
No Builds
No Audits
ae9173241069 Replace deprecated global variable by out variable
Author
neher
Browse Repository
No Builds
No Audits
df75d70c4797 Merge branch 'T23975-Connectomics'
Author
neher
Browse Repository
No Builds
No Audits
9456a62b9116 Add cmd apps
Author
neher
Browse Repository
No Builds
No Audits
4ccea4dff0a6 Updated perspectives
Author
neher
Browse Repository
No Builds
No Audits
307675e342a2 Merge branch 'T23991-DefaultSubprojects'
Author
kislinsk
Browse Repository
No Builds
No Audits
dbd8f86bb964 Relax checks for subprojects
Author
kislinsk
Browse Repository
No Builds
No Audits
509297ccb534 Merge branch 'T23989-CrashOnAppExitInDebugMode'
Author
kislinsk
Browse Repository
No Builds
No Audits
3e1db8af5fa9 Fix crash on app exit in debug mode
Author
kislinsk
Browse Repository
No Builds
No Audits
d837c16a2986 Weighted fiber count
Author
neher
Browse Repository
No Builds
No Audits
44e59fb85a85 Merge branch 'T23815-FiberTermination'
Author
neher
Browse Repository
No Builds
No Audits
5dcad5fac386 Enable only self connections
Author
neher
Browse Repository
No Builds
No Audits

Changes (49)

Path

Size

Packages

CMake/

mitkFunctionCreateModule.cmake

O1: MITK Reviewer Group I

mitkFunctionCreatePlugin.cmake

O1: MITK Reviewer Group I

CMakeExternals/

OpenCV.cmake

O1: MITK Reviewer Group I

OpenCV.patch

O1: MITK Reviewer Group I

Modules/

Core/

src/

Rendering/

mitkAnnotationUtils.cpp

O1: MITK Reviewer Group I

mitkRenderWindowBase.cpp

O1: MITK Reviewer Group I

DiffusionImaging/

Connectomics/

Algorithms/

itkConnectomicsNetworkToConnectivityMatrixImageFilter.cpp

mitkConnectomicsNetworkCreator.cpp

mitkConnectomicsNetworkCreator.h

mitkConnectomicsNetworkThresholder.cpp

mitkConnectomicsSimulatedAnnealingPermutationModularity.cpp

mitkCorrelationCalculator.txx

IODataStructures/

mitkConnectomicsNetwork.cpp

mitkConnectomicsNetwork.h

Rendering/

mitkConnectomicsNetworkMapper3D.cpp

Testing/

mitkConnectomicsNetworkTest.cpp

mitkCorrelationCalculatorTest.cpp

cmdapps/

NetworkCreation.cpp

NetworkStatistics.cpp

DiffusionCore/

autoload/

IO/

mitkDiffusionCoreIOMimeTypes.cpp

cmdapps/

src/

Algorithms/

Registration/

mitkDWIHeadMotionCorrectionFilter.cpp

DicomImport/

mitkDiffusionDICOMFileReader.cpp

mitkDiffusionHeaderSiemensDICOMFileReader.cpp

DiffusionIO/

mitkConnectomicsNetworkDefinitions.cpp

mitkConnectomicsNetworkDefinitions.h

mitkConnectomicsNetworkMatrixWriter.cpp

mitkConnectomicsNetworkReader.cpp

mitkConnectomicsNetworkWriter.cpp

mitkFiberBundleMapper2D.cpp

mitkFiberBundleMapper3D.cpp

FiberTracking/

Algorithms/

itkFiberExtractionFilter.cpp

itkFiberExtractionFilter.h

cmdapps/

TractographyEvaluation/

AnchorBasedScoring.cpp

ExtractAnchorTracts.cpp

Plugins/

org.mitk.gui.qt.diffusionimaging.connectomics/

src/

internal/

Perspectives/

QmitkConnectomicsPerspective.cpp

org.mitk.gui.qt.diffusionimaging.fiberfox/

src/

internal/

Perspectives/

QmitkDIAppSyntheticDataGenerationPerspective.cpp

org.mitk.gui.qt.diffusionimaging.fiberprocessing/

src/

internal/

Perspectives/

QmitkFiberProcessingPerspective.cpp

org.mitk.gui.qt.diffusionimaging.ivim/

src/

internal/

Perspectives/

QmitkDIAppIVIMPerspective.cpp

org.mitk.gui.qt.diffusionimaging.reconstruction/

src/

internal/

Perspectives/

QmitkReconstructionPerspective.cpp

org.mitk.gui.qt.diffusionimaging.registration/

src/

internal/

QmitkDwiRegistrationPerspective.cpp

org.mitk.gui.qt.diffusionimaging.tractography/

src/

internal/

Perspectives/

QmitkGibbsTractographyPerspective.cpp

QmitkMachineLearningTractographyPerspective.cpp

QmitkStreamlineTractographyPerspective.cpp

org.mitk.gui.qt.diffusionimaging/

src/

internal/

Perspectives/

QmitkDiffusionDefaultPerspective.cpp

rMITK5a101ba1cd9a

View Options

CMake/mitkFunctionCreateModule.cmake

View Options

CMake/mitkFunctionCreatePlugin.cmake

View Options

CMakeExternals/OpenCV.cmake

View Options

CMakeExternals/OpenCV.patch

View Options

Modules/Core/src/Rendering/mitkAnnotationUtils.cpp

View Options

Modules/Core/src/Rendering/mitkRenderWindowBase.cpp

View Options

Modules/DiffusionImaging/Connectomics/Algorithms/itkConnectomicsNetworkToConnectivityMatrixImageFilter.cpp

View Options

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsNetworkCreator.cpp

View Options

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsNetworkCreator.h

View Options

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsNetworkThresholder.cpp

View Options

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsSimulatedAnnealingPermutationModularity.cpp

View Options

Modules/DiffusionImaging/Connectomics/Algorithms/mitkCorrelationCalculator.txx

View Options

Modules/DiffusionImaging/Connectomics/IODataStructures/mitkConnectomicsNetwork.cpp

View Options

Modules/DiffusionImaging/Connectomics/IODataStructures/mitkConnectomicsNetwork.h

View Options

Modules/DiffusionImaging/Connectomics/Rendering/mitkConnectomicsNetworkMapper3D.cpp

View Options

Modules/DiffusionImaging/Connectomics/Testing/mitkConnectomicsNetworkTest.cpp

View Options

Modules/DiffusionImaging/Connectomics/Testing/mitkCorrelationCalculatorTest.cpp

View Options

Modules/DiffusionImaging/Connectomics/cmdapps/NetworkCreation.cpp

View Options

Modules/DiffusionImaging/Connectomics/cmdapps/NetworkStatistics.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/autoload/IO/mitkDiffusionCoreIOMimeTypes.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/cmdapps/CMakeLists.txt

View Options

Modules/DiffusionImaging/DiffusionCore/cmdapps/DImp.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/cmdapps/DReg.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/cmdapps/DwiDenoising.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/cmdapps/ExportShImage.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/src/Algorithms/Registration/mitkDWIHeadMotionCorrectionFilter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/src/DicomImport/mitkDiffusionDICOMFileReader.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/src/DicomImport/mitkDiffusionHeaderSiemensDICOMFileReader.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkDefinitions.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkDefinitions.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkMatrixWriter.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkReader.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkWriter.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper2D.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFiberExtractionFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFiberExtractionFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/AnchorBasedScoring.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/ExtractAnchorTracts.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/Perspectives/QmitkConnectomicsPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/Perspectives/QmitkDIAppSyntheticDataGenerationPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/Perspectives/QmitkFiberProcessingPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.ivim/src/internal/Perspectives/QmitkDIAppIVIMPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/Perspectives/QmitkReconstructionPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkDwiRegistrationPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkGibbsTractographyPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkMachineLearningTractographyPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkStreamlineTractographyPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Perspectives/QmitkDiffusionDefaultPerspective.cpp

Merge remote-tracking branch 'origin/master' into T23077-ProjectShapeComparison25a101ba1cd9aActions

Description

Details

Event Timeline

Merged Changes

Changes (49)

rMITK5a101ba1cd9a

CMake/mitkFunctionCreateModule.cmake

CMake/mitkFunctionCreatePlugin.cmake

CMakeExternals/OpenCV.cmake

CMakeExternals/OpenCV.patch

Modules/Core/src/Rendering/mitkAnnotationUtils.cpp

Modules/Core/src/Rendering/mitkRenderWindowBase.cpp

Modules/DiffusionImaging/Connectomics/Algorithms/itkConnectomicsNetworkToConnectivityMatrixImageFilter.cpp

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsNetworkCreator.cpp

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsNetworkCreator.h

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsNetworkThresholder.cpp

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsSimulatedAnnealingPermutationModularity.cpp

Modules/DiffusionImaging/Connectomics/Algorithms/mitkCorrelationCalculator.txx

Modules/DiffusionImaging/Connectomics/IODataStructures/mitkConnectomicsNetwork.cpp

Modules/DiffusionImaging/Connectomics/IODataStructures/mitkConnectomicsNetwork.h

Modules/DiffusionImaging/Connectomics/Rendering/mitkConnectomicsNetworkMapper3D.cpp

Modules/DiffusionImaging/Connectomics/Testing/mitkConnectomicsNetworkTest.cpp

Modules/DiffusionImaging/Connectomics/Testing/mitkCorrelationCalculatorTest.cpp

Modules/DiffusionImaging/Connectomics/cmdapps/NetworkCreation.cpp

Modules/DiffusionImaging/Connectomics/cmdapps/NetworkStatistics.cpp

Modules/DiffusionImaging/DiffusionCore/autoload/IO/mitkDiffusionCoreIOMimeTypes.cpp

Modules/DiffusionImaging/DiffusionCore/cmdapps/CMakeLists.txt

Modules/DiffusionImaging/DiffusionCore/cmdapps/DImp.cpp

Modules/DiffusionImaging/DiffusionCore/cmdapps/DReg.cpp

Modules/DiffusionImaging/DiffusionCore/cmdapps/DwiDenoising.cpp

Modules/DiffusionImaging/DiffusionCore/cmdapps/ExportShImage.cpp

Modules/DiffusionImaging/DiffusionCore/src/Algorithms/Registration/mitkDWIHeadMotionCorrectionFilter.cpp

Modules/DiffusionImaging/DiffusionCore/src/DicomImport/mitkDiffusionDICOMFileReader.cpp

Modules/DiffusionImaging/DiffusionCore/src/DicomImport/mitkDiffusionHeaderSiemensDICOMFileReader.cpp

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkDefinitions.cpp

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkDefinitions.h

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkMatrixWriter.cpp

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkReader.cpp

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkWriter.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper2D.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFiberExtractionFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFiberExtractionFilter.h

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/AnchorBasedScoring.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/ExtractAnchorTracts.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/src/internal/Perspectives/QmitkConnectomicsPerspective.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/Perspectives/QmitkDIAppSyntheticDataGenerationPerspective.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/Perspectives/QmitkFiberProcessingPerspective.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.ivim/src/internal/Perspectives/QmitkDIAppIVIMPerspective.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/src/internal/Perspectives/QmitkReconstructionPerspective.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkDwiRegistrationPerspective.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkGibbsTractographyPerspective.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkMachineLearningTractographyPerspective.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/Perspectives/QmitkStreamlineTractographyPerspective.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Perspectives/QmitkDiffusionDefaultPerspective.cpp

Merge remote-tracking branch 'origin/master' into T23077-ProjectShapeComparison2
5a101ba1cd9a
Actions