Merge branch 'bug-15849-VTK6Migration_IntegrationNov13' into bug-15849…
bdde0b1ad9bb
Actions

Description

Merge branch 'bug-15849-VTK6Migration_IntegrationNov13' into bug-15849-VTK6Migration_IntegrationDec04

Conflicts:
CMakeExternals/VTK.cmake
Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp
Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui

Merge branch 'bug-15849-VTK6Migration_IntegrationNov13' into bug-15849…bdde0b1ad9bbActions

Description

Details

Event Timeline

Merged Changes

Changes (156)

rMITKbdde0b1ad9bb

CMake/PackageDepends/MITK_QVTK_Config.cmake

CMake/PackageDepends/MITK_VTK_Config.cmake

CMake/mitkSetupVariables.cmake

CMakeExternals/ACVD.cmake

CMakeExternals/PatchACVD.cmake

CMakeExternals/VTK.cmake

Core/Code/Algorithms/mitkExtractSliceFilter.cpp

Core/Code/Algorithms/mitkExtractSliceFilter.h

Core/Code/Algorithms/mitkGeometry2DDataToSurfaceFilter.cpp

Core/Code/Algorithms/mitkImageToSurfaceFilter.cpp

Core/Code/Algorithms/mitkPlaneClipping.h

Core/Code/Algorithms/mitkSurfaceToImageFilter.cpp

Core/Code/DataManagement/mitkImage.cpp

Core/Code/DataManagement/mitkImageDataItem.cpp

Core/Code/DataManagement/mitkLookupTable.cpp

Core/Code/DataManagement/mitkMaterial.cpp

Core/Code/DataManagement/mitkMaterial.h

Core/Code/DataManagement/mitkPlaneGeometry.cpp

Core/Code/DataManagement/mitkSurface.cpp

Core/Code/DataManagement/mitkTransferFunction.cpp

Core/Code/IO/mitkIOUtil.cpp

Core/Code/IO/mitkImageWriter.cpp

Core/Code/IO/mitkSTLFileReader.cpp

Core/Code/IO/mitkSurfaceVtkWriter.txx

Core/Code/Interactions/mitkVtkInteractorStyle.cxx

Core/Code/Interactions/mitkVtkInteractorStyle.h

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.cpp

Core/Code/Rendering/mitkGradientBackground.cpp

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Core/Code/Rendering/mitkImageVtkMapper2D.h

Core/Code/Rendering/mitkLabelOverlay3D.cpp

Core/Code/Rendering/mitkManufacturerLogo.cpp

Core/Code/Rendering/mitkPointSetVtkMapper2D.cpp

Core/Code/Rendering/mitkPointSetVtkMapper3D.cpp

Core/Code/Rendering/mitkPolyDataGLMapper2D.cpp

Core/Code/Rendering/mitkRenderingTestHelper.cpp

Core/Code/Rendering/mitkSurfaceGLMapper2D.cpp

Core/Code/Rendering/mitkSurfaceVtkMapper3D.cpp

Core/Code/Rendering/mitkTextOverlay2D.cpp

Core/Code/Rendering/mitkVolumeDataVtkMapper3D.cpp

Core/Code/Rendering/mitkVtkEventProvider.cpp

Core/Code/Rendering/mitkVtkEventProvider.h

Core/Code/Rendering/mitkVtkPropRenderer.h

Core/Code/Rendering/vtkMitkLevelWindowFilter.cpp

Core/Code/Rendering/vtkMitkLevelWindowFilter.h

Core/Code/Rendering/vtkMitkThickSlicesFilter.cpp

Core/Code/Rendering/vtkMitkThickSlicesFilter.h

Core/Code/Testing/mitkGeometryDataToSurfaceFilterTest.cpp

Core/Code/Testing/mitkImageTest.cpp

Core/Code/Testing/mitkMaterialTest.cpp

Core/Code/Testing/mitkSurfaceTest.cpp

Core/Code/Testing/mitkTransferFunctionTest.cpp

Core/Code/Testing/vtkMitkThickSlicesFilterTest.cpp

Examples/Tutorial/Step7.cpp

Examples/Tutorial/mitkWithITKAndVTK.cpp

Modules/ContourModel/Rendering/mitkContourModelMapper2D.cpp

Modules/ContourModel/Rendering/mitkContourModelMapper3D.cpp

Modules/ContourModel/Rendering/mitkContourModelSetMapper3D.cpp

Modules/DiffusionImaging/Connectomics/Rendering/mitkConnectomicsNetworkMapper3D.cpp

Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkOrientationDistributionFunction.txx

Modules/DiffusionImaging/DiffusionCore/Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.cpp

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkOdfVtkMapper2D.h

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkOdfVtkMapper2D.txx

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkPlanarFigureMapper3D.cpp

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkVectorImageVtkGlyphMapper3D.cpp

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkMaskedProgrammableGlyphFilter.cpp

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkMaskedProgrammableGlyphFilter.h

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkOdfSource.cxx

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkOdfSource.h

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkThickPlane.cxx

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkThickPlane.h

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXReader.cpp

Merge branch 'bug-15849-VTK6Migration_IntegrationNov13' into bug-15849…
bdde0b1ad9bb
Actions