Diffusion MITK 2e9e1f8ae1c6

Merge branch 'bug-13664-code-review-changes'
2e9e1f8ae1c6
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-13664-code-review-changes'

bug-13664-code-review-changes: Use the correct method to unregister DataInteractor from DataNode. Fixed copy constructor for mitk::CameraIntrinsics. Removed DEPRECATED macro again, since it leads to compile errors. Harmonized Set/Load/Add event config methods. Removed GetEventClass() method, using GetNameOfClass() instead. Deprecated classes, added const and pass by reference, simplified inheritance. Moved interaction event constants to DataInteractor and InteractionEvent. Added proper clone methods for properties. Improved equality methods using static casts. Added deprecated macro for old Interactor class. Moved test interaction xml files to the test driver. Use C++ style operator== for comparing interaction events. Deprecated TActionFunctor and used mitk::Message instead. Added const modifiers and passing arguments by reference instead of value.

Details

Provenance

Authored on Mar 30 2013, 7:26 PM

Parents

rMITK2d4c337ea0b5: Use the correct method to unregister DataInteractor from DataNode.
rMITK46a6fa11c939: Merge branch 'bug-14783-cmake-compiler-and-linker-flags'

Branches

Unknown

Tags

Unknown

Event Timeline

zelzer committed rMITK2e9e1f8ae1c6: Merge branch 'bug-13664-code-review-changes' (authored by zelzer).Mar 30 2013, 7:26 PM

Merged Changes

2d4c337ea0b5 Use the correct method to unregister DataInteractor from DataNode.
Author
zelzer
Browse Repository
No Builds
No Audits
90d8c3c2c763 Fixed copy constructor for mitk::CameraIntrinsics.
Author
zelzer
Browse Repository
No Builds
No Audits
a499df4e6f18 Removed DEPRECATED macro again, since it leads to compile errors.
Author
zelzer
Browse Repository
No Builds
No Audits
6cc320de9466 Merge branch 'bug-14783-cmake-compiler-and-linker-flags' into bug-13664-code…
Author
zelzer
Browse Repository
No Builds
No Audits
3b550aaab691 Harmonized Set/Load/Add event config methods.
Author
zelzer
Browse Repository
No Builds
No Audits
f8f0c03f2821 Removed GetEventClass() method, using GetNameOfClass() instead.
Author
zelzer
Browse Repository
No Builds
No Audits
0f2869dd9a64 Deprecated classes, added const and pass by reference, simplified inheritance.
Author
zelzer
Browse Repository
No Builds
No Audits
7d2f2202f492 Moved interaction event constants to DataInteractor and InteractionEvent.
Author
zelzer
Browse Repository
No Builds
No Audits
25c8bce4b253 Added proper clone methods for properties.
Author
zelzer
Browse Repository
No Builds
No Audits
a52e5dc88e27 Improved equality methods using static casts.
Author
zelzer
Browse Repository
No Builds
No Audits
65863b003c13 Added deprecated macro for old Interactor class.
Author
zelzer
Browse Repository
No Builds
No Audits
357df31029d8 Moved test interaction xml files to the test driver.
Author
zelzer
Browse Repository
No Builds
No Audits
7a3277af073a Use C++ style operator== for comparing interaction events.
Author
zelzer
Browse Repository
No Builds
No Audits
f7e74e4f45b8 Deprecated TActionFunctor and used mitk::Message instead.
Author
zelzer
Browse Repository
No Builds
No Audits
2773cc795563 Added const modifiers and passing arguments by reference instead of value.
Author
zelzer
Browse Repository
No Builds
No Audits

Changes (140)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

Packages

Core/

Code/

Controllers/

mitkCameraController.h

mitkVtkInteractorCameraController.cpp

DataManagement/

mitkAnnotationProperty.cpp

mitkAnnotationProperty.h

mitkBaseProperty.cpp

mitkBaseProperty.h

mitkClippingProperty.cpp

mitkClippingProperty.h

mitkColorProperty.cpp

mitkColorProperty.h

mitkDataNode.cpp

mitkEnumerationProperty.cpp

mitkEnumerationProperty.h

mitkGenericProperty.h

mitkGroupTagProperty.cpp

mitkGroupTagProperty.h

mitkLevelWindowProperty.cpp

mitkLevelWindowProperty.h

mitkLookupTable.cpp

mitkLookupTable.h

mitkModalityProperty.cpp

mitkModalityProperty.h

mitkPlaneOrientationProperty.cpp

mitkPlaneOrientationProperty.h

mitkPropertyList.cpp

mitkPropertyList.h

mitkRenderingModeProperty.cpp

mitkRenderingModeProperty.h

mitkResliceMethodProperty.cpp

mitkResliceMethodProperty.h

mitkShaderProperty.cpp

mitkShaderProperty.h

mitkSmartPointerProperty.cpp

mitkSmartPointerProperty.h

mitkStringProperty.cpp

mitkStringProperty.h

mitkTransferFunction.cpp

mitkTransferFunction.h

mitkTransferFunctionProperty.cpp

mitkTransferFunctionProperty.h

mitkVtkInterpolationProperty.cpp

mitkVtkInterpolationProperty.h

mitkVtkRepresentationProperty.cpp

mitkVtkRepresentationProperty.h

mitkVtkResliceInterpolationProperty.cpp

mitkVtkResliceInterpolationProperty.h

mitkVtkScalarModeProperty.cpp

mitkVtkScalarModeProperty.h

mitkVtkVolumeRenderingProperty.cpp

mitkVtkVolumeRenderingProperty.h

mitkWeakPointerProperty.cpp

mitkWeakPointerProperty.h

IO/

mitkLookupTableProperty.cpp

mitkLookupTableProperty.h

Interactions/

mitkBindDispatcherInteractor.cpp

mitkBindDispatcherInteractor.h

mitkDataInteractor.cpp

mitkDataInteractor.h

mitkDispatcher.cpp

mitkDisplayInteractor.cpp

mitkEventConfig.cpp

mitkEventConfig.h

mitkEventFactory.cpp

mitkEventMapper.cpp

mitkEventStateMachine.cpp

mitkEventStateMachine.h

mitkInteractionEvent.cpp

mitkInteractionEvent.h

mitkInteractionEventConst.cpp

mitkInteractionEventConst.h

mitkInteractionEventHandler.cpp

mitkInteractionEventHandler.h

mitkInteractionKeyEvent.cpp

mitkInteractionKeyEvent.h

mitkInteractionPositionEvent.cpp

mitkInteractionPositionEvent.h

mitkInternalEvent.cpp

mitkInternalEvent.h

mitkMouseModeSwitcher.cpp

mitkMouseMoveEvent.cpp

mitkMouseMoveEvent.h

mitkMousePressEvent.cpp

mitkMousePressEvent.h

mitkMouseReleaseEvent.cpp

mitkMouseReleaseEvent.h

mitkMouseWheelEvent.cpp

mitkMouseWheelEvent.h

mitkStateMachineAction.cpp

mitkStateMachineAction.h

mitkStateMachineContainer.cpp

mitkStateMachineContainer.h

mitkStateMachineState.cpp

mitkStateMachineState.h

mitkStateMachineTransition.cpp

mitkStateMachineTransition.h

mitkVtkEventAdapter.cpp

Interfaces/

mitkInteractionEventObserver.cpp

mitkInteractionEventObserver.h

Rendering/

mitkBaseRenderer.cpp

mitkBaseRenderer.h

mitkRenderWindowBase.h

Resources/

Interactions/

DisplayConfig.xml

DisplayInteraction.xml

PointSetConfig.xml

AddAndRemovePoints.xml

StatemachineConfigTest.xml

StatemachineTest.xml

globalConfig.xml

globalConfig.xml

Testing/

mitkInteractionEventTest.cpp

mitkPropertyTest.cpp

	Testing/	Resources/	Interactions/
		Resources/	Interactions/	Tests/

AddAndRemovePoints.xml

StatemachineConfigTest.xml

StatemachineTest.xml

globalConfig.xml

Documentation/

Doxygen/

Concepts/

Documentation/

Doxygen/

DeveloperManual/

Starting/

GettingToKnow/

Tutorial/

Modules/

CameraCalibration/

mitkCameraIntrinsics.cpp

mitkCameraIntrinsics.h

mitkCameraIntrinsicsProperty.cpp

mitkCameraIntrinsicsProperty.h

MitkExt/

Controllers/

mitkToolManager.cpp

mitkToolManager.h

DataManagement/

mitkGridRepresentationProperty.cpp

mitkGridRepresentationProperty.h

mitkGridVolumeMapperProperty.cpp

mitkGridVolumeMapperProperty.h

mitkOrganTypeProperty.cpp

mitkOrganTypeProperty.h

PlanarFigure/

DataManagement/

mitkPlanarFigureControlPointStyleProperty.cpp

O1: MITK Reviewer Group I

mitkPlanarFigureControlPointStyleProperty.h

O1: MITK Reviewer Group I

Qmitk/

QmitkRenderWindow.cpp

QmitkRenderWindow.h

rMITK2e9e1f8ae1c6

Core/Code/Controllers/mitkCameraController.h

Core/Code/Controllers/mitkVtkInteractorCameraController.cpp

Core/Code/DataManagement/mitkAnnotationProperty.cpp

Core/Code/DataManagement/mitkAnnotationProperty.h

Core/Code/DataManagement/mitkBaseProperty.cpp

Core/Code/DataManagement/mitkBaseProperty.h

Core/Code/DataManagement/mitkClippingProperty.cpp

Core/Code/DataManagement/mitkClippingProperty.h

Core/Code/DataManagement/mitkColorProperty.cpp

Core/Code/DataManagement/mitkColorProperty.h

Core/Code/DataManagement/mitkDataNode.cpp

Core/Code/DataManagement/mitkDataNode.h

Core/Code/DataManagement/mitkEnumerationProperty.cpp

Core/Code/DataManagement/mitkEnumerationProperty.h

Core/Code/DataManagement/mitkGenericProperty.h

Core/Code/DataManagement/mitkGroupTagProperty.cpp

Core/Code/DataManagement/mitkGroupTagProperty.h

Core/Code/DataManagement/mitkLevelWindowProperty.cpp

Core/Code/DataManagement/mitkLevelWindowProperty.h

Core/Code/DataManagement/mitkLookupTable.cpp

Core/Code/DataManagement/mitkLookupTable.h

Core/Code/DataManagement/mitkModalityProperty.cpp

Core/Code/DataManagement/mitkModalityProperty.h

Core/Code/DataManagement/mitkPlaneOrientationProperty.cpp

Core/Code/DataManagement/mitkPlaneOrientationProperty.h

Core/Code/DataManagement/mitkPropertyList.cpp

Core/Code/DataManagement/mitkPropertyList.h

Core/Code/DataManagement/mitkRenderingModeProperty.cpp

Core/Code/DataManagement/mitkRenderingModeProperty.h

Core/Code/DataManagement/mitkResliceMethodProperty.cpp

Core/Code/DataManagement/mitkResliceMethodProperty.h

Core/Code/DataManagement/mitkShaderProperty.cpp

Core/Code/DataManagement/mitkShaderProperty.h

Core/Code/DataManagement/mitkSmartPointerProperty.cpp

Core/Code/DataManagement/mitkSmartPointerProperty.h

Core/Code/DataManagement/mitkStringProperty.cpp

Core/Code/DataManagement/mitkStringProperty.h

Core/Code/DataManagement/mitkTransferFunction.cpp

Core/Code/DataManagement/mitkTransferFunction.h

Core/Code/DataManagement/mitkTransferFunctionProperty.cpp

Core/Code/DataManagement/mitkTransferFunctionProperty.h

Core/Code/DataManagement/mitkVtkInterpolationProperty.cpp

Core/Code/DataManagement/mitkVtkInterpolationProperty.h

Core/Code/DataManagement/mitkVtkRepresentationProperty.cpp

Core/Code/DataManagement/mitkVtkRepresentationProperty.h

Core/Code/DataManagement/mitkVtkResliceInterpolationProperty.cpp

Core/Code/DataManagement/mitkVtkResliceInterpolationProperty.h

Core/Code/DataManagement/mitkVtkScalarModeProperty.cpp

Core/Code/DataManagement/mitkVtkScalarModeProperty.h

Core/Code/DataManagement/mitkVtkVolumeRenderingProperty.cpp

Core/Code/DataManagement/mitkVtkVolumeRenderingProperty.h

Core/Code/DataManagement/mitkWeakPointerProperty.cpp

Core/Code/DataManagement/mitkWeakPointerProperty.h

Core/Code/IO/mitkLookupTableProperty.cpp

Core/Code/IO/mitkLookupTableProperty.h

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/mitkDisplayInteractor.cpp

Core/Code/Interactions/mitkEventConfig.cpp

Core/Code/Interactions/mitkEventConfig.h

Core/Code/Interactions/mitkEventFactory.cpp

Core/Code/Interactions/mitkEventMapper.cpp

Core/Code/Interactions/mitkEventStateMachine.cpp

Core/Code/Interactions/mitkEventStateMachine.h

Core/Code/Interactions/mitkInteractionEvent.cpp

Core/Code/Interactions/mitkInteractionEvent.h

Core/Code/Interactions/mitkInteractionEventConst.cpp

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/mitkInternalEvent.cpp

Core/Code/Interactions/mitkInternalEvent.h

Core/Code/Interactions/mitkMouseModeSwitcher.cpp

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/mitkStateMachineAction.cpp

Core/Code/Interactions/mitkStateMachineAction.h

Core/Code/Interactions/mitkStateMachineContainer.cpp

Core/Code/Interactions/mitkStateMachineContainer.h

Core/Code/Interactions/mitkStateMachineState.cpp

Core/Code/Interactions/mitkStateMachineState.h

Core/Code/Interactions/mitkStateMachineTransition.cpp

Core/Code/Interactions/mitkStateMachineTransition.h

Core/Code/Interactions/mitkVtkEventAdapter.cpp

Core/Code/Interfaces/mitkInteractionEventObserver.cpp

Core/Code/Interfaces/mitkInteractionEventObserver.h

Core/Code/Rendering/mitkBaseRenderer.cpp

Core/Code/Rendering/mitkBaseRenderer.h

Core/Code/Rendering/mitkRenderWindowBase.h

Core/Code/Resources/Interactions/DisplayConfig.xml

Core/Code/Resources/Interactions/DisplayInteraction.xml

Core/Code/Resources/Interactions/PointSet.xml

Core/Code/Resources/Interactions/PointSetConfig.xml

Core/Code/Resources/Interactions/Tests

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

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

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

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

Core/Code/Resources/Interactions/globalConfig.xml

Core/Code/Testing/Resources/Interactions/AddAndRemovePoints.xml

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

Core/Code/Testing/Resources/Interactions/StatemachineTest.xml

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

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkInteractionEventTest.cpp

Core/Code/Testing/mitkPropertyTest.cpp

Core/Code/files.cmake

Core/Documentation/Doxygen/Concepts/NewEvents.dox

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

Modules/CameraCalibration/mitkCameraIntrinsics.cpp

Modules/CameraCalibration/mitkCameraIntrinsics.h

Modules/CameraCalibration/mitkCameraIntrinsicsProperty.cpp

Modules/CameraCalibration/mitkCameraIntrinsicsProperty.h

Modules/MitkExt/Controllers/mitkToolManager.cpp

Modules/MitkExt/Controllers/mitkToolManager.h

Modules/MitkExt/DataManagement/mitkGridRepresentationProperty.cpp

Modules/MitkExt/DataManagement/mitkGridRepresentationProperty.h

Modules/MitkExt/DataManagement/mitkGridVolumeMapperProperty.cpp

Modules/MitkExt/DataManagement/mitkGridVolumeMapperProperty.h

Modules/MitkExt/DataManagement/mitkOrganTypeProperty.cpp

Modules/MitkExt/DataManagement/mitkOrganTypeProperty.h

Modules/PlanarFigure/DataManagement/mitkPlanarFigureControlPointStyleProperty.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarFigureControlPointStyleProperty.h

Modules/Qmitk/QmitkRenderWindow.cpp

Modules/Qmitk/QmitkRenderWindow.h