Diffusion MITK 7fb25e5eed79

Merge branch 'bug-8492-accessbyitk-macro-with-typelist-2'
7fb25e5eed79
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-8492-accessbyitk-macro-with-typelist-2'

bug-8492-accessbyitk-macro-with-typelist-2: (38 commits) Improved macro documentation. Use the CMake configured define MITK_ACCESSBYITK_DIMENSIONS_SEQ. Added simple compile test for InstantiateAccessFunction macros. Removed wrong export directive. Changed InstantiateAccessFunction macro style to match AccessByItk. Much simplified by removing redundant code. Added configurable dimension. Added additional CMake variable containing image dimensions. Fixed AccessTwoImages macro Pass pixel type lists from supberbuild to MITK. Separate integral and floating pixel types into distinct variables. Added documentation about passing arguments to AccessByItk_n Use the configured pixel types when accessing OpenCV images. Fixed Windows warnings. Windows compatibility for AccessByItk macros. Added missing headers due to restructuring in previous commit. Redesigned AccessByItk macros and cleaned up header files. Added missing include guards and header files. Added new macro for counting arguments. Make the AccessItkImageFunctor take a member function pointer. Added headers to files.cmake. ...

Details

Provenance

Authored on Jun 29 2011, 11:27 PM

Parents

rMITK1ea8e9d66b90: Improved macro documentation.
rMITKefb1ca69cb73: Merge branch 'bug-8155-close_contour_property_does_not_work'

Branches

Unknown

Tags

Unknown

Event Timeline

zelzer committed rMITK7fb25e5eed79: Merge branch 'bug-8492-accessbyitk-macro-with-typelist-2' (authored by zelzer).Jun 29 2011, 11:27 PM

Merged Changes

1ea8e9d66b90 Improved macro documentation.
Author
zelzer
Browse Repository
No Builds
No Audits
ae6535dfed89 Use the CMake configured define MITK_ACCESSBYITK_DIMENSIONS_SEQ.
Author
zelzer
Browse Repository
No Builds
No Audits
f1a3cd908e9c Added simple compile test for InstantiateAccessFunction macros.
Author
zelzer
Browse Repository
No Builds
No Audits
5bf13d7f052a Removed wrong export directive.
Author
zelzer
Browse Repository
No Builds
No Audits
b2ef3ac407d0 Changed InstantiateAccessFunction macro style to match AccessByItk.
Author
zelzer
Browse Repository
No Builds
No Audits
aa4e8887e251 Much simplified by removing redundant code. Added configurable dimension.
Author
zelzer
Browse Repository
No Builds
No Audits
66a143b4f7d4 Added additional CMake variable containing image dimensions.
Author
zelzer
Browse Repository
No Builds
No Audits
3ffd1020d5ad Fixed AccessTwoImages macro
Author
zelzer
Browse Repository
No Builds
No Audits
257662361145 Pass pixel type lists from supberbuild to MITK.
Author
zelzer
Browse Repository
No Builds
No Audits
d9d1e5761670 Separate integral and floating pixel types into distinct variables.
Author
zelzer
Browse Repository
No Builds
No Audits
eb3b0150b3a4 Added documentation about passing arguments to AccessByItk_n
Author
zelzer
Browse Repository
No Builds
No Audits
563c1aa872a7 Use the configured pixel types when accessing OpenCV images.
Author
zelzer
Browse Repository
No Builds
No Audits
5d0ff3d450b6 Fixed Windows warnings.
Author
zelzer
Browse Repository
No Builds
No Audits
ed612935ef50 Windows compatibility for AccessByItk macros.
Author
zelzer
Browse Repository
No Builds
No Audits
826e65b8fd84 Added missing headers due to restructuring in previous commit.
Author
zelzer
Browse Repository
No Builds
No Audits
6848bf7703b5 Redesigned AccessByItk macros and cleaned up header files.
Author
zelzer
Browse Repository
No Builds
No Audits
2152f339aed4 Added missing include guards and header files.
Author
zelzer
Browse Repository
No Builds
No Audits
69b7967b5171 Added new macro for counting arguments.
Author
zelzer
Browse Repository
No Builds
No Audits
f3bf0b9bbc17 Make the AccessItkImageFunctor take a member function pointer.
Author
zelzer
Browse Repository
No Builds
No Audits
09f083161db5 Added headers to files.cmake.
Author
zelzer
Browse Repository
No Builds
No Audits
d5bd3c607ee3 Added Boost Stringize header for preprocessing.
Author
zelzer
Browse Repository
No Builds
No Audits
2e86307955dd Use include guards in mitkConfig.h
Author
zelzer
Browse Repository
No Builds
No Audits
59d40ab2cd6a New-style InstantiateAccessFunction macors, based on Boost PreProcessor.
Author
zelzer
Browse Repository
No Builds
No Audits
7a9b86a8f4f1 Added Boost preprocessor macros for handling variable type lists.
Author
zelzer
Browse Repository
No Builds
No Audits
7aaec642d01a Use the new-style AccessByItk macros in RigidRegistration.
Author
zelzer
Browse Repository
No Builds
No Audits
55491400bfe5 Modified Core classes to use the new-style AccessByItk macros.
Author
zelzer
Browse Repository
No Builds
No Audits
d12f6a85e042 Added instantiate template macros for new-style AccessByItk functions.
Author
zelzer
Browse Repository
No Builds
No Audits
b5120dda47ce Removed unnecessary include directive.
Author
zelzer
Browse Repository
No Builds
No Audits
503c4887d2f6 Added AccessFixedDimensionDefaultPixelTypesByItk macros.
Author
zelzer
Browse Repository
No Builds
No Audits
19f8909433d9 Reset to default values if pixel type list is empty.
Author
zelzer
Browse Repository
No Builds
No Audits
07a89f0431ca Use MITK_ACCESSBYITK_PIXEL_TYPES in MITK_MULTIPLEX_PICTYPE
Author
zelzer
Browse Repository
No Builds
No Audits
a93f7e0a1af3 AccessByItk improvements:
Author
zelzer
Browse Repository
No Builds
No Audits
07c3730225d5 Fixed typo in type name.
Author
zelzer
Browse Repository
No Builds
No Audits
97f6aa000c86 Fixed mitk::Image::ConstPointer case.
Author
zelzer
Browse Repository
No Builds
No Audits
9d10b6c5f64f Throw a mitk::AccessByItkException object if AccessByItk fails.
Author
zelzer
Browse Repository
No Builds
No Audits
5882625a274c Cleaned up some old documentation about AccessByItk macros.
Author
zelzer
Browse Repository
No Builds
No Audits
90e5bd226f04 Added assert statements about pixel types in AccessByItk macros.
Author
zelzer
Browse Repository
No Builds
No Audits
f3ff75ed46d5 Added typelist template and AccessSpecificTypesByItk macro.
Author
zelzer
Browse Repository
No Builds
No Audits

Changes (113)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

Packages

Applications/

Tutorial/

Step6RegionGrowing1.cpp

Step6RegionGrowing2.cpp

mitkWithITKAndVTK.cpp

CMake/

mitkMacroMultiplexPicType.cmake

O1: MITK Reviewer Group I

mitkSetupVariables.cmake

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

Core/

Code/

Algorithms/

mitkHistogramGenerator.cpp

mitkImageAccessByItk.h

mitkImageCast.h

mitkImageCastPart1.cpp

mitkImageCastPart2.cpp

mitkImageCastPart3.cpp

mitkImageCastPart4.cpp

mitkImageCaster.cpp

mitkImageCaster.h

mitkImageToItk.h

mitkInstantiateAccessFunctions.h

	mitkPPArgCount.h
	mitkImageCast.h

mitkPPArithmeticDec.h

mitkPPControlExprIIf.h

mitkPPControlIIf.h

mitkPPControlIf.h

mitkPPDebugError.h

mitkPPDetailAutoRec.h

mitkPPDetailDMCAutoRec.h

mitkPPFacilitiesEmpty.h

mitkPPFacilitiesExpand.h

mitkPPLogicalBool.h

mitkPPRepetitionDetailDMCFor.h

mitkPPRepetitionDetailEDGFor.h

mitkPPRepetitionDetailFor.h

mitkPPRepetitionDetailMSVCFor.h

mitkPPRepetitionFor.h

mitkPPSeqElem.h

mitkPPSeqEnum.h

mitkPPSeqForEach.h

mitkPPSeqForEachProduct.h

mitkPPSeqSize.h

mitkPPSeqToTuple.h

mitkPPStringize.h

mitkPPTupleEat.h

mitkPPTupleElem.h

mitkPPTupleRem.h

mitkPixelTypeList.h

mitkRGBToRGBACastImageFilter.cpp

IO/

mitkItkPictureWrite.cpp

Testing/

mitkAccessByItkTest.cpp

mitkImageToItkTest.cpp

mitkInstantiateAccessFunctionTest.cpp

Documentation/

Doxygen/

Modules/

ModuleAdaptors.dox

Modules/

DeformableRegistration/

mitkBSplineRegistration.cpp

mitkDemonsRegistration.cpp

mitkHistogramMatching.cpp

mitkSymmetricForcesDemonsRegistration.cpp

DiffusionImaging/

IODataStructures/

TensorImages/

mitkNrrdTensorImageWriter.cpp

ImageExtraction/

Testing/

mitkCompareImageSliceTestHelper.h

mitkExtractDirectedPlaneImageFilterNew.cpp

mitkExtractImageFilter.cpp

ImageStatistics/

mitkImageStatisticsCalculator.cpp

O1: MITK Reviewer Group I

MitkExt/

Algorithms/

mitkBoundingObjectToSegmentationFilter.cpp

mitkCalculateSegmentationVolume.cpp

mitkContourUtils.cpp

mitkCorrectorAlgorithm.cpp

mitkDiffImageApplier.cpp

mitkLabeledImageToSurfaceFilter.cpp

mitkOverwriteDirectedPlaneImageFilter.cpp

mitkOverwriteSliceImageFilter.cpp

mitkShapeBasedInterpolationAlgorithm.cpp

Controllers/

mitkSegmentationInterpolationController.cpp

Interactions/

mitkBinaryThresholdTool.cpp

mitkBinaryThresholdULTool.cpp

mitkCalculateGrayValueStatisticsTool.cpp

mitkPaintbrushTool.cpp

mitkPixelManipulationTool.cpp

mitkRegionGrow3DTool.cpp

mitkRegionGrowingTool.cpp

mitkSetRegionTool.cpp

Testing/

mitkCompareImageSliceTestHelper.h

OpenCVVideoSupport/

mitkImageToOpenCVImageFilter.cpp

mitkImageToOpenCVImageFilter.h

QmitkExt/

QmitkFunctionalityComponents/

QmitkThresholdComponent.cpp

RigidRegistration/

mitkImageRegistrationMethod.cpp

mitkImageRegistrationMethod.h

mitkImageRegistrationMethod.txx

mitkImageRegistrationMethodAccessFunctor.txx

mitkPyramidalRegistrationMethod-TYPE.cpp

mitkPyramidalRegistrationMethod.cpp

mitkPyramidalRegistrationMethod.h

mitkPyramidalRegistrationMethod.txx

mitkPyramidalRegistrationMethodAccessFunctor.h

mitkPyramidalRegistrationMethodAccessFunctor.txx

RigidRegistrationUI/

RigidRegistrationTransforms/

QmitkAffineTransformView.cpp

QmitkCenteredRigid2DTransformView.cpp

QmitkCenteredSimilarity2DTransformView.cpp

QmitkEuler2DTransformView.cpp

QmitkFixedCenterOfRotationAffineTransformView.cpp

QmitkQuaternionRigidTransformView.cpp

QmitkRigid2DTransformView.cpp

QmitkScaleSkewVersor3DTransformView.cpp

QmitkSimilarity2DTransformView.cpp

QmitkSimilarity3DTransformView.cpp

QmitkVersorRigid3DTransformView.cpp

QmitkVersorTransformView.cpp

	Modules/	RigidRegistration/
	Core/	Code/

	mitkImageRegistrationMethod-TYPE.cpp/
	Algorithms/


	mitkImageCast.h

	mitkImageRegistrationMethodAccessFunctor.h/
	Algorithms/


	mitkImageCast.h

SuperBuild.cmake

O1: MITK Reviewer Group I

mitkConfig.h.in

rMITK7fb25e5eed79

Applications/Tutorial/Step6RegionGrowing1.cpp

Applications/Tutorial/Step6RegionGrowing2.cpp

Applications/Tutorial/mitkWithITKAndVTK.cpp

CMake/mitkMacroMultiplexPicType.cmake

CMake/mitkSetupVariables.cmake

CMakeLists.txt

Core/Code/Algorithms/mitkHistogramGenerator.cpp

Core/Code/Algorithms/mitkImageAccessByItk.h

Core/Code/Algorithms/mitkImageCast.h

Core/Code/Algorithms/mitkImageCastPart1.cpp

Core/Code/Algorithms/mitkImageCastPart2.cpp

Core/Code/Algorithms/mitkImageCastPart3.cpp

Core/Code/Algorithms/mitkImageCastPart4.cpp

Core/Code/Algorithms/mitkImageCaster.cpp

Core/Code/Algorithms/mitkImageCaster.h

Core/Code/Algorithms/mitkImageToItk.h

Core/Code/Algorithms/mitkInstantiateAccessFunctions.h

Core/Code/Algorithms/mitkPPArgCount.h

Core/Code/Algorithms/mitkPPArithmeticDec.h

Core/Code/Algorithms/mitkPPCat.h

Core/Code/Algorithms/mitkPPConfig.h

Core/Code/Algorithms/mitkPPControlExprIIf.h

Core/Code/Algorithms/mitkPPControlIIf.h

Core/Code/Algorithms/mitkPPControlIf.h

Core/Code/Algorithms/mitkPPDebugError.h

Core/Code/Algorithms/mitkPPDetailAutoRec.h

Core/Code/Algorithms/mitkPPDetailDMCAutoRec.h

Core/Code/Algorithms/mitkPPExpand.h

Core/Code/Algorithms/mitkPPFacilitiesEmpty.h

Core/Code/Algorithms/mitkPPFacilitiesExpand.h

Core/Code/Algorithms/mitkPPLogicalBool.h

Core/Code/Algorithms/mitkPPRepetitionDetailDMCFor.h

Core/Code/Algorithms/mitkPPRepetitionDetailEDGFor.h

Core/Code/Algorithms/mitkPPRepetitionDetailFor.h

Core/Code/Algorithms/mitkPPRepetitionDetailMSVCFor.h

Core/Code/Algorithms/mitkPPRepetitionFor.h

Core/Code/Algorithms/mitkPPSeq.h

Core/Code/Algorithms/mitkPPSeqElem.h

Core/Code/Algorithms/mitkPPSeqEnum.h

Core/Code/Algorithms/mitkPPSeqForEach.h

Core/Code/Algorithms/mitkPPSeqForEachProduct.h

Core/Code/Algorithms/mitkPPSeqSize.h

Core/Code/Algorithms/mitkPPSeqToTuple.h

Core/Code/Algorithms/mitkPPStringize.h

Core/Code/Algorithms/mitkPPTupleEat.h

Core/Code/Algorithms/mitkPPTupleElem.h

Core/Code/Algorithms/mitkPPTupleRem.h

Core/Code/Algorithms/mitkPixelTypeList.h

Core/Code/Algorithms/mitkRGBToRGBACastImageFilter.cpp

Core/Code/IO/mitkItkPictureWrite.cpp

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkAccessByItkTest.cpp

Core/Code/Testing/mitkImageToItkTest.cpp

Core/Code/Testing/mitkInstantiateAccessFunctionTest.cpp

Core/Code/files.cmake

Documentation/Doxygen/Modules/ModuleAdaptors.dox

Modules/DeformableRegistration/mitkBSplineRegistration.cpp

Modules/DeformableRegistration/mitkDemonsRegistration.cpp

Modules/DeformableRegistration/mitkHistogramMatching.cpp

Modules/DeformableRegistration/mitkSymmetricForcesDemonsRegistration.cpp

Modules/DiffusionImaging/IODataStructures/TensorImages/mitkNrrdTensorImageWriter.cpp

Modules/ImageExtraction/Testing/mitkCompareImageSliceTestHelper.h

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilterNew.cpp

Modules/ImageExtraction/mitkExtractImageFilter.cpp

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

Modules/MitkExt/Algorithms/mitkBoundingObjectToSegmentationFilter.cpp

Modules/MitkExt/Algorithms/mitkCalculateSegmentationVolume.cpp

Modules/MitkExt/Algorithms/mitkContourUtils.cpp

Modules/MitkExt/Algorithms/mitkCorrectorAlgorithm.cpp

Modules/MitkExt/Algorithms/mitkDiffImageApplier.cpp

Modules/MitkExt/Algorithms/mitkLabeledImageToSurfaceFilter.cpp

Modules/MitkExt/Algorithms/mitkOverwriteDirectedPlaneImageFilter.cpp

Modules/MitkExt/Algorithms/mitkOverwriteSliceImageFilter.cpp

Modules/MitkExt/Algorithms/mitkShapeBasedInterpolationAlgorithm.cpp

Modules/MitkExt/Controllers/mitkSegmentationInterpolationController.cpp

Modules/MitkExt/Interactions/mitkBinaryThresholdTool.cpp

Modules/MitkExt/Interactions/mitkBinaryThresholdULTool.cpp

Modules/MitkExt/Interactions/mitkCalculateGrayValueStatisticsTool.cpp

Modules/MitkExt/Interactions/mitkPaintbrushTool.cpp

Modules/MitkExt/Interactions/mitkPixelManipulationTool.cpp

Modules/MitkExt/Interactions/mitkRegionGrow3DTool.cpp

Modules/MitkExt/Interactions/mitkRegionGrowingTool.cpp

Modules/MitkExt/Interactions/mitkSetRegionTool.cpp

Modules/MitkExt/Testing/mitkCompareImageSliceTestHelper.h

Modules/OpenCVVideoSupport/mitkImageToOpenCVImageFilter.cpp

Modules/OpenCVVideoSupport/mitkImageToOpenCVImageFilter.h

Modules/QmitkExt/QmitkFunctionalityComponents/QmitkThresholdComponent.cpp

Modules/RigidRegistration/mitkImageRegistrationMethod-TYPE.cpp

Modules/RigidRegistration/mitkImageRegistrationMethod.cpp

Modules/RigidRegistration/mitkImageRegistrationMethod.h

Modules/RigidRegistration/mitkImageRegistrationMethod.txx

Modules/RigidRegistration/mitkImageRegistrationMethodAccessFunctor.h

Modules/RigidRegistration/mitkImageRegistrationMethodAccessFunctor.txx

Modules/RigidRegistration/mitkPyramidalRegistrationMethod-TYPE.cpp

Modules/RigidRegistration/mitkPyramidalRegistrationMethod.cpp

Modules/RigidRegistration/mitkPyramidalRegistrationMethod.h

Modules/RigidRegistration/mitkPyramidalRegistrationMethod.txx

Modules/RigidRegistration/mitkPyramidalRegistrationMethodAccessFunctor.h

Modules/RigidRegistration/mitkPyramidalRegistrationMethodAccessFunctor.txx

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkAffineTransformView.cpp

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkCenteredRigid2DTransformView.cpp

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkCenteredSimilarity2DTransformView.cpp

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkEuler2DTransformView.cpp

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkFixedCenterOfRotationAffineTransformView.cpp

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkQuaternionRigidTransformView.cpp

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkRigid2DTransformView.cpp

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkScaleSkewVersor3DTransformView.cpp

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkSimilarity2DTransformView.cpp

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkSimilarity3DTransformView.cpp

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkVersorRigid3DTransformView.cpp

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkVersorTransformView.cpp

SuperBuild.cmake

mitkConfig.h.in