Merge branch 'bug-15846-DwiHeadMotionCorrection-master-integration' into bug…
88f7c9415da4
Actions

Description

Merge branch 'bug-15846-DwiHeadMotionCorrection-master-integration' into bug-15846-DWI-Registration-PreReleaseFixes

Conflicts:
Modules/DiffusionImaging/DiffusionCore/Algorithms/Registration/mitkDWIHeadMotionCorrectionFilter.cpp
Modules/DiffusionImaging/DiffusionCore/IODataStructures/DiffusionWeightedImages/mitkImageToDiffusionImageSource.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionView.cpp

Details

Provenance

• hering

Authored on Oct 6 2014, 3:52 PM

Parents

rMITK20b969ea4fee: Fixed variable initialization
rMITKdb34399980fc: COMP: Merge branch 'bug-14866-MakeFileReaderAndFileWriterMicroserviceBased…

Branches

Unknown

Tags

Unknown

Event Timeline

• hering committed rMITK88f7c9415da4: Merge branch 'bug-15846-DwiHeadMotionCorrection-master-integration' into bug… (authored by • hering).Oct 6 2014, 3:52 PM

Merged Changes

20b969ea4fee Fixed variable initialization
Author
• hering
Browse Repository
No Builds
No Audits
efc0e9a636a5 Fixed SplitDWFilter : correctly copying directions
Author
• hering
Browse Repository
No Builds
No Audits
672c6064ce93 Exported ItkAccumulate out of class
Author
• hering
Browse Repository
No Builds
No Audits
4dddf40b0df0 Fixed warnings, added missing dependencies
Author
• hering
Browse Repository
No Builds
No Audits
44e9ae6a6570 Merge branch 'bug-15846-FixesInDWIHeadMotionCorrection' into bug-15846…
Author
• hering
Browse Repository
No Builds
No Audits
1bc3595cea8b Fixed mask image iterator construction
Author
• hering
Browse Repository
No Builds
No Audits
be7eaf17ced8 Fixing mask image iteration, removed std output
Author
• hering
Browse Repository
No Builds
No Audits
d4293da33e3c Add masking for signal generation
Author
• hering
Browse Repository
No Builds
No Audits
3207deb4115f Correct processing of multi-b0 data
Author
• hering
Browse Repository
No Builds
No Audits
b1b7b6665434 Merge branch 'personal/hering/mbi-dev-branch' into bug-15846…
Author
• hering
Browse Repository
No Builds
No Audits
a04fe04c6f50 Enhancing API to allow inheritance
Author
• hering
Browse Repository
No Builds
No Audits
569ebf5bc248 Fix b0 initialization in tensor to dwi
Author
• hering
Browse Repository
No Builds
No Audits
80a742be66fe Fix pyramid level initialization
Author
• hering
Browse Repository
No Builds
No Audits
d43a39fed327 Resolved conflicts
Author
• hering
Browse Repository
No Builds
No Audits
04206f02ecc4 Add single shell extraction custom test
Author
• hering
Browse Repository
No Builds
No Audits
e8fe40b0836d Merge branch 'personal/hering/mbi-dev-branch' of mitk.org:MITK into…
Author
• hering
Browse Repository
No Builds
No Audits
0a32d1ac5d52 Single shell extraction
Author
• hering
Browse Repository
No Builds
No Audits
59fb79f550b3 WIP
Author
• hering
Browse Repository
No Builds
No Audits
7ff2ac68f700 Add custom test for DW convert
Author
• hering
Browse Repository
No Builds
No Audits
00c39be56252 Move GradientReduction filter to DiffusionCore
Author
• hering
Browse Repository
No Builds
No Audits
36683e0a13d9 Allowing more complex processing in registration
Author
• hering
Browse Repository
No Builds
No Audits
043b08df2f50 Changed container type to the same as in DiffusionImage
Author
• hering
Browse Repository
No Builds
No Audits
4cdaf4c5933f Adapting to changed Container type
Author
• hering
Browse Repository
No Builds
No Audits
afbef68c3459 Changed container type to the same as in DiffusionImage
Author
• hering
Browse Repository
No Builds
No Audits
403342d8d75c Merge branch 'personal/hering/mbi-dev-branch' of mitk.org:MITK into…
Author
• hering
Browse Repository
No Builds
No Audits
f434d83a482e Adapting to changed Container type
Author
• hering
Browse Repository
No Builds
No Audits
fccdd86195a9 Changed container type to the same as in DiffusionImage
Author
• hering
Browse Repository
No Builds
No Audits
092d847e1c7c Merge branch 'master' into personal/hering/mbi-dev-branch
Author
• hering
Browse Repository
No Builds
No Audits
8549614b9d06 Merge branch 'bug-15945-FixContainerType' into mbi-dev-branch
Author
• hering
Browse Repository
No Builds
No Audits
348223005b67 Adapting to changed Container type
Author
• hering
Browse Repository
No Builds
No Audits
7f22862cf105 Changed container type to the same as in DiffusionImage
Author
• hering
Browse Repository
No Builds
No Audits

Changes (22)

Path

Size

Modules/

DiffusionImaging/

DiffusionCore/

Algorithms/

Registration/

mitkDWIHeadMotionCorrectionFilter.cpp

mitkDWIHeadMotionCorrectionFilter.h

mitkPyramidImageRegistrationMethod.cpp

mitkPyramidImageRegistrationMethod.h

mitkPyramidRegistrationMethodHelper.h

itkSplitDWImageFilter.h

itkSplitDWImageFilter.txx

itkTensorImageToDiffusionImageFilter.h

itkTensorImageToDiffusionImageFilter.txx

CMakeLists.txt

Testing/

files.cmake

	mitkConvertDWITypeTest.cpp
	mitkDWHeadMotionCorrectionTest.cpp

mitkDWHeadMotionCorrectionTest.cpp

mitkExtractSingleShellTest.cpp

files.cmake

	DiffusionCore/	Algorithms/
	FiberTracking/	Algorithms/

itkElectrostaticRepulsionDiffusionGradientReductionFilter.h

itkElectrostaticRepulsionDiffusionGradientReductionFilter.txx

FiberTracking/

Algorithms/

itkElectrostaticRepulsionDiffusionGradientReductionFilter.h

itkElectrostaticRepulsionDiffusionGradientReductionFilter.txx

files.cmake

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

Merge branch 'bug-15846-DwiHeadMotionCorrection-master-integration' into bug…88f7c9415da4Actions

Description

Details

Event Timeline

Merged Changes

Changes (22)

rMITK88f7c9415da4

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

Modules/DiffusionImaging/DiffusionCore/Algorithms/Registration/mitkDWIHeadMotionCorrectionFilter.h

Modules/DiffusionImaging/DiffusionCore/Algorithms/Registration/mitkPyramidImageRegistrationMethod.cpp

Modules/DiffusionImaging/DiffusionCore/Algorithms/Registration/mitkPyramidImageRegistrationMethod.h

Modules/DiffusionImaging/DiffusionCore/Algorithms/Registration/mitkPyramidRegistrationMethodHelper.h

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkElectrostaticRepulsionDiffusionGradientReductionFilter.h

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkElectrostaticRepulsionDiffusionGradientReductionFilter.txx

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkSplitDWImageFilter.h

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkSplitDWImageFilter.txx

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkTensorImageToDiffusionImageFilter.h

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkTensorImageToDiffusionImageFilter.txx

Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt

Modules/DiffusionImaging/DiffusionCore/Testing/files.cmake

Modules/DiffusionImaging/DiffusionCore/Testing/mitkConvertDWITypeTest.cpp

Modules/DiffusionImaging/DiffusionCore/Testing/mitkDWHeadMotionCorrectionTest.cpp

Modules/DiffusionImaging/DiffusionCore/Testing/mitkExtractSingleShellTest.cpp

Modules/DiffusionImaging/DiffusionCore/files.cmake

Modules/DiffusionImaging/FiberTracking/Algorithms/itkElectrostaticRepulsionDiffusionGradientReductionFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkElectrostaticRepulsionDiffusionGradientReductionFilter.txx

Modules/DiffusionImaging/FiberTracking/files.cmake

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

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

Merge branch 'bug-15846-DwiHeadMotionCorrection-master-integration' into bug…
88f7c9415da4
Actions