Merge pull request RTKConsortium#324 from acoussat/check-geometry

ENH: filters check whether their geometry is set
acoussat · Apr 11, 2020 · bc6d102 · bc6d102
2 parents 100bd89 + 40c0565
commit bc6d102
Show file tree

Hide file tree

Showing 54 changed files with 364 additions and 23 deletions.
diff --git a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h
@@ -214,6 +214,10 @@ class ADMMTotalVariationConeBeamReconstructionFilter
   ADMMTotalVariationConeBeamReconstructionFilter();
   ~ADMMTotalVariationConeBeamReconstructionFilter() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void
+  VerifyPreconditions() ITKv5_CONST override;
+
   /** Does the real work. */
   void
   GenerateData() override;

diff --git a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.hxx b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.hxx
@@ -163,6 +163,16 @@ ADMMTotalVariationConeBeamReconstructionFilter<TOutputImage, TGradientOutputImag
   inputPtr1->SetRequestedRegion(inputPtr1->GetLargestPossibleRegion());
 }
 
+template <class TInputImage, class TOutputImage>
+void
+ADMMTotalVariationConeBeamReconstructionFilter<TInputImage, TOutputImage>::VerifyPreconditions() ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 template <typename TOutputImage, typename TGradientOutputImage>
 void
 ADMMTotalVariationConeBeamReconstructionFilter<TOutputImage, TGradientOutputImage>::GenerateOutputInformation()

diff --git a/include/rtkADMMTotalVariationConjugateGradientOperator.h b/include/rtkADMMTotalVariationConjugateGradientOperator.h
@@ -162,6 +162,10 @@ class ADMMTotalVariationConjugateGradientOperator : public ConjugateGradientOper
   ADMMTotalVariationConjugateGradientOperator();
   ~ADMMTotalVariationConjugateGradientOperator() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void
+  VerifyPreconditions() ITKv5_CONST override;
+
   /** Does the real work. */
   void
   GenerateData() override;

diff --git a/include/rtkADMMTotalVariationConjugateGradientOperator.hxx b/include/rtkADMMTotalVariationConjugateGradientOperator.hxx
@@ -94,6 +94,16 @@ ADMMTotalVariationConjugateGradientOperator<TOutputImage, TGradientOutputImage>:
   this->Modified();
 }
 
+template <class TInputImage, class TOutputImage>
+void
+ADMMTotalVariationConjugateGradientOperator<TInputImage, TOutputImage>::VerifyPreconditions() ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 template <typename TOutputImage, typename TGradientOutputImage>
 void
 ADMMTotalVariationConjugateGradientOperator<TOutputImage, TGradientOutputImage>::GenerateInputRequestedRegion()

diff --git a/include/rtkADMMWaveletsConeBeamReconstructionFilter.h b/include/rtkADMMWaveletsConeBeamReconstructionFilter.h
@@ -214,6 +214,10 @@ class ADMMWaveletsConeBeamReconstructionFilter
   ADMMWaveletsConeBeamReconstructionFilter();
   ~ADMMWaveletsConeBeamReconstructionFilter() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void
+  VerifyPreconditions() ITKv5_CONST override;
+
   /** Does the real work. */
   void
   GenerateData() override;

diff --git a/include/rtkADMMWaveletsConeBeamReconstructionFilter.hxx b/include/rtkADMMWaveletsConeBeamReconstructionFilter.hxx
@@ -97,6 +97,16 @@ ADMMWaveletsConeBeamReconstructionFilter<TOutputImage>::SetBackProjectionFilter(
   }
 }
 
+template <class TOutputImage>
+void
+ADMMWaveletsConeBeamReconstructionFilter<TOutputImage>::VerifyPreconditions() ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 template <typename TOutputImage>
 void
 ADMMWaveletsConeBeamReconstructionFilter<TOutputImage>::GenerateInputRequestedRegion()

diff --git a/include/rtkBackProjectionImageFilter.h b/include/rtkBackProjectionImageFilter.h
@@ -90,6 +90,10 @@ class BackProjectionImageFilter : public itk::InPlaceImageFilter<TInputImage, TO
   };
   ~BackProjectionImageFilter() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void
+  VerifyPreconditions() ITKv5_CONST override;
+
   /** Apply changes to the input image requested region. */
   void
   GenerateInputRequestedRegion() override;

diff --git a/include/rtkBackProjectionImageFilter.hxx b/include/rtkBackProjectionImageFilter.hxx
@@ -146,6 +146,16 @@ BackProjectionImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegi
   }
 }
 
+template <class TInputImage, class TOutputImage>
+void
+BackProjectionImageFilter<TInputImage, TOutputImage>::VerifyPreconditions() ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 template <class TInputImage, class TOutputImage>
 void
 BackProjectionImageFilter<TInputImage, TOutputImage>::BeforeThreadedGenerateData()

diff --git a/include/rtkConjugateGradientConeBeamReconstructionFilter.h b/include/rtkConjugateGradientConeBeamReconstructionFilter.h
@@ -217,6 +217,10 @@ class ConjugateGradientConeBeamReconstructionFilter : public IterativeConeBeamRe
   ConjugateGradientConeBeamReconstructionFilter();
   ~ConjugateGradientConeBeamReconstructionFilter() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void
+  VerifyPreconditions() ITKv5_CONST override;
+
   /** Does the real work. */
   void
   GenerateData() override;

diff --git a/include/rtkConjugateGradientConeBeamReconstructionFilter.hxx b/include/rtkConjugateGradientConeBeamReconstructionFilter.hxx
@@ -150,6 +150,17 @@ ConjugateGradientConeBeamReconstructionFilter<TOutputImage, TSingleComponentImag
   }
 }
 
+template <typename TOutputImage, typename TSingleComponentImage, typename TWeightsImage>
+void
+ConjugateGradientConeBeamReconstructionFilter<TOutputImage, TSingleComponentImage, TWeightsImage>::VerifyPreconditions()
+  ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 template <typename TOutputImage, typename TSingleComponentImage, typename TWeightsImage>
 void
 ConjugateGradientConeBeamReconstructionFilter<TOutputImage, TSingleComponentImage, TWeightsImage>::

diff --git a/include/rtkDisplacedDetectorImageFilter.h b/include/rtkDisplacedDetectorImageFilter.h
@@ -117,6 +117,10 @@ class ITK_EXPORT DisplacedDetectorImageFilter : public itk::InPlaceImageFilter<T
   itkGetMacro(InferiorCorner, double);
   itkGetMacro(SuperiorCorner, double);
 
+  /** Checks that inputs are correctly set. */
+  void
+  VerifyPreconditions() ITKv5_CONST override;
+
   void
   GenerateInputRequestedRegion() override;
 

diff --git a/include/rtkDisplacedDetectorImageFilter.hxx b/include/rtkDisplacedDetectorImageFilter.hxx
@@ -51,6 +51,16 @@ DisplacedDetectorImageFilter<TInputImage, TOutputImage>::SetOffsets(double minOf
   }
 }
 
+template <class TInputImage, class TOutputImage>
+void
+DisplacedDetectorImageFilter<TInputImage, TOutputImage>::VerifyPreconditions() ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 /**
  * Account for the padding computed in GenerateOutputInformation to propagate the
  * requested region.

diff --git a/include/rtkFDKConeBeamReconstructionFilter.h b/include/rtkFDKConeBeamReconstructionFilter.h
@@ -122,6 +122,10 @@ class ITK_EXPORT FDKConeBeamReconstructionFilter : public itk::InPlaceImageFilte
   FDKConeBeamReconstructionFilter();
   ~FDKConeBeamReconstructionFilter() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void
+  VerifyPreconditions() ITKv5_CONST override;
+
   void
   GenerateInputRequestedRegion() override;
 

diff --git a/include/rtkFDKConeBeamReconstructionFilter.hxx b/include/rtkFDKConeBeamReconstructionFilter.hxx
@@ -56,6 +56,16 @@ FDKConeBeamReconstructionFilter<TInputImage, TOutputImage, TFFTPrecision>::FDKCo
 #endif
 }
 
+template <class TInputImage, class TOutputImage, class TFFTPrecision>
+void
+FDKConeBeamReconstructionFilter<TInputImage, TOutputImage, TFFTPrecision>::VerifyPreconditions() ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 template <class TInputImage, class TOutputImage, class TFFTPrecision>
 void
 FDKConeBeamReconstructionFilter<TInputImage, TOutputImage, TFFTPrecision>::GenerateInputRequestedRegion()

diff --git a/include/rtkFDKWeightProjectionFilter.h b/include/rtkFDKWeightProjectionFilter.h
@@ -78,6 +78,10 @@ class ITK_EXPORT FDKWeightProjectionFilter : public itk::InPlaceImageFilter<TInp
   FDKWeightProjectionFilter() = default;
   ~FDKWeightProjectionFilter() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void
+  VerifyPreconditions() ITKv5_CONST override;
+
   void
   BeforeThreadedGenerateData() override;
 

diff --git a/include/rtkFDKWeightProjectionFilter.hxx b/include/rtkFDKWeightProjectionFilter.hxx
@@ -25,6 +25,17 @@
 
 namespace rtk
 {
+
+template <class TInputImage, class TOutputImage>
+void
+FDKWeightProjectionFilter<TInputImage, TOutputImage>::VerifyPreconditions() ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 template <class TInputImage, class TOutputImage>
 void
 FDKWeightProjectionFilter<TInputImage, TOutputImage>::BeforeThreadedGenerateData()

diff --git a/include/rtkFieldOfViewImageFilter.h b/include/rtkFieldOfViewImageFilter.h
@@ -114,6 +114,9 @@ class ITK_EXPORT FieldOfViewImageFilter : public itk::InPlaceImageFilter<TInputI
   FieldOfViewImageFilter();
   ~FieldOfViewImageFilter() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void VerifyPreconditions() ITKv5_CONST override;
+
   void
   BeforeThreadedGenerateData() override;
 

diff --git a/include/rtkFieldOfViewImageFilter.hxx b/include/rtkFieldOfViewImageFilter.hxx
@@ -188,6 +188,16 @@ FieldOfViewImageFilter<TInputImage, TOutputImage>::ComputeFOVRadius(const FOVRad
   return true;
 }
 
+template <class TInputImage, class TOutputImage>
+void
+FieldOfViewImageFilter<TInputImage, TOutputImage>::VerifyPreconditions() ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 template <class TInputImage, class TOutputImage>
 void
 FieldOfViewImageFilter<TInputImage, TOutputImage>::BeforeThreadedGenerateData()

diff --git a/include/rtkForwardProjectionImageFilter.h b/include/rtkForwardProjectionImageFilter.h
@@ -65,6 +65,9 @@ class ForwardProjectionImageFilter : public itk::InPlaceImageFilter<TInputImage,
 
   ~ForwardProjectionImageFilter() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void VerifyPreconditions() ITKv5_CONST override;
+
   /** Apply changes to the input image requested region. */
   void
   GenerateInputRequestedRegion() override;

diff --git a/include/rtkForwardProjectionImageFilter.hxx b/include/rtkForwardProjectionImageFilter.hxx
@@ -30,6 +30,16 @@
 namespace rtk
 {
 
+template <class TInputImage, class TOutputImage>
+void
+ForwardProjectionImageFilter<TInputImage, TOutputImage>::VerifyPreconditions() ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 template <class TInputImage, class TOutputImage>
 void
 ForwardProjectionImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion()

diff --git a/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h b/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h
@@ -187,6 +187,9 @@ class ITK_EXPORT FourDConjugateGradientConeBeamReconstructionFilter
   FourDConjugateGradientConeBeamReconstructionFilter();
   ~FourDConjugateGradientConeBeamReconstructionFilter() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void VerifyPreconditions() ITKv5_CONST override;
+
   void
   GenerateOutputInformation() override;
 

diff --git a/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.hxx b/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.hxx
@@ -152,6 +152,17 @@ FourDConjugateGradientConeBeamReconstructionFilter<VolumeSeriesType, ProjectionS
   this->Modified();
 }
 
+template <class VolumeSeriesType, class ProjectionStackType>
+void
+FourDConjugateGradientConeBeamReconstructionFilter<VolumeSeriesType, ProjectionStackType>::VerifyPreconditions()
+  ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 template <class VolumeSeriesType, class ProjectionStackType>
 void
 FourDConjugateGradientConeBeamReconstructionFilter<VolumeSeriesType, ProjectionStackType>::GenerateOutputInformation()

diff --git a/include/rtkFourDROOSTERConeBeamReconstructionFilter.h b/include/rtkFourDROOSTERConeBeamReconstructionFilter.h
@@ -398,6 +398,9 @@ class FourDROOSTERConeBeamReconstructionFilter
   FourDROOSTERConeBeamReconstructionFilter();
   ~FourDROOSTERConeBeamReconstructionFilter() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void VerifyPreconditions() ITKv5_CONST override;
+
   /** Does the real work. */
   void
   GenerateData() override;

diff --git a/include/rtkFourDROOSTERConeBeamReconstructionFilter.hxx b/include/rtkFourDROOSTERConeBeamReconstructionFilter.hxx
@@ -200,6 +200,16 @@ FourDROOSTERConeBeamReconstructionFilter<VolumeSeriesType, ProjectionStackType>:
   this->Modified();
 }
 
+template <typename VolumeSeriesType, typename ProjectionStackType>
+void
+FourDROOSTERConeBeamReconstructionFilter<VolumeSeriesType, ProjectionStackType>::VerifyPreconditions() ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 template <typename VolumeSeriesType, typename ProjectionStackType>
 void
 FourDROOSTERConeBeamReconstructionFilter<VolumeSeriesType, ProjectionStackType>::GenerateInputRequestedRegion()

diff --git a/include/rtkFourDReconstructionConjugateGradientOperator.h b/include/rtkFourDReconstructionConjugateGradientOperator.h
@@ -228,6 +228,9 @@ class FourDReconstructionConjugateGradientOperator : public ConjugateGradientOpe
   FourDReconstructionConjugateGradientOperator();
   ~FourDReconstructionConjugateGradientOperator() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void VerifyPreconditions() ITKv5_CONST override;
+
   /** Builds the pipeline and computes output information */
   void
   GenerateOutputInformation() override;

diff --git a/include/rtkFourDReconstructionConjugateGradientOperator.hxx b/include/rtkFourDReconstructionConjugateGradientOperator.hxx
@@ -154,6 +154,16 @@ FourDReconstructionConjugateGradientOperator<VolumeSeriesType, ProjectionStackTy
   m_ConstantVolumeSeriesSource->ReleaseDataFlagOn();
 }
 
+template <typename VolumeSeriesType, typename ProjectionStackType>
+void
+FourDReconstructionConjugateGradientOperator<VolumeSeriesType, ProjectionStackType>::VerifyPreconditions() ITKv5_CONST
+{
+  this->Superclass::VerifyPreconditions();
+
+  if (this->m_Geometry.IsNull())
+    itkExceptionMacro(<< "Geometry has not been set.");
+}
+
 template <typename VolumeSeriesType, typename ProjectionStackType>
 void
 FourDReconstructionConjugateGradientOperator<VolumeSeriesType, ProjectionStackType>::GenerateOutputInformation()

diff --git a/include/rtkFourDSARTConeBeamReconstructionFilter.h b/include/rtkFourDSARTConeBeamReconstructionFilter.h
@@ -220,6 +220,9 @@ class ITK_EXPORT FourDSARTConeBeamReconstructionFilter
   FourDSARTConeBeamReconstructionFilter();
   ~FourDSARTConeBeamReconstructionFilter() override = default;
 
+  /** Checks that inputs are correctly set. */
+  void VerifyPreconditions() ITKv5_CONST override;
+
   void
   GenerateInputRequestedRegion() override;