Merge branch 'bug-18075-CreateManufacturerLogoOverlay' into bug-18102…
5e6c897c869e
Actions

Description

Merge branch 'bug-18075-CreateManufacturerLogoOverlay' into bug-18102-MoveOverlayImplementationsToModules

Details

Provenance

Authored on Sep 17 2014, 11:03 AM

Parents

rMITK497bdd0d53ed: Move Overlays to Overlays modules and Qt based overlays in new QtOverlays
rMITK1435c7856494: Merge branch 'bug-17836-pythoninstaller-sitk-integration'

Branches

Unknown

Tags

Unknown

Event Timeline

• kolbch committed rMITK5e6c897c869e: Merge branch 'bug-18075-CreateManufacturerLogoOverlay' into bug-18102… (authored by • kolbch).Sep 17 2014, 11:03 AM

Merged Changes

497bdd0d53ed Move Overlays to Overlays modules and Qt based overlays in new QtOverlays
Author
• kolbch
Browse Repository
No Builds
No Audits
41ded1e1ec00 replace manufacturer logo with overlay
Author
• kolbch
Browse Repository
No Builds
No Audits
a6be7331dd2e cmake file
Author
• kolbch
Browse Repository
No Builds
No Audits
49406f0d9f5e Add LogoOverlay
Author
• kolbch
Browse Repository
No Builds
No Audits

Changes (84)

Path

Size

Packages

Core/

Code/

Rendering/

mitkLabelOverlay3D.cpp

mitkLabelOverlay3D.h

mitkOverlay2DLayouter.cpp

mitkOverlay2DLayouter.h

mitkScaleLegendOverlay.cpp

mitkScaleLegendOverlay.h

mitkTextOverlay2D.cpp

mitkTextOverlay2D.h

mitkTextOverlay3D.cpp

mitkTextOverlay3D.h

Testing/

CMakeLists.txt

files.cmake

mitkLabelOverlay3DRendering2DTest.cpp

mitkLabelOverlay3DRendering3DTest.cpp

mitkTextOverlay2DLayouterRenderingTest.cpp

mitkTextOverlay2DRenderingTest.cpp

mitkTextOverlay2DSymbolsRenderingTest.cpp

mitkTextOverlay3DColorRenderingTest.cpp

mitkTextOverlay3DRendering2DTest.cpp

mitkTextOverlay3DRendering3DTest.cpp

files.cmake

Documentation/

Doxygen/

Concepts/

Modules/

QmitkCustomWidgetOverlay.cpp

QmitkCustomWidgetOverlay.h

QmitkOverlay.cpp

QmitkOverlay.h

QmitkOverlayController.cpp

QmitkOverlayController.h

QmitkScalarBar.cpp

QmitkScalarBar.h

QmitkScalarBarOverlay.cpp

QmitkScalarBarOverlay.h

	QtOverlays
	Overlays/

CMakeLists.txt

QmitkCustomWidgetOverlay.cpp

QmitkCustomWidgetOverlay.h

QmitkOverlay.cpp

QmitkOverlay.h

QmitkOverlayController.cpp

QmitkOverlayController.h

QmitkScalarBar.cpp

QmitkScalarBar.h

QmitkScalarBarOverlay.cpp

QmitkScalarBarOverlay.h

QtWidgets/

O3: MITK Reviewer Group II

QmitkStdMultiWidget.cpp

O3: MITK Reviewer Group II

QmitkStdMultiWidget.h

O3: MITK Reviewer Group II

ToFUI/

CMakeLists.txt

Qmitk/

QmitkToFPointSetWidget.cpp

	Modules/
	Core/

	Overlays/	Documentation/	doxygen/
	Documentation/	Doxygen/	Concepts/

	OverlaysModule.dox
	Overlays.dox

	Overlays/
	Code/

Testing/

mitkLabelOverlay3DRendering2DTest.cpp

mitkLabelOverlay3DRendering3DTest.cpp

mitkTextOverlay2DLayouterRenderingTest.cpp

mitkTextOverlay2DRenderingTest.cpp

mitkTextOverlay2DSymbolsRenderingTest.cpp

mitkTextOverlay3DColorRenderingTest.cpp

mitkTextOverlay3DRendering2DTest.cpp

mitkTextOverlay3DRendering3DTest.cpp


	Rendering/

mitkLabelOverlay3D.cpp

mitkLabelOverlay3D.h

mitkOverlay2DLayouter.cpp

mitkOverlay2DLayouter.h

mitkScaleLegendOverlay.cpp

mitkScaleLegendOverlay.h

mitkTextOverlay2D.cpp

mitkTextOverlay2D.h

mitkTextOverlay3D.cpp

mitkTextOverlay3D.h

	mitkLogoOverlay.h/
	Rendering/


	mitkTextOverlay2D.h

rMITK5e6c897c869e

View Options

Core/Code/Rendering/mitkLabelOverlay3D.cpp

View Options

Core/Code/Rendering/mitkLabelOverlay3D.h

View Options

Core/Code/Rendering/mitkOverlay2DLayouter.cpp

View Options

Core/Code/Rendering/mitkOverlay2DLayouter.h

View Options

Core/Code/Rendering/mitkScaleLegendOverlay.cpp

View Options

Core/Code/Rendering/mitkScaleLegendOverlay.h

View Options

Core/Code/Rendering/mitkTextOverlay2D.cpp

View Options

Core/Code/Rendering/mitkTextOverlay2D.h

View Options

Core/Code/Rendering/mitkTextOverlay3D.cpp

View Options

Core/Code/Rendering/mitkTextOverlay3D.h

View Options

Core/Code/Testing/CMakeLists.txt

View Options

Core/Code/Testing/files.cmake

View Options

Core/Code/Testing/mitkLabelOverlay3DRendering2DTest.cpp

View Options

Core/Code/Testing/mitkLabelOverlay3DRendering3DTest.cpp

View Options

Core/Code/Testing/mitkTextOverlay2DLayouterRenderingTest.cpp

View Options

Core/Code/Testing/mitkTextOverlay2DRenderingTest.cpp

View Options

Core/Code/Testing/mitkTextOverlay2DSymbolsRenderingTest.cpp

View Options

Core/Code/Testing/mitkTextOverlay3DColorRenderingTest.cpp

View Options

Core/Code/Testing/mitkTextOverlay3DRendering2DTest.cpp

View Options

Core/Code/Testing/mitkTextOverlay3DRendering3DTest.cpp

View Options

Core/Code/files.cmake

View Options

Core/Documentation/Doxygen/Concepts/Overlays.dox

View Options

Modules/CMakeLists.txt

View Options

Modules/Overlays/CMakeLists.txt

View Options

Modules/Overlays/Documentation/doxygen/OverlaysModule.dox

View Options

Modules/Overlays/QmitkCustomWidgetOverlay.cpp

View Options

Modules/Overlays/QmitkCustomWidgetOverlay.h

View Options

Modules/Overlays/QmitkOverlay.cpp

View Options

Modules/Overlays/QmitkOverlay.h

View Options

Modules/Overlays/QmitkOverlayController.cpp

View Options

Modules/Overlays/QmitkOverlayController.h

View Options

Modules/Overlays/QmitkScalarBar.cpp

View Options

Modules/Overlays/QmitkScalarBar.h

View Options

Modules/Overlays/QmitkScalarBarOverlay.cpp

View Options

Modules/Overlays/QmitkScalarBarOverlay.h

View Options

Modules/Overlays/QmitkTextOverlay.cpp

View Options

Modules/Overlays/QmitkTextOverlay.h

View Options

Modules/Overlays/Testing/CMakeLists.txt

View Options

Modules/Overlays/Testing/files.cmake

View Options

Modules/Overlays/Testing/mitkLabelOverlay3DRendering2DTest.cpp

View Options

Modules/Overlays/Testing/mitkLabelOverlay3DRendering3DTest.cpp

View Options

Modules/Overlays/Testing/mitkTextOverlay2DLayouterRenderingTest.cpp

View Options

Modules/Overlays/Testing/mitkTextOverlay2DRenderingTest.cpp

View Options

Modules/Overlays/Testing/mitkTextOverlay2DSymbolsRenderingTest.cpp

View Options

Modules/Overlays/Testing/mitkTextOverlay3DColorRenderingTest.cpp

View Options

Modules/Overlays/Testing/mitkTextOverlay3DRendering2DTest.cpp

View Options

Modules/Overlays/Testing/mitkTextOverlay3DRendering3DTest.cpp

View Options

Modules/Overlays/files.cmake

View Options

Modules/Overlays/mitkLabelOverlay3D.cpp

View Options

Modules/Overlays/mitkLabelOverlay3D.h

View Options

Modules/Overlays/mitkLogoOverlay.cpp

View Options

Modules/Overlays/mitkLogoOverlay.h

View Options

Modules/Overlays/mitkOverlay2DLayouter.cpp

View Options

Modules/Overlays/mitkOverlay2DLayouter.h

View Options

Modules/Overlays/mitkScaleLegendOverlay.cpp

View Options

Modules/Overlays/mitkScaleLegendOverlay.h

View Options

Modules/Overlays/mitkTextOverlay2D.cpp

View Options

Modules/Overlays/mitkTextOverlay2D.h

View Options

Modules/Overlays/mitkTextOverlay3D.cpp

View Options

Modules/Overlays/mitkTextOverlay3D.h

View Options

Modules/QtOverlays/CMakeLists.txt

View Options

Modules/QtOverlays/QmitkCustomWidgetOverlay.cpp

View Options

Modules/QtOverlays/QmitkCustomWidgetOverlay.h

View Options

Modules/QtOverlays/QmitkOverlay.cpp

View Options

Modules/QtOverlays/QmitkOverlay.h

View Options

Modules/QtOverlays/QmitkOverlayController.cpp

View Options

Modules/QtOverlays/QmitkOverlayController.h

View Options

Modules/QtOverlays/QmitkScalarBar.cpp

View Options

Modules/QtOverlays/QmitkScalarBar.h

View Options

Modules/QtOverlays/QmitkScalarBarOverlay.cpp

View Options

Modules/QtOverlays/QmitkScalarBarOverlay.h

View Options

Modules/QtOverlays/QmitkTextOverlay.cpp

View Options

Modules/QtOverlays/QmitkTextOverlay.h

View Options

Modules/QtOverlays/files.cmake

View Options

Modules/QtWidgets/CMakeLists.txt

View Options

Modules/QtWidgets/QmitkStdMultiWidget.cpp

View Options

Modules/QtWidgets/QmitkStdMultiWidget.h

View Options

Modules/ToFUI/CMakeLists.txt

View Options

Modules/ToFUI/Qmitk/QmitkToFPointSetWidget.cpp

Merge branch 'bug-18075-CreateManufacturerLogoOverlay' into bug-18102…5e6c897c869eActions

Description

Details

Event Timeline

Merged Changes

Changes (84)

rMITK5e6c897c869e

Core/Code/Rendering/mitkLabelOverlay3D.cpp

Core/Code/Rendering/mitkLabelOverlay3D.h

Core/Code/Rendering/mitkOverlay2DLayouter.cpp

Core/Code/Rendering/mitkOverlay2DLayouter.h

Core/Code/Rendering/mitkScaleLegendOverlay.cpp

Core/Code/Rendering/mitkScaleLegendOverlay.h

Core/Code/Rendering/mitkTextOverlay2D.cpp

Core/Code/Rendering/mitkTextOverlay2D.h

Core/Code/Rendering/mitkTextOverlay3D.cpp

Core/Code/Rendering/mitkTextOverlay3D.h

Core/Code/Testing/CMakeLists.txt

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkLabelOverlay3DRendering2DTest.cpp

Core/Code/Testing/mitkLabelOverlay3DRendering3DTest.cpp

Core/Code/Testing/mitkTextOverlay2DLayouterRenderingTest.cpp

Core/Code/Testing/mitkTextOverlay2DRenderingTest.cpp

Core/Code/Testing/mitkTextOverlay2DSymbolsRenderingTest.cpp

Core/Code/Testing/mitkTextOverlay3DColorRenderingTest.cpp

Core/Code/Testing/mitkTextOverlay3DRendering2DTest.cpp

Core/Code/Testing/mitkTextOverlay3DRendering3DTest.cpp

Core/Code/files.cmake

Core/Documentation/Doxygen/Concepts/Overlays.dox

Modules/CMakeLists.txt

Modules/Overlays/CMakeLists.txt

Modules/Overlays/Documentation/doxygen/OverlaysModule.dox

Modules/Overlays/QmitkCustomWidgetOverlay.cpp

Modules/Overlays/QmitkCustomWidgetOverlay.h

Modules/Overlays/QmitkOverlay.cpp

Modules/Overlays/QmitkOverlay.h

Modules/Overlays/QmitkOverlayController.cpp

Modules/Overlays/QmitkOverlayController.h

Modules/Overlays/QmitkScalarBar.cpp

Modules/Overlays/QmitkScalarBar.h

Modules/Overlays/QmitkScalarBarOverlay.cpp

Modules/Overlays/QmitkScalarBarOverlay.h

Modules/Overlays/QmitkTextOverlay.cpp

Modules/Overlays/QmitkTextOverlay.h

Modules/Overlays/Testing/CMakeLists.txt

Modules/Overlays/Testing/files.cmake

Modules/Overlays/Testing/mitkLabelOverlay3DRendering2DTest.cpp

Modules/Overlays/Testing/mitkLabelOverlay3DRendering3DTest.cpp

Modules/Overlays/Testing/mitkTextOverlay2DLayouterRenderingTest.cpp

Modules/Overlays/Testing/mitkTextOverlay2DRenderingTest.cpp

Modules/Overlays/Testing/mitkTextOverlay2DSymbolsRenderingTest.cpp

Modules/Overlays/Testing/mitkTextOverlay3DColorRenderingTest.cpp

Modules/Overlays/Testing/mitkTextOverlay3DRendering2DTest.cpp

Modules/Overlays/Testing/mitkTextOverlay3DRendering3DTest.cpp

Modules/Overlays/files.cmake

Modules/Overlays/mitkLabelOverlay3D.cpp

Modules/Overlays/mitkLabelOverlay3D.h

Modules/Overlays/mitkLogoOverlay.cpp

Modules/Overlays/mitkLogoOverlay.h

Modules/Overlays/mitkOverlay2DLayouter.cpp

Modules/Overlays/mitkOverlay2DLayouter.h

Modules/Overlays/mitkScaleLegendOverlay.cpp

Modules/Overlays/mitkScaleLegendOverlay.h

Modules/Overlays/mitkTextOverlay2D.cpp

Modules/Overlays/mitkTextOverlay2D.h

Modules/Overlays/mitkTextOverlay3D.cpp

Modules/Overlays/mitkTextOverlay3D.h

Modules/QtOverlays/CMakeLists.txt

Modules/QtOverlays/QmitkCustomWidgetOverlay.cpp

Modules/QtOverlays/QmitkCustomWidgetOverlay.h

Modules/QtOverlays/QmitkOverlay.cpp

Modules/QtOverlays/QmitkOverlay.h

Modules/QtOverlays/QmitkOverlayController.cpp

Modules/QtOverlays/QmitkOverlayController.h

Modules/QtOverlays/QmitkScalarBar.cpp

Modules/QtOverlays/QmitkScalarBar.h

Modules/QtOverlays/QmitkScalarBarOverlay.cpp

Modules/QtOverlays/QmitkScalarBarOverlay.h

Modules/QtOverlays/QmitkTextOverlay.cpp

Modules/QtOverlays/QmitkTextOverlay.h

Merge branch 'bug-18075-CreateManufacturerLogoOverlay' into bug-18102…
5e6c897c869e
Actions