Merge branch 'bug-16845-RefactorFiberfox'
f35197f2ac80
Actions

Description

Merge branch 'bug-16845-RefactorFiberfox'

Conflicts:
Modules/DiffusionImaging/FiberTracking/Algorithms/itkAddArtifactsToDwiImageFilter.cpp
Modules/DiffusionImaging/FiberTracking/Algorithms/itkKspaceImageFilter.cpp
Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp
Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.h
Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.cpp
Modules/DiffusionImaging/FiberTracking/SignalModels/mitkDiffusionSignalModel.h

Details

Provenance

neher

Authored on Jan 22 2014, 10:19 AM

Parents

rMITK5a5cb5bdc496: updated and complemented user manual
rMITK772ee4e83c5d: Merge branch 'bug-16780-RemoveWarningsInDiffusionImaging'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITKf35197f2ac80: Merge branch 'bug-16845-RefactorFiberfox' (authored by neher).Jan 22 2014, 10:19 AM

Merged Changes

5a5cb5bdc496 updated and complemented user manual
Author
neher
Browse Repository
No Builds
No Audits
4b4003dc4c59 updated and extended documentation
Author
neher
Browse Repository
No Builds
No Audits
72281fb0bfe1 refactored fiberfox. using parameter objects now. many small changes.
Author
neher
Browse Repository
No Builds
No Audits

Changes (48)

Path

Size

Modules/

DiffusionImaging/

FiberTracking/

Algorithms/

itkAddArtifactsToDwiImageFilter.cpp

itkAddArtifactsToDwiImageFilter.h

itkEvaluateDirectionImagesFilter.h

itkEvaluateTractogramDirectionsFilter.h

itkFibersFromPlanarFiguresFilter.h

itkFieldmapGeneratorFilter.h

itkGibbsTrackingFilter.h

itkKspaceImageFilter.cpp

itkKspaceImageFilter.h

itkStreamlineTrackingFilter.h

itkTractsToDWIImageFilter.cpp

itkTractsToDWIImageFilter.h

IODataStructures/

mitkFiberfoxParameters.cpp

mitkFiberfoxParameters.h

SignalModels/

mitkAstroStickModel.cpp

mitkAstroStickModel.h

mitkChiSquareNoiseModel.h

mitkDiffusionNoiseModel.h

mitkDiffusionSignalModel.h

mitkDotModel.h

mitkRicianNoiseModel.h

Testing/

mitkFiberfoxAddArtifactsToDwiTest.cpp

mitkFiberfoxSignalGenerationTest.cpp

files.cmake

MiniApps/

CMakeLists.txt

FiberFoxProcessing.cpp

files.cmake

Plugins/

org.mitk.gui.qt.diffusionimaging/

documentation/

UserManual/

QmitkDiffusionImagingUserManual.dox

QmitkFiberExtractionViewUserManual.dox

QmitkFiberProcessingViewUserManual.dox

QmitkFiberfoxViewUserManual.dox

QmitkFieldmapGeneratorViewUserManual.dox

QmitkGibbsTrackingViewUserManual.dox

QmitkOdfMaximaExtractionViewUserManual.dox

QmitkStreamlineTrackingViewUserManual.dox

crossingmaxima.png

fiberprocessing.png

fieldmapGenerator.png

peakextractionview.png

peaks.png

streamlinetrackingview.png

src/

internal/

QmitkFiberExtractionView.h

QmitkFiberProcessingView.h

QmitkFiberfoxView.cpp

QmitkFiberfoxView.h

Merge branch 'bug-16845-RefactorFiberfox'f35197f2ac80Actions

Description

Details

Event Timeline

Merged Changes

Changes (48)

rMITKf35197f2ac80

Modules/DiffusionImaging/FiberTracking/Algorithms/itkAddArtifactsToDwiImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkAddArtifactsToDwiImageFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkEvaluateDirectionImagesFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkEvaluateTractogramDirectionsFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFibersFromPlanarFiguresFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFieldmapGeneratorFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkGibbsTrackingFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkKspaceImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkKspaceImageFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.h

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkAstroStickModel.cpp

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkAstroStickModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkChiSquareNoiseModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkDiffusionNoiseModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkDiffusionSignalModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkDotModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkRicianNoiseModel.h

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberfoxAddArtifactsToDwiTest.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberfoxSignalGenerationTest.cpp

Modules/DiffusionImaging/FiberTracking/files.cmake

Modules/DiffusionImaging/MiniApps/CMakeLists.txt

Modules/DiffusionImaging/MiniApps/FiberFoxProcessing.cpp

Modules/DiffusionImaging/MiniApps/files.cmake

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberExtractionViewUserManual.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberProcessingViewUserManual.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberfoxViewUserManual.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFieldmapGeneratorViewUserManual.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkGibbsTrackingViewUserManual.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfMaximaExtractionViewUserManual.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkStreamlineTrackingViewUserManual.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/crossingmaxima.png

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fiberprocessing.png

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fieldmapGenerator.png

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/peakextractionview.png

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/peaks.png

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/streamlinetrackingview.png

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberExtractionView.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.h

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

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberfoxView.h

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

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFieldmapGeneratorView.h

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

Merge branch 'bug-16845-RefactorFiberfox'
f35197f2ac80
Actions