Merge branch 'bug-18006-removing-contour-for-3D-interpolation'
060d96c7fff3
Actions

Description

Merge branch 'bug-18006-removing-contour-for-3D-interpolation'

Conflicts:
Modules/Segmentation/Interactions/mitkSegTool2D.cpp
Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp
Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.h

Details

Provenance

• fetzer

Authored on Oct 12 2014, 7:26 PM

Parents

rMITK487a35666c6c: Merge branch 'bug-16775-live-wire-with-3d-interpolation' into removing…
rMITK0ee3c00f9c14: Merge branch 'bug-18103-Integration2'

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITK060d96c7fff3: Merge branch 'bug-18006-removing-contour-for-3D-interpolation' (authored by • fetzer).Oct 12 2014, 7:26 PM

Merged Changes

487a35666c6c Merge branch 'bug-16775-live-wire-with-3d-interpolation' into removing-contour…
Author
• fetzer
Browse Repository
No Builds
No Audits
42f38aad90c2 Fixed documentation
Author
• fetzer
Browse Repository
No Builds
No Audits
592dcedd6af8 Cleanup
Author
• fetzer
Browse Repository
No Builds
No Audits
5279c2569a00 Added method for removing contours and adapted test. Removed the…
Author
• fetzer
Browse Repository
No Builds
No Audits
65658f0501c8 SurfaceInterpolationController now uses PlaneGeometries instead of…
Author
• fetzer
Browse Repository
No Builds
No Audits

Changes (8)

Path

Size

Packages

Modules/

Segmentation/

Interactions/

mitkSegTool2D.cpp

O1: MITK Reviewer Group I

mitkSegTool2D.h

O1: MITK Reviewer Group I

SegmentationUI/

Qmitk/

QmitkSlicesInterpolator.cpp

O1: MITK Reviewer Group I

SurfaceInterpolation/

Testing/

mitkSurfaceInterpolationControllerTest.cpp

mitkComputeContourSetNormalsFilter.h

mitkCreateDistanceImageFromSurfaceFilter.cpp

mitkSurfaceInterpolationController.cpp

mitkSurfaceInterpolationController.h

rMITK060d96c7fff3

View Options

Modules/Segmentation/Interactions/mitkSegTool2D.cpp

View Options

Modules/Segmentation/Interactions/mitkSegTool2D.h

View Options

Modules/SegmentationUI/Qmitk/QmitkSlicesInterpolator.cpp

View Options

Modules/SurfaceInterpolation/Testing/mitkSurfaceInterpolationControllerTest.cpp

View Options

Modules/SurfaceInterpolation/mitkComputeContourSetNormalsFilter.h

View Options

Modules/SurfaceInterpolation/mitkCreateDistanceImageFromSurfaceFilter.cpp

View Options

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp

View Options

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.h

Merge branch 'bug-18006-removing-contour-for-3D-interpolation'060d96c7fff3Actions

Description

Details

Event Timeline

Merged Changes

Changes (8)

rMITK060d96c7fff3

Modules/Segmentation/Interactions/mitkSegTool2D.cpp

Modules/Segmentation/Interactions/mitkSegTool2D.h

Modules/SegmentationUI/Qmitk/QmitkSlicesInterpolator.cpp

Modules/SurfaceInterpolation/Testing/mitkSurfaceInterpolationControllerTest.cpp

Modules/SurfaceInterpolation/mitkComputeContourSetNormalsFilter.h

Modules/SurfaceInterpolation/mitkCreateDistanceImageFromSurfaceFilter.cpp

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.h

Merge branch 'bug-18006-removing-contour-for-3D-interpolation'
060d96c7fff3
Actions