Merge branch 'T23157-3DFiberClipping3' into T23157-3DFiberClipping4
d904d59610b7
Actions

Description

Merge branch 'T23157-3DFiberClipping3' into T23157-3DFiberClipping4

Details

Provenance

neher	Authored on Aug 10 2017, 2:49 PM
neher	Pushed on Sep 5 2017, 2:23 PM

Parents

rMITKa8d6a1403b0e: Merge branch 'T23157-3DFiberClipping2' into T23157-3DFiberClipping3
rMITK0a91acb0ebfd: reverting duplicate rotation

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITKd904d59610b7: Merge branch 'T23157-3DFiberClipping3' into T23157-3DFiberClipping4 (authored by neher).Aug 10 2017, 2:49 PM

Merged Changes

a8d6a1403b0e Merge branch 'T23157-3DFiberClipping2' into T23157-3DFiberClipping3
Author
neher
Browse Repository
No Builds
No Audits
4baaa0d1fc50 Merge branch 'T23157-3DFiberClipping' into T23157-3DFiberClipping2
Author
neher
Browse Repository
No Builds
No Audits
42e98bf69c6f Include lighting in mitkShaderFiberClipping3D
Author
neher
Browse Repository
No Builds
No Audits
d908cc80b73c Avoid jump if distance to plane < 0
Author
neher
Browse Repository
No Builds
No Audits
e870c9405857 Fix uninitialized warning
Author
neher
Browse Repository
No Builds
No Audits
7d662f924eef Add shader for 3D fiber clipping
Author
neher
Browse Repository
No Builds
No Audits

Changes (15)

Path

Size

Packages

Modules/

Core/

include/

mitkIShaderRepository.h

O1: MITK Reviewer Group I

mitkVtkMapper.h

O1: MITK Reviewer Group I

src/

Rendering/

mitkVtkMapper.cpp

O1: MITK Reviewer Group I

DiffusionImaging/

DiffusionIO/

mitkFiberBundleMapper2D.cpp

mitkFiberBundleMapper3D.cpp

mitkFiberBundleMapper3D.h

FiberTracking/

Resources/

Shaders/

mitkShaderFiberClipping.xml

mitkShaderFiberClipping3D.xml

files.cmake

VtkShaders/

src/

mitkVtkShaderRepository.cpp

mitkVtkShaderRepository.h

Plugins/

org.mitk.gui.qt.datamanager/

src/

QmitkDataManagerView.cpp

O1: MITK Reviewer Group I

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkControlVisualizationPropertiesView.cpp

QmitkControlVisualizationPropertiesView.h

QmitkControlVisualizationPropertiesViewControls.ui

rMITKd904d59610b7

View Options

Modules/Core/include/mitkIShaderRepository.h

View Options

Modules/Core/include/mitkVtkMapper.h

View Options

Modules/Core/src/Rendering/mitkVtkMapper.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper2D.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.h

View Options

Modules/DiffusionImaging/FiberTracking/Resources/Shaders/mitkShaderFiberClipping.xml

View Options

Modules/DiffusionImaging/FiberTracking/Resources/Shaders/mitkShaderFiberClipping3D.xml

View Options

Modules/DiffusionImaging/FiberTracking/files.cmake

View Options

Modules/VtkShaders/src/mitkVtkShaderRepository.cpp

View Options

Modules/VtkShaders/src/mitkVtkShaderRepository.h

View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

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 'T23157-3DFiberClipping3' into T23157-3DFiberClipping4d904d59610b7Actions

Description

Details

Event Timeline

Merged Changes

Changes (15)

rMITKd904d59610b7

Modules/Core/include/mitkIShaderRepository.h

Modules/Core/include/mitkVtkMapper.h

Modules/Core/src/Rendering/mitkVtkMapper.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper2D.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.h

Modules/DiffusionImaging/FiberTracking/Resources/Shaders/mitkShaderFiberClipping.xml

Modules/DiffusionImaging/FiberTracking/Resources/Shaders/mitkShaderFiberClipping3D.xml

Modules/DiffusionImaging/FiberTracking/files.cmake

Modules/VtkShaders/src/mitkVtkShaderRepository.cpp

Modules/VtkShaders/src/mitkVtkShaderRepository.h

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

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 'T23157-3DFiberClipping3' into T23157-3DFiberClipping4
d904d59610b7
Actions