Diffusion MITK 65a9972d57c9

Merge branch 'bug-8150-VtkMapper2D3DarchitectureRefactoring'
65a9972d57c9
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-8150-VtkMapper2D3DarchitectureRefactoring'

Conflicts:
Core/Code/Rendering/mitkImageVtkMapper2D.cpp
Core/Code/Rendering/mitkImageVtkMapper2D.h
Core/Code/Rendering/mitkSurfaceVtkMapper3D.cpp
Core/Code/Rendering/mitkVtkPropRenderer.cpp
Modules/DiffusionImaging/Connectomics/Rendering/mitkConnectomicsNetworkMapper3D.h
Modules/DiffusionImaging/DiffusionCore/Rendering/mitkCompositeMapper.h
Modules/DiffusionImaging/DiffusionCore/Rendering/mitkVectorImageVtkGlyphMapper3D.h
Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleXMapper3D.h
Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleXThreadMonitorMapper3D.h
Modules/DiffusionImaging/Rendering/mitkConnectomicsNetworkMapper3D.cpp
Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.h
Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.txx

Details

Provenance

Authored on Feb 27 2013, 3:23 PM

Parents

rMITK3f1958188322: Replace function name ApplyColorAndOpacityProperties by ApplyAllProperties
rMITK04e09a1738eb: Merge branch 'bug-14590-RemoveT1'

Branches

Unknown

Tags

Unknown

Event Timeline

• engelhsa committed rMITK65a9972d57c9: Merge branch 'bug-8150-VtkMapper2D3DarchitectureRefactoring' (authored by • engelhsa).Feb 27 2013, 3:23 PM

Merged Changes

3f1958188322 Replace function name ApplyColorAndOpacityProperties by ApplyAllProperties
Author
• engelhsa
Browse Repository
No Builds
No Audits
74b1d3c5e9c4 Adding documentation concerning the GLMapper coordinate system
Author
• engelhsa
Browse Repository
No Builds
No Audits
c8711d6da939 Adding comments and private copy constructor and assignment operator
Author
• engelhsa
Browse Repository
No Builds
No Audits
4ced6f2fb65d Replace ApplyProperties() by ApplyColorAndOpacityProperties()
Author
• engelhsa
Browse Repository
No Builds
No Audits
d4e7b7d2ba07 Deleted unneccessary comments
Author
• engelhsa
Browse Repository
No Builds
No Audits
d8f9fcafa419 Use Deprecated Macro for typedefs
Author
• engelhsa
Browse Repository
No Builds
No Audits
6e312e44beef Set methods in Mapper.h as deprecated since they are only convenience methods
Author
• engelhsa
Browse Repository
No Builds
No Audits
1ccf807b6f34 Deleting uncommented function
Author
• engelhsa
Browse Repository
No Builds
No Audits
53724b21d08b Update include information
Author
• engelhsa
Browse Repository
No Builds
No Audits
b52b0ac3ab69 uncommented unused variables
Author
neher
Browse Repository
No Builds
No Audits
f962b8a54953 Adding new files and removing deleting files to files.cmake
Author
• engelhsa
Browse Repository
No Builds
No Audits
00f00508bc1b Paste GenerateData() into GenerateDataForRenderer()
Author
• engelhsa
Browse Repository
No Builds
No Audits
dde0a525c7a2 Paste GenerateData() into GenerateDataForRenderer()
Author
• engelhsa
Browse Repository
No Builds
No Audits
533dc3a7ad6b Paste GenerateData() into GenerateDataForRenderer()
Author
• engelhsa
Browse Repository
No Builds
No Audits
9cc3349c9422 Paste GenerateData() into GenerateDataForRenderer()
Author
• engelhsa
Browse Repository
No Builds
No Audits
8c885288a2d0 Paste GenerateData() into GenerateDataForRenderer()
Author
• engelhsa
Browse Repository
No Builds
No Audits
c2ccfb0ca2a3 Insert GenerateData() into GenerateDataForRenderer()
Author
• engelhsa
Browse Repository
No Builds
No Audits
36a1e2dd3f21 Include GenerateData() into GenerateDataForRenderer()
Author
• engelhsa
Browse Repository
No Builds
No Audits
56ce9725c8bc Merge GenerateData() with GenerateDataForRenderer()
Author
• engelhsa
Browse Repository
No Builds
No Audits
cd29bcb79afc Merge GenerateData() with GenerateDataForRenderer()
Author
• engelhsa
Browse Repository
No Builds
No Audits
4bafe8da990b Merge GenerateData() with GenerateDataForRenderer()
Author
• engelhsa
Browse Repository
No Builds
No Audits
f4c7e9b751bc Replace GenerateData() by GenerateDataForRenderer()
Author
• engelhsa
Browse Repository
No Builds
No Audits
1145803dbd45 Port existing VTK mappers to one base class
Author
• engelhsa
Browse Repository
No Builds
No Audits
a6d9b80e0efa Porting all GLMapper2D to new base class GLMapper
Author
• engelhsa
Browse Repository
No Builds
No Audits
00de40f45a7b Adding comments in order to obtain a more detailed documentation
Author
• engelhsa
Browse Repository
No Builds
No Audits
5f857eaaf357 Deleted old cpp base class files
Author
• engelhsa
Browse Repository
No Builds
No Audits
20a942eac088 Unify comment style in Mapper.h and add comments
Author
• engelhsa
Browse Repository
No Builds
No Audits
71d925de6530 introduce typedefs to map old classes to new classes
Author
• engelhsa
Browse Repository
No Builds
No Audits
ef677555cf83 Adding base class for all GLMappers
Author
• engelhsa
Browse Repository
No Builds
No Audits
33f5b6c9f4a5 Adding new base class for all VTK Mapper
Author
• engelhsa
Browse Repository
No Builds
No Audits

Changes (84)

Path

Size

Packages

Core/

Code/

Rendering/

	mitkGLMapper.cpp
	mitkGLMapper2D.cpp

mitkGLMapper2D.cpp

mitkGeometry2DDataMapper2D.cpp

mitkGeometry2DDataMapper2D.h

mitkGeometry2DDataVtkMapper3D.cpp

mitkGeometry2DDataVtkMapper3D.h

mitkImageVtkMapper2D.cpp

mitkImageVtkMapper2D.h

mitkMapper2D.cpp

mitkMapper3D.cpp

mitkPointSetGLMapper2D.cpp

mitkPointSetGLMapper2D.h

mitkPointSetVtkMapper3D.cpp

mitkPointSetVtkMapper3D.h

mitkPolyDataGLMapper2D.cpp

mitkPolyDataGLMapper2D.h

mitkSurfaceGLMapper2D.cpp

mitkSurfaceGLMapper2D.h

mitkSurfaceVtkMapper3D.cpp

mitkSurfaceVtkMapper3D.h

mitkVolumeDataVtkMapper3D.cpp

mitkVolumeDataVtkMapper3D.h

mitkVtkMapper.cpp

mitkVtkMapper.h

mitkVtkMapper2D.cpp

mitkVtkMapper3D.cpp

mitkVtkPropRenderer.cpp

vtkMitkRenderProp.cpp

vtkMitkRenderProp.h

	Rendering/
	IO/

	mitkVtkMapper3D.h
	mitkCoreDataNodeReader.h

	Core/	Code/	Rendering/
		Modules/	SceneSerialization/

	mitkGLMapper2D.h
	mitkSceneDataNodeReader.h

	Core/	Code/	Rendering/
	Modules/	MitkExt/	DataManagement/

	mitkVtkMapper2D.h
	vtkObjectObserver.h

Modules/

DiffusionImaging/

Connectomics/

Rendering/

mitkConnectomicsNetworkMapper3D.cpp

mitkConnectomicsNetworkMapper3D.h

DiffusionCore/

Rendering/

mitkCompositeMapper.h

mitkPlanarFigureMapper3D.cpp

mitkPlanarFigureMapper3D.h

mitkVectorImageVtkGlyphMapper3D.cpp

mitkVectorImageVtkGlyphMapper3D.h

FiberTracking/

Rendering/

mitkFiberBundleXMapper2D.cpp

mitkFiberBundleXMapper2D.h

mitkFiberBundleXMapper3D.cpp

mitkFiberBundleXMapper3D.h

mitkFiberBundleXThreadMonitorMapper3D.cpp

mitkFiberBundleXThreadMonitorMapper3D.h

MitkExt/

Rendering/

mitkEnhancedPointSetVtkMapper3D.cpp

mitkEnhancedPointSetVtkMapper3D.h

mitkGPUVolumeMapper3D.cpp

mitkGPUVolumeMapper3D.h

mitkLineMapper2D.cpp

mitkMeshMapper2D.cpp

mitkMeshMapper2D.h

mitkMeshVtkMapper3D.cpp

mitkMeshVtkMapper3D.h

mitkSplineMapper2D.cpp

mitkSplineMapper2D.h

mitkSplineVtkMapper3D.cpp

mitkSplineVtkMapper3D.h

mitkUnstructuredGridMapper2D.cpp

mitkUnstructuredGridMapper2D.h

mitkUnstructuredGridVtkMapper3D.cpp

mitkUnstructuredGridVtkMapper3D.h

mitkVectorImageMapper2D.cpp

mitkVectorImageMapper2D.h

Testing/

mitkDataNodeExtTest.cpp

PlanarFigure/

Rendering/

mitkPlanarFigureMapper2D.cpp

O1: MITK Reviewer Group I

mitkPlanarFigureMapper2D.h

O1: MITK Reviewer Group I

Segmentation/

Rendering/

mitkContourMapper2D.cpp

O1: MITK Reviewer Group I

mitkContourMapper2D.h

O1: MITK Reviewer Group I

mitkContourSetMapper2D.cpp

O1: MITK Reviewer Group I

mitkContourSetMapper2D.h

O1: MITK Reviewer Group I

mitkContourSetVtkMapper3D.cpp

O1: MITK Reviewer Group I

mitkContourSetVtkMapper3D.h

O1: MITK Reviewer Group I

mitkContourVtkMapper3D.cpp

O1: MITK Reviewer Group I

mitkContourVtkMapper3D.h

O1: MITK Reviewer Group I

Testing/

mitkDataNodeSegmentationTest.cpp

O1: MITK Reviewer Group I

ToFProcessing/

mitkToFSurfaceVtkMapper3D.cpp

mitkToFSurfaceVtkMapper3D.h

rMITK65a9972d57c9

Core/Code/Rendering/mitkGLMapper.cpp

Loading...

Core/Code/Rendering/mitkGLMapper.h

Loading...

Core/Code/Rendering/mitkGLMapper2D.cpp

Loading...

Core/Code/Rendering/mitkGLMapper2D.h

Loading...

Core/Code/Rendering/mitkGeometry2DDataMapper2D.cpp

Loading...

Core/Code/Rendering/mitkGeometry2DDataMapper2D.h

Loading...

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.cpp

Loading...

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.h

Loading...

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Loading...

Core/Code/Rendering/mitkImageVtkMapper2D.h

Loading...

Core/Code/Rendering/mitkMapper.cpp

Loading...

Core/Code/Rendering/mitkMapper.h

Loading...

Core/Code/Rendering/mitkMapper2D.cpp

Loading...

Core/Code/Rendering/mitkMapper2D.h

Loading...

Core/Code/Rendering/mitkMapper3D.cpp

Loading...

Core/Code/Rendering/mitkMapper3D.h

Loading...

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

Loading...

Core/Code/Rendering/mitkPointSetGLMapper2D.h

Loading...

Core/Code/Rendering/mitkPointSetVtkMapper3D.cpp

Loading...

Core/Code/Rendering/mitkPointSetVtkMapper3D.h

Loading...

Core/Code/Rendering/mitkPolyDataGLMapper2D.cpp

Loading...

Core/Code/Rendering/mitkPolyDataGLMapper2D.h

Loading...

Core/Code/Rendering/mitkSurfaceGLMapper2D.cpp

Loading...

Core/Code/Rendering/mitkSurfaceGLMapper2D.h

Loading...

Core/Code/Rendering/mitkSurfaceVtkMapper3D.cpp

Loading...

Core/Code/Rendering/mitkSurfaceVtkMapper3D.h

Loading...

Core/Code/Rendering/mitkVolumeDataVtkMapper3D.cpp

Loading...

Core/Code/Rendering/mitkVolumeDataVtkMapper3D.h

Loading...

Core/Code/Rendering/mitkVtkMapper.cpp

Loading...

Core/Code/Rendering/mitkVtkMapper.h

Loading...

Core/Code/Rendering/mitkVtkMapper2D.cpp

Loading...

Core/Code/Rendering/mitkVtkMapper2D.h

Loading...

Core/Code/Rendering/mitkVtkMapper3D.cpp

Loading...

Core/Code/Rendering/mitkVtkMapper3D.h

Loading...

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Loading...

Core/Code/Rendering/vtkMitkRenderProp.cpp

Loading...

Core/Code/Rendering/vtkMitkRenderProp.h

Loading...

Core/Code/files.cmake

Loading...

Modules/DiffusionImaging/Connectomics/Rendering/mitkConnectomicsNetworkMapper3D.cpp

Loading...

Modules/DiffusionImaging/Connectomics/Rendering/mitkConnectomicsNetworkMapper3D.h

Loading...

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkCompositeMapper.h

Loading...

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkPlanarFigureMapper3D.cpp

Loading...

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkPlanarFigureMapper3D.h

Loading...

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkVectorImageVtkGlyphMapper3D.cpp

Loading...

Modules/DiffusionImaging/DiffusionCore/Rendering/mitkVectorImageVtkGlyphMapper3D.h

Loading...

Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleXMapper2D.cpp

Loading...

Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleXMapper2D.h

Loading...

Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleXMapper3D.cpp

Loading...

Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleXMapper3D.h

Loading...

Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleXThreadMonitorMapper3D.cpp

Loading...

Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleXThreadMonitorMapper3D.h

Loading...

Modules/MitkExt/Rendering/mitkEnhancedPointSetVtkMapper3D.cpp

Loading...

Modules/MitkExt/Rendering/mitkEnhancedPointSetVtkMapper3D.h

Loading...

Modules/MitkExt/Rendering/mitkGPUVolumeMapper3D.cpp

Loading...

Modules/MitkExt/Rendering/mitkGPUVolumeMapper3D.h

Loading...

Modules/MitkExt/Rendering/mitkLineMapper2D.cpp

Loading...

Modules/MitkExt/Rendering/mitkMeshMapper2D.cpp

Loading...

Modules/MitkExt/Rendering/mitkMeshMapper2D.h

Loading...

Modules/MitkExt/Rendering/mitkMeshVtkMapper3D.cpp

Loading...

Modules/MitkExt/Rendering/mitkMeshVtkMapper3D.h

Loading...

Modules/MitkExt/Rendering/mitkSplineMapper2D.cpp

Loading...

Modules/MitkExt/Rendering/mitkSplineMapper2D.h

Loading...

Modules/MitkExt/Rendering/mitkSplineVtkMapper3D.cpp

Loading...

Modules/MitkExt/Rendering/mitkSplineVtkMapper3D.h

Loading...

Modules/MitkExt/Rendering/mitkUnstructuredGridMapper2D.cpp

Loading...

Modules/MitkExt/Rendering/mitkUnstructuredGridMapper2D.h

Loading...

Modules/MitkExt/Rendering/mitkUnstructuredGridVtkMapper3D.cpp

Loading...

Modules/MitkExt/Rendering/mitkUnstructuredGridVtkMapper3D.h

Loading...

Modules/MitkExt/Rendering/mitkVectorImageMapper2D.cpp

Loading...

Modules/MitkExt/Rendering/mitkVectorImageMapper2D.h

Loading...

Modules/MitkExt/Testing/mitkDataNodeExtTest.cpp

Loading...

Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.cpp

Loading...

Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.h

Loading...

Modules/Segmentation/Rendering/mitkContourMapper2D.cpp

Loading...

Modules/Segmentation/Rendering/mitkContourMapper2D.h

Loading...

Modules/Segmentation/Rendering/mitkContourSetMapper2D.cpp

Loading...

Modules/Segmentation/Rendering/mitkContourSetMapper2D.h

Loading...

Modules/Segmentation/Rendering/mitkContourSetVtkMapper3D.cpp

Loading...

Modules/Segmentation/Rendering/mitkContourSetVtkMapper3D.h

Loading...

Modules/Segmentation/Rendering/mitkContourVtkMapper3D.cpp

Loading...

Modules/Segmentation/Rendering/mitkContourVtkMapper3D.h

Loading...

Modules/Segmentation/Testing/mitkDataNodeSegmentationTest.cpp

Loading...

Modules/ToFProcessing/mitkToFSurfaceVtkMapper3D.cpp

Loading...

Modules/ToFProcessing/mitkToFSurfaceVtkMapper3D.h

Loading...