Merge remote-tracking branch 'origin/bug-15902-RegistrationWrapper'
af2e0662bfc0
Actions

Description

Merge remote-tracking branch 'origin/bug-15902-RegistrationWrapper'

Details

Provenance

Authored on Aug 27 2013, 10:06 AM

Parents

rMITKec25b6df6a21: Created Classes and Wrappers for batched registrations
rMITK3aae9ca11280: Merge branch 'bug-15888-temporary-files-and-dirs'

Branches

Unknown

Tags

Unknown

Event Timeline

• webechr committed rMITKaf2e0662bfc0: Merge remote-tracking branch 'origin/bug-15902-RegistrationWrapper' (authored by • webechr).Aug 27 2013, 10:06 AM

Merged Changes

ec25b6df6a21 Created Classes and Wrappers for batched registrations
Author
• webechr
Browse Repository
No Builds
No Audits
6a6650b6d4da Merge branch 'bug-15838-TriangulationThreshold'
Author
• kilgus
Browse Repository
No Builds
No Audits
3aa1858a7028 Merge branch 'bug-15901-NiftiDti'
Author
neher
Browse Repository
No Builds
No Audits
72e9e7cd3d47 Merge branch 'bug-15837-Boost_ADDITIONAL_VERSIONS'
Author
kislinsk
Browse Repository
No Builds
No Audits
f086eecfeeb2 Use Boost_ADDITIONAL_VERSIONS to find boost.
Author
kislinsk
Browse Repository
No Builds
No Audits
1edd1ea916dc allowing nine component tensors and nifti dti
Author
neher
Browse Repository
No Builds
No Audits
610188fa35d0 Merge branch 'bug-15837-Boost_LIBRARY_DIR'
Author
kislinsk
Browse Repository
No Builds
No Audits
37f9cbc17dc6 Corrected Boost_LIBRARY_DIRS to Boost_LIBRARY_DIR.
Author
kislinsk
Browse Repository
No Builds
No Audits
62bbe6f4eec5 Merge branch 'bug-15752-RemoveCommas'
Author
• webechr
Browse Repository
No Builds
No Audits
c19571c4b9d5 Merge branch 'bug-12065-SetSlice'
Author
• webechr
Browse Repository
No Builds
No Audits
c106968666a9 copied and adapted set slice methods from the segmentation view.
Author
• webechr
Browse Repository
No Builds
No Audits
bd6ae7e1ade1 Merge branch 'bug-15896-OpenCLFix'
Author
goetzm
Browse Repository
No Builds
No Audits
474e2fb988ae Changed namespace for us-functions
Author
goetzm
Browse Repository
No Builds
No Audits
6139aa316f35 Changing default value to 0.0 instead of -1.0 to allow squaring in setter…
Author
• kilgus
Browse Repository
No Builds
No Audits
2a0fec609f80 Code for GUI of triangulation threshold.
Author
• kilgus
Browse Repository
No Builds
No Audits
a4703808a1e9 removed commas which caused compile errors when macro was used
Author
• webechr
Browse Repository
No Builds
No Audits

Changes (26)

Path

Size

Packages

CMake/

PackageDepends/

MITK_Boost_Config.cmake

O1: MITK Reviewer Group I

mitkFunctionGetLibrarySearchPaths.cmake

O1: MITK Reviewer Group I

CMakeExternals/

SOFA.cmake

O1: MITK Reviewer Group I

Core/

Code/

IO/

mitkPixelTypeMultiplex.h

Modules/

DiffusionImaging/

DiffusionCore/

Algorithms/

Registration/

mitkBatchedRegistration.cpp

mitkBatchedRegistration.h

IODataStructures/

DiffusionWeightedImages/

mitkNrrdDiffusionImageReader.cpp

TensorImages/

mitkNrrdTensorImageReader.cpp

MiniApps/

QballReconstruction.cpp

TensorReconstruction.cpp

files.cmake

OpenCL/

Testing/

mitkOclBinaryThresholdImageFilterTest.cpp

mitkOclImageTest.cpp

mitkOclReferenceCountTest.cpp

mitkOclResourceServiceTest.cpp

mitkOclBinaryThresholdImageFilter.cpp

mitkOclFilter.cpp

mitkOclImage.cpp

mitkOclResourceServiceImpl_p.h

mitkOpenCLActivator.cpp

mitkOpenCLActivator.h

ToFProcessing/

mitkToFDistanceImageToSurfaceFilter.cpp

ToFUI/

Qmitk/

QmitkToFConnectionWidget.cpp

Plugins/

org.mitk.gui.qt.measurementtoolbox/

src/

internal/

QmitkMeasurementView.cpp

O1: MITK Reviewer Group I

org.mitk.gui.qt.tofutil/

src/

internal/

QmitkToFUtilView.cpp

QmitkToFUtilViewControls.ui

rMITKaf2e0662bfc0

View Options

CMake/PackageDepends/MITK_Boost_Config.cmake

View Options

CMake/mitkFunctionGetLibrarySearchPaths.cmake

View Options

CMakeExternals/SOFA.cmake

View Options

Core/Code/IO/mitkPixelTypeMultiplex.h

View Options

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

View Options

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

View Options

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

View Options

Modules/DiffusionImaging/DiffusionCore/IODataStructures/TensorImages/mitkNrrdTensorImageReader.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/MiniApps/QballReconstruction.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/MiniApps/TensorReconstruction.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/files.cmake

View Options

Modules/OpenCL/Testing/mitkOclBinaryThresholdImageFilterTest.cpp

View Options

Modules/OpenCL/Testing/mitkOclImageTest.cpp

View Options

Modules/OpenCL/Testing/mitkOclReferenceCountTest.cpp

View Options

Modules/OpenCL/Testing/mitkOclResourceServiceTest.cpp

View Options

Modules/OpenCL/mitkOclBinaryThresholdImageFilter.cpp

View Options

Modules/OpenCL/mitkOclFilter.cpp

View Options

Modules/OpenCL/mitkOclImage.cpp

View Options

Modules/OpenCL/mitkOclResourceServiceImpl_p.h

View Options

Modules/OpenCL/mitkOpenCLActivator.cpp

View Options

Modules/OpenCL/mitkOpenCLActivator.h

View Options

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.cpp

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilViewControls.ui

Merge remote-tracking branch 'origin/bug-15902-RegistrationWrapper'af2e0662bfc0Actions

Description

Details

Event Timeline

Merged Changes

Changes (26)

rMITKaf2e0662bfc0

CMake/PackageDepends/MITK_Boost_Config.cmake

CMake/mitkFunctionGetLibrarySearchPaths.cmake

CMakeExternals/SOFA.cmake

Core/Code/IO/mitkPixelTypeMultiplex.h

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

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

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

Modules/DiffusionImaging/DiffusionCore/IODataStructures/TensorImages/mitkNrrdTensorImageReader.cpp

Modules/DiffusionImaging/DiffusionCore/MiniApps/QballReconstruction.cpp

Modules/DiffusionImaging/DiffusionCore/MiniApps/TensorReconstruction.cpp

Modules/DiffusionImaging/DiffusionCore/files.cmake

Modules/OpenCL/Testing/mitkOclBinaryThresholdImageFilterTest.cpp

Modules/OpenCL/Testing/mitkOclImageTest.cpp

Modules/OpenCL/Testing/mitkOclReferenceCountTest.cpp

Modules/OpenCL/Testing/mitkOclResourceServiceTest.cpp

Modules/OpenCL/mitkOclBinaryThresholdImageFilter.cpp

Modules/OpenCL/mitkOclFilter.cpp

Modules/OpenCL/mitkOclImage.cpp

Modules/OpenCL/mitkOclResourceServiceImpl_p.h

Modules/OpenCL/mitkOpenCLActivator.cpp

Modules/OpenCL/mitkOpenCLActivator.h

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.cpp

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.cpp

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilViewControls.ui

Merge remote-tracking branch 'origin/bug-15902-RegistrationWrapper'
af2e0662bfc0
Actions