Diffusion MITK cdaf95f4cd65

Merge branch 'bug-11532-FibColorChange'
cdaf95f4cd65
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-11532-FibColorChange'

Conflicts:
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/QmitkFiberProcessingView.cpp

Details

Provenance

Authored on Apr 19 2012, 7:43 PM

Parents

rMITK8c264e43bfa4: removed tube/wire visualization. color noch correct
rMITK94a47e890e0b: Merge branch 'bug-11682-PvAnalysisExport'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITKcdaf95f4cd65: Merge branch 'bug-11532-FibColorChange' (authored by neher).Apr 19 2012, 7:43 PM

Merged Changes

8c264e43bfa4 removed tube/wire visualization. color noch correct
Author
neher
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

Packages

Modules/

DiffusionImaging/

IODataStructures/

FiberBundleX/

mitkFiberBundleX.cpp

Rendering/

mitkFiberBundleXMapper2D.cpp

mitkPlanarCircleMapper3D.cpp

PlanarFigure/

Algorithms/

mitkPlanarFigureObjectFactory.cpp

O1: MITK Reviewer Group I

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

QmitkFiberProcessingView.cpp

QmitkFiberProcessingView.h

QmitkFiberProcessingViewControls.ui

rMITKcdaf95f4cd65

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

Loading...

Modules/DiffusionImaging/Rendering/mitkFiberBundleXMapper2D.cpp

Loading...

Modules/DiffusionImaging/Rendering/mitkPlanarCircleMapper3D.cpp

Loading...

Modules/PlanarFigure/Algorithms/mitkPlanarFigureObjectFactory.cpp

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...