COMP: Fix inconsistency of SetSigma types and overrides

Remove unnecessary redundancy for the SetSigma() between the base class and the derived class. ANTs/Examples/SurfaceBasedSmoothing.cxx:7: ANTs/Utilities/itkSurfaceImageCurvature.h:155:3: warning: 'SetSigma' overrides a member function but is not marked 'override' itkSetMacro(Sigma, float); ^ ANTs/Examples/SurfaceBasedSmoothing.cxx:71:3: note: in instantiation of template class 'itk::SurfaceImageCurvature<itk::Image<float, 3> >' requested here ParamType::Pointer Parameterizer = ParamType::New(); ^ ANTs/Utilities/itkSurfaceCurvatureBase.h:164:3: note: overridden virtual function is here itkSetMacro(Sigma, RealType); ^
gandreadis · Nov 22, 2017 · 949463d · 949463d
1 parent 7e85d85
commit 949463d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/Utilities/itkSurfaceCurvatureBase.h b/Utilities/itkSurfaceCurvatureBase.h
@@ -159,8 +159,8 @@ class SurfaceCurvatureBase : public ProcessObject
 
   itkGetMacro(Normal, FixedVectorType);
 
-  itkGetMacro(Sigma, RealType);
   itkGetMacro(MeanKappa, RealType);
+  itkGetMacro(Sigma, RealType);
   itkSetMacro(Sigma, RealType);
 
   itkGetMacro(UseGeodesicNeighborhood, bool);

diff --git a/Utilities/itkSurfaceCurvatureBase.hxx b/Utilities/itkSurfaceCurvatureBase.hxx
@@ -60,6 +60,7 @@ SurfaceCurvatureBase<TSurface, TDimension>
   m_UseGeodesicNeighborhood = false;
 
   m_TotalArea = 0.0;
+  m_Sigma = 1.0F;
 }
 
 template <typename TSurface, unsigned int TDimension>

diff --git a/Utilities/itkSurfaceImageCurvature.h b/Utilities/itkSurfaceImageCurvature.h
@@ -152,7 +152,6 @@ class SurfaceImageCurvature :
   itkGetMacro(UseLabel, bool);
 
   itkSetMacro(kSign, float);
-  itkSetMacro(Sigma, float);
 
   itkSetMacro(Threshold, float);
 
@@ -260,7 +259,6 @@ class SurfaceImageCurvature :
   NeighborhoodIteratorType m_ti2;
   bool                     m_UseLabel;
   float                    m_kSign;
-  float                    m_Sigma;
   float                    m_Threshold;
   float                    m_Area;
   RealType                 m_MinSpacing;

diff --git a/Utilities/itkSurfaceImageCurvature.hxx b/Utilities/itkSurfaceImageCurvature.hxx
@@ -86,7 +86,6 @@ SurfaceImageCurvature<TSurface>
   m_UseLabel = false;
   m_kSign = -1.0;
   m_FunctionImage = ITK_NULLPTR;
-  m_Sigma = 1.0;
   this->m_Vinterp = ITK_NULLPTR;
   this->m_MinSpacing = itk::NumericTraits<RealType>::max() ;
 }