Diffusion MITK 13e624dba44f

Merge branch 'bug-18851-FiberfoxT1' into bug-18851-FiberfoxT1_2
13e624dba44f
Actions

Description

Merge branch 'bug-18851-FiberfoxT1' into bug-18851-FiberfoxT1_2

Details

Provenance

neher

Authored on Mar 20 2015, 9:58 AM

Parents

rMITK2e91405d42bd: added reverse phase direction
rMITK10559efb7c41: Merge branch 'bug-18875-EpCommonCacheArgs'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK13e624dba44f: Merge branch 'bug-18851-FiberfoxT1' into bug-18851-FiberfoxT1_2 (authored by neher).Mar 20 2015, 9:58 AM

Merged Changes

2e91405d42bd added reverse phase direction
Author
neher
Browse Repository
No Builds
No Audits
826fee81d3fd added basic T1 support. todo: update parameter saving and loading. adapt…
Author
neher
Browse Repository
No Builds
No Audits
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 (38)

Path

Size

Modules/

DiffusionImaging/

DiffusionCore/

IODataStructures/

Properties/

mitkDiffusionPropertyHelper.cpp

Rendering/

mitkOdfVtkMapper2D.txx

FiberTracking/

Algorithms/

itkKspaceImageFilter.cpp

itkKspaceImageFilter.h

itkTractsToDWIImageFilter.cpp

itkTractsToDWIImageFilter.h

IODataStructures/

FiberBundle/

mitkFiberBundle.cpp

mitkFiberfoxParameters.h

SignalModels/

mitkDiffusionSignalModel.h

Testing/

mitkFiberfoxSignalGenerationTest.cpp

Plugins/

org.mitk.gui.qt.basicimageprocessing/

src/

internal/

QmitkBasicImageProcessingView.cpp

QmitkBasicImageProcessingView.h

QmitkBasicImageProcessingViewControls.ui

org.mitk.gui.qt.diffusionimaging/

src/

QmitkAstrosticksModelParametersWidget.h

QmitkAstrosticksModelParametersWidgetControls.ui

QmitkBallModelParametersWidget.h

QmitkBallModelParametersWidgetControls.ui

QmitkDotModelParametersWidget.h

QmitkDotModelParametersWidgetControls.ui

QmitkStickModelParametersWidget.h

QmitkStickModelParametersWidgetControls.ui

QmitkTensorModelParametersWidget.h

QmitkTensorModelParametersWidgetControls.ui

QmitkZeppelinModelParametersWidget.h

QmitkZeppelinModelParametersWidgetControls.ui

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

rMITK13e624dba44f

View Options

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

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkOdfVtkMapper2D.txx

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkKspaceImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkKspaceImageFilter.h

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/IODataStructures/mitkFiberfoxParameters.h

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkDiffusionSignalModel.h

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/QmitkAstrosticksModelParametersWidget.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkAstrosticksModelParametersWidgetControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkBallModelParametersWidget.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkBallModelParametersWidgetControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkDotModelParametersWidget.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkDotModelParametersWidgetControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkStickModelParametersWidget.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkStickModelParametersWidgetControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkTensorModelParametersWidget.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkTensorModelParametersWidgetControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkZeppelinModelParametersWidget.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkZeppelinModelParametersWidgetControls.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-18851-FiberfoxT1' into bug-18851-FiberfoxT1_213e624dba44fActions

Description

Details

Event Timeline

Merged Changes

Changes (38)

rMITK13e624dba44f

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

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkOdfVtkMapper2D.txx

Modules/DiffusionImaging/FiberTracking/Algorithms/itkKspaceImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkKspaceImageFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.h

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

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkDiffusionSignalModel.h

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/QmitkAstrosticksModelParametersWidget.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkAstrosticksModelParametersWidgetControls.ui

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkBallModelParametersWidget.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkBallModelParametersWidgetControls.ui

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkDotModelParametersWidget.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkDotModelParametersWidgetControls.ui

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkStickModelParametersWidget.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkStickModelParametersWidgetControls.ui

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkTensorModelParametersWidget.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkTensorModelParametersWidgetControls.ui

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkZeppelinModelParametersWidget.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkZeppelinModelParametersWidgetControls.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-18851-FiberfoxT1' into bug-18851-FiberfoxT1_2
13e624dba44f
Actions