Merge branch 'T23157-3DFiberClipping5'
87435b916444
Actions

Description

Merge branch 'T23157-3DFiberClipping5'

Details

Provenance

neher	Authored on Sep 5 2017, 2:37 PM
neher	Pushed on Sep 5 2017, 2:36 PM

Parents

rMITK9b681e718401: added Resources folder
rMITK4a2ec71c7578: Merge branch 'T23309-AddTractDicom'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK87435b916444: Merge branch 'T23157-3DFiberClipping5' (authored by neher).Sep 5 2017, 2:37 PM

Merged Changes

9b681e718401 added Resources folder
Author
neher
Browse Repository
No Builds
No Audits
fab77d1663e2 lighting is working now
Author
neher
Browse Repository
No Builds
No Audits
6d1a56100781 Merge branch 'T23157-3DFiberClipping4' into T23157-3DFiberClipping5
Author
neher
Browse Repository
No Builds
No Audits
d904d59610b7 Merge branch 'T23157-3DFiberClipping3' into T23157-3DFiberClipping4
Author
neher
Browse Repository
No Builds
No Audits
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 (7)

Path

Size

Packages

Modules/

DiffusionImaging/

DiffusionIO/

mitkFiberBundleMapper2D.cpp

mitkFiberBundleMapper3D.cpp

mitkFiberBundleMapper3D.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

rMITK87435b916444

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper2D.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.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-3DFiberClipping5'87435b916444Actions

Description

Details

Event Timeline

Merged Changes

Changes (7)

rMITK87435b916444

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper2D.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.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-3DFiberClipping5'
87435b916444
Actions