Skip to content

Commit ce00b06

Browse files
jhlegarretadzenanz
authored andcommitted
ENH: Add boolean macros to miscellaneous boolean ivars
Add boolean macros to miscellaneous boolean ivars. Exercise the boolean macros and the boolean ivar Set/Get methods.
1 parent 2d63eb0 commit ce00b06

12 files changed

+54
-11
lines changed

Modules/Filtering/DisplacementField/include/itkInvertDisplacementFieldImageFilter.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ class ITK_TEMPLATE_EXPORT InvertDisplacementFieldImageFilter : public ImageToIma
139139
/* Should we force the boundary to have zero displacement? */
140140
itkSetMacro(EnforceBoundaryCondition, bool);
141141
itkGetMacro(EnforceBoundaryCondition, bool);
142+
itkBooleanMacro(EnforceBoundaryCondition);
142143

143144
protected:
144145
/** Constructor */

Modules/Filtering/DisplacementField/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ itk_add_test(NAME itkTimeVaryingVelocityFieldIntegrationImageFilterTest
5757
itk_add_test(NAME itkTimeVaryingBSplineVelocityFieldTransformTest
5858
COMMAND ITKDisplacementFieldTestDriver itkTimeVaryingBSplineVelocityFieldTransformTest )
5959
itk_add_test(NAME itkInvertDisplacementFieldImageFilterTest
60-
COMMAND ITKDisplacementFieldTestDriver itkInvertDisplacementFieldImageFilterTest )
60+
COMMAND ITKDisplacementFieldTestDriver itkInvertDisplacementFieldImageFilterTest 0)
6161
itk_add_test(NAME itkDisplacementFieldToBSplineImageFilterTest
6262
COMMAND ITKDisplacementFieldTestDriver itkDisplacementFieldToBSplineImageFilterTest )
6363
itk_add_test(NAME itkTransformToDisplacementFieldFilterTest01

Modules/Filtering/DisplacementField/test/itkInvertDisplacementFieldImageFilterTest.cxx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,15 @@
2121
#include "itkTestingMacros.h"
2222

2323
int
24-
itkInvertDisplacementFieldImageFilterTest(int, char *[])
24+
itkInvertDisplacementFieldImageFilterTest(int argc, char * argv[])
2525
{
26+
if (argc != 2)
27+
{
28+
std::cerr << "Missing parameters." << std::endl;
29+
std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " enforceBoundaryCondition" << std::endl;
30+
return EXIT_FAILURE;
31+
}
32+
2633
constexpr unsigned int ImageDimension = 2;
2734

2835
using VectorType = itk::Vector<float, ImageDimension>;
@@ -94,11 +101,14 @@ itkInvertDisplacementFieldImageFilterTest(int, char *[])
94101
inverter->SetMaximumNumberOfIterations(numberOfIterations);
95102
inverter->SetMeanErrorToleranceThreshold(meanTolerance);
96103
inverter->SetMaxErrorToleranceThreshold(maxTolerance);
97-
inverter->SetEnforceBoundaryCondition(false);
104+
98105
std::cout << "number of iterations: " << inverter->GetMaximumNumberOfIterations() << std::endl;
99106
std::cout << "mean error tolerance: " << inverter->GetMeanErrorToleranceThreshold() << std::endl;
100107
std::cout << "max error tolerance: " << inverter->GetMaxErrorToleranceThreshold() << std::endl;
101108

109+
auto enforceBoundaryCondition = static_cast<bool>(std::stoi(argv[1]));
110+
ITK_TEST_SET_GET_BOOLEAN(inverter, EnforceBoundaryCondition, enforceBoundaryCondition);
111+
102112
try
103113
{
104114
inverter->Update();

Modules/Filtering/DistanceMap/include/itkContourMeanDistanceImageFilter.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ class ITK_TEMPLATE_EXPORT ContourMeanDistanceImageFilter : public ImageToImageFi
128128
/** Set if image spacing should be used in computing distances. */
129129
itkSetMacro(UseImageSpacing, bool);
130130
itkGetConstMacro(UseImageSpacing, bool);
131+
itkBooleanMacro(UseImageSpacing);
131132

132133
#ifdef ITK_USE_CONCEPT_CHECKING
133134
// Begin concept checking

Modules/Filtering/DistanceMap/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ itk_add_test(NAME itkSignedDanielssonDistanceMapImageFilterTest4D
7979
${ITK_TEST_OUTPUT_DIR}/itkSignedDanielssonDistanceMapImageFilterTest4D.mhd 4)
8080

8181
itk_add_test(NAME itkContourMeanDistanceImageFilterTest
82-
COMMAND ITKDistanceMapTestDriver itkContourMeanDistanceImageFilterTest)
82+
COMMAND ITKDistanceMapTestDriver itkContourMeanDistanceImageFilterTest 1)
8383
itk_add_test(NAME itkContourDirectedMeanDistanceImageFilterTest
8484
COMMAND ITKDistanceMapTestDriver itkContourDirectedMeanDistanceImageFilterTest)
8585
itk_add_test(NAME itkFastChamferDistanceImageFilterTest1

Modules/Filtering/DistanceMap/test/itkContourMeanDistanceImageFilterTest.cxx

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,17 @@
1818

1919
#include "itkContourMeanDistanceImageFilter.h"
2020
#include "itkSimpleFilterWatcher.h"
21+
#include "itkTestingMacros.h"
2122

2223
int
23-
itkContourMeanDistanceImageFilterTest(int, char *[])
24+
itkContourMeanDistanceImageFilterTest(int argc, char * argv[])
2425
{
26+
if (argc != 2)
27+
{
28+
std::cerr << "Missing parameters." << std::endl;
29+
std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " useImageSpacing" << std::endl;
30+
return EXIT_FAILURE;
31+
}
2532

2633
using Pixel1Type = unsigned int;
2734
using Pixel2Type = float;
@@ -136,7 +143,11 @@ itkContourMeanDistanceImageFilterTest(int, char *[])
136143
// compute the directed Mean distance h(image2,image1) with different pixel sizes
137144
{
138145
using FilterType = itk::ContourMeanDistanceImageFilter<Image2Type, Image1Type>;
139-
auto filter = FilterType::New();
146+
auto filter = FilterType::New();
147+
148+
auto useImageSpacing = static_cast<bool>(std::stoi(argv[1]));
149+
ITK_TEST_SET_GET_BOOLEAN(filter, UseImageSpacing, useImageSpacing);
150+
140151
Image1Type::SpacingType spacing1 = image1->GetSpacing();
141152
spacing1[0] = spacing1[0] / 2;
142153
spacing1[1] = spacing1[1] / 2;
@@ -151,7 +162,6 @@ itkContourMeanDistanceImageFilterTest(int, char *[])
151162

152163
filter->SetInput1(image2);
153164
filter->SetInput2(image1);
154-
filter->SetUseImageSpacing(true);
155165
filter->Update();
156166

157167
// check results

Modules/Filtering/ImageFeature/include/itkHessianRecursiveGaussianImageFilter.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ class ITK_TEMPLATE_EXPORT HessianRecursiveGaussianImageFilter : public ImageToIm
124124
void
125125
SetNormalizeAcrossScale(bool normalize);
126126
itkGetConstMacro(NormalizeAcrossScale, bool);
127+
itkBooleanMacro(NormalizeAcrossScale);
127128

128129
/** HessianRecursiveGaussianImageFilter needs all of the input to produce an
129130
* output. Therefore, HessianRecursiveGaussianImageFilter needs to provide

Modules/Filtering/ImageFeature/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ itk_add_test(NAME itkHessianRecursiveGaussianFilterScaleSpaceTest
108108

109109
itk_add_test(NAME itkHessianRecursiveGaussianFilterTest
110110
COMMAND ITKImageFeatureTestDriver --redirectOutput ${TEMP}/itkHessianRecursiveGaussianFilterTest.txt
111-
itkHessianRecursiveGaussianFilterTest)
111+
itkHessianRecursiveGaussianFilterTest 0)
112112
set_tests_properties(itkHessianRecursiveGaussianFilterTest PROPERTIES ATTACHED_FILES_ON_FAIL ${TEMP}/itkHessianRecursiveGaussianFilterTest.txt)
113113

114114
itk_add_test(NAME itkHoughTransform2DCirclesImageTest

Modules/Filtering/ImageFeature/test/itkHessianRecursiveGaussianFilterTest.cxx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,17 @@
1717
*=========================================================================*/
1818
#include "itkHessianRecursiveGaussianImageFilter.h"
1919
#include "itkSimpleFilterWatcher.h"
20+
#include "itkTestingMacros.h"
2021

2122
int
22-
itkHessianRecursiveGaussianFilterTest(int, char *[])
23+
itkHessianRecursiveGaussianFilterTest(int argc, char * argv[])
2324
{
25+
if (argc != 2)
26+
{
27+
std::cerr << "Missing parameters." << std::endl;
28+
std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " normalizeAcrossScale" << std::endl;
29+
return EXIT_FAILURE;
30+
}
2431

2532
// Define the dimension of the images
2633
constexpr unsigned int myDimension = 3;
@@ -103,6 +110,9 @@ itkHessianRecursiveGaussianFilterTest(int, char *[])
103110
auto filter = myFilterType::New();
104111
itk::SimpleFilterWatcher watcher(filter);
105112

113+
auto normalizeAcrossScale = static_cast<bool>(std::stoi(argv[1]));
114+
ITK_TEST_SET_GET_BOOLEAN(filter, NormalizeAcrossScale, normalizeAcrossScale);
115+
106116

107117
// Connect the input images
108118
filter->SetInput(inputImage);

Modules/Filtering/ImageGradient/include/itkGradientMagnitudeRecursiveGaussianImageFilter.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ class ITK_TEMPLATE_EXPORT GradientMagnitudeRecursiveGaussianImageFilter
122122
void
123123
SetNormalizeAcrossScale(bool normalize);
124124
itkGetConstMacro(NormalizeAcrossScale, bool);
125+
itkBooleanMacro(NormalizeAcrossScale);
125126

126127
void
127128
SetNumberOfWorkUnits(ThreadIdType nb) override;

0 commit comments

Comments
 (0)