Added versioning to filter parameters and json (#1088)

* Added IFilter::parametersVersion() and IParameter::getVersion() * Updated filter hpp files * Updated filter cpp files * Updated IParameter::fromJson to allow for no version specified * Updated test filters * Updated parameters * Updated python bindings * Updated new filter from rebase * Allowed backwards compatible parameter json reading * Updated pipelines --------- Signed-off-by: Jared Duffey <[email protected]>
BlueQuartzSoftware · Sep 30, 2024 · 59d102d · 59d102d
1 parent f25133d
commit 59d102d
Show file tree

Hide file tree

Showing 690 changed files with 20,751 additions and 12,794 deletions.
diff --git a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline
diff --git a/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline
diff --git a/src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline
diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImageFilter.cpp
@@ -82,6 +82,12 @@ Parameters ITKAbsImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKAbsImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKAbsImageFilter::clone() const
 {

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImageFilter.hpp
@@ -76,6 +76,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKAbsImageFilter : public IFilter
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImageFilter.cpp
@@ -82,6 +82,12 @@ Parameters ITKAcosImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKAcosImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKAcosImageFilter::clone() const
 {

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImageFilter.hpp
@@ -95,6 +95,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKAcosImageFilter : public IFilter
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/...Processing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.cpp b/...Processing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.cpp
@@ -105,6 +105,12 @@ Parameters ITKAdaptiveHistogramEqualizationImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKAdaptiveHistogramEqualizationImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKAdaptiveHistogramEqualizationImageFilter::clone() const
 {

diff --git a/...Processing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.hpp b/...Processing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.hpp
@@ -94,6 +94,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKAdaptiveHistogramEqualizationImageFilter : pu
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/...eProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.cpp b/...eProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.cpp
@@ -88,6 +88,12 @@ Parameters ITKApproximateSignedDistanceMapImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKApproximateSignedDistanceMapImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKApproximateSignedDistanceMapImageFilter::clone() const
 {

diff --git a/...eProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.hpp b/...eProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.hpp
@@ -104,6 +104,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKApproximateSignedDistanceMapImageFilter : pub
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImageFilter.cpp
@@ -82,6 +82,12 @@ Parameters ITKAsinImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKAsinImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKAsinImageFilter::clone() const
 {

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImageFilter.hpp
@@ -95,6 +95,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKAsinImageFilter : public IFilter
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImageFilter.cpp
@@ -82,6 +82,12 @@ Parameters ITKAtanImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKAtanImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKAtanImageFilter::clone() const
 {

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImageFilter.hpp
@@ -91,6 +91,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKAtanImageFilter : public IFilter
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/...Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.cpp b/...Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.cpp
@@ -97,6 +97,12 @@ Parameters ITKBinaryContourImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKBinaryContourImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKBinaryContourImageFilter::clone() const
 {

diff --git a/...Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.hpp b/...Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.hpp
@@ -89,6 +89,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryContourImageFilter : public IFilter
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImageFilter.cpp
@@ -104,6 +104,12 @@ Parameters ITKBinaryDilateImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKBinaryDilateImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKBinaryDilateImageFilter::clone() const
 {

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImageFilter.hpp
@@ -100,6 +100,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryDilateImageFilter : public IFilter
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImageFilter.cpp
@@ -104,6 +104,12 @@ Parameters ITKBinaryErodeImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKBinaryErodeImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKBinaryErodeImageFilter::clone() const
 {

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImageFilter.hpp
@@ -100,6 +100,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryErodeImageFilter : public IFilter
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/...ageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.cpp b/...ageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.cpp
@@ -100,6 +100,12 @@ Parameters ITKBinaryMorphologicalClosingImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKBinaryMorphologicalClosingImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKBinaryMorphologicalClosingImageFilter::clone() const
 {

diff --git a/...ageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.hpp b/...ageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.hpp
@@ -90,6 +90,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryMorphologicalClosingImageFilter : publi
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/...ageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.cpp b/...ageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.cpp
@@ -100,6 +100,12 @@ Parameters ITKBinaryMorphologicalOpeningImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKBinaryMorphologicalOpeningImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKBinaryMorphologicalOpeningImageFilter::clone() const
 {

diff --git a/...ageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.hpp b/...ageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.hpp
@@ -90,6 +90,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryMorphologicalOpeningImageFilter : publi
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/...Processing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.cpp b/...Processing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.cpp
@@ -107,6 +107,12 @@ Parameters ITKBinaryOpeningByReconstructionImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKBinaryOpeningByReconstructionImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKBinaryOpeningByReconstructionImageFilter::clone() const
 {

diff --git a/...Processing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.hpp b/...Processing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.hpp
@@ -90,6 +90,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryOpeningByReconstructionImageFilter : pu
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/...gins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.cpp b/...gins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.cpp
@@ -98,6 +98,12 @@ Parameters ITKBinaryProjectionImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKBinaryProjectionImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKBinaryProjectionImageFilter::clone() const
 {

diff --git a/...gins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.hpp b/...gins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.hpp
@@ -105,6 +105,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryProjectionImageFilter : public IFilter
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return

diff --git a/...lugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.cpp b/...lugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.cpp
@@ -81,6 +81,12 @@ Parameters ITKBinaryThinningImageFilter::parameters() const
   return params;
 }
 
+//------------------------------------------------------------------------------
+IFilter::VersionType ITKBinaryThinningImageFilter::parametersVersion() const
+{
+  return 1;
+}
+
 //------------------------------------------------------------------------------
 IFilter::UniquePointer ITKBinaryThinningImageFilter::clone() const
 {

diff --git a/...lugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.hpp b/...lugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.hpp
@@ -88,6 +88,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryThinningImageFilter : public IFilter
    */
   Parameters parameters() const override;
 
+  /**
+   * @brief Returns parameters version integer.
+   * Initial version should always be 1.
+   * Should be incremented everytime the parameters change.
+   * @return VersionType
+   */
+  VersionType parametersVersion() const override;
+
   /**
    * @brief Returns a copy of the filter.
    * @return