Diffusion MITK 1166a23d6365

Merge branch 'bug-18103-FiberGeometry' into bug-18103-Integration
1166a23d6365
Actions

Description

Merge branch 'bug-18103-FiberGeometry' into bug-18103-Integration

Conflicts:
CMakeExternals/MITKData.cmake

Details

Provenance

neher

Authored on Oct 1 2014, 2:31 PM

Parents

rMITK7bf35d4a6605: adapted test data
rMITK5cff0364631e: Merge branch 'bug-14866-MakeFileReaderAndFileWriterMicroserviceBased-2014-03'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK1166a23d6365: Merge branch 'bug-18103-FiberGeometry' into bug-18103-Integration (authored by neher).Oct 1 2014, 2:31 PM

Merged Changes

7bf35d4a6605 adapted test data
Author
neher
Browse Repository
No Builds
No Audits
68b362ba32cd fiber geometry compatible with trackvis
Author
neher
Browse Repository
No Builds
No Audits
48bac81ecb4a added miniapp file
Author
neher
Browse Repository
No Builds
No Audits
51ffffc8eb0a added miniapp to calculate tractometer metrics
Author
neher
Browse Repository
No Builds
No Audits
25483a182680 applying transform after loading
Author
neher
Browse Repository
No Builds
No Audits
3cce77512c95 wip
Author
neher
Browse Repository
No Builds
No Audits
18b3501cb27a silence miniapps
Author
neher
Browse Repository
No Builds
No Audits
a09c96753c21 peak extraction mod
Author
neher
Browse Repository
No Builds
No Audits

Changes (38)

Path

Size

Packages

CMakeExternals/

MITKData.cmake

O1: MITK Reviewer Group I

Modules/

DiffusionImaging/

DiffusionCore/

Algorithms/

Reconstruction/

itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

itkFiniteDiffOdfMaximaExtractionFilter.cpp

FiberTracking/

Algorithms/

itkStreamlineTrackingFilter.cpp

IODataStructures/

FiberBundleX/

mitkFiberBundleX.cpp

mitkFiberBundleX.h

mitkFiberBundleXReader.cpp

mitkFiberBundleXReader.h

mitkFiberBundleXWriter.cpp

MiniApps/

FiberDirectionExtraction.cpp

FiberExtraction.cpp

FiberProcessing.cpp

Fiberfox.cpp

FileFormatConverter.cpp

GibbsTracking.cpp

LocalDirectionalFiberPlausibility.cpp

MultishellMethods.cpp

PeakExtraction.cpp

PeaksAngularError.cpp

QballReconstruction.cpp

StreamlineTracking.cpp

TensorDerivedMapsExtraction.cpp

TensorReconstruction.cpp

TractogramAngularError.cpp

TractometerMetrics.cpp

files.cmake

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkGibbsTrackingView.cpp

QmitkOdfMaximaExtractionViewControls.ui

QmitkStochasticFiberTrackingView.cpp

QmitkStreamlineTrackingView.cpp

QmitkStreamlineTrackingViewControls.ui

rMITK1166a23d6365

View Options

CMakeExternals/MITKData.cmake

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkFiniteDiffOdfMaximaExtractionFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.cpp

View Options

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

View Options

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

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/mitkFiberBundleXWriter.cpp

View Options

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

View Options

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

View Options

Modules/DiffusionImaging/MiniApps/CMakeLists.txt

View Options

Modules/DiffusionImaging/MiniApps/CopyGeometry.cpp

View Options

Modules/DiffusionImaging/MiniApps/DiffusionIndices.cpp

View Options

Modules/DiffusionImaging/MiniApps/DwiDenoising.cpp

View Options

Modules/DiffusionImaging/MiniApps/ExportShImage.cpp

View Options

Modules/DiffusionImaging/MiniApps/FiberDirectionExtraction.cpp

View Options

Modules/DiffusionImaging/MiniApps/FiberExtraction.cpp

View Options

Modules/DiffusionImaging/MiniApps/FiberProcessing.cpp

View Options

Modules/DiffusionImaging/MiniApps/Fiberfox.cpp

View Options

Modules/DiffusionImaging/MiniApps/FileFormatConverter.cpp

View Options

Modules/DiffusionImaging/MiniApps/GibbsTracking.cpp

View Options

Modules/DiffusionImaging/MiniApps/LocalDirectionalFiberPlausibility.cpp

View Options

Modules/DiffusionImaging/MiniApps/MultishellMethods.cpp

View Options

Modules/DiffusionImaging/MiniApps/PeakExtraction.cpp

View Options

Modules/DiffusionImaging/MiniApps/PeaksAngularError.cpp

View Options

Modules/DiffusionImaging/MiniApps/QballReconstruction.cpp

View Options

Modules/DiffusionImaging/MiniApps/StreamlineTracking.cpp

View Options

Modules/DiffusionImaging/MiniApps/TensorDerivedMapsExtraction.cpp

View Options

Modules/DiffusionImaging/MiniApps/TensorReconstruction.cpp

View Options

Modules/DiffusionImaging/MiniApps/TractogramAngularError.cpp

View Options

Modules/DiffusionImaging/MiniApps/TractometerMetrics.cpp

View Options

Modules/DiffusionImaging/MiniApps/files.cmake

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkOdfMaximaExtractionViewControls.ui

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingViewControls.ui

Merge branch 'bug-18103-FiberGeometry' into bug-18103-Integration1166a23d6365Actions

Description

Details

Event Timeline

Merged Changes

Changes (38)

rMITK1166a23d6365

CMakeExternals/MITKData.cmake

Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkFiniteDiffOdfMaximaExtractionFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.cpp

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

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

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

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

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

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

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

Modules/DiffusionImaging/MiniApps/CMakeLists.txt

Modules/DiffusionImaging/MiniApps/CopyGeometry.cpp

Modules/DiffusionImaging/MiniApps/DiffusionIndices.cpp

Modules/DiffusionImaging/MiniApps/DwiDenoising.cpp

Modules/DiffusionImaging/MiniApps/ExportShImage.cpp

Modules/DiffusionImaging/MiniApps/FiberDirectionExtraction.cpp

Modules/DiffusionImaging/MiniApps/FiberExtraction.cpp

Modules/DiffusionImaging/MiniApps/FiberProcessing.cpp

Modules/DiffusionImaging/MiniApps/Fiberfox.cpp

Modules/DiffusionImaging/MiniApps/FileFormatConverter.cpp

Modules/DiffusionImaging/MiniApps/GibbsTracking.cpp

Modules/DiffusionImaging/MiniApps/LocalDirectionalFiberPlausibility.cpp

Modules/DiffusionImaging/MiniApps/MultishellMethods.cpp

Modules/DiffusionImaging/MiniApps/PeakExtraction.cpp

Modules/DiffusionImaging/MiniApps/PeaksAngularError.cpp

Modules/DiffusionImaging/MiniApps/QballReconstruction.cpp

Modules/DiffusionImaging/MiniApps/StreamlineTracking.cpp

Modules/DiffusionImaging/MiniApps/TensorDerivedMapsExtraction.cpp

Modules/DiffusionImaging/MiniApps/TensorReconstruction.cpp

Modules/DiffusionImaging/MiniApps/TractogramAngularError.cpp

Modules/DiffusionImaging/MiniApps/TractometerMetrics.cpp

Modules/DiffusionImaging/MiniApps/files.cmake

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

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkOdfMaximaExtractionViewControls.ui

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

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

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingViewControls.ui

Merge branch 'bug-18103-FiberGeometry' into bug-18103-Integration
1166a23d6365
Actions