Diffusion MITK d1bfa200a7de

Merge branch 'bug-9342-enhance-statemachine-scroll-zoom-and-pan'
d1bfa200a7de
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-9342-enhance-statemachine-scroll-zoom-and-pan'

Conflicts:
Core/Code/Interactions/mitkDisplayVectorInteractorScroll.h

Details

Provenance

Authored on Sep 14 2011, 4:51 PM

Parents

rMITK1c338447a6aa: removed unwanted MITK_INFO
rMITK528f0f3d7555: Merge branch 'bug-8903-AutoDetectionAuroraFails'

Branches

Unknown

Tags

Unknown

Event Timeline

saruji committed rMITKd1bfa200a7de: Merge branch 'bug-9342-enhance-statemachine-scroll-zoom-and-pan' (authored by saruji).Sep 14 2011, 4:51 PM

Merged Changes

1c338447a6aa removed unwanted MITK_INFO
Author
saruji
Browse Repository
No Builds
No Audits
27e7e29d93a7 wrong type: corrected event alt+shift+rightBN+MouseMove
Author
saruji
Browse Repository
No Builds
No Audits
9de4f52b09b9 added new event to statemachine
Author
saruji
Browse Repository
No Builds
No Audits
02a505d0767b changed mouse wheel interaction
Author
saruji
Browse Repository
No Builds
No Audits
3ea2891c92f6 enhance statemachine for zoom, scroll and pan
Author
saruji
Browse Repository
No Builds
No Audits
82feef3f364c Merge branch 'bug-9232-planarfigure-control-point-overlap' into…
Author
seitelm
Browse Repository
No Builds
No Audits

Changes (6)

Path

Size

Core/

Code/

Interactions/

StateMachine.xml

mitkDisplayVectorInteractorScroll.cpp

mitkDisplayVectorInteractorScroll.h

mitkInteractionConst.h

Rendering/

mitkBaseRenderer.cpp

mitkRenderWindowBase.cpp

rMITKd1bfa200a7de

Core/Code/Interactions/StateMachine.xml

Loading...

Core/Code/Interactions/mitkDisplayVectorInteractorScroll.cpp

Loading...

Core/Code/Interactions/mitkDisplayVectorInteractorScroll.h

Loading...

Core/Code/Interactions/mitkInteractionConst.h

Loading...

Core/Code/Rendering/mitkBaseRenderer.cpp

Loading...

Core/Code/Rendering/mitkRenderWindowBase.cpp

Loading...