Merge branch 'bug-9541-EnhanceFBDev'
be5d921ab511
Actions

Description

Merge branch 'bug-9541-EnhanceFBDev'

Details

Provenance

Authored on Sep 27 2011, 11:27 PM

Parents

rMITKf165585376f1: major architecture for colorcoding in fiberbundleDevView implemented
rMITKeb5d5d83d0f4: Merge branch 'bug-9516-DifferentModesForFiducialRegistrationWidget'

Branches

Unknown

Tags

Unknown

Event Timeline

reicht committed rMITKbe5d921ab511: Merge branch 'bug-9541-EnhanceFBDev' (authored by reicht).Sep 27 2011, 11:27 PM

Merged Changes

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 (14)

Path

Size

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

rMITKbe5d921ab511

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

Merge branch 'bug-9541-EnhanceFBDev'be5d921ab511Actions

Description

Details

Event Timeline

Merged Changes

Changes (14)

rMITKbe5d921ab511

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

Merge branch 'bug-9541-EnhanceFBDev'
be5d921ab511
Actions