Diffusion MITK 7c2ccdabe900

Merge branch 'bug-14776-RedesignPointSetGLMapper2D' into bug-14776…
7c2ccdabe900
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

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

Conflicts:
Core/Code/Rendering/mitkPointSetGLMapper2D.cpp
Modules/MitkExt/Rendering/mitkSplineMapper2D.cpp

Details

Provenance

Authored on May 23 2013, 6:34 PM

Parents

rMITK1b8d7a9d186b: fixed Contour Rendering
rMITK6e61cc0994ea: Merge branch 'bug-15127-ImageCropperProducesSomeGreySlices'

Branches

Unknown

Tags

Unknown

Event Timeline

• engelhsa committed rMITK7c2ccdabe900: Merge branch 'bug-14776-RedesignPointSetGLMapper2D' into bug-14776… (authored by • engelhsa).May 23 2013, 6:34 PM

Merged Changes

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 (13)

Path

Size

Core/

Code/

Common/

mitkCoreObjectFactory.cpp

Rendering/

mitkPointSetGLMapper2D.cpp

mitkPointSetGLMapper2D.h

mitkPointSetVtkMapper2D.cpp

mitkPointSetVtkMapper2D.h

mitkVtkPropRenderer.cpp

Testing/

mitkDataNodeTest.cpp

Modules/

MitkExt/

Rendering/

mitkLineMapper2D.cpp

mitkLineMapper2D.h

mitkSplineMapper2D.cpp

mitkSplineMapper2D.h

Testing/

mitkDataNodeExtTest.cpp

rMITK7c2ccdabe900

Core/Code/Common/mitkCoreObjectFactory.cpp

Loading...

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

Loading...

Core/Code/Rendering/mitkPointSetGLMapper2D.h

Loading...

Core/Code/Rendering/mitkPointSetVtkMapper2D.cpp

Loading...

Core/Code/Rendering/mitkPointSetVtkMapper2D.h

Loading...

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Loading...

Core/Code/Testing/mitkDataNodeTest.cpp

Loading...

Core/Code/files.cmake

Loading...

Modules/MitkExt/Rendering/mitkLineMapper2D.cpp

Loading...

Modules/MitkExt/Rendering/mitkLineMapper2D.h

Loading...

Modules/MitkExt/Rendering/mitkSplineMapper2D.cpp

Loading...

Modules/MitkExt/Rendering/mitkSplineMapper2D.h

Loading...

Modules/MitkExt/Testing/mitkDataNodeExtTest.cpp

Loading...