ismrm_phantom4
2e32d255d4e0
Actions

Description

Merge branch 'personal/neher/ismrm_phantom3' into personal/neher/ismrm_phantom4

Conflicts:
Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXMapper3D.cpp
Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXReader.cpp
Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp
Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.h
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp

Details

Provenance

neher

Authored on Feb 7 2015, 12:22 PM

Parents

rMITK477c339ed58b: wip
rMITKd01a7eff25e5: Merge branch 'bug-18725-ConversionError'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK2e32d255d4e0: Merge branch 'personal/neher/ismrm_phantom3' into personal/neher/ismrm_phantom4 (authored by neher).Feb 7 2015, 12:22 PM

Merged Changes

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 (24)

Path

Size

Modules/

DiffusionImaging/

DiffusionCore/

IODataStructures/

Properties/

mitkDiffusionPropertyHelper.cpp

Rendering/

mitkOdfVtkMapper2D.txx

FiberTracking/

Algorithms/

itkTractDensityImageFilter.cpp

itkTractDensityImageFilter.h

itkTractsToDWIImageFilter.cpp

itkTractsToDWIImageFilter.h

Plugins/

org.mitk.gui.qt.basicimageprocessing/

src/

internal/

QmitkBasicImageProcessingView.cpp

QmitkBasicImageProcessingView.h

QmitkBasicImageProcessingViewControls.ui

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkControlVisualizationPropertiesView.cpp

QmitkControlVisualizationPropertiesView.h

QmitkControlVisualizationPropertiesViewControls.ui

QmitkFiberProcessingView.cpp

QmitkFiberProcessingViewControls.ui

QmitkFiberQuantificationView.cpp

QmitkFiberfoxView.cpp

QmitkFiberfoxView.h

QmitkFiberfoxViewControls.ui

QmitkPreprocessingView.cpp

QmitkPreprocessingView.h

QmitkPreprocessingViewControls.ui

Merge branch 'personal/neher/ismrm_phantom3' into personal/neher/ismrm_phantom42e32d255d4e0Actions

Description

Details

Event Timeline

Merged Changes

Changes (24)

rMITK2e32d255d4e0

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

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkOdfVtkMapper2D.txx

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractDensityImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractDensityImageFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.h

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

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

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 'personal/neher/ismrm_phantom3' into personal/neher/ismrm_phantom4
2e32d255d4e0
Actions