Merge branch 'bug-8579-picking-fibers'
a4d0a110da0f
Actions

Description

Merge branch 'bug-8579-picking-fibers'

Details

Provenance

Authored on Jun 30 2011, 4:52 PM

Parents

rMITK8f11a32e0c09: picking and repositioning of crosshair works fine
rMITKcfb3dffef8a6: Merge branch 'bug-8539-highres-screeny-bug'

Branches

Unknown

Tags

Unknown

Event Timeline

fritzsck committed rMITKa4d0a110da0f: Merge branch 'bug-8579-picking-fibers' (authored by fritzsck).Jun 30 2011, 4:52 PM

Merged Changes

8f11a32e0c09 picking and repositioning of crosshair works fine
Author
fritzsck
Browse Repository
No Builds
No Audits
9da014aa089a initial tests
Author
fritzsck
Browse Repository
No Builds
No Audits

Changes (15)

Path

Size

Core/

Code/

Interactions/

StateMachine.xml

mitkInteractionConst.h

CoreUI/

Bundles/

org.mitk.gui.qt.common/

resources/

StateMachine.xml

mitkEventAndActionConstants.xml

Modules/

Bundles/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkControlVisualizationPropertiesView.cpp

QmitkControlVisualizationPropertiesView.h

QmitkControlVisualizationPropertiesViewControls.ui

DiffusionImaging/

CMakeLists.txt

IODataStructures/

FiberBundle/

mitkFiberBundle.h

Interactions

mitkFiberBundleInteractor.cpp

Rendering/

mitkFiberBundleMapper3D.cpp

files.cmake

	DiffusionImaging/	Interactions/
	MitkExt/	Interactions/

	mitkFiberBundleInteractor.h
	mitkPointSelectorInteractor.h

MitkExt/

Interactions/

mitkEventAndActionConstants.xml

rMITKa4d0a110da0f

View Options

Core/Code/Interactions/StateMachine.xml

View Options

Core/Code/Interactions/mitkInteractionConst.h

View Options

CoreUI/Bundles/org.mitk.gui.qt.common/resources/StateMachine.xml

View Options

CoreUI/Bundles/org.mitk.gui.qt.common/resources/mitkEventAndActionConstants.xml

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.h

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui

View Options

Modules/DiffusionImaging/CMakeLists.txt

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.h

View Options

Modules/DiffusionImaging/Interactions/mitkFiberBundleInteractor.cpp

View Options

Modules/DiffusionImaging/Interactions/mitkFiberBundleInteractor.h

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.cpp

View Options

Modules/DiffusionImaging/files.cmake

View Options

Modules/MitkExt/Interactions/mitkEventAndActionConstants.xml

Merge branch 'bug-8579-picking-fibers'a4d0a110da0fActions

Description

Details

Event Timeline

Merged Changes

Changes (15)

rMITKa4d0a110da0f

Core/Code/Interactions/StateMachine.xml

Core/Code/Interactions/mitkInteractionConst.h

CoreUI/Bundles/org.mitk.gui.qt.common/resources/StateMachine.xml

CoreUI/Bundles/org.mitk.gui.qt.common/resources/mitkEventAndActionConstants.xml

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.h

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui

Modules/DiffusionImaging/CMakeLists.txt

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.h

Modules/DiffusionImaging/Interactions/mitkFiberBundleInteractor.cpp

Modules/DiffusionImaging/Interactions/mitkFiberBundleInteractor.h

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.cpp

Modules/DiffusionImaging/files.cmake

Modules/MitkExt/Interactions/mitkEventAndActionConstants.xml

Merge branch 'bug-8579-picking-fibers'
a4d0a110da0f
Actions