Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STYLE: Replace additional itkTypeMacro calls with itkOverrideGetNameOfClassMacro #574

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/rtkConjugateGradientGetP_kPlusOneImageFilter.h
Original file line number Diff line number Diff line change
@@ -49,7 +49,11 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientGetP_kPlusOneImageFilter
itkNewMacro(Self);

/** Run-time type information (and related methods). */
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(ConjugateGradientGetP_kPlusOneImageFilter);
#else
itkTypeMacro(ConjugateGradientGetP_kPlusOneImageFilter, itk::ImageToImageFilter);
#endif

/** Functions to set the inputs */
void
4 changes: 4 additions & 0 deletions include/rtkConjugateGradientGetR_kPlusOneImageFilter.h
Original file line number Diff line number Diff line change
@@ -50,7 +50,11 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientGetR_kPlusOneImageFilter
itkNewMacro(Self);

/** Run-time type information (and related methods). */
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(ConjugateGradientGetR_kPlusOneImageFilter);
#else
itkTypeMacro(ConjugateGradientGetR_kPlusOneImageFilter, itk::ImageToImageFilter);
#endif

/** Functions to set the inputs */
void
4 changes: 4 additions & 0 deletions include/rtkConjugateGradientGetX_kPlusOneImageFilter.h
Original file line number Diff line number Diff line change
@@ -49,7 +49,11 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientGetX_kPlusOneImageFilter
itkNewMacro(Self);

/** Run-time type information (and related methods). */
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(ConjugateGradientGetX_kPlusOneImageFilter);
#else
itkTypeMacro(ConjugateGradientGetX_kPlusOneImageFilter, itk::ImageToImageFilter);
#endif

/** Functions to set the inputs */
void
4 changes: 4 additions & 0 deletions include/rtkElektaXVI5GeometryXMLFileReader.h
Original file line number Diff line number Diff line change
@@ -61,7 +61,11 @@ class RTK_EXPORT ElektaXVI5GeometryXMLFileReader : public itk::XMLReader<ThreeDC
static const unsigned int CurrentVersion = 2;

/** Run-time type information (and related methods). */
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(ElektaXVI5GeometryXMLFileReader);
#else
itkTypeMacro(ElektaXVI5GeometryXMLFileReader, itk::XMLFileReader);
#endif

/** Method for creation through the object factory. */
itkNewMacro(Self);
6 changes: 5 additions & 1 deletion include/rtkI0EstimationProjectionFilter.h
Original file line number Diff line number Diff line change
@@ -58,7 +58,11 @@ class ITK_TEMPLATE_EXPORT I0EstimationProjectionFilter : public itk::InPlaceImag
itkNewMacro(Self);

/** Runtime information support. */
itkTypeMacro(I0EstimationProjectionFilter, ImageToImageFilter);
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(I0EstimationProjectionFilter);
#else
itkTypeMacro(I0EstimationProjectionFilter, itk::InPlaceImageFilter);
#endif

/** Some convenient type alias. */
using InputImageType = TInputImage;
4 changes: 4 additions & 0 deletions include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h
Original file line number Diff line number Diff line change
@@ -98,7 +98,11 @@ class ITK_TEMPLATE_EXPORT LUTbasedVariableI0RawToAttenuationImageFilter
itkNewMacro(Self);

/** Run-time type information (and related methods). */
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(LUTbasedVariableI0RawToAttenuationImageFilter);
#else
itkTypeMacro(LUTbasedVariableI0RawToAttenuationImageFilter, LookupTableImageFilter);
#endif

/** Air level I0
*/
4 changes: 4 additions & 0 deletions include/rtkLastDimensionL0GradientDenoisingImageFilter.h
Original file line number Diff line number Diff line change
@@ -56,7 +56,11 @@ class ITK_TEMPLATE_EXPORT LastDimensionL0GradientDenoisingImageFilter
itkNewMacro(Self);

/** Run-time type information (and related methods). */
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(LastDimensionL0GradientDenoisingImageFilter);
#else
itkTypeMacro(LastDimensionL0GradientDenoisingImageFilter, itk::InPlaceImageFilter);
#endif

/** Get / Set the threshold. Default is 0.001 */
itkGetMacro(Lambda, double);
2 changes: 1 addition & 1 deletion include/rtkMagnitudeThresholdImageFilter.h
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ class ITK_TEMPLATE_EXPORT MagnitudeThresholdImageFilter : public itk::InPlaceIma
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(MagnitudeThresholdImageFilter);
#else
itkTypeMacro(MagnitudeThresholdImageFilter, ImageToImageFilter);
itkTypeMacro(MagnitudeThresholdImageFilter, itk::ImageToImageFilter);
#endif

/** Extract some information from the image types. Dimensionality
Original file line number Diff line number Diff line change
@@ -111,8 +111,12 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDConjugateGradientConeBeamReconst
itkNewMacro(Self);

/** Runtime information support. */
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter);
#else
itkTypeMacro(MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter,
FourDConjugateGradientConeBeamReconstructionFilter);
#endif

/** Neither the Forward nor the Back projection filters can be set by the user */
void
Original file line number Diff line number Diff line change
@@ -172,8 +172,11 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDROOSTERConeBeamReconstructionFil
itkNewMacro(Self);

/** Run-time type information (and related methods). */
itkTypeMacro(MotionCompensatedFourDROOSTERConeBeamReconstructionFilter,
rtk::FourDROOSTERConeBeamReconstructionFilter);
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(MotionCompensatedFourDROOSTERConeBeamReconstructionFilter);
#else
itkTypeMacro(MotionCompensatedFourDROOSTERConeBeamReconstructionFilter, FourDROOSTERConeBeamReconstructionFilter);
#endif

using MotionCompensatedFourDCGFilterType =
rtk::MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter<VolumeSeriesType, ProjectionStackType>;
Original file line number Diff line number Diff line change
@@ -150,8 +150,12 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDReconstructionConjugateGradientO
itkNewMacro(Self);

/** Run-time type information (and related methods). */
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(MotionCompensatedFourDReconstructionConjugateGradientOperator);
#else
itkTypeMacro(MotionCompensatedFourDReconstructionConjugateGradientOperator,
FourDReconstructionConjugateGradientOperator);
#endif

/** The forward and back projection filters cannot be set by the user */
void
5 changes: 5 additions & 0 deletions include/rtkReg1DExtractShroudSignalImageFilter.h
Original file line number Diff line number Diff line change
@@ -58,7 +58,12 @@ class ITK_TEMPLATE_EXPORT Reg1DExtractShroudSignalImageFilter
itkNewMacro(Self);

/** Runtime information support. */
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(Reg1DExtractShroudSignalImageFilter);
#else
itkTypeMacro(Reg1DExtractShroudSignalImageFilter, itk::ImageToImageFilter);
#endif


protected:
Reg1DExtractShroudSignalImageFilter();
10 changes: 9 additions & 1 deletion include/rtkSchlomka2008NegativeLogLikelihood.h
Original file line number Diff line number Diff line change
@@ -51,8 +51,16 @@ class Schlomka2008NegativeLogLikelihood : public rtk::ProjectionsDecompositionNe
using Superclass = rtk::ProjectionsDecompositionNegativeLogLikelihood;
using Pointer = itk::SmartPointer<Self>;
using ConstPointer = itk::SmartPointer<const Self>;

/** Method for creation through the object factory. */
itkNewMacro(Self);
itkTypeMacro(Schlomka2008NegativeLogLikelihood, rtk::ProjectionsDecompositionNegativeLogLikelihood);

/** Run-time type information (and related methods) */
#ifdef itkOverrideGetNameOfClassMacro
itkOverrideGetNameOfClassMacro(Schlomka2008NegativeLogLikelihood);
#else
itkTypeMacro(Schlomka2008NegativeLogLikelihood, ProjectionsDecompositionNegativeLogLikelihood);
#endif

using ParametersType = Superclass::ParametersType;
using DerivativeType = Superclass::DerivativeType;