sw-review-branch' into…
b1a166ed3246
Actions

Description

Merge remote-tracking branch 'origin/personal/hering/sw-review-branch' 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/documentation/UserManual/QmitkFiberfoxViewUserManual.dox
Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfMaximaExtractionViewUserManual.dox
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionView.cpp

Details

Provenance

• hering

Authored on Oct 6 2014, 4:15 PM

Parents

rMITK4660ca477bbc: Enabling Head-motion correction batch processing
rMITK88f7c9415da4: Merge branch 'bug-15846-DwiHeadMotionCorrection-master-integration' into bug…

Branches

Unknown

Tags

Unknown

Event Timeline

• hering committed rMITKb1a166ed3246: Merge remote-tracking branch 'origin/personal/hering/sw-review-branch' into… (authored by • hering).Oct 7 2014, 1:54 PM

Merged Changes

4660ca477bbc Enabling Head-motion correction batch processing
Author
• hering
Browse Repository
No Builds
No Audits
cc096c43541e User Manual enhancements
Author
• hering
Browse Repository
No Builds
No Audits
21bb967882da Entry for user manual
Author
• hering
Browse Repository
No Builds
No Audits
c9e44892f65b Registration code cleanup
Author
• hering
Browse Repository
No Builds
No Audits
0bef0824a2e0 Cleanup code and add documentation
Author
• hering
Browse Repository
No Builds
No Audits
6f6a45fe0ad6 Fix compile errors due to master changes
Author
• hering
Browse Repository
No Builds
No Audits
a61ec75715cb Merge remote-tracking branch 'origin/bug-15846-DwiHeadMotionCorrection-master…
Author
• hering
Browse Repository
No Builds
No Audits

Changes (17)

Path

Size

Applications/

Diffusion/

MitkDiffusion.cpp

Modules/

DiffusionImaging/

DiffusionCore/

Algorithms/

Registration/

mitkDWIHeadMotionCorrectionFilter.cpp

mitkPyramidImageRegistrationMethod.cpp

mitkPyramidImageRegistrationMethod.h

mitkPyramidRegistrationMethodHelper.h

IODataStructures/

DiffusionWeightedImages/

mitkDiffusionImage.txx

Testing/

mitkDWHeadMotionCorrectionTest.cpp

mitkExtractSingleShellTest.cpp

Plugins/

org.mitk.gui.qt.diffusionimaging/

documentation/

UserManual/

QmitkDiffusionImagingUserManual.dox

QmitkFiberfoxViewUserManual.dox

QmitkOdfMaximaExtractionViewUserManual.dox

registration_basic.png

registration_batch.png

src/

internal/

QmitkDiffusionRegistrationView.cpp

Merge remote-tracking branch 'origin/personal/hering/sw-review-branch' into…b1a166ed3246Actions

Description

Details

Event Timeline

Merged Changes

Changes (17)

rMITKb1a166ed3246

Applications/Diffusion/MitkDiffusion.cpp

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

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

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

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

Modules/DiffusionImaging/DiffusionCore/IODataStructures/DiffusionWeightedImages/mitkDiffusionImage.txx

Modules/DiffusionImaging/DiffusionCore/Testing/mitkDWHeadMotionCorrectionTest.cpp

Modules/DiffusionImaging/DiffusionCore/Testing/mitkExtractSingleShellTest.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberfoxViewUserManual.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfMaximaExtractionViewUserManual.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/registration_basic.png

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/registration_batch.png

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

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

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

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

Merge remote-tracking branch 'origin/personal/hering/sw-review-branch' into…
b1a166ed3246
Actions