Merge branch 'bug-16871-Interaction-Testing-Framework-integration'
30c0e81e6e5f
Actions

Description

Merge branch 'bug-16871-Interaction-Testing-Framework-integration'

Details

Provenance

Authored on Feb 27 2014, 12:24 PM

Parents

rMITK052e5969ca82: Adapted to new API of InteractionPositionEvent.
rMITKbdc7b0ba5b0b: Merge branch 'bug-17349-ImageDenoisingModule'

Branches

Unknown

Tags

Unknown

Event Timeline

• schroedt committed rMITK30c0e81e6e5f: Merge branch 'bug-16871-Interaction-Testing-Framework-integration' (authored by • schroedt).Feb 27 2014, 12:24 PM

Merged Changes

052e5969ca82 Adapted to new API of InteractionPositionEvent.
Author
• schroedt
Browse Repository
No Builds
No Audits
501b6fad1289 Fixed warning.
Author
• schroedt
Browse Repository
No Builds
No Audits
d97bfc10cc32 Deprecated function.
Author
• schroedt
Browse Repository
No Builds
No Audits
873a5c281dcd Remove unused include.
Author
• schroedt
Browse Repository
No Builds
No Audits
1931570e47f6 Moved private static member functions to cpp file.
Author
• schroedt
Browse Repository
No Builds
No Audits
9f40527a43f2 Added test data to MITK-Data.
Author
• schroedt
Browse Repository
No Builds
No Audits
f9dafe73f9b9 Merge branch 'bug-16871-InteractionRecorderWriter' into bug-16871-Interaction…
Author
• schroedt
Browse Repository
No Builds
No Audits
84a39a8fb276 Fix setting timesteps
Author
• schroedt
Browse Repository
No Builds
No Audits
3dcd8f95ecd4 Added support for InteractionKeyEvent
Author
• schroedt
Browse Repository
No Builds
No Audits
a0f79dcc5585 helper class is no member
Author
• schroedt
Browse Repository
No Builds
No Audits
0585e1c3e881 Added access to renderWindows
Author
• schroedt
Browse Repository
No Builds
No Audits
20ebceba1874 Added tooltips for buttons.
Author
• schroedt
Browse Repository
No Builds
No Audits
e91902f0fbf7 Undo smartpointer support.
Author
• schroedt
Browse Repository
No Builds
No Audits
5ea649e982ed Renamed members of PointSetDataInteractorTest
Author
• schroedt
Browse Repository
No Builds
No Audits
b1274f0ab3e0 Use itk smartpointer for test helper class.
Author
• schroedt
Browse Repository
No Builds
No Audits
7ec2d0d416eb Refactored test helper class to dynamically load RenderWindows from xml file.
Author
• schroedt
Browse Repository
No Builds
No Audits
8c3f49d99e88 Documentation added
Author
• schroedt
Browse Repository
No Builds
No Audits
f778196e25a2 Use xml header and write config for renderers.
Author
• schroedt
Browse Repository
No Builds
No Audits
68eda689f590 Changed test to take care of destruction.
Author
• schroedt
Browse Repository
No Builds
No Audits
a6ee306510ce Added renderwindows for the 3 default view directions.
Author
• schroedt
Browse Repository
No Builds
No Audits
7f577e52a881 Redisgned test
Author
• schroedt
Browse Repository
No Builds
No Audits
225687f93cfe Remove all unnecessary code
Author
• schroedt
Browse Repository
No Builds
No Audits
5c5c0f8007a7 Class documentation for InteractionTestHelper
Author
• schroedt
Browse Repository
No Builds
No Audits
659243696ba6 Added a working test based on CPPUnit. TODO: remove absolute paths to files.
Author
• schroedt
Browse Repository
No Builds
No Audits
a732c3cc0ec5 Fix compile errors
Author
• schroedt
Browse Repository
No Builds
No Audits
ba3f821a0f45 Changed getter for renderer and render window
Author
• schroedt
Browse Repository
No Builds
No Audits
8a4fd0939ca9 Initially added helper class
Author
• schroedt
Browse Repository
No Builds
No Audits
3ae5debc7199 Use first renderer if no one was found by name
Author
• schroedt
Browse Repository
No Builds
No Audits
ab15a61240ed Managed to playback scroll interaction the right way.
Author
• schroedt
Browse Repository
No Builds
No Audits
b3ab38bd4a69 Removed axis-flip in VtkEventAdapter
Author
• schroedt
Browse Repository
No Builds
No Audits
064a6a88588c Fixed tests.
Author
• schroedt
Browse Repository
No Builds
No Audits
92edd8337920 Added new plugin icon.
Author
• schroedt
Browse Repository
No Builds
No Audits
5126c24d1ad0 Transform 2d to 3d point before creating Position events, to stay independent…
Author
• webechr
Browse Repository
No Builds
No Audits
9aca78734a95 Fix event modification in BaseRenderer - Map2DRendererPositionTo3DWorldPosition…
Author
• webechr
Browse Repository
No Builds
No Audits
06b42cc4e4ec Save and Load funcionality for Renderer.
Author
• schroedt
Browse Repository
No Builds
No Audits
1fc936464732 Icons for buttons
Author
• schroedt
Browse Repository
No Builds
No Audits
84974b4d571c Parse screen position
Author
• schroedt
Browse Repository
No Builds
No Audits
6e29fffd303c Opening and closing tag in xml file
Author
• schroedt
Browse Repository
No Builds
No Audits
1571ff53c135 Open file dialog for interaction file
Author
• schroedt
Browse Repository
No Builds
No Audits
1ca7c2a5c4cf Fixed BAD_ACCESS during playback
Author
• schroedt
Browse Repository
No Builds
No Audits
c0b566eea3b6 Add XML Reader of Event Files.
Author
• webechr
Browse Repository
No Builds
No Audits
6d469206d8cd move recorder initaialization into plugin
Author
• webechr
Browse Repository
No Builds
No Audits
d96cfbe6429b fix in xml syntax
Author
• webechr
Browse Repository
No Builds
No Audits
751be9fd3816 + WriteSupport for event recorder + Plugin Stub to use event recorder
Author
• webechr
Browse Repository
No Builds
No Audits
0222c5e29862 - debug o
Author
• webechr
Browse Repository
No Builds
No Audits
871c392e50ed mix up, position in world / screen
Author
• webechr
Browse Repository
No Builds
No Audits
9f6217d680ac fix: ignored some parameters in mousewheel events.
Author
• webechr
Browse Repository
No Builds
No Audits
5bdc9c6a85d4 Wrote EventObserver that transforms all events into XML, attached ot to…
Author
• webechr
Browse Repository
No Builds
No Audits
3a5bd64225c7 Extended EventConsts to describe events
Author
• webechr
Browse Repository
No Builds
No Audits
10fab8ef20f6 Extended Event Factory to Map InteractionEvents to XML description
Author
• webechr
Browse Repository
No Builds
No Audits

Changes (61)

Path

Size

Packages

CMakeExternals/

MITKData.cmake

O1: MITK Reviewer Group I

Core/

Code/

Interactions/

mitkEventFactory.cpp

mitkEventFactory.h

mitkEventRecorder.cpp

mitkEventRecorder.h

mitkInteractionEventConst.cpp

mitkInteractionEventConst.h

mitkInteractionPositionEvent.cpp

mitkInteractionPositionEvent.h

mitkMouseDoubleClickEvent.cpp

mitkMouseDoubleClickEvent.h

mitkMouseModeSwitcher.cpp

mitkMouseModeSwitcher.h

mitkMouseMoveEvent.cpp

mitkMouseMoveEvent.h

mitkMousePressEvent.cpp

mitkMousePressEvent.h

mitkMouseReleaseEvent.cpp

mitkMouseReleaseEvent.h

mitkMouseWheelEvent.cpp

mitkMouseWheelEvent.h

mitkVtkEventAdapter.cpp

mitkXML2EventParser.cpp

mitkXML2EventParser.h

Rendering/

mitkBaseRenderer.cpp

mitkBaseRenderer.h

Testing/

files.cmake

mitkEventConfigTest.cpp

mitkInteractionEventTest.cpp

mitkPointSetDataInteractorTest.cpp

TestingHelper/

files.cmake

mitkInteractionTestHelper.cpp

mitkInteractionTestHelper.h

files.cmake

Modules/

Qmitk/

QmitkRenderWindow.cpp

Segmentation/

Interactions/

mitkFastMarchingTool.cpp

O1: MITK Reviewer Group I

Plugins/

PluginList.cmake

org.mitk.gui.qt.eventrecorder

manifest_headers.cmake

InteractionEventRecorder.cpp

InteractionEventRecorder.h

InteractionEventRecorderControls.ui

org_mitk_gui_gt_eventrecorder_Activator.cpp

org_mitk_gui_gt_eventrecorder_Activator.h

	Plugins/	org.mitk.gui.qt.eventrecorder/		documentation/	UserManual/
	Applications/	PluginGenerator/	PluginTemplate/	documentation/	UserManual/

icon.xpm

rMITK30c0e81e6e5f

View Options

CMakeExternals/MITKData.cmake

View Options

Core/Code/Interactions/mitkEventFactory.cpp

View Options

Core/Code/Interactions/mitkEventFactory.h

View Options

Core/Code/Interactions/mitkEventRecorder.cpp

View Options

Core/Code/Interactions/mitkEventRecorder.h

View Options

Core/Code/Interactions/mitkInteractionEventConst.cpp

View Options

Core/Code/Interactions/mitkInteractionEventConst.h

View Options

Core/Code/Interactions/mitkInteractionPositionEvent.cpp

View Options

Core/Code/Interactions/mitkInteractionPositionEvent.h

View Options

Core/Code/Interactions/mitkMouseDoubleClickEvent.cpp

View Options

Core/Code/Interactions/mitkMouseDoubleClickEvent.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/mitkVtkEventAdapter.cpp

View Options

Core/Code/Interactions/mitkXML2EventParser.cpp

View Options

Core/Code/Interactions/mitkXML2EventParser.h

View Options

Core/Code/Rendering/mitkBaseRenderer.cpp

View Options

Core/Code/Rendering/mitkBaseRenderer.h

View Options

Core/Code/Testing/files.cmake

View Options

Core/Code/Testing/mitkEventConfigTest.cpp

View Options

Core/Code/Testing/mitkInteractionEventTest.cpp

View Options

Core/Code/Testing/mitkPointSetDataInteractorTest.cpp

View Options

Core/Code/TestingHelper/files.cmake

View Options

Core/Code/TestingHelper/mitkInteractionTestHelper.cpp

View Options

Core/Code/TestingHelper/mitkInteractionTestHelper.h

View Options

Core/Code/files.cmake

View Options

Modules/Qmitk/QmitkRenderWindow.cpp

View Options

Modules/Segmentation/Interactions/mitkFastMarchingTool.cpp

View Options

Plugins/PluginList.cmake

View Options

Plugins/org.mitk.gui.qt.eventrecorder/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.eventrecorder/documentation/UserManual/Manual.dox

View Options

Plugins/org.mitk.gui.qt.eventrecorder/documentation/UserManual/icon.xpm

View Options

Plugins/org.mitk.gui.qt.eventrecorder/documentation/doxygen/modules.dox

View Options

Plugins/org.mitk.gui.qt.eventrecorder/files.cmake

View Options

Plugins/org.mitk.gui.qt.eventrecorder/manifest_headers.cmake

View Options

Plugins/org.mitk.gui.qt.eventrecorder/plugin.xml

View Options

Plugins/org.mitk.gui.qt.eventrecorder/resources/icon.png

View Options

Plugins/org.mitk.gui.qt.eventrecorder/resources/play.png

View Options

Plugins/org.mitk.gui.qt.eventrecorder/resources/rec.png

View Options

Plugins/org.mitk.gui.qt.eventrecorder/resources/stop.png

View Options

Plugins/org.mitk.gui.qt.eventrecorder/resources/stop_rec.png

View Options

Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorder.cpp

View Options

Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorder.h

View Options

Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorderControls.ui

View Options

Plugins/org.mitk.gui.qt.eventrecorder/src/internal/org_mitk_gui_gt_eventrecorder_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.eventrecorder/src/internal/org_mitk_gui_gt_eventrecorder_Activator.h

Merge branch 'bug-16871-Interaction-Testing-Framework-integration'30c0e81e6e5fActions

Description

Details

Event Timeline

Merged Changes

Changes (61)

rMITK30c0e81e6e5f

CMakeExternals/MITKData.cmake

Core/Code/Interactions/mitkEventFactory.cpp

Core/Code/Interactions/mitkEventFactory.h

Core/Code/Interactions/mitkEventRecorder.cpp

Core/Code/Interactions/mitkEventRecorder.h

Core/Code/Interactions/mitkInteractionEventConst.cpp

Core/Code/Interactions/mitkInteractionEventConst.h

Core/Code/Interactions/mitkInteractionPositionEvent.cpp

Core/Code/Interactions/mitkInteractionPositionEvent.h

Core/Code/Interactions/mitkMouseDoubleClickEvent.cpp

Core/Code/Interactions/mitkMouseDoubleClickEvent.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/mitkVtkEventAdapter.cpp

Core/Code/Interactions/mitkXML2EventParser.cpp

Core/Code/Interactions/mitkXML2EventParser.h

Core/Code/Rendering/mitkBaseRenderer.cpp

Core/Code/Rendering/mitkBaseRenderer.h

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkEventConfigTest.cpp

Core/Code/Testing/mitkInteractionEventTest.cpp

Core/Code/Testing/mitkPointSetDataInteractorTest.cpp

Core/Code/TestingHelper/files.cmake

Core/Code/TestingHelper/mitkInteractionTestHelper.cpp

Core/Code/TestingHelper/mitkInteractionTestHelper.h

Core/Code/files.cmake

Modules/Qmitk/QmitkRenderWindow.cpp

Modules/Segmentation/Interactions/mitkFastMarchingTool.cpp

Plugins/PluginList.cmake

Plugins/org.mitk.gui.qt.eventrecorder/CMakeLists.txt

Plugins/org.mitk.gui.qt.eventrecorder/documentation/UserManual/Manual.dox

Plugins/org.mitk.gui.qt.eventrecorder/documentation/UserManual/icon.xpm

Plugins/org.mitk.gui.qt.eventrecorder/documentation/doxygen/modules.dox

Plugins/org.mitk.gui.qt.eventrecorder/files.cmake

Plugins/org.mitk.gui.qt.eventrecorder/manifest_headers.cmake

Plugins/org.mitk.gui.qt.eventrecorder/plugin.xml

Plugins/org.mitk.gui.qt.eventrecorder/resources/icon.png

Plugins/org.mitk.gui.qt.eventrecorder/resources/play.png

Plugins/org.mitk.gui.qt.eventrecorder/resources/rec.png

Plugins/org.mitk.gui.qt.eventrecorder/resources/stop.png

Plugins/org.mitk.gui.qt.eventrecorder/resources/stop_rec.png

Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorder.cpp

Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorder.h

Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorderControls.ui

Plugins/org.mitk.gui.qt.eventrecorder/src/internal/org_mitk_gui_gt_eventrecorder_Activator.cpp

Plugins/org.mitk.gui.qt.eventrecorder/src/internal/org_mitk_gui_gt_eventrecorder_Activator.h

Merge branch 'bug-16871-Interaction-Testing-Framework-integration'
30c0e81e6e5f
Actions