Diffusion MITK 16ef562b0c7a

Merge branch 'bug-9551-FixAmbigousCallsToSqrt' into bug-9551…
16ef562b0c7a
Actions

Description

Merge branch 'bug-9551-FixAmbigousCallsToSqrt' into bug-9551-StatisticsCalculatorForPointSetDifference

Conflicts:
Modules/ImageStatistics/Testing/mitkPointSetDifferenceStatisticsCalculatorTest.cpp

Details

Provenance

seitela

Authored on Sep 29 2011, 8:36 AM

Parents

rMITK21f59e290a9d: corrected zero check
rMITKc849bcee5dbe: COMP: Temporarily deactivate test.

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITK16ef562b0c7a: Merge branch 'bug-9551-FixAmbigousCallsToSqrt' into bug-9551… (authored by seitela).Sep 29 2011, 8:36 AM

Merged Changes

c849bcee5dbe COMP: Temporarily deactivate test.
Author
seitela
Browse Repository
No Builds
No Audits
628abf0195e1 COMP: fixed ambiguous calls to sqrt()
Author
seitela
Browse Repository
No Builds
No Audits
f1a135d605a0 Merge branch 'bug-9551-StatisticsCalculatorForPointSetDifference'
Author
seitela
Browse Repository
No Builds
No Audits
90da6aed0707 Merge branch 'bug-9541-EnhanceFBDev'
Author
reicht
Browse Repository
No Builds
No Audits
9dd446abfca3 COMP adding exports macro to fiberbundle
Author
reicht
Browse Repository
No Builds
No Audits
00fe7f4f4df3 Merge branch 'bug-9541-EnhanceFBDev'
Author
reicht
Browse Repository
No Builds
No Audits
96fa026a5af2 COMP fix caseSensitive includes
Author
reicht
Browse Repository
No Builds
No Audits
be5d921ab511 Merge branch 'bug-9541-EnhanceFBDev'
Author
reicht
Browse Repository
No Builds
No Audits
f165585376f1 major architecture for colorcoding in fiberbundleDevView implemented
Author
reicht
Browse Repository
No Builds
No Audits
21a85b6f8566 interim for colorcoding
Author
reicht
Browse Repository
No Builds
No Audits
bf1c52a9e27c Merge branch 'bug-9408-portingFBMapper2DtoMaster'
Author
reicht
Browse Repository
No Builds
No Audits
bcd35e54f083 interim commit
Author
reicht
Browse Repository
No Builds
No Audits
bed3c3ef56f7 introducing FBMapper2D
Author
reicht
Browse Repository
No Builds
No Audits

Changes (15)

Path

Size

Packages

Modules/

Bundles/

org.mitk.diffusionimaging/

src/

internal/

mitkDiffusionImagingActivator.cpp

org.mitk.gui.qt.diffusionimaging/

resources/

	FiberBundleX.png
	FiberBundle.png

src/

internal/

QmitkFiberBundleDeveloperView.cpp

QmitkFiberBundleDeveloperView.h

QmitkFiberBundleDeveloperViewControls.ui

DiffusionImaging/

IODataStructures/

FiberBundle/

mitkFiberBundle.cpp

mitkFiberBundle.h

mitkDiffusionImagingObjectFactory.cpp

Rendering/

mitkDiffusionImageMapper.cpp

mitkFiberBundleMapper2D.cpp

mitkFiberBundleMapper2D.h

mitkFiberBundleMapper3D.cpp

mitkFiberBundleMapper3D.h

files.cmake

ImageStatistics/

Testing/

files.cmake

O1: MITK Reviewer Group I

rMITK16ef562b0c7a

View Options

Modules/Bundles/org.mitk.diffusionimaging/src/internal/mitkDiffusionImagingActivator.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/FiberBundleX.png

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.h

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperViewControls.ui

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.h

View Options

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkDiffusionImageMapper.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper2D.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper2D.h

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.h

View Options

Modules/DiffusionImaging/files.cmake

View Options

Modules/ImageStatistics/Testing/files.cmake

Merge branch 'bug-9551-FixAmbigousCallsToSqrt' into bug-9551…16ef562b0c7aActions

Description

Details

Event Timeline

Merged Changes

Changes (15)

rMITK16ef562b0c7a

Modules/Bundles/org.mitk.diffusionimaging/src/internal/mitkDiffusionImagingActivator.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/FiberBundleX.png

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.h

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperViewControls.ui

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.h

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

Modules/DiffusionImaging/Rendering/mitkDiffusionImageMapper.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper2D.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper2D.h

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.h

Modules/DiffusionImaging/files.cmake

Modules/ImageStatistics/Testing/files.cmake

Merge branch 'bug-9551-FixAmbigousCallsToSqrt' into bug-9551…
16ef562b0c7a
Actions