Skip to content

Commit 5162452

Browse files
dzenanzdzenanz
committed
STYLE: Rename ANTSGroupwiseRegistration to ANTSGroupwiseBuildTemplate
1 parent ef800a5 commit 5162452

9 files changed

+34
-34
lines changed

include/itkANTSGroupwiseRegistration.h renamed to include/itkANTSGroupwiseBuildTemplate.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* limitations under the License.
1616
*
1717
*=========================================================================*/
18-
#ifndef itkANTSGroupwiseRegistration_h
19-
#define itkANTSGroupwiseRegistration_h
18+
#ifndef itkANTSGroupwiseBuildTemplate_h
19+
#define itkANTSGroupwiseBuildTemplate_h
2020

2121
#include "itkImageToImageFilter.h"
2222
#include "itkANTSRegistration.h"
@@ -26,7 +26,7 @@
2626
namespace itk
2727
{
2828

29-
/** \class ANTSGroupwiseRegistration
29+
/** \class ANTSGroupwiseBuildTemplate
3030
*
3131
* \brief Group-wise image registration method parameterized according to ANTsPy.
3232
*
@@ -48,10 +48,10 @@ namespace itk
4848
template <typename TImage,
4949
typename TTemplateImage = Image<float, TImage::ImageDimension>,
5050
typename TParametersValueType = double>
51-
class ANTSGroupwiseRegistration : public ImageToImageFilter<TTemplateImage, TTemplateImage>
51+
class ANTSGroupwiseBuildTemplate : public ImageToImageFilter<TTemplateImage, TTemplateImage>
5252
{
5353
public:
54-
ITK_DISALLOW_COPY_AND_MOVE(ANTSGroupwiseRegistration);
54+
ITK_DISALLOW_COPY_AND_MOVE(ANTSGroupwiseBuildTemplate);
5555

5656
static constexpr unsigned int ImageDimension = TImage::ImageDimension;
5757

@@ -66,13 +66,13 @@ class ANTSGroupwiseRegistration : public ImageToImageFilter<TTemplateImage, TTem
6666
using DecoratedOutputTransformType = DataObjectDecorator<OutputTransformType>;
6767

6868
/** Standard class aliases. */
69-
using Self = ANTSGroupwiseRegistration<ImageType, TTemplateImage, ParametersValueType>;
69+
using Self = ANTSGroupwiseBuildTemplate<ImageType, TTemplateImage, ParametersValueType>;
7070
using Superclass = ImageToImageFilter<TTemplateImage, TTemplateImage>;
7171
using Pointer = SmartPointer<Self>;
7272
using ConstPointer = SmartPointer<const Self>;
7373

7474
/** Run-time type information. */
75-
itkTypeMacro(ANTSGroupwiseRegistration, ImageToImageFilter);
75+
itkTypeMacro(ANTSGroupwiseBuildTemplate, ImageToImageFilter);
7676

7777
/** Standard New macro. */
7878
itkNewMacro(Self);
@@ -184,8 +184,8 @@ class ANTSGroupwiseRegistration : public ImageToImageFilter<TTemplateImage, TTem
184184
GenerateOutputInformation() override;
185185

186186
protected:
187-
ANTSGroupwiseRegistration();
188-
~ANTSGroupwiseRegistration() override = default;
187+
ANTSGroupwiseBuildTemplate();
188+
~ANTSGroupwiseBuildTemplate() override = default;
189189

190190
/** Make a DataObject of the correct type to be used as the specified output. */
191191
using DataObjectPointerArraySizeType = ProcessObject::DataObjectPointerArraySizeType;
@@ -243,7 +243,7 @@ class ANTSGroupwiseRegistration : public ImageToImageFilter<TTemplateImage, TTem
243243
} // namespace itk
244244

245245
#ifndef ITK_MANUAL_INSTANTIATION
246-
# include "itkANTSGroupwiseRegistration.hxx"
246+
# include "itkANTSGroupwiseBuildTemplate.hxx"
247247
#endif
248248

249-
#endif // itkANTSGroupwiseRegistration
249+
#endif // itkANTSGroupwiseBuildTemplate

include/itkANTSGroupwiseRegistration.hxx renamed to include/itkANTSGroupwiseBuildTemplate.hxx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
* limitations under the License.
1616
*
1717
*=========================================================================*/
18-
#ifndef itkANTSGroupwiseRegistration_hxx
19-
#define itkANTSGroupwiseRegistration_hxx
18+
#ifndef itkANTSGroupwiseBuildTemplate_hxx
19+
#define itkANTSGroupwiseBuildTemplate_hxx
2020

2121
#include <sstream>
2222

2323
#include "itkPrintHelper.h"
24-
#include "itkANTSGroupwiseRegistration.h" // needed by Visual Studio for code completion
24+
#include "itkANTSGroupwiseBuildTemplate.h" // needed by Visual Studio for code completion
2525
#include "itkImageDuplicator.h"
2626
#include "itkWeightedAddImageFilter.h"
2727
#include "itkAverageAffineTransformFunction.h"
@@ -78,7 +78,7 @@ namespace itk
7878
{
7979

8080
template <typename TImage, typename TTemplateImage, typename TParametersValueType>
81-
ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::ANTSGroupwiseRegistration()
81+
ANTSGroupwiseBuildTemplate<TImage, TTemplateImage, TParametersValueType>::ANTSGroupwiseBuildTemplate()
8282
{
8383
this->SetPrimaryInputName("InitialTemplate");
8484
this->SetPrimaryOutputName("OptimizedImage");
@@ -91,7 +91,7 @@ ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::ANTSGro
9191

9292
template <typename TImage, typename TTemplateImage, typename TParametersValueType>
9393
void
94-
ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::PrintSelf(std::ostream & os,
94+
ANTSGroupwiseBuildTemplate<TImage, TTemplateImage, TParametersValueType>::PrintSelf(std::ostream & os,
9595
Indent indent) const
9696
{
9797
using namespace print_helper;
@@ -127,7 +127,7 @@ ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::PrintSe
127127

128128
template <typename TImage, typename TTemplateImage, typename TParametersValueType>
129129
void
130-
ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::VerifyInputInformation() const
130+
ANTSGroupwiseBuildTemplate<TImage, TTemplateImage, TParametersValueType>::VerifyInputInformation() const
131131
{
132132
if (m_ImageList.empty() && m_PathList.empty())
133133
{
@@ -155,7 +155,7 @@ ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::VerifyI
155155

156156
template <typename TImage, typename TTemplateImage, typename TParametersValueType>
157157
DataObject::Pointer
158-
ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::MakeOutput(DataObjectPointerArraySizeType)
158+
ANTSGroupwiseBuildTemplate<TImage, TTemplateImage, TParametersValueType>::MakeOutput(DataObjectPointerArraySizeType)
159159
{
160160
typename OutputTransformType::Pointer ptr;
161161
Self::MakeOutputTransform(ptr);
@@ -167,7 +167,7 @@ ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::MakeOut
167167

168168
template <typename TImage, typename TTemplateImage, typename TParametersValueType>
169169
auto
170-
ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::DuplicateImage(const TemplateImageType * image)
170+
ANTSGroupwiseBuildTemplate<TImage, TTemplateImage, TParametersValueType>::DuplicateImage(const TemplateImageType * image)
171171
-> typename TemplateImageType::Pointer
172172
{
173173
using DuplicatorType = ImageDuplicator<TemplateImageType>;
@@ -181,7 +181,7 @@ ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::Duplica
181181
template <typename TImage, typename TTemplateImage, typename TParametersValueType>
182182
template <typename TOutputImage, typename TInputImage>
183183
auto
184-
itk::ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::ResampleToTarget(
184+
itk::ANTSGroupwiseBuildTemplate<TImage, TTemplateImage, TParametersValueType>::ResampleToTarget(
185185
const TInputImage * input,
186186
const TemplateImageType * target,
187187
typename TransformType::ConstPointer transform) -> typename TOutputImage::Pointer
@@ -204,7 +204,7 @@ itk::ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::Re
204204
template <typename TImage, typename TTemplateImage, typename TParametersValueType>
205205
template <typename TTempImage>
206206
typename TTempImage::Pointer
207-
ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::ScaleAndAdd(
207+
ANTSGroupwiseBuildTemplate<TImage, TTemplateImage, TParametersValueType>::ScaleAndAdd(
208208
typename TTempImage::Pointer temp,
209209
const TTempImage * image,
210210
typename TTempImage::PixelType weight)
@@ -230,7 +230,7 @@ ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::ScaleAn
230230

231231
template <typename TImage, typename TTemplateImage, typename TParametersValueType>
232232
void
233-
ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::GenerateOutputInformation()
233+
ANTSGroupwiseBuildTemplate<TImage, TTemplateImage, TParametersValueType>::GenerateOutputInformation()
234234
{
235235
if (!m_PairwiseRegistration) // a custom pairwise registration is not set
236236
{
@@ -299,7 +299,7 @@ ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::Generat
299299

300300
template <typename TImage, typename TTemplateImage, typename TParametersValueType>
301301
void
302-
ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::GenerateData()
302+
ANTSGroupwiseBuildTemplate<TImage, TTemplateImage, TParametersValueType>::GenerateData()
303303
{
304304
this->UpdateProgress(0.0);
305305

@@ -502,4 +502,4 @@ ANTSGroupwiseRegistration<TImage, TTemplateImage, TParametersValueType>::Generat
502502

503503
} // end namespace itk
504504

505-
#endif // itkANTSGroupwiseRegistration_hxx
505+
#endif // itkANTSGroupwiseBuildTemplate_hxx

‎test/itkANTSGroupwiseRegistrationTest3D.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*=========================================================================*/
1818

19-
#include "itkANTSGroupwiseRegistration.h"
19+
#include "itkANTSGroupwiseBuildTemplate.h"
2020

2121
#include "itkImageFileWriter.h"
2222
#include "itkTxtTransformIOFactory.h"
@@ -44,7 +44,7 @@ itkANTSGroupwiseRegistrationTest3D(int argc, char * argv[])
4444

4545
using ImageType = itk::Image<signed short, 3>;
4646
using FloatImageType = itk::Image<float, 3>;
47-
using FilterType = itk::ANTSGroupwiseRegistration<ImageType, ImageType, float>;
47+
using FilterType = itk::ANTSGroupwiseBuildTemplate<ImageType, ImageType, float>;
4848
typename FilterType::Pointer filter = FilterType::New();
4949

5050
std::vector<ImageType::Pointer> images;

‎test/itkANTSGroupwiseRegistrationTestFaces.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*=========================================================================*/
1818

19-
#include "itkANTSGroupwiseRegistration.h"
19+
#include "itkANTSGroupwiseBuildTemplate.h"
2020

2121
#include "itkImageFileWriter.h"
2222
#include "itkSimpleFilterWatcher.h"
@@ -56,15 +56,15 @@ itkANTSGroupwiseRegistrationTestFaces(int argc, char * argv[])
5656

5757
using ImageType = itk::Image<unsigned char, 2>;
5858
using FloatImageType = itk::Image<float, 2>;
59-
using FilterType = itk::ANTSGroupwiseRegistration<ImageType, FloatImageType, float>;
59+
using FilterType = itk::ANTSGroupwiseBuildTemplate<ImageType, FloatImageType, float>;
6060
typename FilterType::Pointer filter = FilterType::New();
6161

6262
if (argc > 5)
6363
{
6464
auto initialTemplate = itk::ReadImage<FloatImageType>(argv[5]);
6565
filter->SetInitialTemplateImage(initialTemplate);
6666
}
67-
ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, ANTSGroupwiseRegistration, ImageToImageFilter);
67+
ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, ANTSGroupwiseBuildTemplate, ImageToImageFilter);
6868

6969
itk::SimpleFilterWatcher watcher(filter, "ANTs groupwise registration");
7070
std::vector<ImageType::Pointer> images;

wrapping/itkANTSGroupwiseRegistration.wrap renamed to wrapping/itkANTSGroupwiseBuildTemplate.wrap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if ("3" IN_LIST ITK_WRAP_IMAGE_DIMS)
77
list(APPEND Dimensions "3")
88
endif()
99

10-
itk_wrap_class("itk::ANTSGroupwiseRegistration" POINTER)
10+
itk_wrap_class("itk::ANTSGroupwiseBuildTemplate" POINTER)
1111
foreach(d ${Dimensions})
1212
foreach(t ${WRAP_ITK_SCALAR})
1313
string(APPEND ITK_WRAP_PYTHON_SWIG_EXT "DECL_PYTHON_STD_VEC_RAW_TO_SMARTPTR_TYPEMAP(itkImage${ITKM_${t}}${d}, itkImage${ITKM_${t}}${d}_Pointer)\n")

‎wrapping/test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ itk_python_add_test(NAME PythonANTSRegistrationTest
2222
)
2323

2424
itk_python_expression_add_test(NAME PythonInstantiateANTSGroupwiseRegistrationShort3Dfloat
25-
EXPRESSION "reg = itk.ANTSGroupwiseRegistration[itk.Image[itk.SS, 3], itk.Image[itk.F, 3], itk.F].New()"
25+
EXPRESSION "reg = itk.ANTSGroupwiseBuildTemplate[itk.Image[itk.SS, 3], itk.Image[itk.F, 3], itk.F].New()"
2626
)
2727

2828
itk_python_add_test(NAME PythonANTsGroupwiseFaces

‎wrapping/test/PythonANTsGroupwiseBrainSlices.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
assert ImageType == type(first_image)
3737
TemplateImageType = itk.Image[itk.F, Dimension]
3838

39-
gwr = itk.ANTSGroupwiseRegistration[ImageType, TemplateImageType, itk.F].New()
39+
gwr = itk.ANTSGroupwiseBuildTemplate[ImageType, TemplateImageType, itk.F].New()
4040
# pairwise registration has different order of template parameters
4141
pwr = itk.ANTSRegistration[TemplateImageType, ImageType, itk.F].New()
4242

‎wrapping/test/PythonANTsGroupwiseFaces.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
assert ImageType == type(first_image)
3737
TemplateImageType = itk.Image[itk.F, Dimension]
3838

39-
gwr = itk.ANTSGroupwiseRegistration[ImageType, TemplateImageType, itk.F].New()
39+
gwr = itk.ANTSGroupwiseBuildTemplate[ImageType, TemplateImageType, itk.F].New()
4040
# pairwise registration has different order of template parameters
4141
pwr = itk.ANTSRegistration[TemplateImageType, ImageType, itk.F].New()
4242

‎wrapping/test/PythonANTsGroupwisePaths.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
assert ImageType == type(first_image)
3737
TemplateImageType = itk.Image[itk.F, Dimension]
3838

39-
gwr = itk.ANTSGroupwiseRegistration[ImageType, TemplateImageType, itk.F].New()
39+
gwr = itk.ANTSGroupwiseBuildTemplate[ImageType, TemplateImageType, itk.F].New()
4040
# pairwise registration has different order of template parameters
4141
pwr = itk.ANTSRegistration[TemplateImageType, ImageType, itk.F].New()
4242

0 commit comments

Comments
 (0)