Merge remote-tracking branch 'origin/bug-18416-PlaneSuggestion-Integration'…
2a3bb36a0cb8
Actions

Description

Merge remote-tracking branch 'origin/bug-18416-PlaneSuggestion-Integration' into bug-18416-PlaneSuggestFunction-Integration

Conflicts:
CMakeExternals/MITKData.cmake
Modules/AlgorithmsExt/include/mitkUnstructuredGridClusteringFilter.h

Details

Provenance

riecker

Authored on Jun 11 2015, 3:20 PM

Parents

rMITK6abb40cea98d: fixed the progress bar after first use
rMITK8d0e6b6d28dd: Merge branch 'bug-17844-RT-Refactoring-PluginIntegrationQt5-Integration'

Branches

Unknown

Tags

Unknown

Event Timeline

riecker committed rMITK2a3bb36a0cb8: Merge remote-tracking branch 'origin/bug-18416-PlaneSuggestion-Integration'… (authored by riecker).Jun 11 2015, 3:20 PM

Merged Changes

6abb40cea98d fixed the progress bar after first use
Author
riecker
Browse Repository
No Builds
No Audits
ff319f793542 loading the plane on axial view, added a thread for the calculation and a…
Author
riecker
Browse Repository
No Builds
No Audits
f137c709239c integration of the 3 filters into the segmentation view
Author
riecker
Browse Repository
No Builds
No Audits
08083361c087 Merge remote-tracking branch 'origin/bug-18467-ClusteredPlaneSuggestionFilter…
Author
riecker
Browse Repository
No Builds
No Audits
0fcb177901c7 OXMerge remote-tracking branch 'origin/bug-18456-PointCloudScoring-Improvement'…
Author
riecker
Browse Repository
No Builds
No Audits
c8598ebabb1b Merge remote-tracking branch 'origin/bug-18417-FeatureBasedEdgeDetectionFilter'…
Author
riecker
Browse Repository
No Builds
No Audits
f8c629d73d93 finished the filter with review changes
Author
riecker
Browse Repository
No Builds
No Audits
ba5e7a307fc4 finished the filter with review changes
Author
riecker
Browse Repository
No Builds
No Audits
3434b0ea6fb5 changes from code review
Author
riecker
Browse Repository
No Builds
No Audits
a59cbe23c9b5 added some documentation cleaned the code and added more setter methods
Author
riecker
Browse Repository
No Builds
No Audits
72bc8a494842 cleaned code and changed the distance calculation in DBSCAN to optional
Author
riecker
Browse Repository
No Builds
No Audits
dc426ef66251 Merge branch 'bug-18467-ClusteredPlaneSuggestionFilter' into bug-18467…
Author
riecker
Browse Repository
No Builds
No Audits
e66af01017ab changed the revision tag for MITK Data
Author
riecker
Browse Repository
No Builds
No Audits
5b04e1597c0a added some documentation, a mitkFeatureBasedEdgeDetectionFilterTest and a…
Author
riecker
Browse Repository
No Builds
No Audits
616c74c3cc23 used an other mean method
Author
riecker
Browse Repository
No Builds
No Audits
c9890956ab58 created some intermediate outputs, fixed the enum and added the new export…
Author
riecker
Browse Repository
No Builds
No Audits
7437a5f21f24 Merge branch 'bug-18417-ImageToPointCloudFilter' into bug-18417…
Author
riecker
Browse Repository
No Builds
No Audits
ec1f1f16799c added documentation and used the parameters instead of fixed values
Author
riecker
Browse Repository
No Builds
No Audits
653529c89eeb added some error handling
Author
riecker
Browse Repository
No Builds
No Audits
5dc9ea9b3fa9 added a getter for all found clusters
Author
riecker
Browse Repository
No Builds
No Audits
793a3e54353b set up a filter which uses the clusteringFilter and the planefit filter
Author
riecker
Browse Repository
No Builds
No Audits
2ea77188296f export macro changed
Author
riecker
Browse Repository
No Builds
No Audits
2e49aa7ef905 added a new filter based on the segmented pixel values
Author
riecker
Browse Repository
No Builds
No Audits
a255a16d7184 changed the filtertype from imageToSurface to imageToUnstructuredGrid
Author
riecker
Browse Repository
No Builds
No Audits
11d7d86cfe72 Merge branch 'bug-18481-ImageToUnstructuredGridFilter' into bug-18417…
Author
riecker
Browse Repository
No Builds
No Audits
2735d3a1e8d4 correct ordering in files.cmake
Author
riecker
Browse Repository
No Builds
No Audits
331c3ed095ed added lines between the polydata points for correct visualization
Author
riecker
Browse Repository
No Builds
No Audits
c624fd44997e refactored the code and added itkGetter and setter methods
Author
riecker
Browse Repository
No Builds
No Audits
f825303c8add added some getter, refactored the code and changed the point geometry to…
Author
riecker
Browse Repository
No Builds
No Audits
7df382a2dcfd extended the filter for other detection methods
Author
riecker
Browse Repository
No Builds
No Audits
9cab9475153a created an ImageToPointCloudFilter for detecting the edges of an image and…
Author
riecker
Browse Repository
No Builds
No Audits

Changes (25)

Path

Size

Packages

Modules/

AlgorithmsExt/

include/

mitkUnstructuredGridClusteringFilter.h

src/

mitkUnstructuredGridClusteringFilter.cpp

test/

mitkImageToUnstructuredGridFilterTest.cpp

mitkUnstructuredGridClusteringFilterTest.cpp

Segmentation/

Algorithms/

mitkFeatureBasedEdgeDetectionFilter.cpp

O1: MITK Reviewer Group I

mitkFeatureBasedEdgeDetectionFilter.h

O1: MITK Reviewer Group I

Testing/

files.cmake

O1: MITK Reviewer Group I

mitkFeatureBasedEdgeDetectionFilterTest.cpp

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

SegmentationUI/

Qmitk/

QmitkSlicesInterpolator.cpp

O1: MITK Reviewer Group I

QmitkSlicesInterpolator.h

O1: MITK Reviewer Group I

SurfaceInterpolation/

CMakeLists.txt

Testing/

files.cmake

mitkPointCloudScoringFilterTest.cpp

files.cmake

mitkClusteredPlaneSuggestionFilter.cpp

mitkClusteredPlaneSuggestionFilter.h

mitkCreateDistanceImageFromSurfaceFilter.h

mitkImageToPointCloudFilter.cpp

mitkImageToPointCloudFilter.h

mitkPointCloudScoringFilter.cpp

mitkPointCloudScoringFilter.h

mitkSurfaceInterpolationController.cpp

mitkSurfaceInterpolationController.h

	SurfaceInterpolation/	Testing/
	AlgorithmsExt/	test/

	mitkImageToPointCloudFilterTest.cpp
	mitkImageToUnstructuredGridFilterTest.cpp

rMITK2a3bb36a0cb8

View Options

Modules/AlgorithmsExt/include/mitkUnstructuredGridClusteringFilter.h

View Options

Modules/AlgorithmsExt/src/mitkUnstructuredGridClusteringFilter.cpp

View Options

Modules/AlgorithmsExt/test/mitkImageToUnstructuredGridFilterTest.cpp

View Options

Modules/AlgorithmsExt/test/mitkUnstructuredGridClusteringFilterTest.cpp

View Options

Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.cpp

View Options

Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.h

View Options

Modules/Segmentation/Testing/files.cmake

View Options

Modules/Segmentation/Testing/mitkFeatureBasedEdgeDetectionFilterTest.cpp

View Options

Modules/Segmentation/files.cmake

View Options

Modules/SegmentationUI/Qmitk/QmitkSlicesInterpolator.cpp

View Options

Modules/SegmentationUI/Qmitk/QmitkSlicesInterpolator.h

View Options

Modules/SurfaceInterpolation/CMakeLists.txt

View Options

Modules/SurfaceInterpolation/Testing/files.cmake

View Options

Modules/SurfaceInterpolation/Testing/mitkImageToPointCloudFilterTest.cpp

View Options

Modules/SurfaceInterpolation/Testing/mitkPointCloudScoringFilterTest.cpp

View Options

Modules/SurfaceInterpolation/files.cmake

View Options

Modules/SurfaceInterpolation/mitkClusteredPlaneSuggestionFilter.cpp

View Options

Modules/SurfaceInterpolation/mitkClusteredPlaneSuggestionFilter.h

View Options

Modules/SurfaceInterpolation/mitkCreateDistanceImageFromSurfaceFilter.h

View Options

Modules/SurfaceInterpolation/mitkImageToPointCloudFilter.cpp

View Options

Modules/SurfaceInterpolation/mitkImageToPointCloudFilter.h

View Options

Modules/SurfaceInterpolation/mitkPointCloudScoringFilter.cpp

View Options

Modules/SurfaceInterpolation/mitkPointCloudScoringFilter.h

View Options

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp

View Options

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.h

Merge remote-tracking branch 'origin/bug-18416-PlaneSuggestion-Integration'…2a3bb36a0cb8Actions

Description

Details

Event Timeline

Merged Changes

Changes (25)

rMITK2a3bb36a0cb8

Modules/AlgorithmsExt/include/mitkUnstructuredGridClusteringFilter.h

Modules/AlgorithmsExt/src/mitkUnstructuredGridClusteringFilter.cpp

Modules/AlgorithmsExt/test/mitkImageToUnstructuredGridFilterTest.cpp

Modules/AlgorithmsExt/test/mitkUnstructuredGridClusteringFilterTest.cpp

Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.cpp

Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.h

Modules/Segmentation/Testing/files.cmake

Modules/Segmentation/Testing/mitkFeatureBasedEdgeDetectionFilterTest.cpp

Modules/Segmentation/files.cmake

Modules/SegmentationUI/Qmitk/QmitkSlicesInterpolator.cpp

Modules/SegmentationUI/Qmitk/QmitkSlicesInterpolator.h

Modules/SurfaceInterpolation/CMakeLists.txt

Modules/SurfaceInterpolation/Testing/files.cmake

Modules/SurfaceInterpolation/Testing/mitkImageToPointCloudFilterTest.cpp

Modules/SurfaceInterpolation/Testing/mitkPointCloudScoringFilterTest.cpp

Modules/SurfaceInterpolation/files.cmake

Modules/SurfaceInterpolation/mitkClusteredPlaneSuggestionFilter.cpp

Modules/SurfaceInterpolation/mitkClusteredPlaneSuggestionFilter.h

Modules/SurfaceInterpolation/mitkCreateDistanceImageFromSurfaceFilter.h

Modules/SurfaceInterpolation/mitkImageToPointCloudFilter.cpp

Modules/SurfaceInterpolation/mitkImageToPointCloudFilter.h

Modules/SurfaceInterpolation/mitkPointCloudScoringFilter.cpp

Modules/SurfaceInterpolation/mitkPointCloudScoringFilter.h

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.h

Merge remote-tracking branch 'origin/bug-18416-PlaneSuggestion-Integration'…
2a3bb36a0cb8
Actions