Diffusion MITK c47bd9a285a8

Merge branch 'bug-18353-port-diffusion-readers-writers'
c47bd9a285a8
Actions

Description

Merge branch 'bug-18353-port-diffusion-readers-writers'

Details

Provenance

• goch

Authored on Oct 23 2014, 8:00 PM

Parents

rMITK4ea0987fc08e: Ported connectomics reader writer
rMITK756368638932: Merge branch 'bug-18329-CrashInLiveWireTool'

Branches

Unknown

Tags

Unknown

Event Timeline

• goch committed rMITKc47bd9a285a8: Merge branch 'bug-18353-port-diffusion-readers-writers' (authored by • goch).Oct 23 2014, 8:00 PM

Merged Changes

4ea0987fc08e Ported connectomics reader writer
Author
• goch
Browse Repository
No Builds
No Audits
beb7053307fe Centralized Diffusion mime types.
Author
• goch
Browse Repository
No Builds
No Audits
5cc1c1f91802 Ported qball image reader writer
Author
• goch
Browse Repository
No Builds
No Audits
40398c3fff4d Ported tensor image writer
Author
• goch
Browse Repository
No Builds
No Audits
de06e31c9ce8 Merge remote-tracking branch 'origin/personal/cordes/dwireader' into bug-18353…
Author
• goch
Browse Repository
No Builds
No Audits
3cd7bfe7d8df fixed typo (should be discussed later)
Author
• cordes
Browse Repository
No Builds
No Audits
b455d9075d2d activate NrrdDiffusionImageReader in diffusion ModuleActivator
Author
• cordes
Browse Repository
No Builds
No Audits
8080c33c13d9 remove reader from diffusioncoreObjectFactory
Author
• cordes
Browse Repository
No Builds
No Audits
f12226b5b6f4 NrrdDiffusionImageReader inherit from mitk::AbstractReader rm template ->…
Author
• cordes
Browse Repository
No Builds
No Audits
d9e978ec24a7 remove IO factory
Author
• cordes
Browse Repository
No Builds
No Audits

Changes (62)

Path

Size

Modules/

DiffusionImaging/

DiffusionIO/

files.cmake

mitkConnectomicsNetworkIOFactory.cpp

mitkConnectomicsNetworkIOFactory.h

mitkConnectomicsNetworkReader.cpp

mitkConnectomicsNetworkSerializer.cpp

mitkConnectomicsNetworkWriter.cpp

mitkConnectomicsNetworkWriter.h

mitkConnectomicsNetworkWriterFactory.cpp

mitkConnectomicsNetworkWriterFactory.h

mitkConnectomicsObjectFactory.cpp

mitkDiffusionCoreObjectFactory.cpp

mitkDiffusionCoreObjectFactory.h

mitkDiffusionIOMimeTypes.cpp

mitkDiffusionIOMimeTypes.h

mitkDiffusionModuleActivator.cpp

mitkFiberTrackingObjectFactory.cpp

mitkFiberTrackingObjectFactory.h

mitkNrrdDiffusionImageIOFactory.cpp

mitkNrrdDiffusionImageIOFactory.h

mitkNrrdDiffusionImageReader.cpp

mitkNrrdDiffusionImageReader.h

mitkNrrdQBallImageIOFactory.cpp

mitkNrrdQBallImageIOFactory.h

mitkNrrdQBallImageReader.cpp

mitkNrrdQBallImageWriter.cpp

mitkNrrdQBallImageWriter.h

mitkNrrdQBallImageWriterFactory.cpp

mitkNrrdQBallImageWriterFactory.h

mitkNrrdTensorImageIOFactory.cpp

mitkNrrdTensorImageIOFactory.h

mitkNrrdTensorImageReader.cpp

mitkNrrdTensorImageReader.h

mitkNrrdTensorImageWriter.cpp

mitkNrrdTensorImageWriter.h

mitkNrrdTensorImageWriterFactory.cpp

mitkNrrdTensorImageWriterFactory.h

mitkQBallImageSerializer.cpp

mitkTensorImageSerializer.cpp

	DiffusionIO/
	FiberTracking/

	mitkConnectomicsNetworkReader.h/
	IODataStructures/	FiberBundleX/


	mitkFiberBundleXReader.h


	IODataStructures/	FiberBundleX/

mitkFiberBundleXReader.cpp

mitkFiberBundleXReader.h

mitkFiberBundleXSerializer.cpp

mitkFiberBundleXSerializer.h

mitkFiberBundleXWriter.cpp

mitkFiberBundleXWriter.h

	mitkNrrdQBallImageReader.h/
	IODataStructures/	FiberBundleX/


	mitkFiberBundleXReader.h

FiberTracking/

IODataStructures/

FiberBundleX/

mitkFiberBundleXReader.cpp

mitkFiberBundleXReader.h

mitkFiberBundleXSerializer.cpp

mitkFiberBundleXSerializer.h

mitkFiberBundleXWriter.cpp

mitkFiberBundleXWriter.h

Testing/

mitkFiberBundleXReaderWriterTest.cpp

mitkFiberExtractionTest.cpp

mitkFiberfoxAddArtifactsToDwiTest.cpp

mitkFiberfoxSignalGenerationTest.cpp

mitkLocalFiberPlausibilityTest.cpp

mitkPeakExtractionTest.cpp

mitkStreamlineTrackingTest.cpp

files.cmake

mitkFiberTrackingModuleActivator.cpp

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkDiffusionRegistrationView.cpp

rMITKc47bd9a285a8

View Options

Modules/DiffusionImaging/DiffusionIO/files.cmake

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkIOFactory.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkIOFactory.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkReader.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkReader.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkSerializer.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkWriter.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkWriter.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkWriterFactory.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkWriterFactory.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsObjectFactory.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionCoreObjectFactory.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionCoreObjectFactory.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionIOMimeTypes.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionIOMimeTypes.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionModuleActivator.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXReader.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXReader.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXSerializer.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXSerializer.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXWriter.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXWriter.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberTrackingObjectFactory.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberTrackingObjectFactory.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageIOFactory.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageIOFactory.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageReader.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageReader.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageIOFactory.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageIOFactory.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageReader.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageReader.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageWriter.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageWriter.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageWriterFactory.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageWriterFactory.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageIOFactory.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageIOFactory.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageReader.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageReader.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageWriter.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageWriter.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageWriterFactory.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageWriterFactory.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkQBallImageSerializer.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkTensorImageSerializer.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXReader.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXReader.h

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.h

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXWriter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXWriter.h

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberBundleXReaderWriterTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberExtractionTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberfoxAddArtifactsToDwiTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberfoxSignalGenerationTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkLocalFiberPlausibilityTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkPeakExtractionTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkStreamlineTrackingTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/files.cmake

View Options

Modules/DiffusionImaging/FiberTracking/mitkFiberTrackingModuleActivator.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionRegistrationView.cpp

Merge branch 'bug-18353-port-diffusion-readers-writers'c47bd9a285a8Actions

Description

Details

Event Timeline

Merged Changes

Changes (62)

rMITKc47bd9a285a8

Modules/DiffusionImaging/DiffusionIO/files.cmake

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkIOFactory.cpp

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkIOFactory.h

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkReader.cpp

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkReader.h

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkSerializer.cpp

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkWriter.cpp

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkWriter.h

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkWriterFactory.cpp

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsNetworkWriterFactory.h

Modules/DiffusionImaging/DiffusionIO/mitkConnectomicsObjectFactory.cpp

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionCoreObjectFactory.cpp

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionCoreObjectFactory.h

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionIOMimeTypes.cpp

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionIOMimeTypes.h

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionModuleActivator.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXReader.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXReader.h

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXSerializer.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXSerializer.h

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXWriter.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXWriter.h

Modules/DiffusionImaging/DiffusionIO/mitkFiberTrackingObjectFactory.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberTrackingObjectFactory.h

Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageIOFactory.cpp

Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageIOFactory.h

Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageReader.cpp

Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageReader.h

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageIOFactory.cpp

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageIOFactory.h

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageReader.cpp

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageReader.h

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageWriter.cpp

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageWriter.h

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageWriterFactory.cpp

Modules/DiffusionImaging/DiffusionIO/mitkNrrdQBallImageWriterFactory.h

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageIOFactory.cpp

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageIOFactory.h

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageReader.cpp

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageReader.h

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageWriter.cpp

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageWriter.h

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageWriterFactory.cpp

Modules/DiffusionImaging/DiffusionIO/mitkNrrdTensorImageWriterFactory.h

Modules/DiffusionImaging/DiffusionIO/mitkQBallImageSerializer.cpp

Modules/DiffusionImaging/DiffusionIO/mitkTensorImageSerializer.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXReader.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXReader.h

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.h

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXWriter.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXWriter.h

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberBundleXReaderWriterTest.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberExtractionTest.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberfoxAddArtifactsToDwiTest.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberfoxSignalGenerationTest.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkLocalFiberPlausibilityTest.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkPeakExtractionTest.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkStreamlineTrackingTest.cpp

Modules/DiffusionImaging/FiberTracking/files.cmake

Modules/DiffusionImaging/FiberTracking/mitkFiberTrackingModuleActivator.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionRegistrationView.cpp

Merge branch 'bug-18353-port-diffusion-readers-writers'
c47bd9a285a8
Actions