Merge branch 'T24670-FiberRendering'
6d58caa292b5
Actions

Description

Merge branch 'T24670-FiberRendering'

Details

Provenance

neher	Authored on Apr 19 2018, 11:57 AM
neher	Pushed on Apr 19 2018, 11:56 AM

Parents

rMITKff98dcc6e594: Added 3D peak mapper
rMITK5fb87cc5cb67: Merge branch 'T23349-Change-icons-in-the-documentation'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK6d58caa292b5: Merge branch 'T24670-FiberRendering' (authored by neher).Apr 19 2018, 11:57 AM

Merged Changes

ff98dcc6e594 Added 3D peak mapper
Author
neher
Browse Repository
No Builds
No Audits

Changes (15)

Path

Size

Modules/

DiffusionImaging/

DiffusionIO/

files.cmake

mitkFiberBundleMapper2D.h

mitkFiberBundleMapper3D.cpp

mitkFiberBundleMapper3D.h

mitkFiberTrackingObjectFactory.cpp

mitkFiberTrackingObjectFactory.h

mitkPeakImageMapper2D.cpp

mitkPeakImageMapper2D.h

mitkPeakImageMapper3D.cpp

mitkPeakImageMapper3D.h

Plugins/

org.mitk.gui.qt.diffusionimaging.tractography/

src/

internal/

QmitkStreamlineTrackingView.cpp

QmitkStreamlineTrackingView.h

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkControlVisualizationPropertiesView.cpp

QmitkControlVisualizationPropertiesView.h

QmitkControlVisualizationPropertiesViewControls.ui

rMITK6d58caa292b5

View Options

Modules/DiffusionImaging/DiffusionIO/files.cmake

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper2D.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberTrackingObjectFactory.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberTrackingObjectFactory.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkPeakImageMapper2D.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkPeakImageMapper2D.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkPeakImageMapper3D.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkPeakImageMapper3D.h

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'T24670-FiberRendering'6d58caa292b5Actions

Description

Details

Event Timeline

Merged Changes

Changes (15)

rMITK6d58caa292b5

Modules/DiffusionImaging/DiffusionIO/files.cmake

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper2D.h

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.h

Modules/DiffusionImaging/DiffusionIO/mitkFiberTrackingObjectFactory.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberTrackingObjectFactory.h

Modules/DiffusionImaging/DiffusionIO/mitkPeakImageMapper2D.cpp

Modules/DiffusionImaging/DiffusionIO/mitkPeakImageMapper2D.h

Modules/DiffusionImaging/DiffusionIO/mitkPeakImageMapper3D.cpp

Modules/DiffusionImaging/DiffusionIO/mitkPeakImageMapper3D.h

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

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

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

Merge branch 'T24670-FiberRendering'
6d58caa292b5
Actions