Diffusion MITK f44e3d57c347

Merge branch 'bug-16746-depth-peeling' into bug-16746-integration-depth-peeling
f44e3d57c347
Actions

Description

Merge branch 'bug-16746-depth-peeling' into bug-16746-integration-depth-peeling

Conflicts:
Modules/QtWidgets/QmitkRenderWindow.cpp

Details

Provenance

• engelhsa

Authored on Mar 5 2014, 3:58 PM

Parents

rMITK7e2dca5cb8b7: restored former constructor and fix the initialize method
rMITK1bc00921b574: Merge branch 'bug-16682-IGTTrackingDeviceConfigurationWidgetPersistence'

Branches

Unknown

Tags

Unknown

Event Timeline

• engelhsa committed rMITKf44e3d57c347: Merge branch 'bug-16746-depth-peeling' into bug-16746-integration-depth-peeling (authored by • engelhsa).Mar 5 2014, 3:58 PM

Merged Changes

7e2dca5cb8b7 restored former constructor and fix the initialize method
Author
• engelhsa
Browse Repository
No Builds
No Audits
de051a3a2d8a Change in ContourMapper2DTest
Author
• engelhsa
Browse Repository
No Builds
No Audits
285d548fb925 Standard Rendering, Depth Peeling and Multi Sampling
Author
• engelhsa
Browse Repository
No Builds
No Audits
c7cc443a7b69 introduce rendering mode in preference menu
Author
• engelhsa
Browse Repository
No Builds
No Audits
ccd28286e277 Remove legacy depth peeling support
Author
• engelhsa
Browse Repository
No Builds
No Audits

Changes (19)

Path

Size

Packages

Core/

Code/

Controllers/

mitkRenderingManager.cpp

mitkRenderingManager.h

Rendering/

mitkBaseRenderer.cpp

mitkBaseRenderer.h

mitkRenderWindowBase.cpp

mitkRenderWindowBase.h

mitkVtkPropRenderer.cpp

mitkVtkPropRenderer.h

Modules/

QtWidgets/

QmitkRenderWindow.cpp

O3: MITK Reviewer Group II

QmitkRenderWindow.h

O3: MITK Reviewer Group II

QmitkStdMultiWidget.cpp

O3: MITK Reviewer Group II

QmitkStdMultiWidget.h

O3: MITK Reviewer Group II

QtWidgetsExt/

QmitkSelectableGLWidget.cpp

O3: MITK Reviewer Group II

Segmentation/

Testing/

mitkContourMapper2DTest.cpp

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.common/

src/

mitkIRenderingManager.cpp

O1: MITK Reviewer Group I

mitkIRenderingManager.h

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

rMITKf44e3d57c347

View Options

Core/Code/Controllers/mitkRenderingManager.cpp

View Options

Core/Code/Controllers/mitkRenderingManager.h

View Options

Core/Code/Rendering/mitkBaseRenderer.cpp

View Options

Core/Code/Rendering/mitkBaseRenderer.h

View Options

Core/Code/Rendering/mitkRenderWindowBase.cpp

View Options

Core/Code/Rendering/mitkRenderWindowBase.h

View Options

Core/Code/Rendering/mitkVtkPropRenderer.cpp

View Options

Core/Code/Rendering/mitkVtkPropRenderer.h

View Options

Modules/QtWidgets/QmitkRenderWindow.cpp

View Options

Modules/QtWidgets/QmitkRenderWindow.h

View Options

Modules/QtWidgets/QmitkStdMultiWidget.cpp

View Options

Modules/QtWidgets/QmitkStdMultiWidget.h

View Options

Modules/QtWidgetsExt/QmitkSelectableGLWidget.cpp

View Options

Modules/Segmentation/Testing/mitkContourMapper2DTest.cpp

View Options

Plugins/org.mitk.gui.common/src/mitkIRenderingManager.cpp

View Options

Plugins/org.mitk.gui.common/src/mitkIRenderingManager.h

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

Merge branch 'bug-16746-depth-peeling' into bug-16746-integration-depth-peelingf44e3d57c347Actions

Description

Details

Event Timeline

Merged Changes

Changes (19)

rMITKf44e3d57c347

Core/Code/Controllers/mitkRenderingManager.cpp

Core/Code/Controllers/mitkRenderingManager.h

Core/Code/Rendering/mitkBaseRenderer.cpp

Core/Code/Rendering/mitkBaseRenderer.h

Core/Code/Rendering/mitkRenderWindowBase.cpp

Core/Code/Rendering/mitkRenderWindowBase.h

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Core/Code/Rendering/mitkVtkPropRenderer.h

Modules/QtWidgets/QmitkRenderWindow.cpp

Modules/QtWidgets/QmitkRenderWindow.h

Modules/QtWidgets/QmitkStdMultiWidget.cpp

Modules/QtWidgets/QmitkStdMultiWidget.h

Modules/QtWidgetsExt/QmitkSelectableGLWidget.cpp

Modules/Segmentation/Testing/mitkContourMapper2DTest.cpp

Plugins/org.mitk.gui.common/src/mitkIRenderingManager.cpp

Plugins/org.mitk.gui.common/src/mitkIRenderingManager.h

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

Merge branch 'bug-16746-depth-peeling' into bug-16746-integration-depth-peeling
f44e3d57c347
Actions