Diffusion MITK c30db3c2a66d

Merge branch 'bug-18825-FiberfoxCompartments'
c30db3c2a66d
Actions

Description

Merge branch 'bug-18825-FiberfoxCompartments'

Conflicts:
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingView.h

Details

Provenance

neher

Authored on Jun 12 2015, 2:56 PM

Parents

rMITKe5680551da14: all compartments are able to use volume fraction maps now
rMITK8d0e6b6d28dd: Merge branch 'bug-17844-RT-Refactoring-PluginIntegrationQt5-Integration'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITKc30db3c2a66d: Merge branch 'bug-18825-FiberfoxCompartments' (authored by neher).Jun 12 2015, 2:56 PM

Merged Changes

e5680551da14 all compartments are able to use volume fraction maps now
Author
neher
Browse Repository
No Builds
No Audits
e1a8db79e4e2 Merge branch 'personal/neher/ismrm_phantom5' into bug-18825-FiberfoxCompartments
Author
neher
Browse Repository
No Builds
No Audits
d42c8612d265 adding support for fiber compartment volume map
Author
neher
Browse Repository
No Builds
No Audits
94b92b43dcf9 integrated ismrm changes
Author
neher
Browse Repository
No Builds
No Audits
38acbc9b4443 Merge branch 'personal/neher/ismrm_phantom4' into personal/neher/ismrm_phantom5
Author
neher
Browse Repository
No Builds
No Audits
62ceaa1d21cb flippiing gradients when flipping image
Author
neher
Browse Repository
No Builds
No Audits
dbaa727772df mergetry
Author
neher
Browse Repository
No Builds
No Audits
2e32d255d4e0 Merge branch 'personal/neher/ismrm_phantom3' into personal/neher/ismrm_phantom4
Author
neher
Browse Repository
No Builds
No Audits
477c339ed58b wip
Author
neher
Browse Repository
No Builds
No Audits
e45865f06aff Merge branch 'personal/neher/ismrm_phantom2' into personal/neher/ismrm_phantom3
Author
neher
Browse Repository
No Builds
No Audits
9064fe243cb5 wip
Author
neher
Browse Repository
No Builds
No Audits
9b0e139d4976 volume fractions
Author
neher
Browse Repository
No Builds
No Audits
c189a2b29ffb modified streamline tracking gui
Author
neher
Browse Repository
No Builds
No Audits
c8b17246f225 wip
Author
neher
Browse Repository
No Builds
No Audits
117f49d16118 Merge branch 'personal/neher/ismrm_phantom' into personal/neher/ismrm_phantom2
Author
neher
Browse Repository
No Builds
No Audits
8ba4ec93d988 spikes not in b0 volume
Author
neher
Browse Repository
No Builds
No Audits
1a1b9ed2c03d adapted for headmotion
Author
neher
Browse Repository
No Builds
No Audits
cabe02e4cdaf added additional density correctiony by tdi
Author
neher
Browse Repository
No Builds
No Audits

Changes (22)

Path

Size

Modules/

DiffusionImaging/

DiffusionCore/

IODataStructures/

Properties/

mitkDiffusionPropertyHelper.cpp

Rendering/

mitkOdfVtkMapper2D.txx

FiberTracking/

Algorithms/

itkTractsToDWIImageFilter.cpp

itkTractsToDWIImageFilter.h

IODataStructures/

FiberBundle/

mitkFiberBundle.cpp

Testing/

mitkFiberfoxSignalGenerationTest.cpp

Plugins/

org.mitk.gui.qt.basicimageprocessing/

src/

internal/

QmitkBasicImageProcessingView.cpp

QmitkBasicImageProcessingView.h

QmitkBasicImageProcessingViewControls.ui

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkControlVisualizationPropertiesView.cpp

QmitkControlVisualizationPropertiesViewControls.ui

QmitkFiberProcessingView.cpp

QmitkFiberProcessingViewControls.ui

QmitkFiberfoxView.cpp

QmitkFiberfoxView.h

QmitkFiberfoxViewControls.ui

QmitkPreprocessingView.cpp

QmitkPreprocessingView.h

QmitkPreprocessingViewControls.ui

QmitkStreamlineTrackingView.cpp

QmitkStreamlineTrackingView.h

QmitkStreamlineTrackingViewControls.ui

rMITKc30db3c2a66d

View Options

Modules/DiffusionImaging/DiffusionCore/IODataStructures/Properties/mitkDiffusionPropertyHelper.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkOdfVtkMapper2D.txx

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundle/mitkFiberBundle.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberfoxSignalGenerationTest.cpp

View Options

Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.cpp

View Options

Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.h

View Options

Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingViewControls.ui

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'bug-18825-FiberfoxCompartments'c30db3c2a66dActions

Description

Details

Event Timeline

Merged Changes

Changes (22)

rMITKc30db3c2a66d

Modules/DiffusionImaging/DiffusionCore/IODataStructures/Properties/mitkDiffusionPropertyHelper.cpp

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkOdfVtkMapper2D.txx

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.h

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundle/mitkFiberBundle.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberfoxSignalGenerationTest.cpp

Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.cpp

Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.h

Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingViewControls.ui

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

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

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

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

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

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

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

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

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

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

Merge branch 'bug-18825-FiberfoxCompartments'
c30db3c2a66d
Actions