Diffusion MITK c2e6eef039ce

Merge branch 'bug-8549-make-fiberbundle-opensource'
c2e6eef039ce
Actions

Description

Merge branch 'bug-8549-make-fiberbundle-opensource'

Conflicts:
Modules/DiffusionImaging/CMakeLists.txt

Details

Provenance

fritzsck

Authored on Jun 19 2011, 8:08 PM

Parents

rMITK5d6d44ac8a8c: moved some related classes to the public repository
rMITK7c9309f6dee1: Merge branch 'bug-8538-serializer-custom-properties'

Branches

Unknown

Tags

Unknown

Event Timeline

fritzsck committed rMITKc2e6eef039ce: Merge branch 'bug-8549-make-fiberbundle-opensource' (authored by fritzsck).Jun 19 2011, 8:08 PM

Merged Changes

5d6d44ac8a8c moved some related classes to the public repository
Author
fritzsck
Browse Repository
No Builds
No Audits
ce41f772b036 moved corresponding files
Author
fritzsck
Browse Repository
No Builds
No Audits

Changes (25)

Path

Size

Modules/

DiffusionImaging/

CMakeLists.txt

IODataStructures/

FiberBundle

itkSlowPolyLineParametricPath.h

itkSlowPolyLineParametricPath.txx

mitkFiberBundle.cpp

mitkFiberBundle.h

mitkFiberBundleReader.cpp

mitkFiberBundleReader.h

mitkFiberBundleWriter.cpp

	FiberBundle/
	QBallImages/

	mitkFiberBundleIOFactory.cpp
	mitkNrrdQBallImageIOFactory.cpp

	mitkFiberBundleIOFactory.h
	mitkNrrdQBallImageIOFactory.h

	mitkFiberBundleSerializer.cpp
	mitkQBallImageSerializer.cpp

	mitkFiberBundleSource.cpp
	mitkQBallImageSource.cpp

	mitkFiberBundleSource.h
	mitkQBallImageSource.h

	FiberBundle/
	DiffusionWeightedImages/

	mitkFiberBundleSerializer.h
	mitkDiffusionImageSerializer.h

	mitkFiberBundleWriter.h
	mitkNrrdDiffusionImageWriter.h

	FiberBundle/
	TensorImages/

	mitkFiberBundleWriterFactory.h
	mitkNrrdTensorImageWriterFactory.h

PlanarFigureComposite

mitkPlanarFigureComposite.cpp

mitkPlanarFigureComposite.h

mitkDiffusionImagingObjectFactory.cpp

Rendering/

mitkFiberBundleMapper3D.cpp

mitkFiberBundleMapper3D.h

files.cmake

	DiffusionImaging/	IODataStructures/	FiberBundle/
		PlanarFigure/	IO/

	mitkFiberBundleWriterFactory.cpp
	mitkPlanarFigureWriterFactory.cpp

rMITKc2e6eef039ce

View Options

Modules/DiffusionImaging/CMakeLists.txt

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/itkSlowPolyLineParametricPath.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/itkSlowPolyLineParametricPath.txx

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleIOFactory.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleIOFactory.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleReader.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleReader.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleSerializer.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleSerializer.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleSource.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleSource.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleWriter.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleWriter.h

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleWriterFactory.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleWriterFactory.h

View Options

Modules/DiffusionImaging/IODataStructures/PlanarFigureComposite/mitkPlanarFigureComposite.cpp

View Options

Modules/DiffusionImaging/IODataStructures/PlanarFigureComposite/mitkPlanarFigureComposite.h

View Options

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.h

View Options

Modules/DiffusionImaging/files.cmake

Merge branch 'bug-8549-make-fiberbundle-opensource'c2e6eef039ceActions

Description

Details

Event Timeline

Merged Changes

Changes (25)

rMITKc2e6eef039ce

Modules/DiffusionImaging/CMakeLists.txt

Modules/DiffusionImaging/IODataStructures/FiberBundle/itkSlowPolyLineParametricPath.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/itkSlowPolyLineParametricPath.txx

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleIOFactory.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleIOFactory.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleReader.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleReader.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleSerializer.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleSerializer.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleSource.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleSource.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleWriter.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleWriter.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleWriterFactory.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleWriterFactory.h

Modules/DiffusionImaging/IODataStructures/PlanarFigureComposite/mitkPlanarFigureComposite.cpp

Modules/DiffusionImaging/IODataStructures/PlanarFigureComposite/mitkPlanarFigureComposite.h

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.h

Modules/DiffusionImaging/files.cmake

Merge branch 'bug-8549-make-fiberbundle-opensource'
c2e6eef039ce
Actions