Diffusion MITK b7d122bc04f2

Merge branch 'bug-15104-OverlayFrameworkIntegration'
b7d122bc04f2
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-15104-OverlayFrameworkIntegration'

Details

Provenance

Authored on Aug 28 2013, 6:46 PM

Parents

rMITK23fd81ebdcb0: remove unintentionally committed line
rMITK4e203fac99ba: Merge branch 'bug-14802-open-editor-preferences-for-file-open-actions'

Branches

Unknown

Tags

Unknown

Event Timeline

• kolbch committed rMITKb7d122bc04f2: Merge branch 'bug-15104-OverlayFrameworkIntegration' (authored by • kolbch).Aug 28 2013, 6:46 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

23fd81ebdcb0 remove unintentionally committed line
Author
• kolbch
Browse Repository
No Builds
No Audits
9169145727f1 made rendering tests custom only
Author
• kolbch
Browse Repository
No Builds
No Audits
6d893b5b5be1 new revision tag for updated mitk-data
Author
• kolbch
Browse Repository
No Builds
No Audits
1cc0fd9cddad rendering test parameters
Author
• kolbch
Browse Repository
No Builds
No Audits
7c8dd3d3d725 Merge branch 'bug-15104-MigrateOverlayToMovedMicroservices' into bug-15104…
Author
• kolbch
Browse Repository
No Builds
No Audits
03d3824b2fe9 declare some getters as const methods
Author
• kolbch
Browse Repository
No Builds
No Audits
af1436be0a50 change static strings to static const methods
Author
• kolbch
Browse Repository
No Builds
No Audits
9e4d33a3f44e derive AbstractOverlayLayouter and OverlayManager from itk::LightObject
Author
• kolbch
Browse Repository
No Builds
No Audits
d9444b2735e8 rename baseLayouter to AbstractOverlayLayouter
Author
• kolbch
Browse Repository
No Builds
No Audits
2f7a8f4e46d6 code sanity fixes and documentation
Author
• kolbch
Browse Repository
No Builds
No Audits
b14c8289747b move Overlays up to the Rendering folder remove Overlay folder
Author
• kolbch
Browse Repository
No Builds
No Audits
83b62b9eb9f9 add more forward declarations and deleted unneeded includes
Author
• kolbch
Browse Repository
No Builds
No Audits
9d05d8323654 remove service implementation of OverlayManager remove OverlayManager test…
Author
• kolbch
Browse Repository
No Builds
No Audits
20c177c3f435 fixes due to changed microservice api
Author
• kolbch
Browse Repository
No Builds
No Audits
61a4f4b079a8 Merge branch 'bug-15104-CreateOverlayFramework' into bug-15104…
Author
• kolbch
Browse Repository
No Builds
No Audits
6bf0839c4e86 Add example code and use snippets in documentation
Author
• kolbch
Browse Repository
No Builds
No Audits
08243b4938b7 remove overlayexampleplugin from PluginList.cmake
Author
• kolbch
Browse Repository
No Builds
No Audits
f3dc5308f230 add documentation to concept page
Author
• kolbch
Browse Repository
No Builds
No Audits
f60c71b5ec3c update concept page
Author
• kolbch
Browse Repository
No Builds
No Audits
bee63a992864 add documentation
Author
• kolbch
Browse Repository
No Builds
No Audits
66defea5c408 add documentation and remove commented code
Author
• kolbch
Browse Repository
No Builds
No Audits
911f0229c7c7 Move Overlays back to core - corrected
Author
• kolbch
Browse Repository
No Builds
No Audits
8f582b9e4bfc Delete Overlays from Overlays module
Author
• kolbch
Browse Repository
No Builds
No Audits
1b55bda3a1c6 fix microservice and respective test
Author
• kolbch
Browse Repository
No Builds
No Audits
ee15592b0aa3 Add rendering tests
Author
• kolbch
Browse Repository
No Builds
No Audits
eb2a82fdcd07 documentation
Author
• kolbch
Browse Repository
No Builds
No Audits
984e3bfe4fe2 add tests to Overlay module
Author
• kolbch
Browse Repository
No Builds
No Audits
575f991f623f OverlayManagerTest and multiple corrections
Author
• kolbch
Browse Repository
No Builds
No Audits
550c16893886 delete overlay implementations from core - cmake update
Author
• kolbch
Browse Repository
No Builds
No Audits
b55b9c428b16 add OverlayManagerTest
Author
• kolbch
Browse Repository
No Builds
No Audits
2988494571fd add overlay and layouter implementations to Overlay module
Author
• kolbch
Browse Repository
No Builds
No Audits
7f4f82eb3180 Delete implementations from core
Author
• kolbch
Browse Repository
No Builds
No Audits
29d9c010aa06 Documentation
Author
• kolbch
Browse Repository
No Builds
No Audits
05e56af14b61 Documentation and part of layouter implementation
Author
• kolbch
Browse Repository
No Builds
No Audits
60d5d91ae773 added code examples to documentation
Author
• kolbch
Browse Repository
No Builds
No Audits
04d6a0e29292 compiler fixes
Author
• kolbch
Browse Repository
No Builds
No Audits
84e058d26f78 Fixed errors and implemened LabelOverlay
Author
• kolbch
Browse Repository
No Builds
No Audits
b3788ac79ffd added Point2D Propertiy
Author
• kolbch
Browse Repository
No Builds
No Audits
62855356731d storing of layouts in layout manager
Author
• kolbch
Browse Repository
No Builds
No Audits
20d4cd397316 move layouter from overlayManager to overlay
Author
• kolbch
Browse Repository
No Builds
No Audits
329bf0aa8120 Add Layouter Overlay functions
Author
• kolbch
Browse Repository
No Builds
No Audits
bb5303ddc9a5 fixes and added color+opacity property
Author
• kolbch
Browse Repository
No Builds
No Audits
1e9d8be771a3 add superclasses for 2D and 3D vtkOverlays
Author
• kolbch
Browse Repository
No Builds
No Audits
7fcc36f10d55 Microservice implementation of OverlayManager
Author
• kolbch
Browse Repository
No Builds
No Audits
06766e4a99c8 implement OverlayManager as a Microservice
Author
• kolbch
Browse Repository
No Builds
No Audits
f3d7b118e42a add labelOverlay3D class and changes to propertylist handling
Author
• kolbch
Browse Repository
No Builds
No Audits
6f459876219d prepare documentation page
Author
• kolbch
Browse Repository
No Builds
No Audits
0ec43b3801e1 add vtkOverlay + mitkTextOverlay3D
Author
• kolbch
Browse Repository
No Builds
No Audits
a5b1cc17d27d added overlay preparation
Author
• kolbch
Browse Repository
No Builds
No Audits
9b136dc750da Declaration of OverlayManager in BaseRenderer and MultiWidget
Author
• kolbch
Browse Repository
No Builds
No Audits

Changes (48)

Path

Size

Packages

CMakeExternals/

O1: MITK Reviewer Group I

Core/

Code/

DataManagement/

mitkProperties.cpp

mitkProperties.h

Rendering/

mitkAbstractOverlayLayouter.cpp

mitkAbstractOverlayLayouter.h

mitkBaseRenderer.cpp

mitkBaseRenderer.h

mitkLabelOverlay3D.cpp

mitkLabelOverlay3D.h

mitkOverlay.cpp

mitkOverlay2DLayouter.cpp

mitkOverlay2DLayouter.h

mitkOverlayManager.cpp

mitkOverlayManager.h

mitkTextOverlay2D.cpp

mitkTextOverlay2D.h

mitkTextOverlay3D.cpp

mitkTextOverlay3D.h

mitkVtkOverlay.cpp

mitkVtkOverlay.h

mitkVtkOverlay2D.cpp

mitkVtkOverlay2D.h

mitkVtkOverlay3D.cpp

mitkVtkOverlay3D.h

mitkVtkPropRenderer.cpp

Testing/

mitkLabelOverlay3DRendering2DTest.cpp

mitkLabelOverlay3DRendering3DTest.cpp

mitkPointSetVtkMapper2DImageTest.cpp

mitkPointSetVtkMapper2DTest.cpp

mitkTextOverlay2DLayouterRenderingTest.cpp

mitkTextOverlay2DRenderingTest.cpp

mitkTextOverlay2DSymbolsRenderingTest.cpp

mitkTextOverlay3DColorRenderingTest.cpp

mitkTextOverlay3DRendering2DTest.cpp

mitkTextOverlay3DRendering3DTest.cpp

Documentation/

Doxygen/

Concepts/

Examples/

OverlayExample.cpp

Modules/

Overlays/

Qmitk/

QmitkStdMultiWidget.cpp

rMITKb7d122bc04f2

CMakeExternals/MITKData.cmake

Loading...

Core/Code/DataManagement/mitkProperties.cpp

Loading...

Core/Code/DataManagement/mitkProperties.h

Loading...

Core/Code/Rendering/mitkAbstractOverlayLayouter.cpp

Loading...

Core/Code/Rendering/mitkAbstractOverlayLayouter.h

Loading...

Core/Code/Rendering/mitkBaseRenderer.cpp

Loading...

Core/Code/Rendering/mitkBaseRenderer.h

Loading...

Core/Code/Rendering/mitkLabelOverlay3D.cpp

Loading...

Core/Code/Rendering/mitkLabelOverlay3D.h

Loading...

Core/Code/Rendering/mitkOverlay.cpp

Loading...

Core/Code/Rendering/mitkOverlay.h

Loading...

Core/Code/Rendering/mitkOverlay2DLayouter.cpp

Loading...

Core/Code/Rendering/mitkOverlay2DLayouter.h

Loading...

Core/Code/Rendering/mitkOverlayManager.cpp

Loading...

Core/Code/Rendering/mitkOverlayManager.h

Loading...

Core/Code/Rendering/mitkTextOverlay2D.cpp

Loading...

Core/Code/Rendering/mitkTextOverlay2D.h

Loading...

Core/Code/Rendering/mitkTextOverlay3D.cpp

Loading...

Core/Code/Rendering/mitkTextOverlay3D.h

Loading...

Core/Code/Rendering/mitkVtkOverlay.cpp

Loading...

Core/Code/Rendering/mitkVtkOverlay.h

Loading...

Core/Code/Rendering/mitkVtkOverlay2D.cpp

Loading...

Core/Code/Rendering/mitkVtkOverlay2D.h

Loading...

Core/Code/Rendering/mitkVtkOverlay3D.cpp

Loading...

Core/Code/Rendering/mitkVtkOverlay3D.h

Loading...

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Loading...

Core/Code/Testing/CMakeLists.txt

Loading...

Core/Code/Testing/files.cmake

Loading...

Core/Code/Testing/mitkLabelOverlay3DRendering2DTest.cpp

Loading...

Core/Code/Testing/mitkLabelOverlay3DRendering3DTest.cpp

Loading...

Core/Code/Testing/mitkPointSetVtkMapper2DImageTest.cpp

Loading...

Core/Code/Testing/mitkPointSetVtkMapper2DTest.cpp

Loading...

Core/Code/Testing/mitkTextOverlay2DLayouterRenderingTest.cpp

Loading...

Core/Code/Testing/mitkTextOverlay2DRenderingTest.cpp

Loading...

Core/Code/Testing/mitkTextOverlay2DSymbolsRenderingTest.cpp

Loading...

Core/Code/Testing/mitkTextOverlay3DColorRenderingTest.cpp

Loading...

Core/Code/Testing/mitkTextOverlay3DRendering2DTest.cpp

Loading...

Core/Code/Testing/mitkTextOverlay3DRendering3DTest.cpp

Loading...

Core/Code/files.cmake

Loading...

Core/Documentation/Doxygen/Concepts/Concepts.dox

Loading...

Core/Documentation/Doxygen/Concepts/Overlays.dox

Loading...

Examples/CMakeLists.txt

Loading...

Examples/Overlays/CMakeLists.txt

Loading...

Examples/Overlays/OverlayExample.cpp

Loading...

Modules/Overlays/CMakeLists.txt

Loading...

Modules/Overlays/files.cmake

Loading...

Modules/Qmitk/QmitkStdMultiWidget.cpp

Loading...