Merge branch 'bug-15915-TrkFiles'
1a9036d63ad1
Actions

Description

Merge branch 'bug-15915-TrkFiles'

Details

Provenance

Authored on Aug 25 2013, 3:57 PM

Parents

rMITKb26a894d1861: sh not hardcoded anymore in peak extraction
rMITK2902dcaed2eb: Merge branch 'bug-15828-ToolManagerProvider-integration'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK1a9036d63ad1: Merge branch 'bug-15915-TrkFiles' (authored by neher).Aug 25 2013, 3:57 PM

Merged Changes

b26a894d1861 sh not hardcoded anymore in peak extraction
Author
neher
Browse Repository
No Builds
No Audits
ce0f480746d6 allowing to load trackvis fibers. change mitk fibers to binary as default. some…
Author
neher
Browse Repository
No Builds
No Audits

Changes (18)

Path

Size

Modules/

DiffusionImaging/

DiffusionCore/

MiniApps/

CMakeLists.txt

	CopyGeometry.cpp
	ImageFormatConverter.cpp

DiffusionIndices.cpp

ImageFormatConverter.cpp

QballReconstruction.cpp

FiberTracking/

Algorithms/

itkStreamlineTrackingFilter.cpp

itkTractsToDWIImageFilter.cpp

IODataStructures/

FiberBundleX/

mitkFiberBundleXReader.cpp

mitkFiberBundleXWriter.cpp

mitkFiberBundleXWriter.h

mitkTrackvis.cpp

mitkTrackvis.h

mitkFiberTrackingObjectFactory.cpp

MiniApps/

PeakExtraction.cpp

StreamlineTracking.cpp

files.cmake

Plugins/

org.mitk.gui.qt.diffusionimagingapp/

src/

internal/

Perspectives/

QmitkDIAppImageProcessingPerspective.cpp

QmitkDIAppUtilityPerspective.cpp

rMITK1a9036d63ad1

View Options

Modules/DiffusionImaging/DiffusionCore/MiniApps/CMakeLists.txt

View Options

Modules/DiffusionImaging/DiffusionCore/MiniApps/CopyGeometry.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/MiniApps/DiffusionIndices.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/MiniApps/ImageFormatConverter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/MiniApps/QballReconstruction.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberTrackingObjectFactory.cpp

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/PeakExtraction.cpp

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/StreamlineTracking.cpp

View Options

Modules/DiffusionImaging/FiberTracking/files.cmake

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppImageProcessingPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppUtilityPerspective.cpp

Merge branch 'bug-15915-TrkFiles'1a9036d63ad1Actions

Description

Details

Event Timeline

Merged Changes

Changes (18)

rMITK1a9036d63ad1

Modules/DiffusionImaging/DiffusionCore/MiniApps/CMakeLists.txt

Modules/DiffusionImaging/DiffusionCore/MiniApps/CopyGeometry.cpp

Modules/DiffusionImaging/DiffusionCore/MiniApps/DiffusionIndices.cpp

Modules/DiffusionImaging/DiffusionCore/MiniApps/ImageFormatConverter.cpp

Modules/DiffusionImaging/DiffusionCore/MiniApps/QballReconstruction.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

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

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

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

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

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

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberTrackingObjectFactory.cpp

Modules/DiffusionImaging/FiberTracking/MiniApps/PeakExtraction.cpp

Modules/DiffusionImaging/FiberTracking/MiniApps/StreamlineTracking.cpp

Modules/DiffusionImaging/FiberTracking/files.cmake

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppImageProcessingPerspective.cpp

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppUtilityPerspective.cpp

Merge branch 'bug-15915-TrkFiles'
1a9036d63ad1
Actions