Diffusion MITK 33b9e63df846

Merge branch 'bug-9154-SFT_openSource'
33b9e63df846
Actions

Description

Merge branch 'bug-9154-SFT_openSource'

Conflicts:
Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake

Details

Provenance

neher

Authored on Oct 7 2011, 2:40 PM

Parents

rMITKfa14c7299f22: uncommented tracking
rMITK07e2570f0230: Merge branch 'bug-7991-fix-ivim-crash'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK33b9e63df846: Merge branch 'bug-9154-SFT_openSource' (authored by neher).Oct 7 2011, 2:40 PM

Merged Changes

fa14c7299f22 uncommented tracking
Author
neher
Browse Repository
No Builds
No Audits
6ee272757d9b fixed wrong plugin xml view name
Author
neher
Browse Repository
No Builds
No Audits
44d355b762af adding stochastic files
Author
reicht
Browse Repository
No Builds
No Audits
cefcf663df29 commented everything in view
Author
reicht
Browse Repository
No Builds
No Audits

Changes (17)

Path

Size

Modules/

Bundles/

org.mitk.gui.qt.diffusionimaging/

files.cmake

plugin.xml

resources/

QmitkDiffusionImaging.qrc

stochFB.png

src/

internal/

QmitkStochasticFiberTrackingView.cpp

QmitkStochasticFiberTrackingView.h

QmitkStochasticFiberTrackingViewControls.ui

mitkPluginActivator.cpp

DiffusionImaging/

Tractography/

StochasticTracking

StochasticTractographyFilter.cxx

StochasticTractographyFilter.xml

itkStochasticTractographyFilter_SD.txx

itkStochasticTractographyFilter.h

itkStochasticTractographyFilter.txx

	Tractography/	StochasticTracking/
	IODataStructures/	FiberBundle/

itkSlowPolyLineParametricPath.h

itkSlowPolyLineParametricPath.txx

files.cmake

rMITK33b9e63df846

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/plugin.xml

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/stochFB.png

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.h

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingViewControls.ui

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp

View Options

Modules/DiffusionImaging/Tractography/StochasticTracking/StochasticTractographyFilter.cxx

View Options

Modules/DiffusionImaging/Tractography/StochasticTracking/StochasticTractographyFilter.xml

View Options

Modules/DiffusionImaging/Tractography/StochasticTracking/itkSlowPolyLineParametricPath.h

View Options

Modules/DiffusionImaging/Tractography/StochasticTracking/itkSlowPolyLineParametricPath.txx

View Options

Modules/DiffusionImaging/Tractography/StochasticTracking/itkStochasticTractographyFilter_SD.txx

View Options

Modules/DiffusionImaging/Tractography/itkStochasticTractographyFilter.h

View Options

Modules/DiffusionImaging/Tractography/itkStochasticTractographyFilter.txx

View Options

Modules/DiffusionImaging/files.cmake

Merge branch 'bug-9154-SFT_openSource'33b9e63df846Actions

Description

Details

Event Timeline

Merged Changes

Changes (17)

rMITK33b9e63df846

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/plugin.xml

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/stochFB.png

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.h

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingViewControls.ui

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp

Modules/DiffusionImaging/Tractography/StochasticTracking/StochasticTractographyFilter.cxx

Modules/DiffusionImaging/Tractography/StochasticTracking/StochasticTractographyFilter.xml

Modules/DiffusionImaging/Tractography/StochasticTracking/itkSlowPolyLineParametricPath.h

Modules/DiffusionImaging/Tractography/StochasticTracking/itkSlowPolyLineParametricPath.txx

Modules/DiffusionImaging/Tractography/StochasticTracking/itkStochasticTractographyFilter_SD.txx

Modules/DiffusionImaging/Tractography/itkStochasticTractographyFilter.h

Modules/DiffusionImaging/Tractography/itkStochasticTractographyFilter.txx

Modules/DiffusionImaging/files.cmake

Merge branch 'bug-9154-SFT_openSource'
33b9e63df846
Actions