Diffusion MITK d0fa201812c1

Merge branch 'bug-14776-Integration-to-ITK4-PointSetMapper'
d0fa201812c1
Actions

Description

Merge branch 'bug-14776-Integration-to-ITK4-PointSetMapper'

Conflicts:
CMakeExternals/MITKData.cmake
Core/Code/Testing/CMakeLists.txt

Details

Provenance

• engelhsa

Authored on Jun 3 2013, 1:28 PM

Parents

rMITK4de5ac65c886: change docu after renaming new parameters
rMITK106c73865326: Merge branch 'bug-15241-Wrong-eps-in-Equal'

Branches

Unknown

Tags

Unknown

Event Timeline

• engelhsa committed rMITKd0fa201812c1: Merge branch 'bug-14776-Integration-to-ITK4-PointSetMapper' (authored by • engelhsa).Jun 3 2013, 1:28 PM

Merged Changes

4de5ac65c886 change docu after renaming new parameters
Author
• engelhsa
Browse Repository
No Builds
No Audits
0ce771cf8e4a adding PointSetGLMapper2D
Author
• engelhsa
Browse Repository
No Builds
No Audits
a1a1778ce3ed working property show distant lines
Author
• engelhsa
Browse Repository
No Builds
No Audits
e1c62f3c3c0a change name of properties and set classes deprecated
Author
• engelhsa
Browse Repository
No Builds
No Audits
01d2e579b68d more documentation
Author
• engelhsa
Browse Repository
No Builds
No Audits
e8aa1a65a5a1 How to write own mapper documentation
Author
• engelhsa
Browse Repository
No Builds
No Audits
c101f44aac27 PointSetRenderingTests
Author
• engelhsa
Browse Repository
No Builds
No Audits
7d072c4751cc update necessary condition
Author
• engelhsa
Browse Repository
No Builds
No Audits
7c2ccdabe900 Merge branch 'bug-14776-RedesignPointSetGLMapper2D' into bug-14776-Integration…
Author
• engelhsa
Browse Repository
No Builds
No Audits
1b8d7a9d186b fixed Contour Rendering
Author
• engelhsa
Browse Repository
No Builds
No Audits
bffc2c90d1c8 Code with documentation and working angle rendering
Author
• engelhsa
Browse Repository
No Builds
No Audits
22270a9d1972 Working rendering overlay of angles between contour lines
Author
• engelhsa
Browse Repository
No Builds
No Audits
b98a7c318005 Inserting Text and Contours
Author
• engelhsa
Browse Repository
No Builds
No Audits
d3cf4d259c08 Before working Text and Label
Author
• engelhsa
Browse Repository
No Builds
No Audits
2bbcc94462c8 Changed includes in PropRenderer
Author
• engelhsa
Browse Repository
No Builds
No Audits
04f7259b85f6 Adjusted Factory and DataNode Files (replaced old mapper by new mapper)
Author
• engelhsa
Browse Repository
No Builds
No Audits
779e9a5bbbba Added new files to files.cmake
Author
• engelhsa
Browse Repository
No Builds
No Audits
24f373a39230 remove old GL Point Set Mapper 2D
Author
• engelhsa
Browse Repository
No Builds
No Audits
cb19bc453c3c New PointSetMapper (only missing text functionality)
Author
• engelhsa
Browse Repository
No Builds
No Audits

Changes (21)

Path

Size

Packages

CMakeExternals/

MITKData.cmake

O1: MITK Reviewer Group I

Core/

Code/

Common/

mitkCoreObjectFactory.cpp

Rendering/

mitkGLMapper2D.h

mitkPointSetGLMapper2D.cpp

mitkPointSetGLMapper2D.h

mitkPointSetVtkMapper2D.cpp

mitkPointSetVtkMapper2D.h

mitkVtkMapper2D.h

mitkVtkMapper3D.h

mitkVtkPropRenderer.cpp

Testing/

CMakeLists.txt

files.cmake

mitkDataNodeTest.cpp

	mitkPointSetVtkMapper2DGlyphTypeTest.cpp
	mitkImageVtkMapper2DColorTest.cpp

	mitkPointSetVtkMapper2DImageTest.cpp
	mitkImageVtkMapper2DTest.cpp

	mitkPointSetVtkMapper2DTest.cpp
	mitkImageVtkMapper2DTest.cpp

files.cmake

Documentation/

Doxygen/

Concepts/

QVTKRendering.dox

Modules/

MitkExt/

Rendering/

mitkLineMapper2D.h

mitkSplineMapper2D.cpp

mitkSplineMapper2D.h

rMITKd0fa201812c1

View Options

CMakeExternals/MITKData.cmake

View Options

Core/Code/Common/mitkCoreObjectFactory.cpp

View Options

Core/Code/Rendering/mitkGLMapper2D.h

View Options

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

View Options

Core/Code/Rendering/mitkPointSetGLMapper2D.h

View Options

Core/Code/Rendering/mitkPointSetVtkMapper2D.cpp

View Options

Core/Code/Rendering/mitkPointSetVtkMapper2D.h

View Options

Core/Code/Rendering/mitkVtkMapper2D.h

View Options

Core/Code/Rendering/mitkVtkMapper3D.h

View Options

Core/Code/Rendering/mitkVtkPropRenderer.cpp

View Options

Core/Code/Testing/CMakeLists.txt

View Options

Core/Code/Testing/files.cmake

View Options

Core/Code/Testing/mitkDataNodeTest.cpp

View Options

Core/Code/Testing/mitkPointSetVtkMapper2DGlyphTypeTest.cpp

View Options

Core/Code/Testing/mitkPointSetVtkMapper2DImageTest.cpp

View Options

Core/Code/Testing/mitkPointSetVtkMapper2DTest.cpp

View Options

Core/Code/files.cmake

View Options

Core/Documentation/Doxygen/Concepts/QVTKRendering.dox

View Options

Modules/MitkExt/Rendering/mitkLineMapper2D.h

View Options

Modules/MitkExt/Rendering/mitkSplineMapper2D.cpp

View Options

Modules/MitkExt/Rendering/mitkSplineMapper2D.h

Merge branch 'bug-14776-Integration-to-ITK4-PointSetMapper'd0fa201812c1Actions

Description

Details

Event Timeline

Merged Changes

Changes (21)

rMITKd0fa201812c1

CMakeExternals/MITKData.cmake

Core/Code/Common/mitkCoreObjectFactory.cpp

Core/Code/Rendering/mitkGLMapper2D.h

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

Core/Code/Rendering/mitkPointSetGLMapper2D.h

Core/Code/Rendering/mitkPointSetVtkMapper2D.cpp

Core/Code/Rendering/mitkPointSetVtkMapper2D.h

Core/Code/Rendering/mitkVtkMapper2D.h

Core/Code/Rendering/mitkVtkMapper3D.h

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Core/Code/Testing/CMakeLists.txt

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkDataNodeTest.cpp

Core/Code/Testing/mitkPointSetVtkMapper2DGlyphTypeTest.cpp

Core/Code/Testing/mitkPointSetVtkMapper2DImageTest.cpp

Core/Code/Testing/mitkPointSetVtkMapper2DTest.cpp

Core/Code/files.cmake

Core/Documentation/Doxygen/Concepts/QVTKRendering.dox

Modules/MitkExt/Rendering/mitkLineMapper2D.h

Modules/MitkExt/Rendering/mitkSplineMapper2D.cpp

Modules/MitkExt/Rendering/mitkSplineMapper2D.h

Merge branch 'bug-14776-Integration-to-ITK4-PointSetMapper'
d0fa201812c1
Actions