HomePhabricator
Diffusion MITK 77f327092535

Merge branch 'bug-18528-GLMappersModule'
77f327092535
Actions

Description

Merge branch 'bug-18528-GLMappersModule'

Conflicts:
Core/Code/Controllers/mitkVtkLayerController.h
Core/Code/Rendering/mitkOverlay.cpp
Modules/CMakeLists.txt

Details

Provenance
• kilgusAuthored on Dec 19 2014, 3:37 PM
Parents
rMITK46fc0617c795: MultiWidget and gradientbackground refactoring.
rMITK48342d9fd441: COMP: Merge branch 'bug-18556-add-copydeep-for-planarFigure'
Branches
Unknown
Tags
Unknown

Merged Changes

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

Changes (85)

PathSizePackages
Core/
Code/
Common/
Controllers/
DataManagement/
Rendering/
Testing/
mitkSurfaceVtkMapper2DColorTest.cpp
mitkSurfaceGLMapper2DColorTest.cpp
mitkSurfaceVtkMapper2DOpacityTest.cpp
mitkSurfaceGLMapper2DOpacityTest.cpp
Documentation/
Doxygen/
DeveloperManual/
Toolkit/
ModuleManuals/
Modules/
AlgorithmsExt/
ContourModel/
O3: MITK Reviewer Group II
Rendering/
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
MapperExt/
Overlays/
PlanarFigure/
Algorithms/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Rendering/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
QtWidgets/
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
Modules/
LegacyGL/
Core/
Code/
Rendering/
mitkPlaneGeometryDataGLMapper2D.cpp/
Rendering/
mitkPlaneGeometryDataMapper2D.cpp
mitkPlaneGeometryDataGLMapper2D.h/
Rendering/
mitkPlaneGeometryDataMapper2D.h
Plugins/
org.mitk.gui.qt.imagenavigator/
src/
internal/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
org.mitk.gui.qt.stdmultiwidgeteditor/
O1: MITK Reviewer Group I
src/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
internal/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I

rMITK77f327092535

View Options

Core/Code/Common/mitkCoreObjectFactory.cpp

Loading...
View Options

Core/Code/Controllers/mitkVtkLayerController.cpp

Loading...
View Options

Core/Code/Controllers/mitkVtkLayerController.h

Loading...
View Options

Core/Code/DataManagement/mitkColorProperty.h

Loading...
View Options

Core/Code/DataManagement/mitkLine.h

Loading...
View Options

Core/Code/Rendering/mitkGL.h

Loading...
View Options

Core/Code/Rendering/mitkGLMapper.cpp

Loading...
View Options

Core/Code/Rendering/mitkGLMapper.h

Loading...
View Options

Core/Code/Rendering/mitkGLMapper2D.h

Loading...
View Options

Core/Code/Rendering/mitkGradientBackground.cpp

Loading...
View Options

Core/Code/Rendering/mitkGradientBackground.h

Loading...
View Options

Core/Code/Rendering/mitkOverlay.cpp

Loading...
View Options

Core/Code/Rendering/mitkOverlay.h

Loading...
View Options

Core/Code/Rendering/mitkPlaneGeometryDataMapper2D.cpp

Loading...
View Options

Core/Code/Rendering/mitkPlaneGeometryDataMapper2D.h

Loading...
View Options

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

Loading...
View Options

Core/Code/Rendering/mitkPointSetGLMapper2D.h

Loading...
View Options

Core/Code/Rendering/mitkRenderWindowFrame.cpp

Loading...
View Options

Core/Code/Rendering/mitkRenderWindowFrame.h

Loading...
View Options

Core/Code/Rendering/mitkSurfaceGLMapper2D.cpp

Loading...
View Options

Core/Code/Rendering/mitkSurfaceGLMapper2D.h

Loading...
View Options

Core/Code/Rendering/mitkSurfaceVtkMapper2D.cpp

Loading...
View Options

Core/Code/Rendering/mitkSurfaceVtkMapper2D.h

Loading...
View Options

Core/Code/Rendering/mitkVtkOverlay.cpp

Loading...
View Options

Core/Code/Rendering/mitkVtkOverlay.h

Loading...
View Options

Core/Code/Rendering/mitkVtkOverlay2D.h

Loading...
View Options

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Loading...
View Options

Core/Code/Rendering/mitkVtkPropRenderer.h

Loading...
View Options

Core/Code/Rendering/vtkMitkRectangleProp.cpp

Loading...
View Options

Core/Code/Rendering/vtkMitkRectangleProp.h

Loading...
View Options

Core/Code/Rendering/vtkMitkRenderProp.cpp

Loading...
View Options

Core/Code/Testing/CMakeLists.txt

Loading...
View Options

Core/Code/Testing/files.cmake

Loading...
View Options

Core/Code/Testing/mitkDataNodeTest.cpp

Loading...
View Options

Core/Code/Testing/mitkSurfaceGLMapper2DColorTest.cpp

Loading...
View Options

Core/Code/Testing/mitkSurfaceGLMapper2DOpacityTest.cpp

Loading...
View Options

Core/Code/Testing/mitkSurfaceVtkMapper2DColorTest.cpp

Loading...
View Options

Core/Code/Testing/mitkSurfaceVtkMapper2DOpacityTest.cpp

Loading...
View Options

Core/Code/files.cmake

Loading...
View Options

Documentation/Doxygen/DeveloperManual/Toolkit/ModuleManuals/MITKModuleManualsList.dox

Loading...
View Options

Modules/AlgorithmsExt/CMakeLists.txt

Loading...
View Options

Modules/ContourModel/CMakeLists.txt

Loading...
View Options

Modules/ContourModel/Rendering/mitkContourModelGLMapper2DBase.cpp

Loading...
View Options

Modules/ContourModel/Rendering/mitkContourModelGLMapper2DBase.h

Loading...
View Options

Modules/ContourModel/Rendering/mitkContourModelSetGLMapper2D.cpp

Loading...
View Options

Modules/ContourModel/Rendering/mitkContourModelSetGLMapper2D.h

Loading...
View Options

Modules/LegacyGL/CMakeLists.txt

Loading...
View Options

Modules/LegacyGL/Documentation/doxygen/LegacyGL.dox

Loading...
View Options

Modules/LegacyGL/files.cmake

Loading...
View Options

Modules/LegacyGL/mitkGL.h

Loading...
View Options

Modules/LegacyGL/mitkGLMapper.cpp

Loading...
View Options

Modules/LegacyGL/mitkGLMapper.h

Loading...
View Options

Modules/LegacyGL/mitkGLMapper2D.h

Loading...
View Options

Modules/LegacyGL/mitkPlaneGeometryDataGLMapper2D.cpp

Loading...
View Options

Modules/LegacyGL/mitkPlaneGeometryDataGLMapper2D.h

Loading...
View Options

Modules/LegacyGL/mitkPointSetGLMapper2D.cpp

Loading...
View Options

Modules/LegacyGL/mitkPointSetGLMapper2D.h

Loading...
View Options

Modules/LegacyGL/mitkSurfaceGLMapper2D.cpp

Loading...
View Options

Modules/LegacyGL/mitkSurfaceGLMapper2D.h

Loading...
View Options

Modules/LegacyGL/mitkVtkGLMapperWrapper.cpp

Loading...
View Options

Modules/LegacyGL/mitkVtkGLMapperWrapper.h

Loading...
View Options

Modules/LegacyGL/vtkGLMapperProp.cpp

Loading...
View Options

Modules/LegacyGL/vtkGLMapperProp.h

Loading...
View Options

Modules/MapperExt/CMakeLists.txt

Loading...
View Options

Modules/ModuleList.cmake

Loading...
View Options

Modules/Overlays/mitkTextOverlay2D.cpp

Loading...
View Options

Modules/Overlays/mitkTextOverlay2D.h

Loading...
View Options

Modules/PlanarFigure/Algorithms/mitkPlanarFigureObjectFactory.cpp

Loading...
View Options

Modules/PlanarFigure/CMakeLists.txt

Loading...
View Options

Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.cpp

Loading...
View Options

Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.h

Loading...
View Options

Modules/QtWidgets/QmitkRenderWindow.h

Loading...
View Options

Modules/QtWidgets/QmitkStdMultiWidget.cpp

Loading...
View Options

Modules/QtWidgets/QmitkStdMultiWidget.h

Loading...
View Options

Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.h

Loading...
View Options

Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/files.cmake

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
MITK · MIC · IMSY · DKFZ