Merge branch 'bug-16903-FiberVolumeFraction'
60df561ef7f7
Actions

Description

Merge branch 'bug-16903-FiberVolumeFraction'

Conflicts:
Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberfoxAddArtifactsToDwiTest.cpp
Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberfoxSignalGenerationTest.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberfoxView.cpp

Details

Provenance

neher

Authored on Jan 28 2014, 12:34 PM

Parents

rMITKa55e08c7e991: updated data. refactoring done.
rMITK971fd6d954ba: Merge branch 'bug-16882-SwitchCaseProtectedScope'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK60df561ef7f7: Merge branch 'bug-16903-FiberVolumeFraction' (authored by neher).Jan 28 2014, 12:34 PM

Merged Changes

a55e08c7e991 updated data. refactoring done.
Author
neher
Browse Repository
No Builds
No Audits
ae31b13aa51a only increasing fibner volume fraction image values for the first compartment
Author
neher
Browse Repository
No Builds
No Audits

Changes (13)

Path

Size

Packages

CMakeExternals/

MITKData.cmake

O1: MITK Reviewer Group I

Modules/

DiffusionImaging/

FiberTracking/

Algorithms/

GibbsTracking/

mitkEnergyComputer.cpp

mitkEnergyComputer.h

mitkMetropolisHastingsSampler.cpp

mitkMetropolisHastingsSampler.h

itkGibbsTrackingFilter.cpp

itkTractsToDWIImageFilter.cpp

IODataStructures/

mitkFiberfoxParameters.cpp

Testing/

mitkFiberfoxAddArtifactsToDwiTest.cpp

Plugins/

org.mitk.gui.qt.diffusionimaging/

documentation/

UserManual/

QmitkGibbsTrackingViewUserManual.dox

src/

internal/

QmitkFiberfoxView.cpp

QmitkGibbsTrackingView.cpp

QmitkGibbsTrackingViewControls.ui

rMITK60df561ef7f7

View Options

CMakeExternals/MITKData.cmake

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/GibbsTracking/mitkEnergyComputer.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/GibbsTracking/mitkEnergyComputer.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/GibbsTracking/mitkMetropolisHastingsSampler.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/GibbsTracking/mitkMetropolisHastingsSampler.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkGibbsTrackingFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberfoxAddArtifactsToDwiTest.cpp

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'bug-16903-FiberVolumeFraction'60df561ef7f7Actions

Description

Details

Event Timeline

Merged Changes

Changes (13)

rMITK60df561ef7f7

CMakeExternals/MITKData.cmake

Modules/DiffusionImaging/FiberTracking/Algorithms/GibbsTracking/mitkEnergyComputer.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/GibbsTracking/mitkEnergyComputer.h

Modules/DiffusionImaging/FiberTracking/Algorithms/GibbsTracking/mitkMetropolisHastingsSampler.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/GibbsTracking/mitkMetropolisHastingsSampler.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkGibbsTrackingFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberfoxAddArtifactsToDwiTest.cpp

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

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

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

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

Merge branch 'bug-16903-FiberVolumeFraction'
60df561ef7f7
Actions