Merge branch 'bug-15849-VTK6Migration' into bug-15849…
b257fb5326aa
Actions

Description

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

Conflicts:
Core/Code/DataManagement/mitkVector.cpp
Modules/IGT/IGTFilters/mitkTrackingVolumeGenerator.cpp
Modules/Qmitk/CMakeLists.txt

Details

Provenance

• kolbch

Authored on Nov 20 2013, 3:48 PM

Parents

rMITK50ee5cc3f3e9: fix typo
rMITK522d8162078d: Merge branch 'bug-16441-FixTensorToDWIFilter'

Branches

Unknown

Tags

Unknown

Event Timeline

• kolbch committed rMITKb257fb5326aa: Merge branch 'bug-15849-VTK6Migration' into bug-15849… (authored by • kolbch).Nov 20 2013, 3:48 PM

Merged Changes

50ee5cc3f3e9 fix typo
Author
• kolbch
Browse Repository
No Builds
No Audits
cf19b2c49cc0 fix VTK6_TODO regarding update
Author
• kolbch
Browse Repository
No Builds
No Audits
06d83453a04a enable instantiators which are needed for GLSL support
Author
• kolbch
Browse Repository
No Builds
No Audits
522b277b285a trivial Pipeline changes
Author
• kolbch
Browse Repository
No Builds
No Audits
750084b1f443 disable widgets which depend on QCharts
Author
• kolbch
Browse Repository
No Builds
No Audits
68ffdd4e6d32 versionMacro
Author
• kolbch
Browse Repository
No Builds
No Audits
63609e19812d add QWebkit Dependencies for vtk. possibly not nescessary
Author
• kolbch
Browse Repository
No Builds
No Audits
7c30d795811f vtkVersionMacros have to be included to enable VTK_MAJOR_VERSION
Author
• kolbch
Browse Repository
No Builds
No Audits
355f410d7f55 added VTK6_TODO: unclear function
Author
• kolbch
Browse Repository
No Builds
No Audits
af4650078d74 vtk5/6 Pipeline changes with VTK6_TODO
Author
• kolbch
Browse Repository
No Builds
No Audits
e94bc5cee444 vtkVersionMacros.h has to be included to provide version defines
Author
• kolbch
Browse Repository
No Builds
No Audits
e991f8b707fc vtkVolumeRenderingFactory does not exist in vtk6
Author
• kolbch
Browse Repository
No Builds
No Audits
d684af7f1647 renamed execute functions to RequestData
Author
• kolbch
Browse Repository
No Builds
No Audits
5e810dbc7264 Build system changes to use QVTK in vtk6
Author
• kolbch
Browse Repository
No Builds
No Audits
2dadb672d143 VTK5/6 Pipeline changes. lookout for VTK6_TODO
Author
• kolbch
Browse Repository
No Builds
No Audits
07ba4466e2b9 Add TestingRendering and GUI Support to VTK
Author
• kolbch
Browse Repository
No Builds
No Audits
780cdf25a04a Vtk5/6 Pipeline changes
Author
• kolbch
Browse Repository
No Builds
No Audits
9db2fbfcc751 VTK5/6 Pipeline changes
Author
• kolbch
Browse Repository
No Builds
No Audits
e35715a92663 migrated to renamed vtkLibraries. there are probably too much added now
Author
• kolbch
Browse Repository
No Builds
No Audits
4a50e2d8ade9 VTK5/6 Pipline changes. lookout for VTK6_TODO
Author
• kolbch
Browse Repository
No Builds
No Audits
457c7cc5978e VTK6_TODO : vtkMitkLevelWindowFilter should be fixed and tested
Author
• kolbch
Browse Repository
No Builds
No Audits
cf88eae939dc VTK5/6 Pipeline changes
Author
• kolbch
Browse Repository
No Builds
No Audits
fcdf7610d213 Rename and delete deprecated VTK Macros
Author
• kolbch
Browse Repository
No Builds
No Audits
5d30883ccedc VTK_LARGE_FLOAT -> VTK_LARGE_MAX
Author
• kolbch
Browse Repository
No Builds
No Audits
0532992b1044 Change AllocateScalars method in mitkImageDataItem
Author
• kolbch
Browse Repository
No Builds
No Audits
f940beef9d3c unfinished VTK 5/6 Pipeline changes. Lookout for VTK6_TODO !
Author
• kolbch
Browse Repository
No Builds
No Audits
9c3efd997bcc Unfinished VTK5/6 Pipeline changes. lookout for "VTK6_TODO"
Author
• kolbch
Browse Repository
No Builds
No Audits
65122f35a575 Replace deprecated vtkFloatingPointType with double
Author
• kolbch
Browse Repository
No Builds
No Audits

Changes (145)

Path

Size

Packages

CMake/

PackageDepends/

MITK_QVTK_Config.cmake

O1: MITK Reviewer Group I

MITK_VTK_Config.cmake

O1: MITK Reviewer Group I

mitkSetupVariables.cmake

O1: MITK Reviewer Group I

CMakeExternals/

VTK.cmake

O1: MITK Reviewer Group I

Core/

Code/

Algorithms/

mitkExtractSliceFilter.cpp

mitkExtractSliceFilter.h

mitkGeometry2DDataToSurfaceFilter.cpp

mitkImageToSurfaceFilter.cpp

mitkPlaneClipping.h

mitkSurfaceToImageFilter.cpp

DataManagement/

mitkImage.cpp

mitkImageDataItem.cpp

mitkLookupTable.cpp

mitkMaterial.cpp

mitkMaterial.h

mitkPlaneGeometry.cpp

mitkSurface.cpp

mitkTransferFunction.cpp

IO/

mitkIOUtil.cpp

mitkImageWriter.cpp

mitkSTLFileReader.cpp

mitkSurfaceVtkWriter.txx

Interactions/

mitkVtkInteractorStyle.cxx

mitkVtkInteractorStyle.h

Rendering/

mitkGeometry2DDataVtkMapper3D.cpp

mitkGradientBackground.cpp

mitkImageVtkMapper2D.cpp

mitkImageVtkMapper2D.h

mitkLabelOverlay3D.cpp

mitkManufacturerLogo.cpp

mitkPointSetVtkMapper2D.cpp

mitkPointSetVtkMapper3D.cpp

mitkPolyDataGLMapper2D.cpp

mitkRenderingTestHelper.cpp

mitkSurfaceGLMapper2D.cpp

mitkSurfaceVtkMapper3D.cpp

mitkTextOverlay2D.cpp

mitkVolumeDataVtkMapper3D.cpp

mitkVtkEventProvider.cpp

mitkVtkEventProvider.h

mitkVtkPropRenderer.h

vtkMitkLevelWindowFilter.cpp

vtkMitkLevelWindowFilter.h

vtkMitkThickSlicesFilter.cpp

vtkMitkThickSlicesFilter.h

Testing/

mitkGeometryDataToSurfaceFilterTest.cpp

mitkImageTest.cpp

mitkMaterialTest.cpp

mitkSurfaceTest.cpp

mitkTransferFunctionTest.cpp

vtkMitkThickSlicesFilterTest.cpp

Examples/

Tutorial/

Step7.cpp

mitkWithITKAndVTK.cpp

Modules/

ContourModel/

Rendering/

mitkContourModelMapper2D.cpp

O3: MITK Reviewer Group II

mitkContourModelMapper3D.cpp

O3: MITK Reviewer Group II

mitkContourModelSetMapper3D.cpp

O3: MITK Reviewer Group II

DiffusionImaging/

Connectomics/

Rendering/

mitkConnectomicsNetworkMapper3D.cpp

DiffusionCore/

Algorithms/

Reconstruction/

itkOrientationDistributionFunction.txx

mitkPartialVolumeAnalysisHistogramCalculator.cpp

Rendering/

mitkOdfVtkMapper2D.h

mitkOdfVtkMapper2D.txx

mitkPlanarFigureMapper3D.cpp

mitkVectorImageVtkGlyphMapper3D.cpp

vtkMaskedProgrammableGlyphFilter.cpp

vtkMaskedProgrammableGlyphFilter.h

FiberTracking/

IODataStructures/

FiberBundleX/

mitkFiberBundleX.cpp

mitkFiberBundleXReader.cpp

mitkFiberBundleXWriter.cpp

Interactions/

mitkFiberBundleInteractor.h

Rendering/

mitkFiberBundleXMapper2D.cpp

mitkFiberBundleXMapper3D.cpp

ImageExtraction/

mitkExtractDirectedPlaneImageFilter.cpp

mitkExtractDirectedPlaneImageFilter.h

ImageStatistics/

mitkImageStatisticsCalculator.cpp

O1: MITK Reviewer Group I

MitkExt/

Algorithms/

mitkHeightFieldSurfaceClipImageFilter.cpp

mitkLabeledImageToSurfaceFilter.cpp

mitkMeshUtil.h

mitkPointLocator.cpp

mitkPointLocator.h

mitkPolygonToRingFilter.cpp

mitkProbeFilter.cpp

DataManagement/

mitkLabeledImageLookupTable.cpp

mitkLabeledImageLookupTable.h

mitkUSLookupTableSource.cpp

mitkUnstructuredGrid.cpp

IO/

mitkUnstructuredGridVtkWriter.txx

Interactions/

mitkAffineInteractor3D.cpp

mitkAffineInteractor3D.h

mitkSurfaceDeformationInteractor3D.cpp

mitkSurfaceDeformationInteractor3D.h

Rendering/

mitkEnhancedPointSetVtkMapper3D.cpp

mitkGPUVolumeMapper3D.cpp

mitkGPUVolumeMapper3D.h

mitkImageBackground2D.cpp

mitkMeshVtkMapper3D.cpp

mitkSplineMapper2D.cpp

mitkSplineMapper2D.h

mitkSplineVtkMapper3D.cpp

mitkUnstructuredGridMapper2D.cpp

mitkUnstructuredGridVtkMapper3D.cpp

mitkVectorImageMapper2D.cpp

mitkVectorImageMapper2D.h

vtkMitkGPUVolumeRayCastMapper.cpp

vtkMitkGPUVolumeRayCastMapper.h

vtkMitkOpenGLGPUVolumeRayCastMapper.cpp

vtkMitkOpenGLGPUVolumeRayCastMapper.h

vtkMitkOpenGLVolumeTextureMapper3D.cpp

vtkMitkOpenGLVolumeTextureMapper3D.h

vtkMitkVolumeTextureMapper3D.cpp

vtkMitkVolumeTextureMapper3D.h

vtkUnstructuredGridMapper.cpp

vtkUnstructuredGridMapper.h

Testing/

mitkPointLocatorTest.cpp

Overlays/

CMakeLists.txt

PlanarFigure/

Rendering/

mitkPlanarFigureVtkMapper3D.cpp

O1: MITK Reviewer Group I

QmitkExt/

QmitkAboutDialog/

QmitkAboutDialog.cpp

QmitkColorTransferFunctionCanvas.cpp

QmitkColorTransferFunctionCanvas.h

QmitkPiecewiseFunctionCanvas.cpp

QmitkPiecewiseFunctionCanvas.h

QmitkTransferFunctionCanvas.cpp

QmitkTransferFunctionCanvas.h

QmitkTransferFunctionGeneratorWidget.cpp

QmitkVideoBackground.cpp

files.cmake

Segmentation/

Algorithms/

mitkManualSegmentationToSurfaceFilter.cpp

O1: MITK Reviewer Group I

mitkShowSegmentationAsSmoothedSurface.cpp

O1: MITK Reviewer Group I

mitkShowSegmentationAsSurface.cpp

O1: MITK Reviewer Group I

mitkVtkImageOverwrite.cpp

O1: MITK Reviewer Group I

DataManagement/

mitkExtrudedContour.cpp

O1: MITK Reviewer Group I

mitkExtrudedContour.h

O1: MITK Reviewer Group I

Interactions/

mitkContourInteractor.cpp

O1: MITK Reviewer Group I

Rendering/

mitkContourSetVtkMapper3D.cpp

O1: MITK Reviewer Group I

mitkContourVtkMapper3D.cpp

O1: MITK Reviewer Group I

SurfaceInterpolation/

mitkSurfaceInterpolationController.cpp

ToFProcessing/

mitkToFSurfaceVtkMapper3D.cpp

Plugins/

org.mitk.gui.qt.ext/

src/

QmitkExtWorkbenchWindowAdvisor.cpp

O1: MITK Reviewer Group I

rMITKb257fb5326aa

View Options

CMake/PackageDepends/MITK_QVTK_Config.cmake

View Options

CMake/PackageDepends/MITK_VTK_Config.cmake

View Options

CMake/mitkSetupVariables.cmake

View Options

CMakeExternals/VTK.cmake

View Options

Core/Code/Algorithms/mitkExtractSliceFilter.cpp

View Options

Core/Code/Algorithms/mitkExtractSliceFilter.h

View Options

Core/Code/Algorithms/mitkGeometry2DDataToSurfaceFilter.cpp

View Options

Core/Code/Algorithms/mitkImageToSurfaceFilter.cpp

View Options

Core/Code/Algorithms/mitkPlaneClipping.h

View Options

Core/Code/Algorithms/mitkSurfaceToImageFilter.cpp

View Options

Core/Code/DataManagement/mitkImage.cpp

View Options

Core/Code/DataManagement/mitkImageDataItem.cpp

View Options

Core/Code/DataManagement/mitkLookupTable.cpp

View Options

Core/Code/DataManagement/mitkMaterial.cpp

View Options

Core/Code/DataManagement/mitkMaterial.h

View Options

Core/Code/DataManagement/mitkPlaneGeometry.cpp

View Options

Core/Code/DataManagement/mitkSurface.cpp

View Options

Core/Code/DataManagement/mitkTransferFunction.cpp

View Options

Core/Code/IO/mitkIOUtil.cpp

View Options

Core/Code/IO/mitkImageWriter.cpp

View Options

Core/Code/IO/mitkSTLFileReader.cpp

View Options

Core/Code/IO/mitkSurfaceVtkWriter.txx

View Options

Core/Code/Interactions/mitkVtkInteractorStyle.cxx

View Options

Core/Code/Interactions/mitkVtkInteractorStyle.h

View Options

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.cpp

View Options

Core/Code/Rendering/mitkGradientBackground.cpp

View Options

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

View Options

Core/Code/Rendering/mitkImageVtkMapper2D.h

View Options

Core/Code/Rendering/mitkLabelOverlay3D.cpp

View Options

Core/Code/Rendering/mitkManufacturerLogo.cpp

View Options

Core/Code/Rendering/mitkPointSetVtkMapper2D.cpp

View Options

Core/Code/Rendering/mitkPointSetVtkMapper3D.cpp

View Options

Core/Code/Rendering/mitkPolyDataGLMapper2D.cpp

View Options

Core/Code/Rendering/mitkRenderingTestHelper.cpp

View Options

Core/Code/Rendering/mitkSurfaceGLMapper2D.cpp

View Options

Core/Code/Rendering/mitkSurfaceVtkMapper3D.cpp

View Options

Core/Code/Rendering/mitkTextOverlay2D.cpp

View Options

Core/Code/Rendering/mitkVolumeDataVtkMapper3D.cpp

View Options

Core/Code/Rendering/mitkVtkEventProvider.cpp

View Options

Core/Code/Rendering/mitkVtkEventProvider.h

View Options

Core/Code/Rendering/mitkVtkPropRenderer.h

View Options

Core/Code/Rendering/vtkMitkLevelWindowFilter.cpp

View Options

Core/Code/Rendering/vtkMitkLevelWindowFilter.h

View Options

Core/Code/Rendering/vtkMitkThickSlicesFilter.cpp

View Options

Core/Code/Rendering/vtkMitkThickSlicesFilter.h

View Options

Core/Code/Testing/mitkGeometryDataToSurfaceFilterTest.cpp

View Options

Core/Code/Testing/mitkImageTest.cpp

View Options

Core/Code/Testing/mitkMaterialTest.cpp

View Options

Core/Code/Testing/mitkSurfaceTest.cpp

View Options

Core/Code/Testing/mitkTransferFunctionTest.cpp

View Options

Core/Code/Testing/vtkMitkThickSlicesFilterTest.cpp

View Options

Examples/Tutorial/Step7.cpp

View Options

Examples/Tutorial/mitkWithITKAndVTK.cpp

View Options

Modules/ContourModel/Rendering/mitkContourModelMapper2D.cpp

View Options

Modules/ContourModel/Rendering/mitkContourModelMapper3D.cpp

View Options

Modules/ContourModel/Rendering/mitkContourModelSetMapper3D.cpp

View Options

Modules/DiffusionImaging/Connectomics/Rendering/mitkConnectomicsNetworkMapper3D.cpp

View Options

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

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkOdfVtkMapper2D.h

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkOdfVtkMapper2D.txx

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkPlanarFigureMapper3D.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkVectorImageVtkGlyphMapper3D.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkMaskedProgrammableGlyphFilter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkMaskedProgrammableGlyphFilter.h

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkOdfSource.cxx

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkOdfSource.h

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkThickPlane.cxx

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkThickPlane.h

View Options

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

View Options

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

View Options

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

View Options

Modules/DiffusionImaging/FiberTracking/Interactions/mitkFiberBundleInteractor.h

View Options

Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleXMapper2D.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleXMapper3D.cpp

View Options

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.cpp

View Options

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.h

View Options

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

View Options

Modules/MitkExt/Algorithms/mitkHeightFieldSurfaceClipImageFilter.cpp

View Options

Modules/MitkExt/Algorithms/mitkLabeledImageToSurfaceFilter.cpp

View Options

Modules/MitkExt/Algorithms/mitkMeshUtil.h

View Options

Modules/MitkExt/Algorithms/mitkPointLocator.cpp

View Options

Modules/MitkExt/Algorithms/mitkPointLocator.h

View Options

Modules/MitkExt/Algorithms/mitkPolygonToRingFilter.cpp

View Options

Modules/MitkExt/Algorithms/mitkProbeFilter.cpp

View Options

Modules/MitkExt/DataManagement/mitkLabeledImageLookupTable.cpp

View Options

Modules/MitkExt/DataManagement/mitkLabeledImageLookupTable.h

View Options

Modules/MitkExt/DataManagement/mitkUSLookupTableSource.cpp

View Options

Modules/MitkExt/DataManagement/mitkUnstructuredGrid.cpp

View Options

Modules/MitkExt/IO/mitkUnstructuredGridVtkWriter.txx

View Options

Modules/MitkExt/Interactions/mitkAffineInteractor3D.cpp

View Options

Modules/MitkExt/Interactions/mitkAffineInteractor3D.h

View Options

Modules/MitkExt/Interactions/mitkSurfaceDeformationInteractor3D.cpp

View Options

Modules/MitkExt/Interactions/mitkSurfaceDeformationInteractor3D.h

View Options

Modules/MitkExt/Rendering/mitkEnhancedPointSetVtkMapper3D.cpp

View Options

Modules/MitkExt/Rendering/mitkGPUVolumeMapper3D.cpp

View Options

Modules/MitkExt/Rendering/mitkGPUVolumeMapper3D.h

View Options

Modules/MitkExt/Rendering/mitkImageBackground2D.cpp

View Options

Modules/MitkExt/Rendering/mitkMeshVtkMapper3D.cpp

View Options

Modules/MitkExt/Rendering/mitkSplineMapper2D.cpp

View Options

Modules/MitkExt/Rendering/mitkSplineMapper2D.h

View Options

Modules/MitkExt/Rendering/mitkSplineVtkMapper3D.cpp

View Options

Modules/MitkExt/Rendering/mitkUnstructuredGridMapper2D.cpp

View Options

Modules/MitkExt/Rendering/mitkUnstructuredGridVtkMapper3D.cpp

View Options

Modules/MitkExt/Rendering/mitkVectorImageMapper2D.cpp

View Options

Modules/MitkExt/Rendering/mitkVectorImageMapper2D.h

View Options

Modules/MitkExt/Rendering/vtkMaskedGlyph2D.cpp

View Options

Modules/MitkExt/Rendering/vtkMaskedGlyph2D.h

View Options

Modules/MitkExt/Rendering/vtkMaskedGlyph3D.cpp

View Options

Modules/MitkExt/Rendering/vtkMaskedGlyph3D.h

View Options

Modules/MitkExt/Rendering/vtkMitkGPUVolumeRayCastMapper.cpp

View Options

Modules/MitkExt/Rendering/vtkMitkGPUVolumeRayCastMapper.h

View Options

Modules/MitkExt/Rendering/vtkMitkOpenGLGPUVolumeRayCastMapper.cpp

View Options

Modules/MitkExt/Rendering/vtkMitkOpenGLGPUVolumeRayCastMapper.h

View Options

Modules/MitkExt/Rendering/vtkMitkOpenGLVolumeTextureMapper3D.cpp

View Options

Modules/MitkExt/Rendering/vtkMitkOpenGLVolumeTextureMapper3D.h

View Options

Modules/MitkExt/Rendering/vtkMitkVolumeTextureMapper3D.cpp

View Options

Modules/MitkExt/Rendering/vtkMitkVolumeTextureMapper3D.h

View Options

Modules/MitkExt/Rendering/vtkUnstructuredGridMapper.cpp

View Options

Modules/MitkExt/Rendering/vtkUnstructuredGridMapper.h

View Options

Modules/MitkExt/Testing/mitkPointLocatorTest.cpp

View Options

Modules/Overlays/CMakeLists.txt

View Options

Modules/PlanarFigure/Rendering/mitkPlanarFigureVtkMapper3D.cpp

View Options

Modules/QmitkExt/QmitkAboutDialog/QmitkAboutDialog.cpp

View Options

Modules/QmitkExt/QmitkColorTransferFunctionCanvas.cpp

View Options

Modules/QmitkExt/QmitkColorTransferFunctionCanvas.h

View Options

Modules/QmitkExt/QmitkPiecewiseFunctionCanvas.cpp

View Options

Modules/QmitkExt/QmitkPiecewiseFunctionCanvas.h

View Options

Modules/QmitkExt/QmitkTransferFunctionCanvas.cpp

View Options

Modules/QmitkExt/QmitkTransferFunctionCanvas.h

View Options

Modules/QmitkExt/QmitkTransferFunctionGeneratorWidget.cpp

View Options

Modules/QmitkExt/QmitkVideoBackground.cpp

View Options

Modules/QmitkExt/files.cmake

View Options

Modules/Segmentation/Algorithms/mitkManualSegmentationToSurfaceFilter.cpp

View Options

Modules/Segmentation/Algorithms/mitkShowSegmentationAsSmoothedSurface.cpp

View Options

Modules/Segmentation/Algorithms/mitkShowSegmentationAsSurface.cpp

View Options

Modules/Segmentation/Algorithms/mitkVtkImageOverwrite.cpp

View Options

Modules/Segmentation/DataManagement/mitkExtrudedContour.cpp

View Options

Modules/Segmentation/DataManagement/mitkExtrudedContour.h

View Options

Modules/Segmentation/Interactions/mitkContourInteractor.cpp

View Options

Modules/Segmentation/Rendering/mitkContourSetVtkMapper3D.cpp

View Options

Modules/Segmentation/Rendering/mitkContourVtkMapper3D.cpp

View Options

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp

View Options

Modules/ToFProcessing/mitkToFSurfaceVtkMapper3D.cpp

View Options

Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp

Merge branch 'bug-15849-VTK6Migration' into bug-15849…b257fb5326aaActions

Description

Details

Event Timeline

Merged Changes

Changes (145)

rMITKb257fb5326aa

CMake/PackageDepends/MITK_QVTK_Config.cmake

CMake/PackageDepends/MITK_VTK_Config.cmake

CMake/mitkSetupVariables.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

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

Modules/DiffusionImaging/FiberTracking/Interactions/mitkFiberBundleInteractor.h

Merge branch 'bug-15849-VTK6Migration' into bug-15849…
b257fb5326aa
Actions