Diffusion MITK 81ec459c9502

Merge branch 'bug-13664-RedesignInteraction-Integration-4'
81ec459c9502
Actions

Description

Merge branch 'bug-13664-RedesignInteraction-Integration-4'

Conflicts:
Core/Code/Interactions/mitkMousePressEvent.cpp
Core/Code/Interactions/mitkMouseReleaseEvent.cpp

Details

Provenance

• webechr

Authored on Feb 22 2013, 10:20 AM

Parents

rMITKa1117a3e6cbc: decprecated note
rMITK6d3cfb33d9df: Merge branch 'bug-14546-IDListInFilter'

Branches

Unknown

Tags

Unknown

Event Timeline

• webechr committed rMITK81ec459c9502: Merge branch 'bug-13664-RedesignInteraction-Integration-4' (authored by • webechr).Feb 22 2013, 10:20 AM

Merged Changes

a1117a3e6cbc decprecated note
Author
• webechr
Browse Repository
No Builds
No Audits
3962d23177ed re implemented is superclassof etc
Author
• webechr
Browse Repository
No Builds
No Audits
96ad9ef56451 Fix Observer registration .., removing obsolete registration calls
Author
• webechr
Browse Repository
No Builds
No Audits
707ca510e56a Refactoring
Author
• webechr
Browse Repository
No Builds
No Audits
786ccb3506f5 Reworked EventObserver to use us in proper way
Author
• webechr
Browse Repository
No Builds
No Audits
109d04762bbd minor Docu fix
Author
• webechr
Browse Repository
No Builds
No Audits
4753c50cfb84 Code Review Changes Part 2, MicroService Usage fix 1/2
Author
• webechr
Browse Repository
No Builds
No Audits
2c2deea53c91 Some more code changes from review
Author
• webechr
Browse Repository
No Builds
No Audits
400680881dbe Changes in XML event description
Author
• webechr
Browse Repository
No Builds
No Audits
05f26f4611cf Added Deprecated markers
Author
• webechr
Browse Repository
No Builds
No Audits

Changes (115)

Path

Size

Core/

Code/

Interactions/

mitkBindDispatcherInteractor.cpp

mitkBindDispatcherInteractor.h

mitkDataInteractor.cpp

mitkDataInteractor.h

mitkDispatcher.cpp

mitkDispatcher.h

mitkDisplayInteractor.cpp

mitkDisplayInteractor.h

mitkDisplayPositionEvent.cpp

mitkDisplayPositionEvent.h

mitkEvent.h

mitkEventConfig.cpp

mitkEventConfig.h

mitkEventDescription.h

mitkEventObserver.cpp

mitkEventObserver.h

mitkEventStateMachine.cpp

mitkEventStateMachine.h

mitkGlobalInteraction.h

mitkInformer.cpp

mitkInformer.h

mitkInteractionEvent.cpp

mitkInteractionEvent.h

mitkInteractionEventConst.h

	mitkInteractionEventHandler.cpp
	mitkEventHandler.cpp

	mitkInteractionEventHandler.h
	mitkEventHandler.h

mitkInteractionKeyEvent.cpp

mitkInteractionKeyEvent.h

mitkInteractionPositionEvent.cpp

mitkInteractionPositionEvent.h

mitkInteractor.h

mitkInternalEvent.cpp

mitkInternalEvent.h

mitkKeyEvent.h

mitkMouseModeSwitcher.cpp

mitkMouseModeSwitcher.h

mitkMouseMoveEvent.cpp

mitkMouseMoveEvent.h

mitkMousePressEvent.cpp

mitkMousePressEvent.h

mitkMouseReleaseEvent.cpp

mitkMouseReleaseEvent.h

mitkMouseWheelEvent.cpp

mitkMouseWheelEvent.h

mitkPointSetDataInteractor.cpp

mitkPointSetDataInteractor.h

mitkPointSetInteractor.cpp

mitkStateMachineFactory.h

mitkStateMachineState.cpp

mitkStateMachineState.h

mitkStateMachineTransition.cpp

mitkStateMachineTransition.h

mitkTransition.h

mitkVtkEventAdapter.h

mitkWheelEvent.h

	Interfaces/
	Interactions/

	mitkInteractionEventObserver.cpp
	mitkEventObserver.cpp

	mitkInteractionEventObserver.h
	mitkEventObserver.h

Rendering/

mitkBaseRenderer.cpp

mitkBaseRenderer.h

Resources/

Interactions/

DisplayConfig.xml

DisplayConfigMITK.xml

DisplayConfigPACS.xml

DisplayConfigPACSLevelWindow.xml

DisplayConfigPACSPan.xml

DisplayConfigPACSScroll.xml

DisplayConfigPACSZoom.xml

PointSetConfig.xml

Tests/

StatemachineConfigTest.xml

	Tests/

Testing/

Documentation/

Doxygen/

Concepts/

DataInteraction.dox

NewEvents.dox

Documentation/

Doxygen/

DeveloperManual/

Starting/

GettingToKnow/

Tutorial/

Step10.dox

Modules/

Qmitk/

QmitkEventAdapter.h

QmitkRenderWindow.h

Plugins/

PluginList.cmake

org.mitk.gui.InteractionTests

CMakeLists.txt

Resources

PointsConfigRightClick.xml

manifest_headers.cmake

InteractionTestsControls.ui

org_mitk_gui_InteractionTests_Activator.cpp

org_mitk_gui_InteractionTests_Activator.h

rMITK81ec459c9502

View Options

Core/Code/Interactions/mitkBindDispatcherInteractor.cpp

View Options

Core/Code/Interactions/mitkBindDispatcherInteractor.h

View Options

Core/Code/Interactions/mitkDataInteractor.cpp

View Options

Core/Code/Interactions/mitkDataInteractor.h

View Options

Core/Code/Interactions/mitkDispatcher.cpp

View Options

Core/Code/Interactions/mitkDispatcher.h

View Options

Core/Code/Interactions/mitkDisplayInteractor.cpp

View Options

Core/Code/Interactions/mitkDisplayInteractor.h

View Options

Core/Code/Interactions/mitkDisplayPositionEvent.cpp

View Options

Core/Code/Interactions/mitkDisplayPositionEvent.h

View Options

Core/Code/Interactions/mitkEvent.h

View Options

Core/Code/Interactions/mitkEventConfig.cpp

View Options

Core/Code/Interactions/mitkEventConfig.h

View Options

Core/Code/Interactions/mitkEventDescription.h

View Options

Core/Code/Interactions/mitkEventFactory.cpp

View Options

Core/Code/Interactions/mitkEventFactory.h

View Options

Core/Code/Interactions/mitkEventHandler.cpp

View Options

Core/Code/Interactions/mitkEventHandler.h

View Options

Core/Code/Interactions/mitkEventInformer.h

View Options

Core/Code/Interactions/mitkEventMapper.cpp

View Options

Core/Code/Interactions/mitkEventMapper.h

View Options

Core/Code/Interactions/mitkEventObserver.cpp

View Options

Core/Code/Interactions/mitkEventObserver.h

View Options

Core/Code/Interactions/mitkEventStateMachine.cpp

View Options

Core/Code/Interactions/mitkEventStateMachine.h

View Options

Core/Code/Interactions/mitkGlobalInteraction.h

View Options

Core/Code/Interactions/mitkInformer.cpp

View Options

Core/Code/Interactions/mitkInformer.h

View Options

Core/Code/Interactions/mitkInteractionEvent.cpp

View Options

Core/Code/Interactions/mitkInteractionEvent.h

View Options

Core/Code/Interactions/mitkInteractionEventConst.h

View Options

Core/Code/Interactions/mitkInteractionEventHandler.cpp

View Options

Core/Code/Interactions/mitkInteractionEventHandler.h

View Options

Core/Code/Interactions/mitkInteractionKeyEvent.cpp

View Options

Core/Code/Interactions/mitkInteractionKeyEvent.h

View Options

Core/Code/Interactions/mitkInteractionPositionEvent.cpp

View Options

Core/Code/Interactions/mitkInteractionPositionEvent.h

View Options

Core/Code/Interactions/mitkInteractor.h

View Options

Core/Code/Interactions/mitkInternalEvent.cpp

View Options

Core/Code/Interactions/mitkInternalEvent.h

View Options

Core/Code/Interactions/mitkKeyEvent.h

View Options

Core/Code/Interactions/mitkMouseModeSwitcher.cpp

View Options

Core/Code/Interactions/mitkMouseModeSwitcher.h

View Options

Core/Code/Interactions/mitkMouseMoveEvent.cpp

View Options

Core/Code/Interactions/mitkMouseMoveEvent.h

View Options

Core/Code/Interactions/mitkMousePressEvent.cpp

View Options

Core/Code/Interactions/mitkMousePressEvent.h

View Options

Core/Code/Interactions/mitkMouseReleaseEvent.cpp

View Options

Core/Code/Interactions/mitkMouseReleaseEvent.h

View Options

Core/Code/Interactions/mitkMouseWheelEvent.cpp

View Options

Core/Code/Interactions/mitkMouseWheelEvent.h

View Options

Core/Code/Interactions/mitkPointSetDataInteractor.cpp

View Options

Core/Code/Interactions/mitkPointSetDataInteractor.h

View Options

Core/Code/Interactions/mitkPointSetInteractor.cpp

View Options

Core/Code/Interactions/mitkPositionEvent.h

View Options

Core/Code/Interactions/mitkState.h

View Options

Core/Code/Interactions/mitkStateEvent.h

View Options

Core/Code/Interactions/mitkStateMachine.h

View Options

Core/Code/Interactions/mitkStateMachineFactory.h

View Options

Core/Code/Interactions/mitkStateMachineState.cpp

View Options

Core/Code/Interactions/mitkStateMachineState.h

View Options

Core/Code/Interactions/mitkStateMachineTransition.cpp

View Options

Core/Code/Interactions/mitkStateMachineTransition.h

View Options

Core/Code/Interactions/mitkTransition.h

View Options

Core/Code/Interactions/mitkVtkEventAdapter.h

View Options

Core/Code/Interactions/mitkWheelEvent.h

View Options

Core/Code/Interfaces/mitkInteractionEventObserver.cpp

View Options

Core/Code/Interfaces/mitkInteractionEventObserver.h

View Options

Core/Code/Rendering/mitkBaseRenderer.cpp

View Options

Core/Code/Rendering/mitkBaseRenderer.h

View Options

Core/Code/Resources/Interactions/DisplayConfig.xml

View Options

Core/Code/Resources/Interactions/DisplayConfigMITK.xml

View Options

Core/Code/Resources/Interactions/DisplayConfigPACS.xml

View Options

Core/Code/Resources/Interactions/DisplayConfigPACSLevelWindow.xml

View Options

Core/Code/Resources/Interactions/DisplayConfigPACSPan.xml

View Options

Core/Code/Resources/Interactions/DisplayConfigPACSScroll.xml

View Options

Core/Code/Resources/Interactions/DisplayConfigPACSZoom.xml

View Options

Core/Code/Resources/Interactions/PointSetConfig.xml

View Options

Core/Code/Resources/Interactions/Tests/StatemachineConfigTest.xml

View Options

Core/Code/Resources/Interactions/Tests/globalConfig.xml

View Options

Core/Code/Resources/Interactions/globalConfig.xml

View Options

Core/Code/Testing/Testing

View Options

Core/Code/Testing/Testing/Temporary

View Options

Core/Code/Testing/Testing/Temporary/CTestCostData.txt

View Options

Core/Code/Testing/Testing/Temporary/LastTest.log

View Options

Core/Code/Testing/files.cmake

View Options

Core/Code/files.cmake

View Options

Core/Documentation/Doxygen/Concepts/DataInteraction.dox

View Options

Core/Documentation/Doxygen/Concepts/NewEvents.dox

View Options

Documentation/Doxygen/DeveloperManual/Starting/GettingToKnow/Tutorial/Step10.dox

View Options

Modules/Qmitk/QmitkEventAdapter.h

View Options

Modules/Qmitk/QmitkRenderWindow.h

View Options

Plugins/PluginList.cmake

View Options

Plugins/org.mitk.gui.InteractionTests

View Options

Plugins/org.mitk.gui.InteractionTests/CMakeLists.txt

View Options

Plugins/org.mitk.gui.InteractionTests/Resources

View Options

Plugins/org.mitk.gui.InteractionTests/Resources/PointsConfigRightClick.xml

View Options

Plugins/org.mitk.gui.InteractionTests/documentation

View Options

Plugins/org.mitk.gui.InteractionTests/documentation/UserManual

View Options

Plugins/org.mitk.gui.InteractionTests/documentation/UserManual/Manual.dox

View Options

Plugins/org.mitk.gui.InteractionTests/documentation/UserManual/icon.xpm

View Options

Plugins/org.mitk.gui.InteractionTests/documentation/doxygen

View Options

Plugins/org.mitk.gui.InteractionTests/documentation/doxygen/modules.dox

View Options

Plugins/org.mitk.gui.InteractionTests/files.cmake

View Options

Plugins/org.mitk.gui.InteractionTests/manifest_headers.cmake

View Options

Plugins/org.mitk.gui.InteractionTests/plugin.xml

View Options

Plugins/org.mitk.gui.InteractionTests/resources

View Options

Plugins/org.mitk.gui.InteractionTests/resources/icon.xpm

View Options

Plugins/org.mitk.gui.InteractionTests/src

View Options

Plugins/org.mitk.gui.InteractionTests/src/internal

View Options

Plugins/org.mitk.gui.InteractionTests/src/internal/InteractionTests.cpp

View Options

Plugins/org.mitk.gui.InteractionTests/src/internal/InteractionTests.h

View Options

Plugins/org.mitk.gui.InteractionTests/src/internal/InteractionTestsControls.ui

View Options

Plugins/org.mitk.gui.InteractionTests/src/internal/org_mitk_gui_InteractionTests_Activator.cpp

View Options

Plugins/org.mitk.gui.InteractionTests/src/internal/org_mitk_gui_InteractionTests_Activator.h

Merge branch 'bug-13664-RedesignInteraction-Integration-4'81ec459c9502Actions

Description

Details

Event Timeline

Merged Changes

Changes (115)

rMITK81ec459c9502

Core/Code/Interactions/mitkBindDispatcherInteractor.cpp

Core/Code/Interactions/mitkBindDispatcherInteractor.h

Core/Code/Interactions/mitkDataInteractor.cpp

Core/Code/Interactions/mitkDataInteractor.h

Core/Code/Interactions/mitkDispatcher.cpp

Core/Code/Interactions/mitkDispatcher.h

Core/Code/Interactions/mitkDisplayInteractor.cpp

Core/Code/Interactions/mitkDisplayInteractor.h

Core/Code/Interactions/mitkDisplayPositionEvent.cpp

Core/Code/Interactions/mitkDisplayPositionEvent.h

Core/Code/Interactions/mitkEvent.h

Core/Code/Interactions/mitkEventConfig.cpp

Core/Code/Interactions/mitkEventConfig.h

Core/Code/Interactions/mitkEventDescription.h

Core/Code/Interactions/mitkEventFactory.cpp

Core/Code/Interactions/mitkEventFactory.h

Core/Code/Interactions/mitkEventHandler.cpp

Core/Code/Interactions/mitkEventHandler.h

Core/Code/Interactions/mitkEventInformer.h

Core/Code/Interactions/mitkEventMapper.cpp

Core/Code/Interactions/mitkEventMapper.h

Core/Code/Interactions/mitkEventObserver.cpp

Core/Code/Interactions/mitkEventObserver.h

Core/Code/Interactions/mitkEventStateMachine.cpp

Core/Code/Interactions/mitkEventStateMachine.h

Core/Code/Interactions/mitkGlobalInteraction.h

Core/Code/Interactions/mitkInformer.cpp

Core/Code/Interactions/mitkInformer.h

Core/Code/Interactions/mitkInteractionEvent.cpp

Core/Code/Interactions/mitkInteractionEvent.h

Core/Code/Interactions/mitkInteractionEventConst.h

Core/Code/Interactions/mitkInteractionEventHandler.cpp

Core/Code/Interactions/mitkInteractionEventHandler.h

Core/Code/Interactions/mitkInteractionKeyEvent.cpp

Core/Code/Interactions/mitkInteractionKeyEvent.h

Core/Code/Interactions/mitkInteractionPositionEvent.cpp

Core/Code/Interactions/mitkInteractionPositionEvent.h

Core/Code/Interactions/mitkInteractor.h

Core/Code/Interactions/mitkInternalEvent.cpp

Core/Code/Interactions/mitkInternalEvent.h

Core/Code/Interactions/mitkKeyEvent.h

Core/Code/Interactions/mitkMouseModeSwitcher.cpp

Core/Code/Interactions/mitkMouseModeSwitcher.h

Core/Code/Interactions/mitkMouseMoveEvent.cpp

Core/Code/Interactions/mitkMouseMoveEvent.h

Core/Code/Interactions/mitkMousePressEvent.cpp

Core/Code/Interactions/mitkMousePressEvent.h

Core/Code/Interactions/mitkMouseReleaseEvent.cpp

Core/Code/Interactions/mitkMouseReleaseEvent.h

Core/Code/Interactions/mitkMouseWheelEvent.cpp

Core/Code/Interactions/mitkMouseWheelEvent.h

Core/Code/Interactions/mitkPointSetDataInteractor.cpp

Core/Code/Interactions/mitkPointSetDataInteractor.h

Core/Code/Interactions/mitkPointSetInteractor.cpp

Core/Code/Interactions/mitkPositionEvent.h

Core/Code/Interactions/mitkState.h

Core/Code/Interactions/mitkStateEvent.h

Core/Code/Interactions/mitkStateMachine.h

Core/Code/Interactions/mitkStateMachineFactory.h

Core/Code/Interactions/mitkStateMachineState.cpp

Core/Code/Interactions/mitkStateMachineState.h

Core/Code/Interactions/mitkStateMachineTransition.cpp

Core/Code/Interactions/mitkStateMachineTransition.h

Core/Code/Interactions/mitkTransition.h

Core/Code/Interactions/mitkVtkEventAdapter.h

Core/Code/Interactions/mitkWheelEvent.h

Core/Code/Interfaces/mitkInteractionEventObserver.cpp

Core/Code/Interfaces/mitkInteractionEventObserver.h

Core/Code/Rendering/mitkBaseRenderer.cpp

Core/Code/Rendering/mitkBaseRenderer.h

Core/Code/Resources/Interactions/DisplayConfig.xml

Core/Code/Resources/Interactions/DisplayConfigMITK.xml

Core/Code/Resources/Interactions/DisplayConfigPACS.xml

Merge branch 'bug-13664-RedesignInteraction-Integration-4'
81ec459c9502
Actions