Remove RenderingManager parameters and RenderingMode
7d3e2a1aafa3
Actions

Description

Remove RenderingManager parameters and RenderingMode

Summary:
Handle RenderingManager like the singleton it is

This differential changes some public API. If this breaks something for you
it should be very straight forward to migrate:

Remove any RenderingManager and RenderingManager parameters
Use mitk::RenderingManager::GetInstance() to access the RenderingManager

Details:

Remove passing of RenderingManager to many constructors
RenderingManager::GetInstance() is single access point
Remove RenderingMode
Add AntiAliasing managed by RenderingManager
FXAA is on by default
No anti-aliasing in rendering tests by default

TODOs:

Anti-aliasing preference

Test Plan: - A new reference screenshot for an affected rendering test was added to MITK-Data

Maniphest Tasks: T26815

Differential Revision: https://phabricator.mitk.org/D221

Details

Provenance

kislinsk	Authored on Nov 15 2019, 5:08 PM
kislinsk	Pushed on Nov 21 2019, 12:28 PM

Differential Revision

Restricted Differential Revision

Parents

rMITKe935c1fc4f08: Merge branch 'T26717-static_masks_on_dynamic_images' Fixed T26717
rMITK5e0e87c36865: Handle RenderingManager like the singleton it is

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK7d3e2a1aafa3: Remove RenderingManager parameters and RenderingMode (authored by kislinsk).Nov 21 2019, 12:28 PM

kislinsk added an edge: Restricted Differential Revision.

Merged Changes

5e0e87c36865 Handle RenderingManager like the singleton it is
Author
kislinsk
Browse Repository
No Builds
No Audits
c348fdb4d8c8 Set default rendering mode to FXAA
Author
kislinsk
Browse Repository
No Builds
No Audits
a2a69caf2013 Merge remote-tracking branch 'origin/T26811-RenderingModePreference' into…
Author
kislinsk
Browse Repository
No Builds
No Audits
20ecc5df4581 Sync rendering mode preference with actual rendering mode
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (58)

Path

Size

Packages

Modules/

BoundingShape/

src/

Interactions/

mitkBoundingShapeInteractor.cpp

Core/

TestingHelper/

include/

mitkRenderingTestHelper.h

O1: MITK Reviewer Group I

src/

mitkInteractionTestHelper.cpp

O1: MITK Reviewer Group I

mitkRenderingTestHelper.cpp

O1: MITK Reviewer Group I

include/

mitkBaseRenderer.h

O1: MITK Reviewer Group I

mitkRenderWindow.h

O1: MITK Reviewer Group I

mitkRenderWindowBase.h

O1: MITK Reviewer Group I

mitkRenderingManager.h

O1: MITK Reviewer Group I

mitkSliceNavigationController.h

O1: MITK Reviewer Group I

mitkVtkPropRenderer.h

O1: MITK Reviewer Group I

src/

Controllers/

mitkCameraController.cpp

O1: MITK Reviewer Group I

mitkRenderingManager.cpp

O1: MITK Reviewer Group I

mitkSliceNavigationController.cpp

O1: MITK Reviewer Group I

Interactions/

mitkDispatcher.cpp

O1: MITK Reviewer Group I

mitkDisplayActionEventBroadcast.cpp

O1: MITK Reviewer Group I

mitkDisplayActionEventFunctions.cpp

O1: MITK Reviewer Group I

mitkDisplayInteractor.cpp

O1: MITK Reviewer Group I

mitkPointSetDataInteractor.cpp

O1: MITK Reviewer Group I

mitkSinglePointDataInteractor.cpp

O1: MITK Reviewer Group I

Rendering/

mitkBaseRenderer.cpp

O1: MITK Reviewer Group I

mitkRenderWindow.cpp

O1: MITK Reviewer Group I

mitkRenderWindowBase.cpp

O1: MITK Reviewer Group I

mitkVtkPropRenderer.cpp

O1: MITK Reviewer Group I

test/

mitkDataNodeTest.cpp

O1: MITK Reviewer Group I

mitkDispatcherTest.cpp

O1: MITK Reviewer Group I

mitkRenderingManagerTest.cpp

O1: MITK Reviewer Group I

DataTypesExt/

src/

mitkAffineBaseDataInteractor3D.cpp

mitkAffineImageCropperInteractor.cpp

mitkClippingPlaneInteractor3D.cpp

mitkSurfaceDeformationDataInteractor3D.cpp

IGT/

Testing/

mitkCameraVisualizationTest.cpp

PlanarFigure/

src/

Interactions/

mitkPlanarFigureInteractor.cpp

O1: MITK Reviewer Group I

QtOverlays/

QmitkOverlayController.cpp

QtWidgets/

include/

QmitkAbstractMultiWidget.h

O3: MITK Reviewer Group II

QmitkMxNMultiWidget.h

O3: MITK Reviewer Group II

QmitkRenderWindow.h

O3: MITK Reviewer Group II

QmitkRenderWindowWidget.h

O3: MITK Reviewer Group II

QmitkStdMultiWidget.h

O3: MITK Reviewer Group II

src/

QmitkAbstractMultiWidget.cpp

O3: MITK Reviewer Group II

QmitkMxNMultiWidget.cpp

O3: MITK Reviewer Group II

QmitkRenderWindow.cpp

O3: MITK Reviewer Group II

QmitkRenderWindowMenu.cpp

O3: MITK Reviewer Group II

QmitkRenderWindowWidget.cpp

O3: MITK Reviewer Group II

QmitkStdMultiWidget.cpp

O3: MITK Reviewer Group II

QtWidgetsExt/

src/

QmitkSelectableGLWidget.cpp

O3: MITK Reviewer Group II

Segmentation/

Interactions/

mitkLiveWireTool2D.cpp

O1: MITK Reviewer Group I

mitkSegmentationInteractor.cpp

O1: MITK Reviewer Group I

Testing/

mitkContourMapper2DTest.cpp

O1: MITK Reviewer Group I

TubeGraph/

src/

Interactions/

mitkTubeGraphDataInteractor.cpp

	Modules/	Core/	include/
	Plugins/	org.mitk.core.services/	src/

	mitkAntiAliasing.h
	mitkIDataStorageService.cpp

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.mxnmultiwidgeteditor/

src/

QmitkMxNMultiWidgetEditor.cpp

O1: MITK Reviewer Group I

internal/

QmitkMxNMultiWidgetEditorPreferencePage.cpp

O1: MITK Reviewer Group I

QmitkMxNMultiWidgetEditorPreferencePage.h

O1: MITK Reviewer Group I

QmitkMxNMultiWidgetEditorPreferencePage.ui

O1: MITK Reviewer Group I

org.mitk.gui.qt.stdmultiwidgeteditor/

src/

QmitkStdMultiWidgetEditor.cpp

O1: MITK Reviewer Group I

internal/

QmitkStdMultiWidgetEditorPreferencePage.cpp

O1: MITK Reviewer Group I

QmitkStdMultiWidgetEditorPreferencePage.h

O1: MITK Reviewer Group I

QmitkStdMultiWidgetEditorPreferencePage.ui

O1: MITK Reviewer Group I

rMITK7d3e2a1aafa3

View Options

Modules/BoundingShape/src/Interactions/mitkBoundingShapeInteractor.cpp

View Options

Modules/Core/TestingHelper/include/mitkRenderingTestHelper.h

View Options

Modules/Core/TestingHelper/src/mitkInteractionTestHelper.cpp

View Options

Modules/Core/TestingHelper/src/mitkRenderingTestHelper.cpp

View Options

Modules/Core/include/mitkAntiAliasing.h

View Options

Modules/Core/include/mitkBaseRenderer.h

View Options

Modules/Core/include/mitkRenderWindow.h

View Options

Modules/Core/include/mitkRenderWindowBase.h

View Options

Modules/Core/include/mitkRenderingManager.h

View Options

Modules/Core/include/mitkSliceNavigationController.h

View Options

Modules/Core/include/mitkVtkPropRenderer.h

View Options

Modules/Core/src/Controllers/mitkCameraController.cpp

View Options

Modules/Core/src/Controllers/mitkRenderingManager.cpp

View Options

Modules/Core/src/Controllers/mitkSliceNavigationController.cpp

View Options

Modules/Core/src/Interactions/mitkDispatcher.cpp

View Options

Modules/Core/src/Interactions/mitkDisplayActionEventBroadcast.cpp

View Options

Modules/Core/src/Interactions/mitkDisplayActionEventFunctions.cpp

View Options

Modules/Core/src/Interactions/mitkDisplayInteractor.cpp

View Options

Modules/Core/src/Interactions/mitkPointSetDataInteractor.cpp

View Options

Modules/Core/src/Interactions/mitkSinglePointDataInteractor.cpp

View Options

Modules/Core/src/Rendering/mitkBaseRenderer.cpp

View Options

Modules/Core/src/Rendering/mitkRenderWindow.cpp

View Options

Modules/Core/src/Rendering/mitkRenderWindowBase.cpp

View Options

Modules/Core/src/Rendering/mitkVtkPropRenderer.cpp

View Options

Modules/Core/test/mitkDataNodeTest.cpp

View Options

Modules/Core/test/mitkDispatcherTest.cpp

View Options

Modules/Core/test/mitkRenderingManagerTest.cpp

View Options

Modules/DataTypesExt/src/mitkAffineBaseDataInteractor3D.cpp

View Options

Modules/DataTypesExt/src/mitkAffineImageCropperInteractor.cpp

View Options

Modules/DataTypesExt/src/mitkClippingPlaneInteractor3D.cpp

View Options

Modules/DataTypesExt/src/mitkSurfaceDeformationDataInteractor3D.cpp

View Options

Modules/IGT/Testing/mitkCameraVisualizationTest.cpp

View Options

Modules/PlanarFigure/src/Interactions/mitkPlanarFigureInteractor.cpp

View Options

Modules/QtOverlays/QmitkOverlayController.cpp

View Options

Modules/QtWidgets/include/QmitkAbstractMultiWidget.h

View Options

Modules/QtWidgets/include/QmitkMxNMultiWidget.h

View Options

Modules/QtWidgets/include/QmitkRenderWindow.h

View Options

Modules/QtWidgets/include/QmitkRenderWindowWidget.h

View Options

Modules/QtWidgets/include/QmitkStdMultiWidget.h

View Options

Modules/QtWidgets/src/QmitkAbstractMultiWidget.cpp

View Options

Modules/QtWidgets/src/QmitkMxNMultiWidget.cpp

View Options

Modules/QtWidgets/src/QmitkRenderWindow.cpp

View Options

Modules/QtWidgets/src/QmitkRenderWindowMenu.cpp

View Options

Modules/QtWidgets/src/QmitkRenderWindowWidget.cpp

View Options

Modules/QtWidgets/src/QmitkStdMultiWidget.cpp

View Options

Modules/QtWidgetsExt/src/QmitkSelectableGLWidget.cpp

View Options

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

View Options

Modules/Segmentation/Interactions/mitkSegmentationInteractor.cpp

View Options

Modules/Segmentation/Testing/mitkContourMapper2DTest.cpp

View Options

Modules/TubeGraph/src/Interactions/mitkTubeGraphDataInteractor.cpp

View Options

Plugins/org.mitk.gui.qt.mxnmultiwidgeteditor/src/QmitkMxNMultiWidgetEditor.cpp

View Options

Plugins/org.mitk.gui.qt.mxnmultiwidgeteditor/src/internal/QmitkMxNMultiWidgetEditorPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.mxnmultiwidgeteditor/src/internal/QmitkMxNMultiWidgetEditorPreferencePage.h

View Options

Plugins/org.mitk.gui.qt.mxnmultiwidgeteditor/src/internal/QmitkMxNMultiWidgetEditorPreferencePage.ui

View Options

Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.cpp

View Options

Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.h

View Options

Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.ui

Remove RenderingManager parameters and RenderingMode7d3e2a1aafa3Actions

Description

Details

Event Timeline

Merged Changes

Changes (58)

rMITK7d3e2a1aafa3

Modules/BoundingShape/src/Interactions/mitkBoundingShapeInteractor.cpp

Modules/Core/TestingHelper/include/mitkRenderingTestHelper.h

Modules/Core/TestingHelper/src/mitkInteractionTestHelper.cpp

Modules/Core/TestingHelper/src/mitkRenderingTestHelper.cpp

Modules/Core/include/mitkAntiAliasing.h

Modules/Core/include/mitkBaseRenderer.h

Modules/Core/include/mitkRenderWindow.h

Modules/Core/include/mitkRenderWindowBase.h

Modules/Core/include/mitkRenderingManager.h

Modules/Core/include/mitkSliceNavigationController.h

Modules/Core/include/mitkVtkPropRenderer.h

Modules/Core/src/Controllers/mitkCameraController.cpp

Modules/Core/src/Controllers/mitkRenderingManager.cpp

Modules/Core/src/Controllers/mitkSliceNavigationController.cpp

Modules/Core/src/Interactions/mitkDispatcher.cpp

Modules/Core/src/Interactions/mitkDisplayActionEventBroadcast.cpp

Modules/Core/src/Interactions/mitkDisplayActionEventFunctions.cpp

Modules/Core/src/Interactions/mitkDisplayInteractor.cpp

Modules/Core/src/Interactions/mitkPointSetDataInteractor.cpp

Modules/Core/src/Interactions/mitkSinglePointDataInteractor.cpp

Modules/Core/src/Rendering/mitkBaseRenderer.cpp

Modules/Core/src/Rendering/mitkRenderWindow.cpp

Modules/Core/src/Rendering/mitkRenderWindowBase.cpp

Modules/Core/src/Rendering/mitkVtkPropRenderer.cpp

Modules/Core/test/mitkDataNodeTest.cpp

Modules/Core/test/mitkDispatcherTest.cpp

Modules/Core/test/mitkRenderingManagerTest.cpp

Modules/DataTypesExt/src/mitkAffineBaseDataInteractor3D.cpp

Modules/DataTypesExt/src/mitkAffineImageCropperInteractor.cpp

Modules/DataTypesExt/src/mitkClippingPlaneInteractor3D.cpp

Modules/DataTypesExt/src/mitkSurfaceDeformationDataInteractor3D.cpp

Modules/IGT/Testing/mitkCameraVisualizationTest.cpp

Modules/PlanarFigure/src/Interactions/mitkPlanarFigureInteractor.cpp

Modules/QtOverlays/QmitkOverlayController.cpp

Modules/QtWidgets/include/QmitkAbstractMultiWidget.h

Modules/QtWidgets/include/QmitkMxNMultiWidget.h

Modules/QtWidgets/include/QmitkRenderWindow.h

Modules/QtWidgets/include/QmitkRenderWindowWidget.h

Modules/QtWidgets/include/QmitkStdMultiWidget.h

Modules/QtWidgets/src/QmitkAbstractMultiWidget.cpp

Modules/QtWidgets/src/QmitkMxNMultiWidget.cpp

Modules/QtWidgets/src/QmitkRenderWindow.cpp

Modules/QtWidgets/src/QmitkRenderWindowMenu.cpp

Modules/QtWidgets/src/QmitkRenderWindowWidget.cpp

Modules/QtWidgets/src/QmitkStdMultiWidget.cpp

Modules/QtWidgetsExt/src/QmitkSelectableGLWidget.cpp

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

Modules/Segmentation/Interactions/mitkSegmentationInteractor.cpp

Modules/Segmentation/Testing/mitkContourMapper2DTest.cpp

Modules/TubeGraph/src/Interactions/mitkTubeGraphDataInteractor.cpp

Plugins/org.mitk.gui.qt.mxnmultiwidgeteditor/src/QmitkMxNMultiWidgetEditor.cpp

Plugins/org.mitk.gui.qt.mxnmultiwidgeteditor/src/internal/QmitkMxNMultiWidgetEditorPreferencePage.cpp

Plugins/org.mitk.gui.qt.mxnmultiwidgeteditor/src/internal/QmitkMxNMultiWidgetEditorPreferencePage.h

Plugins/org.mitk.gui.qt.mxnmultiwidgeteditor/src/internal/QmitkMxNMultiWidgetEditorPreferencePage.ui

Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.cpp

Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.cpp

Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.h

Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.ui

Remove RenderingManager parameters and RenderingMode
7d3e2a1aafa3
Actions