Diffusion MITK dcab58b7c1e3

Merge branch 'bug-10211-FiberProcessingX' into bug-10116-FiberBundleXintegration
dcab58b7c1e3
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-10211-FiberProcessingX' into bug-10116-FiberBundleXintegration

Conflicts:
Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp
Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.h
Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

Details

Provenance

Authored on Nov 24 2011, 6:53 PM

Parents

rMITK7783ccaf3f65: added join and subtract operator for fiberbundlex. updated filters to…
rMITK051649d2484f: Merge branch 'bug-10048-fastFiberExtraction' into bug-10116…

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITKdcab58b7c1e3: Merge branch 'bug-10211-FiberProcessingX' into bug-10116-FiberBundleXintegration (authored by neher).Nov 24 2011, 6:53 PM

Merged Changes

7783ccaf3f65 added join and subtract operator for fiberbundlex. updated filters to…
Author
neher
Browse Repository
No Builds
No Audits
519d19d3af0c view is working with fibx now. uncommented code blocks that use external…
Author
neher
Browse Repository
No Builds
No Audits
6a14999a961a intermediate
Author
neher
Browse Repository
No Builds
No Audits

Changes (18)

Path

Size

Modules/

Bundles/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkControlVisualizationPropertiesView.cpp

QmitkFiberProcessingView.cpp

QmitkFiberProcessingView.h

QmitkFiberProcessingViewControls.ui

QmitkStochasticFiberTrackingView.cpp

DiffusionImaging/

Algorithms/

itkTractDensityImageFilter.cpp

itkTractDensityImageFilter.h

itkTractEnvelopeImageFilter.cpp

	itkTractEnvelopeImageFilter.h
	itkTractsToProbabilityImageFilter.h

itkTractsToFiberEndingsImageFilter.cpp

itkTractsToFiberEndingsImageFilter.h

itkTractsToProbabilityImageFilter.cpp

itkTractsToProbabilityImageFilter.h

itkTractsToRgbaImageFilter.cpp

itkTractsToRgbaImageFilter.h

IODataStructures/

FiberBundleX/

mitkFiberBundleX.cpp

mitkFiberBundleX.h

rMITKdcab58b7c1e3

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

Modules/DiffusionImaging/Algorithms/itkTractDensityImageFilter.cpp

Loading...

Modules/DiffusionImaging/Algorithms/itkTractDensityImageFilter.h

Loading...

Modules/DiffusionImaging/Algorithms/itkTractEnvelopeImageFilter.cpp

Loading...

Modules/DiffusionImaging/Algorithms/itkTractEnvelopeImageFilter.h

Loading...

Modules/DiffusionImaging/Algorithms/itkTractsToFiberEndingsImageFilter.cpp

Loading...

Modules/DiffusionImaging/Algorithms/itkTractsToFiberEndingsImageFilter.h

Loading...

Modules/DiffusionImaging/Algorithms/itkTractsToProbabilityImageFilter.cpp

Loading...

Modules/DiffusionImaging/Algorithms/itkTractsToProbabilityImageFilter.h

Loading...

Modules/DiffusionImaging/Algorithms/itkTractsToRgbaImageFilter.cpp

Loading...

Modules/DiffusionImaging/Algorithms/itkTractsToRgbaImageFilter.h

Loading...

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

Loading...

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.h

Loading...

Modules/DiffusionImaging/files.cmake

Loading...