Merge remote-tracking branch 'origin/T18922-OpenGLBackend2-kislinsk-2' into tmp…
05f8417fb712
Actions

Description

Merge remote-tracking branch 'origin/T18922-OpenGLBackend2-kislinsk-2' into tmp-shaderproject

Details

Provenance

• goerres	Authored on Jul 10 2017, 1:23 PM
• goerres	Pushed on Jul 28 2017, 2:40 PM

Parents

rMITKed8c7179ece5: Merge branch 'T23019-DiffRelease5'
rMITK526158aabfce: Fixed syntax error in method definition

Branches

Unknown

Tags

Unknown

Event Timeline

• goerres committed rMITK05f8417fb712: Merge remote-tracking branch 'origin/T18922-OpenGLBackend2-kislinsk-2' into tmp… (authored by • goerres).Jul 10 2017, 1:23 PM

Merged Changes

526158aabfce Fixed syntax error in method definition
Author
kislinsk
Browse Repository
No Builds
No Audits
e5354bc037a2 vtkObject::GetMTime() returns vtkMTimeType now
Author
kislinsk
Browse Repository
No Builds
No Audits
d2989e81fa83 remove vtkXMLShader and shaderrepository service
Author
• kolbch
Browse Repository
No Builds
No Audits
3dc37c95ae71 reenable OpenViewCore
Author
• kolbch
Browse Repository
No Builds
No Audits
6f182531d557 remove background for image3D rendering
Author
• kolbch
Browse Repository
No Builds
No Audits
222e6ff3bb21 update to vtk 7.1
Author
• kolbch
Browse Repository
No Builds
No Audits
e340a3e2be0a Workbench compilation fixes
Author
• kolbch
Browse Repository
No Builds
No Audits
08d0bb236cb3 fix deprecated and int unsigned int comparison warnings
Author
• kolbch
Browse Repository
No Builds
No Audits

Changes (65)

Path

Size

Packages

CMakeExternals/

VTK.cmake

O1: MITK Reviewer Group I

VTK.patch

O1: MITK Reviewer Group I

Modules/

Core/

CMakeLists.txt

O1: MITK Reviewer Group I

TestingHelper/

src/

mitkRenderingTestHelper.cpp

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

include/

mitkCoreServices.h

O1: MITK Reviewer Group I

mitkIShaderRepository.h

O1: MITK Reviewer Group I

mitkPlaneClipping.h

O1: MITK Reviewer Group I

mitkShaderProperty.h

O1: MITK Reviewer Group I

mitkSurfaceVtkMapper3D.h

O1: MITK Reviewer Group I

mitkVtkMapper.h

O1: MITK Reviewer Group I

vtkMitkLevelWindowFilter.h

O1: MITK Reviewer Group I

vtkNeverTranslucentTexture.h

O1: MITK Reviewer Group I

src/

Rendering/

mitkIShaderRepository.cpp

O1: MITK Reviewer Group I

mitkPlaneGeometryDataVtkMapper3D.cpp

O1: MITK Reviewer Group I

mitkPointSetVtkMapper3D.cpp

O1: MITK Reviewer Group I

mitkSurfaceVtkMapper3D.cpp

O1: MITK Reviewer Group I

mitkVtkMapper.cpp

O1: MITK Reviewer Group I

vtkMitkLevelWindowFilter.cpp

O1: MITK Reviewer Group I

mitkCoreActivator.cpp

O1: MITK Reviewer Group I

mitkCoreActivator.h

O1: MITK Reviewer Group I

mitkCoreServices.cpp

O1: MITK Reviewer Group I

test/

files.cmake

O1: MITK Reviewer Group I

mitkShaderRepositoryTest.cpp

O1: MITK Reviewer Group I

DicomRT/

src/

mitkDoseImageVtkMapper2D.cpp

DiffusionImaging/

DiffusionCore/

src/

Algorithms/

mitkPartialVolumeAnalysisHistogramCalculator.cpp

DiffusionIO/

mitkFiberBundleMapper2D.cpp

Gizmo/

src/

mitkGizmoMapper2D.cpp

mitkGizmoMapper2D.h

MapperExt/

files.cmake

include/

mitkGPUVolumeMapper3D.h

vtkMitkGPUVolumeRayCastMapper.h

vtkMitkOpenGLVolumeTextureMapper3D.h

vtkMitkVolumeTextureMapper3D.h

vtkUnstructuredGridMapper.h

src/

mitkGPUVolumeMapper3D.cpp

vtkMitkGPUVolumeRayCastMapper.cpp

vtkPointSetSlicer.cxx

vtkPointSetSlicer.h

vtkUnstructuredGridMapper.cpp

ModuleList.cmake

OpenViewCore/

QVTKQuickItem.cxx

src/

QVTKFramebufferObjectRenderer.cxx

QVTKQuickItem.cxx

vtkInternalOpenGLRenderWindow.cxx

QtWidgets/

CMakeLists.txt

O3: MITK Reviewer Group II

SceneSerializationBase/

src/

mitkEnumerationSubclassesSerializer.cpp

O1: MITK Reviewer Group I

test/

mitkPropertySerializationTest.cpp

O1: MITK Reviewer Group I

VtkShaders/

mitkShaderLighting.xml

src/

mitkVtkShaderProgram.h

mitkVtkShaderRepository.h

vtkXMLMaterial.cpp

vtkXMLMaterial.h

vtkXMLMaterialParser.cpp

vtkXMLMaterialParser.h

vtkXMLShader.cpp

vtkXMLShader.h

Plugins/

org.mitk.gui.qt.dosevisualization/

src/

internal/

RTDoseVisualizer.h

O3: MITK Reviewer Group II

org.mitk.gui.qt.materialeditor/

src/

internal/

QmitkMITKSurfaceMaterialEditorView.cpp

QmitkMITKSurfaceMaterialEditorView.h

org.mitk.gui.qt.volumevisualization/

src/

internal/

QmitkVolumeVisualizationView.cpp

O3: MITK Reviewer Group II

rMITK05f8417fb712

View Options

CMakeExternals/VTK.cmake

View Options

CMakeExternals/VTK.patch

View Options

Modules/Core/CMakeLists.txt

View Options

Modules/Core/TestingHelper/src/mitkRenderingTestHelper.cpp

View Options

Modules/Core/files.cmake

View Options

Modules/Core/include/mitkCoreServices.h

View Options

Modules/Core/include/mitkIShaderRepository.h

View Options

Modules/Core/include/mitkPlaneClipping.h

View Options

Modules/Core/include/mitkShaderProperty.h

View Options

Modules/Core/include/mitkSurfaceVtkMapper3D.h

View Options

Modules/Core/include/mitkVtkMapper.h

View Options

Modules/Core/include/vtkMitkLevelWindowFilter.h

View Options

Modules/Core/include/vtkNeverTranslucentTexture.h

View Options

Modules/Core/src/Rendering/mitkIShaderRepository.cpp

View Options

Modules/Core/src/Rendering/mitkPlaneGeometryDataVtkMapper3D.cpp

View Options

Modules/Core/src/Rendering/mitkPointSetVtkMapper3D.cpp

View Options

Modules/Core/src/Rendering/mitkSurfaceVtkMapper3D.cpp

View Options

Modules/Core/src/Rendering/mitkVtkMapper.cpp

View Options

Modules/Core/src/Rendering/vtkMitkLevelWindowFilter.cpp

View Options

Modules/Core/src/mitkCoreActivator.cpp

View Options

Modules/Core/src/mitkCoreActivator.h

View Options

Modules/Core/src/mitkCoreServices.cpp

View Options

Modules/Core/test/files.cmake

View Options

Modules/Core/test/mitkShaderRepositoryTest.cpp

View Options

Modules/DicomRT/src/mitkDoseImageVtkMapper2D.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/src/Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper2D.cpp

View Options

Modules/Gizmo/src/mitkGizmoMapper2D.cpp

View Options

Modules/Gizmo/src/mitkGizmoMapper2D.h

View Options

Modules/MapperExt/files.cmake

View Options

Modules/MapperExt/include/mitkGPUVolumeMapper3D.h

View Options

Modules/MapperExt/include/vtkMitkGPUVolumeRayCastMapper.h

View Options

Modules/MapperExt/include/vtkMitkOpenGLVolumeTextureMapper3D.h

View Options

Modules/MapperExt/include/vtkMitkVolumeTextureMapper3D.h

View Options

Modules/MapperExt/include/vtkUnstructuredGridMapper.h

View Options

Modules/MapperExt/src/mitkGPUVolumeMapper3D.cpp

View Options

Modules/MapperExt/src/vtkMitkGPUVolumeRayCastMapper.cpp

View Options

Modules/MapperExt/src/vtkPointSetSlicer.cxx

View Options

Modules/MapperExt/src/vtkPointSetSlicer.h

View Options

Modules/MapperExt/src/vtkUnstructuredGridMapper.cpp

View Options

Modules/ModuleList.cmake

View Options

Modules/OpenViewCore/QVTKQuickItem.cxx

View Options

Modules/OpenViewCore/src/QVTKFramebufferObjectRenderer.cxx

View Options

Modules/OpenViewCore/src/QVTKQuickItem.cxx

View Options

Modules/OpenViewCore/src/vtkInternalOpenGLRenderWindow.cxx

View Options

Modules/QtWidgets/CMakeLists.txt

View Options

Modules/SceneSerializationBase/src/mitkEnumerationSubclassesSerializer.cpp

View Options

Modules/SceneSerializationBase/test/mitkPropertySerializationTest.cpp

View Options

Modules/VtkShaders/CMakeLists.txt

View Options

Modules/VtkShaders/files.cmake

View Options

Modules/VtkShaders/resource

View Options

Modules/VtkShaders/resource/Shaders

View Options

Modules/VtkShaders/resource/Shaders/mitkShaderLighting.xml

View Options

Modules/VtkShaders/src/mitkVtkShaderProgram.h

View Options

Modules/VtkShaders/src/mitkVtkShaderRepository.h

View Options

Modules/VtkShaders/src/vtkXMLMaterial.cpp

View Options

Modules/VtkShaders/src/vtkXMLMaterial.h

View Options

Modules/VtkShaders/src/vtkXMLMaterialParser.cpp

View Options

Modules/VtkShaders/src/vtkXMLMaterialParser.h

View Options

Modules/VtkShaders/src/vtkXMLShader.cpp

View Options

Modules/VtkShaders/src/vtkXMLShader.h

View Options

Plugins/org.mitk.gui.qt.dosevisualization/src/internal/RTDoseVisualizer.h

View Options

Plugins/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.cpp

View Options

Plugins/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.h

View Options

Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.cpp

Merge remote-tracking branch 'origin/T18922-OpenGLBackend2-kislinsk-2' into tmp…05f8417fb712Actions

Description

Details

Event Timeline

Merged Changes

Changes (65)

rMITK05f8417fb712

CMakeExternals/VTK.cmake

CMakeExternals/VTK.patch

Modules/Core/CMakeLists.txt

Modules/Core/TestingHelper/src/mitkRenderingTestHelper.cpp

Modules/Core/files.cmake

Modules/Core/include/mitkCoreServices.h

Modules/Core/include/mitkIShaderRepository.h

Modules/Core/include/mitkPlaneClipping.h

Modules/Core/include/mitkShaderProperty.h

Modules/Core/include/mitkSurfaceVtkMapper3D.h

Modules/Core/include/mitkVtkMapper.h

Modules/Core/include/vtkMitkLevelWindowFilter.h

Modules/Core/include/vtkNeverTranslucentTexture.h

Modules/Core/src/Rendering/mitkIShaderRepository.cpp

Modules/Core/src/Rendering/mitkPlaneGeometryDataVtkMapper3D.cpp

Modules/Core/src/Rendering/mitkPointSetVtkMapper3D.cpp

Modules/Core/src/Rendering/mitkSurfaceVtkMapper3D.cpp

Modules/Core/src/Rendering/mitkVtkMapper.cpp

Modules/Core/src/Rendering/vtkMitkLevelWindowFilter.cpp

Modules/Core/src/mitkCoreActivator.cpp

Modules/Core/src/mitkCoreActivator.h

Modules/Core/src/mitkCoreServices.cpp

Modules/Core/test/files.cmake

Modules/Core/test/mitkShaderRepositoryTest.cpp

Modules/DicomRT/src/mitkDoseImageVtkMapper2D.cpp

Modules/DiffusionImaging/DiffusionCore/src/Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper2D.cpp

Modules/Gizmo/src/mitkGizmoMapper2D.cpp

Modules/Gizmo/src/mitkGizmoMapper2D.h

Modules/MapperExt/files.cmake

Modules/MapperExt/include/mitkGPUVolumeMapper3D.h

Modules/MapperExt/include/vtkMitkGPUVolumeRayCastMapper.h

Modules/MapperExt/include/vtkMitkOpenGLVolumeTextureMapper3D.h

Modules/MapperExt/include/vtkMitkVolumeTextureMapper3D.h

Modules/MapperExt/include/vtkUnstructuredGridMapper.h

Modules/MapperExt/src/mitkGPUVolumeMapper3D.cpp

Modules/MapperExt/src/vtkMitkGPUVolumeRayCastMapper.cpp

Modules/MapperExt/src/vtkPointSetSlicer.cxx

Modules/MapperExt/src/vtkPointSetSlicer.h

Modules/MapperExt/src/vtkUnstructuredGridMapper.cpp

Modules/ModuleList.cmake

Modules/OpenViewCore/QVTKQuickItem.cxx

Modules/OpenViewCore/src/QVTKFramebufferObjectRenderer.cxx

Modules/OpenViewCore/src/QVTKQuickItem.cxx

Modules/OpenViewCore/src/vtkInternalOpenGLRenderWindow.cxx

Modules/QtWidgets/CMakeLists.txt

Modules/SceneSerializationBase/src/mitkEnumerationSubclassesSerializer.cpp

Modules/SceneSerializationBase/test/mitkPropertySerializationTest.cpp

Modules/VtkShaders/CMakeLists.txt

Modules/VtkShaders/files.cmake

Modules/VtkShaders/resource

Modules/VtkShaders/resource/Shaders

Modules/VtkShaders/resource/Shaders/mitkShaderLighting.xml

Modules/VtkShaders/src/mitkVtkShaderProgram.h

Modules/VtkShaders/src/mitkVtkShaderRepository.h

Modules/VtkShaders/src/vtkXMLMaterial.cpp

Modules/VtkShaders/src/vtkXMLMaterial.h

Modules/VtkShaders/src/vtkXMLMaterialParser.cpp

Modules/VtkShaders/src/vtkXMLMaterialParser.h

Modules/VtkShaders/src/vtkXMLShader.cpp

Modules/VtkShaders/src/vtkXMLShader.h

Plugins/org.mitk.gui.qt.dosevisualization/src/internal/RTDoseVisualizer.h

Plugins/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.cpp

Plugins/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.h

Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.cpp

Merge remote-tracking branch 'origin/T18922-OpenGLBackend2-kislinsk-2' into tmp…
05f8417fb712
Actions