Merge branch 'bug-15902-RegistrationWrapper-201309'
45fca02405c2
Actions

Description

Merge branch 'bug-15902-RegistrationWrapper-201309'

Details

Provenance

Authored on Dec 6 2013, 10:42 AM

Parents

rMITK3c1c27b017b2: Merge branch 'bug-15902-RegistrationWrapper-201309' of mitk.org:MITK into bug…
rMITKb296fe436a27: Merge branch 'bug-16508-StatemachineExtension'

Branches

Unknown

Tags

Unknown

Event Timeline

• webechr committed rMITK45fca02405c2: Merge branch 'bug-15902-RegistrationWrapper-201309' (authored by • webechr).Dec 6 2013, 10:42 AM

Merged Changes

3c1c27b017b2 Merge branch 'bug-15902-RegistrationWrapper-201309' of mitk.org:MITK into bug…
Author
• webechr
Browse Repository
No Builds
No Audits
cdc19eff614e Revert CMakeList Type changes. Minor documentation notes.
Author
• webechr
Browse Repository
No Builds
No Audits
6fe8bdd5242b Fix Error applying parameters.
Author
• webechr
Browse Repository
No Builds
No Audits
8761a7e5bac4 Actually use image with corrected origin for registration.
Author
• webechr
Browse Repository
No Builds
No Audits
ae807a2711ba Fix, enable origin reset again, but modify a cloned image instead of original
Author
• webechr
Browse Repository
No Builds
No Audits
c37bd1a876f5 Temporary Fix for Origin Change
Author
• webechr
Browse Repository
No Builds
No Audits
c0c842a10c1e Merge branch 'bug-15902-RegistrationWrapper' into bug-15902-RegistrationWrapper…
Author
• webechr
Browse Repository
No Builds
No Audits
ffdc8a2d1b62 fix include.
Author
• webechr
Browse Repository
No Builds
No Audits
1f6350e303a4 Merge branch 'bug-15902-RegistrationWrapper' of mitk.org:MITK into bug-15902…
Author
• webechr
Browse Repository
No Builds
No Audits
ec382c7e130f Extended Docu
Author
• webechr
Browse Repository
No Builds
No Audits
35a350e515a1 rename
Author
• webechr
Browse Repository
No Builds
No Audits
30cc48ff7b84 Remove unneccesary functions, fix offset adaption for regular images
Author
• webechr
Browse Repository
No Builds
No Audits
aa1dbbe59aa6 Fix Image data access
Author
• webechr
Browse Repository
No Builds
No Audits
5bd55c0d7cba Fix for Non-diffusion image registration
Author
• webechr
Browse Repository
No Builds
No Audits
c9edc4c22638 Fix for Non-diffusion image registration
Author
• webechr
Browse Repository
No Builds
No Audits
b11bd613bf83 clean up, now working dwi registration, and probably working gradient correction
Author
• webechr
Browse Repository
No Builds
No Audits
e8cdda868407 working dwi registration on b0 images (manual comuptation)
Author
• webechr
Browse Repository
No Builds
No Audits
009002f68fcc almost working DWI registration
Author
• webechr
Browse Repository
No Builds
No Audits
04b8e1fc2da8 added double to pyramid regitsration helper, for some mri
Author
• webechr
Browse Repository
No Builds
No Audits
f86f576c548b Fix working batched registration. Now using resampling to apply transformation.
Author
• webechr
Browse Repository
No Builds
No Audits
ea3f580d38e6 Allow fixed and moving image to be of different types.
Author
• webechr
Browse Repository
No Builds
No Audits
0d06d9f2cd4e Add InitializeByGeometry Option to PyramidalRegistrationMethod
Author
• webechr
Browse Repository
No Builds
No Audits
f126b52b89f2 Michael Goetz: Fixed transformation of DiffusionImages, because they ignore…
Author
• webechr
Browse Repository
No Builds
No Audits
71192ebffc09 enhanced batched registration to handle dwi images added method in…
Author
• webechr
Browse Repository
No Builds
No Audits
ba51f2569e74 Merge branch 'master' into bug-15902-RegistrationWrapper
Author
• webechr
Browse Repository
No Builds
No Audits
b7d722ce9bee Merge branch 'bug-15864-FloatSupportForRGBPixelTTypein3dImages' into bug-15902…
Author
• webechr
Browse Repository
No Builds
No Audits
2743215e3a6f rm unused line
Author
• webechr
Browse Repository
No Builds
No Audits
a389dc0272eb Fix: Apply transformation correclty (now working)
Author
• webechr
Browse Repository
No Builds
No Audits
6857b71983c3 void getTransformation correct translation (invert sign) rotation still an open…
Author
• webechr
Browse Repository
No Builds
No Audits
a4d983b7d36f Fix: proper setting of translation
Author
• webechr
Browse Repository
No Builds
No Audits
5d4a32c6e2c6 Added possibility to mask image regions for registration
Author
• webechr
Browse Repository
No Builds
No Audits
e516781cbcd7 Fixed wrong transformation matrix
Author
goetzm
Browse Repository
No Builds
No Audits
0883bf610d73 ADD unsigned short
Author
• webechr
Browse Repository
No Builds
No Audits
876ce03bdb83 Added unsigned short as possible data input for PyramidRegistrationMethod
Author
• webechr
Browse Repository
No Builds
No Audits
2ea7e6bced41 changes to save image
Author
• webechr
Browse Repository
No Builds
No Audits
73d98102ced5 Merge branch 'master' into bug-15902-RegistrationWrapper
Author
• webechr
Browse Repository
No Builds
No Audits
66eec9a60318 Merge branch 'master' of mitk.org:MITK
Author
• webechr
Browse Repository
No Builds
No Audits
e26feda4c8f1 Merge remote-tracking branch 'origin/bug-15902-RegistrationWrapper'
Author
• webechr
Browse Repository
No Builds
No Audits
8d644e367166 Merge branch 'master' of mitk.org:MITK
Author
• webechr
Browse Repository
No Builds
No Audits
58d55a931cb6 Implemented first version of position correcture.
Author
goetzm
Browse Repository
No Builds
No Audits
af2e0662bfc0 Merge remote-tracking branch 'origin/bug-15902-RegistrationWrapper'
Author
• webechr
Browse Repository
No Builds
No Audits
ec25b6df6a21 Created Classes and Wrappers for batched registrations
Author
• webechr
Browse Repository
No Builds
No Audits
a7af98dc17df fix
Author
• webechr
Browse Repository
No Builds
No Audits
b8417722416f added cmake entry for floats on composite images
Author
• webechr
Browse Repository
No Builds
No Audits
539eb65ad0ec + 2D
Author
• webechr
Browse Repository
No Builds
No Audits
ef6aabb3f1a8 copied templates to support floats with rgb pixels
Author
• webechr
Browse Repository
No Builds
No Audits

Changes (8)

Path

Size

Modules/

DiffusionImaging/

DiffusionCore/

Algorithms/

Registration/

mitkPyramidImageRegistrationMethod.cpp

mitkPyramidImageRegistrationMethod.h

mitkPyramidRegistrationMethodHelper.h

mitkRegistrationWrapper.cpp

mitkRegistrationWrapper.h

IODataStructures/

DiffusionWeightedImages/

mitkDiffusionImageCorrectionFilter.cpp

mitkDiffusionImageCorrectionFilter.h

files.cmake

rMITK45fca02405c2

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Modules/DiffusionImaging/DiffusionCore/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCorrectionFilter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCorrectionFilter.h

View Options

Modules/DiffusionImaging/DiffusionCore/files.cmake

Merge branch 'bug-15902-RegistrationWrapper-201309'45fca02405c2Actions

Description

Details

Event Timeline

Merged Changes

Changes (8)

rMITK45fca02405c2

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/Registration/mitkRegistrationWrapper.cpp

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

Modules/DiffusionImaging/DiffusionCore/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCorrectionFilter.cpp

Modules/DiffusionImaging/DiffusionCore/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCorrectionFilter.h

Modules/DiffusionImaging/DiffusionCore/files.cmake

Merge branch 'bug-15902-RegistrationWrapper-201309'
45fca02405c2
Actions