ENH: Use name process inputs and use macros

Addresses potential minor bugs with casting, modified times with
non-macro versions of pipeline input accessor methods.

Author: blowekamp

Modules/Filtering/DisplacementField/include/itkDisplacementFieldToBSplineImageFilter.h

@@ -95,30 +95,20 @@ class ITK_TEMPLATE_EXPORT DisplacementFieldToBSplineImageFilter : public ImageTo
   using ArrayType = typename BSplineFilterType::ArrayType;
 
   /** Set the displacement field */
-  void
-  SetDisplacementField(const InputFieldType * field)
-  {
-    this->SetInput(0, field);
-  }
+  itkSetInputMacro(DisplacementField, InputFieldType);
 
   /** Get the input displacement field. */
-  const InputFieldType *
-  GetDisplacementField() const
-  {
-    return this->GetInput(0);
-  }
+  itkGetInputMacro(DisplacementField, InputFieldType);
 
   /**
    * Set confidence image function.  If a confidence image is specified,
    * estimation of the displacement field weights the contribution of each voxel
    * according the value of the corresponding voxel in the confidence image.
    */
   /** @ITKStartGrouping */
-  void
-  SetConfidenceImage(const RealImageType * image)
-  {
-    this->SetNthInput(1, const_cast<RealImageType *>(image));
-  }
+  itkSetInputMacro(ConfidenceImage, RealImageType);
+  itkGetInputMacro(ConfidenceImage, RealImageType);
+
   void
   SetInput1(const RealImageType * image)
   {
@@ -127,33 +117,18 @@ class ITK_TEMPLATE_EXPORT DisplacementFieldToBSplineImageFilter : public ImageTo
   /** @ITKEndGrouping */
 
   /** Get confidence image function. */
-  const RealImageType *
-  GetConfidenceImage() const
-  {
-    return static_cast<const RealImageType *>(this->ProcessObject::GetInput(1));
-  }
 
   /** Set the input point set */
   /** @ITKStartGrouping */
-  void
-  SetPointSet(const InputPointSetType * points)
-  {
-    this->SetNthInput(2, const_cast<InputPointSetType *>(points));
-  }
+  itkSetInputMacro(PointSet, InputPointSetType);
+  itkGetInputMacro(PointSet, InputPointSetType);
   void
   SetInput2(const InputPointSetType * points)
   {
     this->SetPointSet(points);
   }
   /** @ITKEndGrouping */
 
-  /** Get the input point set. */
-  const InputPointSetType *
-  GetPointSet() const
-  {
-    return static_cast<const InputPointSetType *>(this->ProcessObject::GetInput(2));
-  }
-
   /** Set the confidence weights associated with the input point set*/
   void
   SetPointSetConfidenceWeights(WeightsContainerType * weights);

Modules/Filtering/DisplacementField/include/itkDisplacementFieldToBSplineImageFilter.hxx

@@ -34,7 +34,15 @@ DisplacementFieldToBSplineImageFilter<TInputImage, TInputPointSet, TOutputImage>
   DisplacementFieldToBSplineImageFilter()
 
 {
-  this->SetNumberOfRequiredInputs(0);
+
+  // Input 0 DisplacementField optional
+  Self::SetPrimaryInputName("DisplacementField");
+  Self::RemoveRequiredInputName("DisplacementField");
+  // Input 1 ConfidenceImage optional
+  Self::AddOptionalInputName("ConfidenceImage", 1);
+  // Input 2 PointSet optional
+  Self::AddOptionalInputName("PointSet", 2);
+
 
   this->m_NumberOfFittingLevels.Fill(1);
   this->m_NumberOfControlPoints.Fill(4);