Merge branch 'bug-15806-HigherFlexibilityOf2dPreprocessingPipelineInMitkUS'…
32e00e7a7664
Actions

Description

Merge branch 'bug-15806-HigherFlexibilityOf2dPreprocessingPipelineInMitkUS' into bug-15806-HigherFlexibilityOf2dPreprocessingPipelineInMitkUS-IntegrationBranch

Conflicts:
Modules/OpenCVVideoSupport/Testing/files.cmake

Details

Provenance

• wintersa

Authored on Dec 6 2013, 10:07 AM

Parents

rMITK0ab24ff7925e: Tests for cropping boundaries is only done once after setting crop region.
rMITKb296fe436a27: Merge branch 'bug-16508-StatemachineExtension'

Branches

Unknown

Tags

Unknown

Event Timeline

• wintersa committed rMITK32e00e7a7664: Merge branch 'bug-15806-HigherFlexibilityOf2dPreprocessingPipelineInMitkUS'… (authored by • wintersa).Dec 6 2013, 10:07 AM

Merged Changes

0ab24ff7925e Tests for cropping boundaries is only done once after setting crop region.
Author
• wintersa
Browse Repository
No Builds
No Audits
638517b87996 Fixed wrong method call (f->F) + Changed greater equal to greater at checking…
Author
• wintersa
Browse Repository
No Builds
No Audits
a27711276e80 Added warnings if correcting roi.
Author
• wintersa
Browse Repository
No Builds
No Audits
720d9fdcdc2b Fixed problems at comparing multi channel images in tests (converting to…
Author
• wintersa
Browse Repository
No Builds
No Audits
225a2feda54b Includes corrected and variable removed which is no longer needed.
Author
• wintersa
Browse Repository
No Builds
No Audits
aa3c161ca009 Implemented some tests for convert grayscale and crop filters.
Author
• wintersa
Browse Repository
No Builds
No Audits
c2a19a35a866 Added statement to include Subdir "Commands", removed trailing whitespaces.
Author
maerz
Browse Repository
No Builds
No Audits
8c1886642c2a Changed method signature of FilterImages in AbstractOpenCVImageFilter. Moved…
Author
• wintersa
Browse Repository
No Builds
No Audits
a880a3d8dc7d 2d image processing pipeline of USImageVideoSource uses the new image filter…
Author
• wintersa
Browse Repository
No Builds
No Audits
c54c8340d14e Added abstract image filter class for OpenCV images and two implemented filters…
Author
• wintersa
Browse Repository
No Builds
No Audits

Changes (14)

Path

Size

Modules/

OpenCVVideoSupport/

CMakeLists.txt

Commands

mitkAbstractOpenCVImageFilter.h

mitkConvertGrayscaleOpenCVImageFilter.h

mitkCropOpenCVImageFilter.cpp

mitkCropOpenCVImageFilter.h

Testing/

files.cmake

mitkConvertGrayscaleOpenCVImageFilterTest.cpp

mitkCropOpenCVImageFilterTest.cpp

files.cmake

	OpenCVVideoSupport/	Commands/
	IGT/	ExceptionHandling/

	mitkAbstractOpenCVImageFilter.cpp
	mitkIGTHardwareException.cpp

US/

USFilters/

mitkUSImageVideoSource.cpp

mitkUSImageVideoSource.h

	Modules/	OpenCVVideoSupport/	Commands/
	Core/	Code/	Algorithms/

	mitkConvertGrayscaleOpenCVImageFilter.cpp
	mitkBaseProcess.h

rMITK32e00e7a7664

View Options

Modules/OpenCVVideoSupport/CMakeLists.txt

View Options

Modules/OpenCVVideoSupport/Commands/mitkAbstractOpenCVImageFilter.cpp

View Options

Modules/OpenCVVideoSupport/Commands/mitkAbstractOpenCVImageFilter.h

View Options

Modules/OpenCVVideoSupport/Commands/mitkConvertGrayscaleOpenCVImageFilter.cpp

View Options

Modules/OpenCVVideoSupport/Commands/mitkConvertGrayscaleOpenCVImageFilter.h

View Options

Modules/OpenCVVideoSupport/Commands/mitkCropOpenCVImageFilter.cpp

View Options

Modules/OpenCVVideoSupport/Commands/mitkCropOpenCVImageFilter.h

View Options

Modules/OpenCVVideoSupport/Testing/files.cmake

View Options

Modules/OpenCVVideoSupport/Testing/mitkConvertGrayscaleOpenCVImageFilterTest.cpp

View Options

Modules/OpenCVVideoSupport/Testing/mitkCropOpenCVImageFilterTest.cpp

View Options

Modules/OpenCVVideoSupport/files.cmake

View Options

Modules/US/USFilters/mitkUSImageVideoSource.cpp

View Options

Modules/US/USFilters/mitkUSImageVideoSource.h

Merge branch 'bug-15806-HigherFlexibilityOf2dPreprocessingPipelineInMitkUS'…32e00e7a7664Actions

Description

Details

Event Timeline

Merged Changes

Changes (14)

rMITK32e00e7a7664

Modules/OpenCVVideoSupport/CMakeLists.txt

Modules/OpenCVVideoSupport/Commands/mitkAbstractOpenCVImageFilter.cpp

Modules/OpenCVVideoSupport/Commands/mitkAbstractOpenCVImageFilter.h

Modules/OpenCVVideoSupport/Commands/mitkConvertGrayscaleOpenCVImageFilter.cpp

Modules/OpenCVVideoSupport/Commands/mitkConvertGrayscaleOpenCVImageFilter.h

Modules/OpenCVVideoSupport/Commands/mitkCropOpenCVImageFilter.cpp

Modules/OpenCVVideoSupport/Commands/mitkCropOpenCVImageFilter.h

Modules/OpenCVVideoSupport/Testing/files.cmake

Modules/OpenCVVideoSupport/Testing/mitkConvertGrayscaleOpenCVImageFilterTest.cpp

Modules/OpenCVVideoSupport/Testing/mitkCropOpenCVImageFilterTest.cpp

Modules/OpenCVVideoSupport/files.cmake

Modules/US/USFilters/mitkUSImageVideoSource.cpp

Modules/US/USFilters/mitkUSImageVideoSource.h

Merge branch 'bug-15806-HigherFlexibilityOf2dPreprocessingPipelineInMitkUS'…
32e00e7a7664
Actions