Merge branch 'bug-9065-mitkFiberBundleX'
291f6d78c39c
Actions

Description

Merge branch 'bug-9065-mitkFiberBundleX'

Details

Provenance

Authored on Aug 19 2011, 5:41 PM

Parents

rMITK88dc9ddc082f: first preview of fiberBundleXMapper3D implemented [cOK]
rMITK1290d8ef83ea: Merge branch 'bug-8945-PointSetStatisticsCalculator'

Branches

Unknown

Tags

Unknown

Event Timeline

reicht committed rMITK291f6d78c39c: Merge branch 'bug-9065-mitkFiberBundleX' (authored by reicht).Aug 19 2011, 5:41 PM

Merged Changes

88dc9ddc082f first preview of fiberBundleXMapper3D implemented [cOK]
Author
reicht
Browse Repository
No Builds
No Audits
7a67ca27a6df corrected header file in files.cmake
Author
reicht
Browse Repository
No Builds
No Audits
658bf668d60b interim commit
Author
reicht
Browse Repository
No Builds
No Audits
504215a6be11 clean memory in FBX
Author
reicht
Browse Repository
No Builds
No Audits
6c078f261d69 adding FBX_Mapper3D files
Author
reicht
Browse Repository
No Builds
No Audits
98164f404dbd added FBX_Mapper3D architecture
Author
reicht
Browse Repository
No Builds
No Audits
a5fdc95487f2 orientationbased colorcoding implemented
Author
reicht
Browse Repository
No Builds
No Audits
bbae682e8d52 starting colorprocessing
Author
reicht
Browse Repository
No Builds
No Audits
420400931517 controlstructure for colorcoding implemented ...beta version [cOK]
Author
reicht
Browse Repository
No Builds
No Audits
76e52b9d89ad varName changed
Author
reicht
Browse Repository
No Builds
No Audits
40b648d6280e adding checking mechanism for colorcoding [cOK]
Author
reicht
Browse Repository
No Builds
No Audits
85455af0a76f cmake changes
Author
reicht
Browse Repository
No Builds
No Audits
0d1167130daa Xedits in Colorcoding
Author
reicht
Browse Repository
No Builds
No Audits
e1e0960742bc colorcoding interim commit [cOK]
Author
reicht
Browse Repository
No Builds
No Audits
b0f6c9309ca9 methods to get/set fiberstructures in vtkpolydata format
Author
reicht
Browse Repository
No Builds
No Audits
068d6c251ce7 adding files for modernized fiberbundle datastructure
Author
reicht
Browse Repository
No Builds
No Audits

Changes (20)

Path

Size

Modules/

DiffusionImaging/

IODataStructures/

mitkFiberBundleXReader.cpp

mitkFiberBundleXWriter.cpp

	FiberBundleX/
	FiberBundle/

	mitkFiberBundleXIOFactory.cpp
	mitkFiberBundleIOFactory.cpp

	mitkFiberBundleXIOFactory.h
	mitkFiberBundleIOFactory.h

	mitkFiberBundleXReader.h
	mitkFiberBundleReader.h

	mitkFiberBundleXSerializer.cpp
	mitkFiberBundleSerializer.cpp

	mitkFiberBundleXSerializer.h
	mitkFiberBundleSerializer.h

	mitkFiberBundleXSource.cpp
	mitkFiberBundleSource.cpp

	mitkFiberBundleXSource.h
	mitkFiberBundleSource.h

	mitkFiberBundleXWriter.h
	mitkFiberBundleWriter.h

	mitkFiberBundleXWriterFactory.cpp
	mitkFiberBundleWriterFactory.cpp

	mitkFiberBundleXWriterFactory.h
	mitkFiberBundleWriterFactory.h

mitkDiffusionImagingObjectFactory.cpp

Rendering/

mitkFiberBundleXMapper3D.cpp

mitkFiberBundleXMapper3D.h

files.cmake

rMITK291f6d78c39c

View Options

Modules/DiffusionImaging/CMakeLists.txt

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXIOFactory.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXIOFactory.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXReader.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXReader.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXSource.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXSource.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXWriter.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXWriter.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXWriterFactory.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXWriterFactory.h

View Options

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleXMapper3D.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleXMapper3D.h

View Options

Modules/DiffusionImaging/files.cmake

Merge branch 'bug-9065-mitkFiberBundleX'291f6d78c39cActions

Description

Details

Event Timeline

Merged Changes

Changes (20)

rMITK291f6d78c39c

Modules/DiffusionImaging/CMakeLists.txt

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.h

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXIOFactory.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXIOFactory.h

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXReader.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXReader.h

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.h

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXSource.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXSource.h

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXWriter.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXWriter.h

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXWriterFactory.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXWriterFactory.h

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleXMapper3D.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleXMapper3D.h

Modules/DiffusionImaging/files.cmake

Merge branch 'bug-9065-mitkFiberBundleX'
291f6d78c39c
Actions