From 59d102d34344bc6fdb73ab61ead4847dc090e8df Mon Sep 17 00:00:00 2001 From: Jared Duffey Date: Mon, 30 Sep 2024 15:31:32 -0400 Subject: [PATCH] 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 --- .../(02) Image Segmentation.d3dpipeline | 428 +++-- .../(03) Porosity Mesh Export.d3dpipeline | 580 ++++-- .../(04) Porosity Analysis.d3dpipeline | 487 +++-- .../Filters/ITKAbsImageFilter.cpp | 6 + .../Filters/ITKAbsImageFilter.hpp | 8 + .../Filters/ITKAcosImageFilter.cpp | 6 + .../Filters/ITKAcosImageFilter.hpp | 8 + ...aptiveHistogramEqualizationImageFilter.cpp | 6 + ...aptiveHistogramEqualizationImageFilter.hpp | 8 + ...pproximateSignedDistanceMapImageFilter.cpp | 6 + ...pproximateSignedDistanceMapImageFilter.hpp | 8 + .../Filters/ITKAsinImageFilter.cpp | 6 + .../Filters/ITKAsinImageFilter.hpp | 8 + .../Filters/ITKAtanImageFilter.cpp | 6 + .../Filters/ITKAtanImageFilter.hpp | 8 + .../Filters/ITKBinaryContourImageFilter.cpp | 6 + .../Filters/ITKBinaryContourImageFilter.hpp | 8 + .../Filters/ITKBinaryDilateImageFilter.cpp | 6 + .../Filters/ITKBinaryDilateImageFilter.hpp | 8 + .../Filters/ITKBinaryErodeImageFilter.cpp | 6 + .../Filters/ITKBinaryErodeImageFilter.hpp | 8 + ...KBinaryMorphologicalClosingImageFilter.cpp | 6 + ...KBinaryMorphologicalClosingImageFilter.hpp | 8 + ...KBinaryMorphologicalOpeningImageFilter.cpp | 6 + ...KBinaryMorphologicalOpeningImageFilter.hpp | 8 + ...naryOpeningByReconstructionImageFilter.cpp | 6 + ...naryOpeningByReconstructionImageFilter.hpp | 8 + .../ITKBinaryProjectionImageFilter.cpp | 6 + .../ITKBinaryProjectionImageFilter.hpp | 8 + .../Filters/ITKBinaryThinningImageFilter.cpp | 6 + .../Filters/ITKBinaryThinningImageFilter.hpp | 8 + .../Filters/ITKBinaryThresholdImageFilter.cpp | 6 + .../Filters/ITKBinaryThresholdImageFilter.hpp | 8 + .../Filters/ITKBlackTopHatImageFilter.cpp | 6 + .../Filters/ITKBlackTopHatImageFilter.hpp | 8 + .../ITKBoundedReciprocalImageFIlter.cpp | 6 + .../ITKBoundedReciprocalImageFilter.hpp | 8 + .../ITKClosingByReconstructionImageFilter.cpp | 6 + .../ITKClosingByReconstructionImageFilter.hpp | 8 + .../ITKConnectedComponentImageFilter.cpp | 6 + .../ITKConnectedComponentImageFilter.hpp | 8 + .../Filters/ITKCosImageFilter.cpp | 6 + .../Filters/ITKCosImageFilter.hpp | 8 + ...rvatureAnisotropicDiffusionImageFilter.cpp | 6 + ...rvatureAnisotropicDiffusionImageFilter.hpp | 8 + .../Filters/ITKCurvatureFlowImageFilter.cpp | 6 + .../Filters/ITKCurvatureFlowImageFilter.hpp | 8 + .../ITKDanielssonDistanceMapImageFilter.cpp | 6 + .../ITKDanielssonDistanceMapImageFilter.hpp | 8 + .../ITKDilateObjectMorphologyImageFilter.cpp | 6 + .../ITKDilateObjectMorphologyImageFilter.hpp | 8 + .../ITKDiscreteGaussianImageFilter.cpp | 6 + .../ITKDiscreteGaussianImageFilter.hpp | 8 + .../Filters/ITKDoubleThresholdImageFilter.cpp | 6 + .../Filters/ITKDoubleThresholdImageFilter.hpp | 8 + .../ITKErodeObjectMorphologyImageFilter.cpp | 6 + .../ITKErodeObjectMorphologyImageFilter.hpp | 8 + .../Filters/ITKExpImageFilter.cpp | 6 + .../Filters/ITKExpImageFilter.hpp | 8 + .../Filters/ITKExpNegativeImageFilter.cpp | 6 + .../Filters/ITKExpNegativeImageFilter.hpp | 8 + ...radientAnisotropicDiffusionImageFilter.cpp | 6 + ...radientAnisotropicDiffusionImageFilter.hpp | 8 + .../ITKGradientMagnitudeImageFilter.cpp | 6 + .../ITKGradientMagnitudeImageFilter.hpp | 8 + ...tMagnitudeRecursiveGaussianImageFilter.cpp | 6 + ...tMagnitudeRecursiveGaussianImageFilter.hpp | 8 + .../Filters/ITKGrayscaleDilateImageFilter.cpp | 6 + .../Filters/ITKGrayscaleDilateImageFilter.hpp | 8 + .../Filters/ITKGrayscaleErodeImageFilter.cpp | 6 + .../Filters/ITKGrayscaleErodeImageFilter.hpp | 8 + .../ITKGrayscaleFillholeImageFilter.cpp | 6 + .../ITKGrayscaleFillholeImageFilter.hpp | 8 + .../ITKGrayscaleGrindPeakImageFilter.cpp | 6 + .../ITKGrayscaleGrindPeakImageFilter.hpp | 8 + ...ayscaleMorphologicalClosingImageFilter.cpp | 6 + ...ayscaleMorphologicalClosingImageFilter.hpp | 8 + ...ayscaleMorphologicalOpeningImageFilter.cpp | 6 + ...ayscaleMorphologicalOpeningImageFilter.hpp | 8 + .../Filters/ITKHConvexImageFilter.cpp | 6 + .../Filters/ITKHConvexImageFilter.hpp | 8 + .../Filters/ITKHMaximaImageFilter.cpp | 6 + .../Filters/ITKHMaximaImageFilter.hpp | 8 + .../Filters/ITKHMinimaImageFilter.cpp | 6 + .../Filters/ITKHMinimaImageFilter.hpp | 8 + .../Filters/ITKImageReaderFilter.cpp | 6 + .../Filters/ITKImageReaderFilter.hpp | 8 + .../Filters/ITKImageWriterFilter.cpp | 6 + .../Filters/ITKImageWriterFilter.hpp | 8 + .../Filters/ITKImportFijiMontageFilter.cpp | 6 + .../Filters/ITKImportFijiMontageFilter.hpp | 8 + .../Filters/ITKImportImageStackFilter.cpp | 6 + .../Filters/ITKImportImageStackFilter.hpp | 8 + .../ITKIntensityWindowingImageFilter.cpp | 6 + .../ITKIntensityWindowingImageFilter.hpp | 8 + .../Filters/ITKInvertIntensityImageFilter.cpp | 6 + .../Filters/ITKInvertIntensityImageFilter.hpp | 8 + .../ITKIsoContourDistanceImageFilter.cpp | 6 + .../ITKIsoContourDistanceImageFilter.hpp | 8 + .../Filters/ITKLabelContourImageFilter.cpp | 6 + .../Filters/ITKLabelContourImageFilter.hpp | 8 + ...KLaplacianRecursiveGaussianImageFilter.cpp | 6 + ...KLaplacianRecursiveGaussianImageFilter.hpp | 8 + .../Filters/ITKLog10ImageFilter.cpp | 6 + .../Filters/ITKLog10ImageFilter.hpp | 8 + .../Filters/ITKLogImageFilter.cpp | 6 + .../Filters/ITKLogImageFilter.hpp | 8 + .../Filters/ITKMaskImageFilter.cpp | 6 + .../Filters/ITKMaskImageFilter.hpp | 8 + .../Filters/ITKMeanProjectionImageFilter.cpp | 6 + .../Filters/ITKMeanProjectionImageFilter.hpp | 8 + .../Filters/ITKMedianImageFilter.cpp | 6 + .../Filters/ITKMedianImageFilter.hpp | 8 + .../Filters/ITKMhaFileReaderFilter.cpp | 6 + .../Filters/ITKMhaFileReaderFilter.hpp | 8 + .../ITKMinMaxCurvatureFlowImageFilter.cpp | 6 + .../ITKMinMaxCurvatureFlowImageFilter.hpp | 8 + .../ITKMorphologicalGradientImageFilter.cpp | 6 + .../ITKMorphologicalGradientImageFilter.hpp | 8 + ...logicalWatershedFromMarkersImageFilter.cpp | 6 + ...logicalWatershedFromMarkersImageFilter.hpp | 8 + .../ITKMorphologicalWatershedImageFilter.cpp | 6 + .../ITKMorphologicalWatershedImageFilter.hpp | 8 + .../Filters/ITKNormalizeImageFilter.cpp | 6 + .../Filters/ITKNormalizeImageFilter.hpp | 8 + .../ITKNormalizeToConstantImageFilter.cpp | 6 + .../ITKNormalizeToConstantImageFilter.hpp | 8 + .../Filters/ITKNotImageFilter.cpp | 6 + .../Filters/ITKNotImageFilter.hpp | 8 + .../ITKOpeningByReconstructionImageFilter.cpp | 6 + .../ITKOpeningByReconstructionImageFilter.hpp | 8 + .../ITKOtsuMultipleThresholdsImageFilter.cpp | 6 + .../ITKOtsuMultipleThresholdsImageFilter.hpp | 8 + .../Filters/ITKRegionalMaximaImageFilter.cpp | 6 + .../Filters/ITKRegionalMaximaImageFilter.hpp | 8 + .../Filters/ITKRegionalMinimaImageFilter.cpp | 6 + .../Filters/ITKRegionalMinimaImageFilter.hpp | 8 + .../ITKRelabelComponentImageFilter.cpp | 6 + .../ITKRelabelComponentImageFilter.hpp | 8 + .../ITKRescaleIntensityImageFilter.cpp | 6 + .../ITKRescaleIntensityImageFilter.hpp | 8 + .../Filters/ITKSigmoidImageFilter.cpp | 6 + .../Filters/ITKSigmoidImageFilter.hpp | 8 + ...SignedDanielssonDistanceMapImageFilter.cpp | 6 + ...SignedDanielssonDistanceMapImageFilter.hpp | 8 + .../ITKSignedMaurerDistanceMapImageFilter.cpp | 6 + .../ITKSignedMaurerDistanceMapImageFilter.hpp | 8 + .../Filters/ITKSinImageFilter.cpp | 6 + .../Filters/ITKSinImageFilter.hpp | 8 + ...KSmoothingRecursiveGaussianImageFilter.cpp | 6 + ...KSmoothingRecursiveGaussianImageFilter.hpp | 8 + .../Filters/ITKSqrtImageFilter.cpp | 6 + .../Filters/ITKSqrtImageFilter.hpp | 8 + .../Filters/ITKSquareImageFilter.cpp | 6 + .../Filters/ITKSquareImageFilter.hpp | 8 + ...StandardDeviationProjectionImageFilter.cpp | 6 + ...StandardDeviationProjectionImageFilter.hpp | 8 + .../Filters/ITKSumProjectionImageFilter.cpp | 6 + .../Filters/ITKSumProjectionImageFilter.hpp | 8 + .../Filters/ITKTanImageFilter.cpp | 6 + .../Filters/ITKTanImageFilter.hpp | 8 + .../Filters/ITKThresholdImageFilter.cpp | 6 + .../Filters/ITKThresholdImageFilter.hpp | 8 + ...dMaximumConnectedComponentsImageFilter.cpp | 6 + ...dMaximumConnectedComponentsImageFilter.hpp | 8 + .../ITKValuedRegionalMaximaImageFilter.cpp | 6 + .../ITKValuedRegionalMaximaImageFilter.hpp | 8 + .../ITKValuedRegionalMinimaImageFilter.cpp | 6 + .../ITKValuedRegionalMinimaImageFilter.hpp | 8 + .../Filters/ITKWhiteTopHatImageFilter.cpp | 6 + .../Filters/ITKWhiteTopHatImageFilter.hpp | 8 + .../Filters/ITKZeroCrossingImageFilter.cpp | 6 + .../Filters/ITKZeroCrossingImageFilter.hpp | 8 + ...AlignSectionsMutualInformation.d3dpipeline | 213 ++- .../pipelines/CI_Histogram.d3dpipeline | 316 +++- .../ComputeGBCD-GBPDMetricBased.d3dpipeline | 1546 +++------------ .../(01) Small IN100 Archive.d3dpipeline | 48 +- ...mall IN100 Full Reconstruction.d3dpipeline | 931 ++++++--- ...IN100 Morphological Statistics.d3dpipeline | 816 +++----- ...00 Crystallographic Statistics.d3dpipeline | 971 +++------- .../(01) Small IN100 Quick Mesh.d3dpipeline | 290 ++- .../(02) Small IN100 Smooth Mesh.d3dpipeline | 194 +- ...3) Small IN100 Mesh Statistics.d3dpipeline | 1305 ++----------- .../(04) Small IN100 GBCD.d3dpipeline | 1662 +++-------------- .../(05) Small IN100 GBCD Metric.d3dpipeline | 1528 ++------------- .../EBSD_Hexagonal_Data_Analysis.d3dpipeline | 715 +++++-- .../pipelines/Edax_IPF_Colors.d3dpipeline | 252 ++- .../pipelines/EnsembleInfoReader.d3dpipeline | 263 ++- .../ImportBrukerNanoEspritData.d3dpipeline | 75 +- .../pipelines/ImportEdaxOIMData.d3dpipeline | 196 +- .../pipelines/ReadAng.d3dpipeline | 230 ++- .../pipelines/ReadCTF.d3dpipeline | 233 ++- .../pipelines/TxCopper_Exposed.d3dpipeline | 443 ++++- .../pipelines/TxCopper_Unexposed.d3dpipeline | 443 ++++- .../pipelines/aptr12_Analysis.d3dpipeline | 993 +++++++--- .../pipelines/avtr12_Analysis.d3dpipeline | 993 +++++++--- .../AlignSectionsMisorientationFilter.cpp | 6 + .../AlignSectionsMisorientationFilter.hpp | 8 + .../AlignSectionsMutualInformationFilter.cpp | 6 + .../AlignSectionsMutualInformationFilter.hpp | 8 + .../BadDataNeighborOrientationCheckFilter.cpp | 6 + .../BadDataNeighborOrientationCheckFilter.hpp | 8 + .../Filters/CAxisSegmentFeaturesFilter.cpp | 6 + .../Filters/CAxisSegmentFeaturesFilter.hpp | 8 + .../Filters/ComputeAvgCAxesFilter.cpp | 6 + .../Filters/ComputeAvgCAxesFilter.hpp | 8 + .../Filters/ComputeAvgOrientationsFilter.cpp | 6 + .../Filters/ComputeAvgOrientationsFilter.hpp | 8 + .../ComputeBoundaryStrengthsFilter.cpp | 6 + .../ComputeBoundaryStrengthsFilter.hpp | 8 + .../Filters/ComputeCAxisLocationsFilter.cpp | 6 + .../Filters/ComputeCAxisLocationsFilter.hpp | 8 + .../Filters/ComputeFZQuaternionsFilter.cpp | 6 + .../Filters/ComputeFZQuaternionsFilter.hpp | 8 + .../Filters/ComputeFaceIPFColoringFilter.cpp | 6 + .../Filters/ComputeFaceIPFColoringFilter.hpp | 8 + ...ComputeFeatureFaceMisorientationFilter.cpp | 6 + ...ComputeFeatureFaceMisorientationFilter.hpp | 8 + ...eatureNeighborCAxisMisalignmentsFilter.cpp | 6 + ...eatureNeighborCAxisMisalignmentsFilter.hpp | 8 + ...ureReferenceCAxisMisorientationsFilter.cpp | 6 + ...ureReferenceCAxisMisorientationsFilter.hpp | 8 + ...eFeatureReferenceMisorientationsFilter.cpp | 6 + ...eFeatureReferenceMisorientationsFilter.hpp | 8 + .../Filters/ComputeGBCDFilter.cpp | 6 + .../Filters/ComputeGBCDFilter.hpp | 8 + .../Filters/ComputeGBCDMetricBasedFilter.cpp | 6 + .../Filters/ComputeGBCDMetricBasedFilter.hpp | 8 + .../Filters/ComputeGBCDPoleFigureFilter.cpp | 6 + .../Filters/ComputeGBCDPoleFigureFilter.hpp | 8 + .../Filters/ComputeGBPDMetricBasedFilter.cpp | 6 + .../Filters/ComputeGBPDMetricBasedFilter.hpp | 8 + .../Filters/ComputeIPFColorsFilter.cpp | 6 + .../Filters/ComputeIPFColorsFilter.hpp | 8 + .../ComputeKernelAvgMisorientationsFilter.cpp | 6 + .../ComputeKernelAvgMisorientationsFilter.hpp | 8 + .../Filters/ComputeMisorientationsFilter.cpp | 6 + .../Filters/ComputeMisorientationsFilter.hpp | 8 + .../ComputeQuaternionConjugateFilter.cpp | 6 + .../ComputeQuaternionConjugateFilter.hpp | 8 + .../Filters/ComputeSchmidsFilter.cpp | 6 + .../Filters/ComputeSchmidsFilter.hpp | 8 + .../Filters/ComputeShapesFilter.cpp | 6 + .../Filters/ComputeShapesFilter.hpp | 8 + .../ComputeSlipTransmissionMetricsFilter.cpp | 6 + .../ComputeSlipTransmissionMetricsFilter.hpp | 8 + .../ComputeTriangleGeomShapesFilter.cpp | 6 + .../ComputeTriangleGeomShapesFilter.hpp | 8 + .../ConvertHexGridToSquareGridFilter.cpp | 6 + .../ConvertHexGridToSquareGridFilter.hpp | 8 + .../Filters/ConvertOrientationsFilter.cpp | 6 + .../Filters/ConvertOrientationsFilter.hpp | 8 + .../Filters/ConvertQuaternionFilter.cpp | 6 + .../Filters/ConvertQuaternionFilter.hpp | 8 + .../Filters/CreateEnsembleInfoFilter.cpp | 6 + .../Filters/CreateEnsembleInfoFilter.hpp | 8 + .../Filters/EBSDSegmentFeaturesFilter.cpp | 6 + .../Filters/EBSDSegmentFeaturesFilter.hpp | 8 + .../Filters/EbsdToH5EbsdFilter.cpp | 6 + .../Filters/EbsdToH5EbsdFilter.hpp | 8 + .../Filters/MergeTwinsFilter.cpp | 6 + .../Filters/MergeTwinsFilter.hpp | 8 + .../NeighborOrientationCorrelationFilter.cpp | 6 + .../NeighborOrientationCorrelationFilter.hpp | 8 + .../Filters/ReadAngDataFilter.cpp | 6 + .../Filters/ReadAngDataFilter.hpp | 8 + .../Filters/ReadCtfDataFilter.cpp | 6 + .../Filters/ReadCtfDataFilter.hpp | 8 + .../Filters/ReadEnsembleInfoFilter.cpp | 6 + .../Filters/ReadEnsembleInfoFilter.hpp | 8 + .../Filters/ReadH5EbsdFilter.cpp | 6 + .../Filters/ReadH5EbsdFilter.hpp | 8 + .../Filters/ReadH5EspritDataFilter.cpp | 6 + .../Filters/ReadH5EspritDataFilter.hpp | 8 + .../Filters/ReadH5OimDataFilter.cpp | 6 + .../Filters/ReadH5OimDataFilter.hpp | 8 + .../Filters/ReadH5OinaDataFilter.cpp | 6 + .../Filters/ReadH5OinaDataFilter.hpp | 8 + .../Filters/RodriguesConvertorFilter.cpp | 6 + .../Filters/RodriguesConvertorFilter.hpp | 8 + .../Filters/RotateEulerRefFrameFilter.cpp | 6 + .../Filters/RotateEulerRefFrameFilter.hpp | 8 + .../Filters/WriteGBCDGMTFileFilter.cpp | 6 + .../Filters/WriteGBCDGMTFileFilter.hpp | 8 + .../Filters/WriteGBCDTriangleDataFilter.cpp | 6 + .../Filters/WriteGBCDTriangleDataFilter.hpp | 8 + .../Filters/WriteINLFileFilter.cpp | 6 + .../Filters/WriteINLFileFilter.hpp | 8 + .../Filters/WritePoleFigureFilter.cpp | 6 + .../Filters/WritePoleFigureFilter.hpp | 8 + .../WriteStatsGenOdfAngleFileFilter.cpp | 6 + .../WriteStatsGenOdfAngleFileFilter.hpp | 8 + .../OEMEbsdScanSelectionParameter.cpp | 10 +- .../OEMEbsdScanSelectionParameter.h | 31 +- .../Parameters/ReadH5EbsdFileParameter.cpp | 10 +- .../Parameters/ReadH5EbsdFileParameter.h | 25 +- .../pipelines/AppendImageGeometry.d3dpipeline | 593 ++++-- .../ApplyTransformation_Demo.d3dpipeline | 291 ++- .../ApplyTransformation_Image.d3dpipeline | 722 ++++--- .../ApplyTransformation_Node.d3dpipeline | 500 +++-- .../ArrayCalculatorExample.d3dpipeline | 282 ++- .../pipelines/AvizoWriters.d3dpipeline | 134 +- .../pipelines/CombineStlFiles.d3dpipeline | 72 +- .../ComputeBiasedFeatures.d3dpipeline | 236 ++- .../ComputeBoundaryCells.d3dpipeline | 122 +- .../ComputeLargestCrossSections.d3dpipeline | 251 ++- ...Compute_Feature_Face_Curvature.d3dpipeline | 442 +++-- ...mpute_Feature_Face_Curvature_2.d3dpipeline | 564 ++++-- .../pipelines/CreateEdgeGeom.d3dpipeline | 522 ++++-- .../CreateHexahedralGeom.d3dpipeline | 558 ++++-- .../pipelines/CreateImageGeom.d3dpipeline | 344 +++- .../pipelines/CreateQuadGeom.d3dpipeline | 534 ++++-- .../pipelines/CreateRectGridGeom.d3dpipeline | 407 ++-- .../pipelines/CreateScanVectors.d3dpipeline | 194 +- .../CreateTetrahedralGeom.d3dpipeline | 534 ++++-- .../pipelines/CreateTriangleGeom.d3dpipeline | 528 ++++-- .../pipelines/CreateVertexGeom.d3dpipeline | 436 +++-- .../pipelines/ExecuteProcess.d3dpipeline | 26 +- .../ExtractPipelineToFile.d3dpipeline | 15 +- .../ExtractVertexGeometry.d3dpipeline | 359 ++-- .../pipelines/Import_CSV_File.d3dpipeline | 315 +++- .../pipelines/Import_STL_Model.d3dpipeline | 95 +- .../pipelines/Import_Text_Data.d3dpipeline | 279 ++- .../pipelines/Remove_Triangles.d3dpipeline | 227 ++- ...eElementAttributesWithNeighbor.d3dpipeline | 434 +++-- .../ResamplePorosityImage.d3dpipeline | 348 +++- .../ResampleRectGridToImageGeom.d3dpipeline | 616 ++++-- .../pipelines/SurfaceNets_Demo.d3dpipeline | 297 ++- .../Triangle_Face_Data_Demo.d3dpipeline | 90 +- .../VtkRectilinearGridWriter.d3dpipeline | 549 +----- ...move_flagged_triangles_example.d3dpipeline | 188 +- .../SimplnxCore/Filters/AddBadDataFilter.cpp | 6 + .../SimplnxCore/Filters/AddBadDataFilter.hpp | 8 + .../Filters/AlignGeometriesFilter.cpp | 6 + .../Filters/AlignGeometriesFilter.hpp | 8 + .../AlignSectionsFeatureCentroidFilter.cpp | 6 + .../AlignSectionsFeatureCentroidFilter.hpp | 8 + .../Filters/AlignSectionsListFilter.cpp | 6 + .../Filters/AlignSectionsListFilter.hpp | 8 + .../Filters/AppendImageGeometryFilter.cpp | 6 + .../Filters/AppendImageGeometryFilter.hpp | 8 + .../ApplyTransformationToGeometryFilter.cpp | 6 + .../ApplyTransformationToGeometryFilter.hpp | 8 + .../ApproximatePointCloudHullFilter.cpp | 6 + .../ApproximatePointCloudHullFilter.hpp | 8 + .../Filters/ArrayCalculatorFilter.cpp | 6 + .../Filters/ArrayCalculatorFilter.hpp | 8 + .../ChangeAngleRepresentationFilter.cpp | 6 + .../ChangeAngleRepresentationFilter.hpp | 8 + .../Filters/CombineAttributeArraysFilter.cpp | 6 + .../Filters/CombineAttributeArraysFilter.hpp | 8 + .../Filters/CombineStlFilesFilter.cpp | 6 + .../Filters/CombineStlFilesFilter.hpp | 8 + .../Filters/ComputeArrayHistogramFilter.cpp | 6 + .../Filters/ComputeArrayHistogramFilter.hpp | 8 + .../Filters/ComputeArrayStatisticsFilter.cpp | 6 + .../Filters/ComputeArrayStatisticsFilter.hpp | 8 + .../Filters/ComputeBiasedFeaturesFilter.cpp | 6 + .../Filters/ComputeBiasedFeaturesFilter.hpp | 8 + .../Filters/ComputeBoundaryCellsFilter.cpp | 6 + .../Filters/ComputeBoundaryCellsFilter.hpp | 8 + .../ComputeBoundaryElementFractionsFilter.cpp | 6 + .../ComputeBoundaryElementFractionsFilter.hpp | 8 + .../Filters/ComputeDifferencesMapFilter.cpp | 6 + .../Filters/ComputeDifferencesMapFilter.hpp | 8 + .../Filters/ComputeEuclideanDistMapFilter.cpp | 6 + .../Filters/ComputeEuclideanDistMapFilter.hpp | 8 + .../Filters/ComputeFeatureCentroidsFilter.cpp | 6 + .../Filters/ComputeFeatureCentroidsFilter.hpp | 8 + .../ComputeFeatureClusteringFilter.cpp | 6 + .../ComputeFeatureClusteringFilter.hpp | 8 + .../Filters/ComputeFeatureNeighborsFilter.cpp | 6 + .../Filters/ComputeFeatureNeighborsFilter.hpp | 8 + .../ComputeFeaturePhasesBinaryFilter.cpp | 6 + .../ComputeFeaturePhasesBinaryFilter.hpp | 8 + .../Filters/ComputeFeaturePhasesFilter.cpp | 6 + .../Filters/ComputeFeaturePhasesFilter.hpp | 8 + .../Filters/ComputeFeatureRectFilter.cpp | 6 + .../Filters/ComputeFeatureRectFilter.hpp | 8 + .../Filters/ComputeFeatureSizesFilter.cpp | 6 + .../Filters/ComputeFeatureSizesFilter.hpp | 8 + .../Filters/ComputeKMeansFilter.cpp | 6 + .../Filters/ComputeKMeansFilter.hpp | 8 + .../Filters/ComputeKMedoidsFilter.cpp | 6 + .../Filters/ComputeKMedoidsFilter.hpp | 8 + .../ComputeLargestCrossSectionsFilter.cpp | 6 + .../ComputeLargestCrossSectionsFilter.hpp | 8 + .../ComputeMomentInvariants2DFilter.cpp | 6 + .../ComputeMomentInvariants2DFilter.hpp | 8 + .../ComputeNeighborListStatisticsFilter.cpp | 6 + .../ComputeNeighborListStatisticsFilter.hpp | 8 + .../Filters/ComputeNeighborhoodsFilter.cpp | 6 + .../Filters/ComputeNeighborhoodsFilter.hpp | 8 + .../Filters/ComputeNumFeaturesFilter.cpp | 6 + .../Filters/ComputeNumFeaturesFilter.hpp | 8 + .../ComputeSurfaceAreaToVolumeFilter.cpp | 6 + .../ComputeSurfaceAreaToVolumeFilter.hpp | 8 + .../Filters/ComputeSurfaceFeaturesFilter.cpp | 6 + .../Filters/ComputeSurfaceFeaturesFilter.hpp | 8 + .../Filters/ComputeTriangleAreasFilter.cpp | 6 + .../Filters/ComputeTriangleAreasFilter.hpp | 8 + .../ComputeTriangleGeomCentroidsFilter.cpp | 6 + .../ComputeTriangleGeomCentroidsFilter.hpp | 8 + .../ComputeTriangleGeomSizesFilter.cpp | 6 + .../ComputeTriangleGeomSizesFilter.hpp | 8 + .../Filters/ComputeVectorColorsFilter.cpp | 6 + .../Filters/ComputeVectorColorsFilter.hpp | 8 + ...ComputeVertexToTriangleDistancesFilter.cpp | 6 + ...ComputeVertexToTriangleDistancesFilter.hpp | 8 + .../Filters/ComputeVolumeFractionsFilter.cpp | 6 + .../Filters/ComputeVolumeFractionsFilter.hpp | 8 + .../Filters/ConcatenateDataArraysFilter.cpp | 6 + .../Filters/ConcatenateDataArraysFilter.hpp | 8 + .../Filters/ConditionalSetValueFilter.cpp | 6 + .../Filters/ConditionalSetValueFilter.hpp | 8 + .../Filters/ConvertColorToGrayScaleFilter.cpp | 6 + .../Filters/ConvertColorToGrayScaleFilter.hpp | 8 + .../SimplnxCore/Filters/ConvertDataFilter.cpp | 6 + .../SimplnxCore/Filters/ConvertDataFilter.hpp | 8 + .../Filters/CopyDataObjectFilter.cpp | 6 + .../Filters/CopyDataObjectFilter.hpp | 8 + .../CopyFeatureArrayToElementArrayFilter.cpp | 6 + .../CopyFeatureArrayToElementArrayFilter.hpp | 8 + .../Filters/CreateAMScanPathsFilter.cpp | 6 + .../Filters/CreateAMScanPathsFilter.hpp | 8 + .../Filters/CreateAttributeMatrixFilter.cpp | 6 + .../Filters/CreateAttributeMatrixFilter.hpp | 8 + .../Filters/CreateColorMapFilter.cpp | 6 + .../Filters/CreateColorMapFilter.hpp | 8 + .../Filters/CreateDataArrayAdvancedFilter.cpp | 6 + .../Filters/CreateDataArrayAdvancedFilter.hpp | 8 + .../Filters/CreateDataArrayFilter.cpp | 6 + .../Filters/CreateDataArrayFilter.hpp | 8 + .../Filters/CreateDataGroupFilter.cpp | 6 + .../Filters/CreateDataGroupFilter.hpp | 8 + ...eateFeatureArrayFromElementArrayFilter.cpp | 6 + ...eateFeatureArrayFromElementArrayFilter.hpp | 8 + .../Filters/CreateGeometryFilter.cpp | 6 + .../Filters/CreateGeometryFilter.hpp | 8 + .../Filters/CreateImageGeometryFilter.cpp | 6 + .../Filters/CreateImageGeometryFilter.hpp | 8 + .../Filters/CreatePythonSkeletonFilter.cpp | 6 + .../Filters/CreatePythonSkeletonFilter.hpp | 8 + .../Filters/CropImageGeometryFilter.cpp | 6 + .../Filters/CropImageGeometryFilter.hpp | 8 + .../Filters/CropVertexGeometryFilter.cpp | 6 + .../Filters/CropVertexGeometryFilter.hpp | 8 + .../src/SimplnxCore/Filters/DBSCANFilter.cpp | 6 + .../src/SimplnxCore/Filters/DBSCANFilter.hpp | 8 + .../SimplnxCore/Filters/DeleteDataFilter.cpp | 6 + .../SimplnxCore/Filters/DeleteDataFilter.hpp | 8 + .../Filters/ErodeDilateBadDataFilter.cpp | 6 + .../Filters/ErodeDilateBadDataFilter.hpp | 8 + .../ErodeDilateCoordinationNumberFilter.cpp | 6 + .../ErodeDilateCoordinationNumberFilter.hpp | 8 + .../Filters/ErodeDilateMaskFilter.cpp | 6 + .../Filters/ErodeDilateMaskFilter.hpp | 8 + .../Filters/ExecuteProcessFilter.cpp | 6 + .../Filters/ExecuteProcessFilter.hpp | 8 + .../Filters/ExtractComponentAsArrayFilter.cpp | 6 + .../Filters/ExtractComponentAsArrayFilter.hpp | 8 + ...rnalSurfacesFromTriangleGeometryFilter.cpp | 6 + ...rnalSurfacesFromTriangleGeometryFilter.hpp | 8 + .../Filters/ExtractPipelineToFileFilter.cpp | 6 + .../Filters/ExtractPipelineToFileFilter.hpp | 8 + .../Filters/ExtractVertexGeometryFilter.cpp | 6 + .../Filters/ExtractVertexGeometryFilter.hpp | 8 + .../Filters/FeatureFaceCurvatureFilter.cpp | 6 + .../Filters/FeatureFaceCurvatureFilter.hpp | 8 + .../SimplnxCore/Filters/FillBadDataFilter.cpp | 6 + .../SimplnxCore/Filters/FillBadDataFilter.hpp | 8 + .../Filters/FlyingEdges3DFilter.cpp | 6 + .../Filters/FlyingEdges3DFilter.hpp | 8 + .../Filters/IdentifySampleFilter.cpp | 6 + .../Filters/IdentifySampleFilter.hpp | 8 + .../Filters/InitializeDataFilter.cpp | 6 + .../Filters/InitializeDataFilter.hpp | 8 + .../InitializeImageGeomCellDataFilter.cpp | 6 + .../InitializeImageGeomCellDataFilter.hpp | 8 + ...terpolatePointCloudToRegularGridFilter.cpp | 6 + ...terpolatePointCloudToRegularGridFilter.hpp | 8 + .../Filters/IterativeClosestPointFilter.cpp | 6 + .../Filters/IterativeClosestPointFilter.hpp | 8 + .../Filters/LabelTriangleGeometryFilter.cpp | 6 + .../Filters/LabelTriangleGeometryFilter.hpp | 8 + .../Filters/LaplacianSmoothingFilter.cpp | 6 + .../Filters/LaplacianSmoothingFilter.hpp | 8 + .../MapPointCloudToRegularGridFilter.cpp | 6 + .../MapPointCloudToRegularGridFilter.hpp | 8 + .../SimplnxCore/Filters/MoveDataFilter.cpp | 6 + .../SimplnxCore/Filters/MoveDataFilter.hpp | 8 + .../Filters/MultiThresholdObjectsFilter.cpp | 6 + .../Filters/MultiThresholdObjectsFilter.hpp | 8 + .../NearestPointFuseRegularGridsFilter.cpp | 6 + .../NearestPointFuseRegularGridsFilter.hpp | 8 + .../Filters/PartitionGeometryFilter.cpp | 6 + .../Filters/PartitionGeometryFilter.hpp | 8 + .../PointSampleTriangleGeometryFilter.cpp | 6 + .../PointSampleTriangleGeometryFilter.hpp | 8 + .../Filters/QuickSurfaceMeshFilter.cpp | 6 + .../Filters/QuickSurfaceMeshFilter.hpp | 8 + .../Filters/ReadBinaryCTNorthstarFilter.cpp | 6 + .../Filters/ReadBinaryCTNorthstarFilter.hpp | 8 + .../SimplnxCore/Filters/ReadCSVFileFilter.cpp | 6 + .../SimplnxCore/Filters/ReadCSVFileFilter.hpp | 8 + .../SimplnxCore/Filters/ReadDREAM3DFilter.cpp | 6 + .../SimplnxCore/Filters/ReadDREAM3DFilter.hpp | 8 + .../Filters/ReadDeformKeyFileV12Filter.cpp | 6 + .../Filters/ReadDeformKeyFileV12Filter.hpp | 8 + .../Filters/ReadHDF5DatasetFilter.cpp | 6 + .../Filters/ReadHDF5DatasetFilter.hpp | 8 + .../Filters/ReadRawBinaryFilter.cpp | 6 + .../Filters/ReadRawBinaryFilter.hpp | 8 + .../SimplnxCore/Filters/ReadStlFileFilter.cpp | 6 + .../SimplnxCore/Filters/ReadStlFileFilter.hpp | 8 + .../Filters/ReadTextDataArrayFilter.cpp | 6 + .../Filters/ReadTextDataArrayFilter.hpp | 8 + .../Filters/ReadVolumeGraphicsFileFilter.cpp | 6 + .../Filters/ReadVolumeGraphicsFileFilter.hpp | 8 + .../Filters/ReadVtkStructuredPointsFilter.cpp | 6 + .../Filters/ReadVtkStructuredPointsFilter.hpp | 8 + .../RegularGridSampleSurfaceMeshFilter.cpp | 6 + .../RegularGridSampleSurfaceMeshFilter.hpp | 8 + .../Filters/RemoveFlaggedEdgesFilter.cpp | 6 + .../Filters/RemoveFlaggedEdgesFilter.hpp | 8 + .../Filters/RemoveFlaggedFeaturesFilter.cpp | 6 + .../Filters/RemoveFlaggedFeaturesFilter.hpp | 8 + .../Filters/RemoveFlaggedTrianglesFilter.cpp | 6 + .../Filters/RemoveFlaggedTrianglesFilter.hpp | 8 + .../Filters/RemoveFlaggedVerticesFilter.cpp | 6 + .../Filters/RemoveFlaggedVerticesFilter.hpp | 8 + .../Filters/RenameDataObjectFilter.cpp | 6 + .../Filters/RenameDataObjectFilter.hpp | 8 + ...mentAttributesWithNeighborValuesFilter.cpp | 6 + ...mentAttributesWithNeighborValuesFilter.hpp | 8 + .../Filters/RequireMinNumNeighborsFilter.cpp | 6 + .../Filters/RequireMinNumNeighborsFilter.hpp | 8 + .../RequireMinimumSizeFeaturesFilter.cpp | 6 + .../RequireMinimumSizeFeaturesFilter.hpp | 8 + .../Filters/ResampleImageGeomFilter.cpp | 6 + .../Filters/ResampleImageGeomFilter.hpp | 8 + .../ResampleRectGridToImageGeomFilter.cpp | 6 + .../ResampleRectGridToImageGeomFilter.hpp | 8 + .../Filters/ReverseTriangleWindingFilter.cpp | 6 + .../Filters/ReverseTriangleWindingFilter.hpp | 8 + .../RobustAutomaticThresholdFilter.cpp | 6 + .../RobustAutomaticThresholdFilter.hpp | 8 + .../Filters/RotateSampleRefFrameFilter.cpp | 6 + .../Filters/RotateSampleRefFrameFilter.hpp | 8 + .../Filters/ScalarSegmentFeaturesFilter.cpp | 6 + .../Filters/ScalarSegmentFeaturesFilter.hpp | 8 + .../SetImageGeomOriginScalingFilter.cpp | 6 + .../SetImageGeomOriginScalingFilter.hpp | 8 + .../Filters/SharedFeatureFaceFilter.cpp | 6 + .../Filters/SharedFeatureFaceFilter.hpp | 8 + .../SimplnxCore/Filters/SilhouetteFilter.cpp | 6 + .../SimplnxCore/Filters/SilhouetteFilter.hpp | 8 + .../Filters/SliceTriangleGeometryFilter.cpp | 6 + .../Filters/SliceTriangleGeometryFilter.hpp | 8 + .../Filters/SplitAttributeArrayFilter.cpp | 6 + .../Filters/SplitAttributeArrayFilter.hpp | 8 + .../SimplnxCore/Filters/SurfaceNetsFilter.cpp | 6 + .../SimplnxCore/Filters/SurfaceNetsFilter.hpp | 8 + .../Filters/TriangleCentroidFilter.cpp | 6 + .../Filters/TriangleCentroidFilter.hpp | 8 + .../Filters/TriangleDihedralAngleFilter.cpp | 6 + .../Filters/TriangleDihedralAngleFilter.hpp | 8 + .../Filters/TriangleNormalFilter.cpp | 6 + .../Filters/TriangleNormalFilter.hpp | 8 + ...tainRegularGridSampleSurfaceMeshFilter.cpp | 6 + ...tainRegularGridSampleSurfaceMeshFilter.hpp | 8 + .../Filters/WriteASCIIDataFilter.cpp | 6 + .../Filters/WriteASCIIDataFilter.hpp | 8 + .../Filters/WriteAbaqusHexahedronFilter.cpp | 6 + .../Filters/WriteAbaqusHexahedronFilter.hpp | 8 + .../WriteAvizoRectilinearCoordinateFilter.cpp | 6 + .../WriteAvizoRectilinearCoordinateFilter.hpp | 8 + .../WriteAvizoUniformCoordinateFilter.cpp | 6 + .../WriteAvizoUniformCoordinateFilter.hpp | 8 + .../Filters/WriteBinaryDataFilter.cpp | 6 + .../Filters/WriteBinaryDataFilter.hpp | 8 + .../Filters/WriteDREAM3DFilter.cpp | 6 + .../Filters/WriteDREAM3DFilter.hpp | 8 + .../Filters/WriteFeatureDataCSVFilter.cpp | 6 + .../Filters/WriteFeatureDataCSVFilter.hpp | 8 + .../Filters/WriteLosAlamosFFTFilter.cpp | 6 + .../Filters/WriteLosAlamosFFTFilter.hpp | 8 + .../Filters/WriteStlFileFilter.cpp | 6 + .../Filters/WriteStlFileFilter.hpp | 8 + .../Filters/WriteVtkRectilinearGridFilter.cpp | 6 + .../Filters/WriteVtkRectilinearGridFilter.hpp | 8 + .../WriteVtkStructuredPointsFilter.cpp | 6 + .../WriteVtkStructuredPointsFilter.hpp | 8 + .../SimplnxCore/utils/PythonFilterTemplate.py | 3 + src/Plugins/SimplnxCore/test/PipelineTest.cpp | 5 + .../SimplnxCore/wrapping/python/simplnxpy.cpp | 2 + .../Filters/DynamicTableExampleFilter.cpp | 6 + .../Filters/DynamicTableExampleFilter.hpp | 8 + .../TestOne/Filters/ErrorWarningFilter.cpp | 6 + .../TestOne/Filters/ErrorWarningFilter.hpp | 8 + .../TestOne/Filters/ExampleFilter1Filter.cpp | 6 + .../TestOne/Filters/ExampleFilter1Filter.hpp | 8 + .../TestOne/Filters/ExampleFilter2Filter.cpp | 6 + .../TestOne/Filters/ExampleFilter2Filter.hpp | 8 + .../src/TestOne/Filters/TestFilter.cpp | 6 + .../src/TestOne/Filters/TestFilter.hpp | 8 + .../src/TestTwo/Filters/Test2Filter.cpp | 6 + .../src/TestTwo/Filters/Test2Filter.hpp | 8 + src/simplnx/Filter/IFilter.cpp | 1 + src/simplnx/Filter/IFilter.hpp | 9 + src/simplnx/Filter/IParameter.cpp | 57 + src/simplnx/Filter/IParameter.hpp | 27 +- .../Parameters/ArrayCreationParameter.cpp | 10 +- .../Parameters/ArrayCreationParameter.hpp | 31 +- .../Parameters/ArraySelectionParameter.cpp | 10 +- .../Parameters/ArraySelectionParameter.hpp | 37 +- .../Parameters/ArrayThresholdsParameter.cpp | 10 +- .../Parameters/ArrayThresholdsParameter.hpp | 34 +- .../AttributeMatrixSelectionParameter.cpp | 10 +- .../AttributeMatrixSelectionParameter.hpp | 37 +- src/simplnx/Parameters/BoolParameter.cpp | 10 +- src/simplnx/Parameters/BoolParameter.hpp | 31 +- .../Parameters/CalculatorParameter.cpp | 10 +- .../Parameters/CalculatorParameter.hpp | 31 +- src/simplnx/Parameters/ChoicesParameter.cpp | 10 +- src/simplnx/Parameters/ChoicesParameter.hpp | 31 +- .../Parameters/CreateColorMapParameter.cpp | 10 +- .../Parameters/CreateColorMapParameter.hpp | 27 +- .../Parameters/DataGroupCreationParameter.cpp | 10 +- .../Parameters/DataGroupCreationParameter.hpp | 37 +- .../DataGroupSelectionParameter.cpp | 10 +- .../DataGroupSelectionParameter.hpp | 37 +- .../Parameters/DataObjectNameParameter.cpp | 10 +- .../Parameters/DataObjectNameParameter.hpp | 29 +- .../Parameters/DataPathSelectionParameter.cpp | 10 +- .../Parameters/DataPathSelectionParameter.hpp | 37 +- .../Parameters/DataStoreFormatParameter.cpp | 10 +- .../Parameters/DataStoreFormatParameter.hpp | 31 +- src/simplnx/Parameters/DataTypeParameter.cpp | 10 +- src/simplnx/Parameters/DataTypeParameter.hpp | 27 +- .../Parameters/Dream3dImportParameter.cpp | 10 +- .../Parameters/Dream3dImportParameter.hpp | 33 +- .../Parameters/DynamicTableParameter.cpp | 10 +- .../Parameters/DynamicTableParameter.hpp | 39 +- .../Parameters/EnsembleInfoParameter.cpp | 10 +- .../Parameters/EnsembleInfoParameter.hpp | 25 +- .../Parameters/FileSystemPathParameter.cpp | 10 +- .../Parameters/FileSystemPathParameter.hpp | 31 +- .../Parameters/GeneratedFileListParameter.cpp | 10 +- .../Parameters/GeneratedFileListParameter.hpp | 25 +- .../Parameters/GeometrySelectionParameter.cpp | 10 +- .../Parameters/GeometrySelectionParameter.hpp | 37 +- .../MultiArraySelectionParameter.cpp | 10 +- .../MultiArraySelectionParameter.hpp | 37 +- .../MultiPathSelectionParameter.cpp | 10 +- .../MultiPathSelectionParameter.hpp | 37 +- .../NeighborListSelectionParameter.cpp | 10 +- .../NeighborListSelectionParameter.hpp | 37 +- src/simplnx/Parameters/NumberParameter.cpp | 11 +- src/simplnx/Parameters/NumberParameter.hpp | 29 +- .../Parameters/NumericTypeParameter.cpp | 10 +- .../Parameters/NumericTypeParameter.hpp | 27 +- .../Parameters/ReadCSVFileParameter.cpp | 10 +- .../Parameters/ReadCSVFileParameter.hpp | 39 +- .../Parameters/ReadHDF5DatasetParameter.cpp | 10 +- .../Parameters/ReadHDF5DatasetParameter.hpp | 39 +- src/simplnx/Parameters/StringParameter.cpp | 10 +- src/simplnx/Parameters/StringParameter.hpp | 27 +- src/simplnx/Parameters/VectorParameter.cpp | 11 +- src/simplnx/Parameters/VectorParameter.hpp | 31 +- test/PipelineSaveTest.cpp | 5 + .../python/CxPybind/CxPybind/CxPybind.hpp | 7 + .../src/ExamplePlugin/CreateArray.py | 3 + .../src/ExamplePlugin/ExampleFilter1.py | 3 + .../src/ExamplePlugin/ExampleFilter2.py | 3 + .../src/ExamplePlugin/InitializeData.py | 3 + .../src/ExamplePlugin/TemplateFilter.py | 3 + .../CalculateHistogramFilter.py | 5 +- .../NXDataAnalysisToolkit/CliReaderFilter.py | 5 +- .../ContourDetectionFilter.py | 5 +- .../InterpolateGridDataFilter.py | 3 + .../src/NXDataAnalysisToolkit/NPSortArray.py | 3 + .../src/NXDataAnalysisToolkit/ReadMeshFile.py | 5 +- .../ReadPeregrineHDF5File.py | 5 +- .../NXDataAnalysisToolkit/WriteAbaqusFile.py | 5 +- .../NXDataAnalysisToolkit/WriteAnsysFile.py | 5 +- .../NXDataAnalysisToolkit/WriteGmshFile.py | 5 +- .../src/NXDataAnalysisToolkit/WriteMedFile.py | 5 +- .../NXDataAnalysisToolkit/WriteTetGenFile.py | 5 +- .../src/NXDataAnalysisToolkit/WriteVtuFile.py | 5 +- 690 files changed, 20751 insertions(+), 12794 deletions(-) diff --git a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline index 7f8e440c19..9e77b2c311 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline @@ -1,39 +1,88 @@ { "isDisabled": false, "name": "(02) Image Segmentation.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "image_data_array_name": "ImageData", - "output_image_geometry_path": "ImageDataContainer", - "image_transform_index": 0, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "change_image_data_type": { + "value": false, + "version": 1 + }, + "color_weights": { + "value": [ + 0.21250000596046448, + 0.715399980545044, + 0.07209999859333038 + ], + "version": 1 + }, + "convert_to_gray_scale": { + "value": false, + "version": 1 + }, + "image_data_array_name": { + "value": "ImageData", + "version": 1 + }, + "image_data_type_index": { + "value": 0, + "version": 1 + }, + "image_transform_index": { + "value": 0, + "version": 1 + }, "input_file_list_object": { - "end_index": 174, - "file_extension": ".tif", - "file_prefix": "slice_", - "file_suffix": "", - "increment_index": 1, - "input_path": "Data/Porosity_Image/", - "ordering": 0, - "padding_digits": 2, - "start_index": 11 - }, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "spacing": [ - 1.0, - 1.0, - 1.0 - ] + "value": { + "end_index": 174, + "file_extension": ".tif", + "file_prefix": "slice_", + "file_suffix": "", + "increment_index": 1, + "input_path": "Data/Porosity_Image/", + "ordering": 0, + "padding_digits": 2, + "start_index": 11 + }, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "ImageDataContainer", + "version": 1 + }, + "parameters_version": 1, + "scale_images": { + "value": false, + "version": 1 + }, + "scaling": { + "value": 1.0, + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ITKImportImageStack", + "name": "nx::core::ITKImportImageStackFilter", "uuid": "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb" }, "isDisabled": false @@ -41,172 +90,343 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "ImageDataContainer/Cell Data/ImageData", - "comparison": 2, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.0 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "ImageDataContainer/Cell Data/ImageData", + "comparison": 2, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 }, - "output_data_array_name": "Mask" + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "active_array_name": "Active", - "cell_feature_group_name": "Cell Feature Data", - "feature_ids_name": "FeatureIds", - "input_image_geometry_path": "ImageDataContainer", - "input_array_path": "ImageDataContainer/Cell Data/ImageData", - "mask_path": "ImageDataContainer/Cell Data/Mask", - "randomize_features": true, - "scalar_tolerance": 0, - "use_mask": true + "active_array_name": { + "value": "Active", + "version": 1 + }, + "cell_feature_group_name": { + "value": "Cell Feature Data", + "version": 1 + }, + "feature_ids_name": { + "value": "FeatureIds", + "version": 1 + }, + "input_array_path": { + "value": "ImageDataContainer/Cell Data/ImageData", + "version": 1 + }, + "input_image_geometry_path": { + "value": "ImageDataContainer", + "version": 1 + }, + "mask_path": { + "value": "ImageDataContainer/Cell Data/Mask", + "version": 1 + }, + "parameters_version": 1, + "randomize_features": { + "value": true, + "version": 1 + }, + "scalar_tolerance": { + "value": 0, + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ScalarSegmentFeaturesFilter", + "name": "nx::core::ScalarSegmentFeaturesFilter", "uuid": "e067cd97-9bbf-4c92-89a6-3cb4fdb76c93" }, "isDisabled": false }, { "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "ImageDataContainer/Cell Feature Data", - "feature_ids_path": "ImageDataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "ImageDataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" + "equivalent_diameters_name": { + "value": "EquivalentDiameters", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "ImageDataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "ImageDataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "ImageDataContainer", + "version": 1 + }, + "num_elements_name": { + "value": "NumElements", + "version": 1 + }, + "parameters_version": 1, + "save_element_sizes": { + "value": false, + "version": 1 + }, + "volumes_name": { + "value": "Volumes", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeFeatureSizesFilter", + "name": "nx::core::ComputeFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false }, { "args": { - "created_array_suffix": "", - "feature_ids_path": "ImageDataContainer/Cell Data/FeatureIds", - "selected_feature_array_paths": ["ImageDataContainer/Cell Feature Data/EquivalentDiameters"] + "created_array_suffix": { + "value": "", + "version": 1 + }, + "feature_ids_path": { + "value": "ImageDataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "parameters_version": 1, + "selected_feature_array_paths": { + "value": [ + "ImageDataContainer/Cell Feature Data/EquivalentDiameters" + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CopyFeatureArrayToElementArrayFilter", + "name": "nx::core::CopyFeatureArrayToElementArrayFilter", "uuid": "4c8c976a-993d-438b-bd8e-99f71114b9a1" }, "isDisabled": false }, { "args": { - "set_tuple_dimensions": false, - "component_count": 1, - "data_format": "", - "initialization_value_str": "1", - "numeric_type_index": 4, - "output_array_path": "ImageDataContainer/Cell Data/Phases", - "tuple_dimensions": [ - [ - 164.0, - 390.0, - 524.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "1", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "ImageDataContainer/Cell Data/Phases", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 164.0, + 390.0, + 524.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false }, { "args": { - "conditional_array_path": "ImageDataContainer/Cell Data/Mask", - "remove_value": "0", - "replace_value": "2", - "selected_array_path": "ImageDataContainer/Cell Data/Phases", - "use_conditional": true + "conditional_array_path": { + "value": "ImageDataContainer/Cell Data/Mask", + "version": 1 + }, + "invert_mask": { + "value": false, + "version": 1 + }, + "parameters_version": 1, + "remove_value": { + "value": "0", + "version": 1 + }, + "replace_value": { + "value": "2", + "version": 1 + }, + "selected_array_path": { + "value": "ImageDataContainer/Cell Data/Phases", + "version": 1 + }, + "use_conditional": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ConditionalSetValueFilter", + "name": "nx::core::ConditionalSetValueFilter", "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881" }, "isDisabled": false }, { "args": { - "cell_features_attribute_matrix_path": "ImageDataContainer/Cell Feature Data", - "cell_phases_array_path": "ImageDataContainer/Cell Data/Phases", - "feature_ids_path": "ImageDataContainer/Cell Data/FeatureIds", - "feature_phases_array_name": "Phases" + "cell_features_attribute_matrix_path": { + "value": "ImageDataContainer/Cell Feature Data", + "version": 1 + }, + "cell_phases_array_path": { + "value": "ImageDataContainer/Cell Data/Phases", + "version": 1 + }, + "feature_ids_path": { + "value": "ImageDataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "feature_phases_array_name": { + "value": "Phases", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ComputeFeaturePhasesFilter", + "name": "nx::core::ComputeFeaturePhasesFilter", "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" }, "isDisabled": false }, { "args": { - "centroids_array_name": "Centroids", - "feature_attribute_matrix_path": "ImageDataContainer/Cell Feature Data", - "feature_ids_path": "ImageDataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "ImageDataContainer" + "centroids_array_name": { + "value": "Centroids", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "ImageDataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "ImageDataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "ImageDataContainer", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ComputeFeatureCentroidsFilter", + "name": "nx::core::ComputeFeatureCentroidsFilter", "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" }, "isDisabled": false }, { "args": { - "data_object_path": "ImageDataContainer/Ensemble AttributeMatrix", - "tuple_dimensions": [ - [ - 3.0 - ] - ] + "data_object_path": { + "value": "ImageDataContainer/Ensemble AttributeMatrix", + "version": 1 + }, + "parameters_version": 1, + "tuple_dimensions": { + "value": [ + [ + 3.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CreateAttributeMatrixFilter", + "name": "nx::core::CreateAttributeMatrixFilter", "uuid": "a6a28355-ee69-4874-bcac-76ed427423ed" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/ImagesStack/Images.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/ImagesStack/Images.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline index 671cf6e8cf..22ec78f5bd 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline @@ -1,39 +1,88 @@ { "isDisabled": false, "name": "(03) Porosity Mesh Export.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "image_data_array_name": "ImageData", - "output_image_geometry_path": "ImageDataContainer", - "image_transform_index": 0, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "change_image_data_type": { + "value": false, + "version": 1 + }, + "color_weights": { + "value": [ + 0.21250000596046448, + 0.715399980545044, + 0.07209999859333038 + ], + "version": 1 + }, + "convert_to_gray_scale": { + "value": false, + "version": 1 + }, + "image_data_array_name": { + "value": "ImageData", + "version": 1 + }, + "image_data_type_index": { + "value": 0, + "version": 1 + }, + "image_transform_index": { + "value": 0, + "version": 1 + }, "input_file_list_object": { - "end_index": 174, - "file_extension": ".tif", - "file_prefix": "slice_", - "file_suffix": "", - "increment_index": 1, - "input_path": "Data/Porosity_Image/", - "ordering": 0, - "padding_digits": 2, - "start_index": 11 - }, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "spacing": [ - 1.0, - 1.0, - 1.0 - ] + "value": { + "end_index": 174, + "file_extension": ".tif", + "file_prefix": "slice_", + "file_suffix": "", + "increment_index": 1, + "input_path": "Data/Porosity_Image/", + "ordering": 0, + "padding_digits": 2, + "start_index": 11 + }, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "ImageDataContainer", + "version": 1 + }, + "parameters_version": 1, + "scale_images": { + "value": false, + "version": 1 + }, + "scaling": { + "value": 1.0, + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ITKImportImageStack", + "name": "nx::core::ITKImportImageStackFilter", "uuid": "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb" }, "isDisabled": false @@ -41,105 +90,244 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "ImageDataContainer/Cell Data/ImageData", - "comparison": 2, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.0 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "ImageDataContainer/Cell Data/ImageData", + "comparison": 2, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 }, - "output_data_array_name": "Mask" + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "active_array_name": "Active", - "cell_feature_group_name": "Cell Feature Data", - "feature_ids_name": "FeatureIds", - "input_image_geometry_path": "ImageDataContainer", - "input_array_path": "ImageDataContainer/Cell Data/ImageData", - "mask_path": "ImageDataContainer/Cell Data/Mask", - "randomize_features": true, - "scalar_tolerance": 0, - "use_mask": true + "active_array_name": { + "value": "Active", + "version": 1 + }, + "cell_feature_group_name": { + "value": "Cell Feature Data", + "version": 1 + }, + "feature_ids_name": { + "value": "FeatureIds", + "version": 1 + }, + "input_array_path": { + "value": "ImageDataContainer/Cell Data/ImageData", + "version": 1 + }, + "input_image_geometry_path": { + "value": "ImageDataContainer", + "version": 1 + }, + "mask_path": { + "value": "ImageDataContainer/Cell Data/Mask", + "version": 1 + }, + "parameters_version": 1, + "randomize_features": { + "value": true, + "version": 1 + }, + "scalar_tolerance": { + "value": 0, + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ScalarSegmentFeaturesFilter", + "name": "nx::core::ScalarSegmentFeaturesFilter", "uuid": "e067cd97-9bbf-4c92-89a6-3cb4fdb76c93" }, "isDisabled": false }, { "args": { - "face_data_group_name": "Face Data", - "face_feature_attribute_matrix_name": "Face Feature Data", - "face_labels_array_name": "FaceLabels", - "feature_ids_path": "ImageDataContainer/Cell Data/FeatureIds", - "fix_problem_voxels": true, - "generate_triple_lines": false, - "input_grid_geometry_path": "ImageDataContainer", - "node_types_array_name": "NodeTypes", - "input_data_array_paths": [], - "output_triangle_geometry_path": "TriangleDataContainer", - "vertex_data_group_name": "Vertex Data" + "face_data_group_name": { + "value": "Face Data", + "version": 1 + }, + "face_feature_attribute_matrix_name": { + "value": "Face Feature Data", + "version": 1 + }, + "face_labels_array_name": { + "value": "FaceLabels", + "version": 1 + }, + "feature_ids_path": { + "value": "ImageDataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "fix_problem_voxels": { + "value": true, + "version": 1 + }, + "generate_triple_lines": { + "value": false, + "version": 1 + }, + "input_data_array_paths": { + "value": [], + "version": 1 + }, + "input_grid_geometry_path": { + "value": "ImageDataContainer", + "version": 1 + }, + "node_types_array_name": { + "value": "NodeTypes", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1, + "vertex_data_group_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::QuickSurfaceMeshFilter", + "name": "nx::core::QuickSurfaceMeshFilter", "uuid": "13dd00bd-ad49-4e04-95eb-3267952fd6e5" }, "isDisabled": false }, { "args": { - "iteration_steps": 15, - "lambda_value": 0.20000000298023224, - "mu_factor": 0.20000000298023224, - "quad_point_lambda": 0.10000000149011612, - "surface_mesh_node_type_array_path": "TriangleDataContainer/Vertex Data/NodeTypes", - "surface_point_lambda": 0.0, - "surface_quad_point_lambda": 0.0, - "surface_triple_line_lambda": 0.0, - "input_triangle_geometry_path": "TriangleDataContainer", - "triple_line_lambda": 0.10000000149011612, - "use_taubin_smoothing": true + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "iteration_steps": { + "value": 15, + "version": 1 + }, + "lambda_value": { + "value": 0.20000000298023224, + "version": 1 + }, + "mu_factor": { + "value": 0.20000000298023224, + "version": 1 + }, + "parameters_version": 1, + "quad_point_lambda": { + "value": 0.10000000149011612, + "version": 1 + }, + "surface_mesh_node_type_array_path": { + "value": "TriangleDataContainer/Vertex Data/NodeTypes", + "version": 1 + }, + "surface_point_lambda": { + "value": 0.0, + "version": 1 + }, + "surface_quad_point_lambda": { + "value": 0.0, + "version": 1 + }, + "surface_triple_line_lambda": { + "value": 0.0, + "version": 1 + }, + "triple_line_lambda": { + "value": 0.10000000149011612, + "version": 1 + }, + "use_taubin_smoothing": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::LaplacianSmoothingFilter", + "name": "nx::core::LaplacianSmoothingFilter", "uuid": "0dd0916e-9305-4a7b-98cf-a6cfb97cb501" }, "isDisabled": false }, { "args": { - "components_to_extract": [ - [ - 0.0 - ] - ], - "delete_original_array": true, - "multicomponent_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "postfix": "-", - "select_components_to_extract": false + "components_to_extract": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + }, + "delete_original_array": { + "value": true, + "version": 1 + }, + "multicomponent_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels", + "version": 1 + }, + "parameters_version": 1, + "postfix": { + "value": "-", + "version": 1 + }, + "select_components_to_extract": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::SplitAttributeArrayFilter", + "name": "nx::core::SplitAttributeArrayFilter", "uuid": "55da791f-4d1c-4413-8673-742f27d2b22b" }, "isDisabled": false @@ -147,25 +335,52 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "TriangleDataContainer/Face Data/FaceLabels-0", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.0 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "TriangleDataContainer/Face Data/FaceLabels-0", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 }, - "output_data_array_name": "FaceLabels-0 Mask" + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "FaceLabels-0 Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -173,88 +388,175 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "TriangleDataContainer/Face Data/FaceLabels-1", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.0 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "TriangleDataContainer/Face Data/FaceLabels-1", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 }, - "output_data_array_name": "FaceLabels-1 Mask" + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "FaceLabels-1 Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "conditional_array_path": "TriangleDataContainer/Face Data/FaceLabels-0 Mask", - "remove_value": "0", - "replace_value": "1", - "selected_array_path": "TriangleDataContainer/Face Data/FaceLabels-0", - "use_conditional": true + "conditional_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels-0 Mask", + "version": 1 + }, + "invert_mask": { + "value": false, + "version": 1 + }, + "parameters_version": 1, + "remove_value": { + "value": "0", + "version": 1 + }, + "replace_value": { + "value": "1", + "version": 1 + }, + "selected_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels-0", + "version": 1 + }, + "use_conditional": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ConditionalSetValueFilter", + "name": "nx::core::ConditionalSetValueFilter", "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881" }, "isDisabled": false }, { "args": { - "conditional_array_path": "TriangleDataContainer/Face Data/FaceLabels-1 Mask", - "remove_value": "0", - "replace_value": "1", - "selected_array_path": "TriangleDataContainer/Face Data/FaceLabels-1", - "use_conditional": true + "conditional_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels-1 Mask", + "version": 1 + }, + "invert_mask": { + "value": false, + "version": 1 + }, + "parameters_version": 1, + "remove_value": { + "value": "0", + "version": 1 + }, + "replace_value": { + "value": "1", + "version": 1 + }, + "selected_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels-1", + "version": 1 + }, + "use_conditional": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ConditionalSetValueFilter", + "name": "nx::core::ConditionalSetValueFilter", "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881" }, "isDisabled": false }, { "args": { - "move_values": true, - "normalize_data": false, - "input_data_array_paths": [ - "TriangleDataContainer/Face Data/FaceLabels-0", - "TriangleDataContainer/Face Data/FaceLabels-1" - ], - "output_data_array_name": "Face Labels" + "input_data_array_paths": { + "value": [ + "TriangleDataContainer/Face Data/FaceLabels-0", + "TriangleDataContainer/Face Data/FaceLabels-1" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Face Labels", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::CombineAttributeArraysFilter", + "name": "nx::core::CombineAttributeArraysFilter", "uuid": "2436b614-e96d-47f0-9f6f-41d6fe97acd4" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/Porosity_Analysis.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Porosity_Analysis.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline index 3d578c5843..8266559026 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline @@ -4,37 +4,81 @@ "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Optical Data", - "color_weights": [ - 0.21250000596046448, - 0.715399980545044, - 0.07209999859333038 - ], - "convert_to_gray_scale": false, - "image_data_array_name": "ImageData", - "image_transform_index": 0, + "cell_attribute_matrix_name": { + "value": "Optical Data", + "version": 1 + }, + "change_image_data_type": { + "value": false, + "version": 1 + }, + "color_weights": { + "value": [ + 0.21250000596046448, + 0.715399980545044, + 0.07209999859333038 + ], + "version": 1 + }, + "convert_to_gray_scale": { + "value": false, + "version": 1 + }, + "image_data_array_name": { + "value": "ImageData", + "version": 1 + }, + "image_data_type_index": { + "value": 0, + "version": 1 + }, + "image_transform_index": { + "value": 0, + "version": 1 + }, "input_file_list_object": { - "end_index": 174, - "file_extension": ".tif", - "file_prefix": "slice_", - "file_suffix": "", - "increment_index": 1, - "input_path": "Data/Porosity_Image", - "ordering": 0, - "padding_digits": 2, - "start_index": 11 - }, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "output_image_geometry_path": "RoboMet.3D Image Stack", - "spacing": [ - 1.0, - 1.0, - 1.0 - ] + "value": { + "end_index": 174, + "file_extension": ".tif", + "file_prefix": "slice_", + "file_suffix": "", + "increment_index": 1, + "input_path": "Data/Porosity_Image", + "ordering": 0, + "padding_digits": 2, + "start_index": 11 + }, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "RoboMet.3D Image Stack", + "version": 1 + }, + "parameters_version": 1, + "scale_images": { + "value": false, + "version": 1 + }, + "scaling": { + "value": 1.0, + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + } }, "comments": "", "filter": { @@ -46,26 +90,48 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "RoboMet.3D Image Stack/Optical Data/ImageData", - "comparison": 2, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.0 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "RoboMet.3D Image Stack/Optical Data/ImageData", + "comparison": 2, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 }, - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "output_data_array_name": "Mask", - "use_custom_false_value": false, - "use_custom_true_value": false + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -76,15 +142,43 @@ }, { "args": { - "active_array_name": "Active", - "cell_feature_group_name": "Pore Data", - "feature_ids_name": "FeatureIds", - "input_array_path": "RoboMet.3D Image Stack/Optical Data/ImageData", - "input_image_geometry_path": "RoboMet.3D Image Stack", - "mask_path": "RoboMet.3D Image Stack/Optical Data/Mask", - "randomize_features": true, - "scalar_tolerance": 0, - "use_mask": true + "active_array_name": { + "value": "Active", + "version": 1 + }, + "cell_feature_group_name": { + "value": "Pore Data", + "version": 1 + }, + "feature_ids_name": { + "value": "FeatureIds", + "version": 1 + }, + "input_array_path": { + "value": "RoboMet.3D Image Stack/Optical Data/ImageData", + "version": 1 + }, + "input_image_geometry_path": { + "value": "RoboMet.3D Image Stack", + "version": 1 + }, + "mask_path": { + "value": "RoboMet.3D Image Stack/Optical Data/Mask", + "version": 1 + }, + "parameters_version": 1, + "randomize_features": { + "value": true, + "version": 1 + }, + "scalar_tolerance": { + "value": 0, + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -95,13 +189,35 @@ }, { "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "RoboMet.3D Image Stack/Pore Data", - "feature_ids_path": "RoboMet.3D Image Stack/Optical Data/FeatureIds", - "input_image_geometry_path": "RoboMet.3D Image Stack", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" + "equivalent_diameters_name": { + "value": "EquivalentDiameters", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "RoboMet.3D Image Stack/Pore Data", + "version": 1 + }, + "feature_ids_path": { + "value": "RoboMet.3D Image Stack/Optical Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "RoboMet.3D Image Stack", + "version": 1 + }, + "num_elements_name": { + "value": "NumElements", + "version": 1 + }, + "parameters_version": 1, + "save_element_sizes": { + "value": false, + "version": 1 + }, + "volumes_name": { + "value": "Volumes", + "version": 1 + } }, "comments": "", "filter": { @@ -112,11 +228,21 @@ }, { "args": { - "created_array_suffix": "", - "feature_ids_path": "RoboMet.3D Image Stack/Optical Data/FeatureIds", - "selected_feature_array_paths": [ - "RoboMet.3D Image Stack/Pore Data/EquivalentDiameters" - ] + "created_array_suffix": { + "value": "", + "version": 1 + }, + "feature_ids_path": { + "value": "RoboMet.3D Image Stack/Optical Data/FeatureIds", + "version": 1 + }, + "parameters_version": 1, + "selected_feature_array_paths": { + "value": [ + "RoboMet.3D Image Stack/Pore Data/EquivalentDiameters" + ], + "version": 1 + } }, "comments": "", "filter": { @@ -127,17 +253,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "1", - "numeric_type_index": 4, - "output_array_path": "RoboMet.3D Image Stack/Optical Data/Phases", - "set_tuple_dimensions": false, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "1", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "RoboMet.3D Image Stack/Optical Data/Phases", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -148,12 +296,31 @@ }, { "args": { - "conditional_array_path": "RoboMet.3D Image Stack/Optical Data/Mask", - "invert_mask": false, - "remove_value": "0", - "replace_value": "2", - "selected_array_path": "RoboMet.3D Image Stack/Optical Data/Phases", - "use_conditional": true + "conditional_array_path": { + "value": "RoboMet.3D Image Stack/Optical Data/Mask", + "version": 1 + }, + "invert_mask": { + "value": false, + "version": 1 + }, + "parameters_version": 1, + "remove_value": { + "value": "0", + "version": 1 + }, + "replace_value": { + "value": "2", + "version": 1 + }, + "selected_array_path": { + "value": "RoboMet.3D Image Stack/Optical Data/Phases", + "version": 1 + }, + "use_conditional": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -164,10 +331,23 @@ }, { "args": { - "cell_features_attribute_matrix_path": "RoboMet.3D Image Stack/Pore Data", - "cell_phases_array_path": "RoboMet.3D Image Stack/Optical Data/Phases", - "feature_ids_path": "RoboMet.3D Image Stack/Optical Data/FeatureIds", - "feature_phases_array_name": "Phases" + "cell_features_attribute_matrix_path": { + "value": "RoboMet.3D Image Stack/Pore Data", + "version": 1 + }, + "cell_phases_array_path": { + "value": "RoboMet.3D Image Stack/Optical Data/Phases", + "version": 1 + }, + "feature_ids_path": { + "value": "RoboMet.3D Image Stack/Optical Data/FeatureIds", + "version": 1 + }, + "feature_phases_array_name": { + "value": "Phases", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -178,10 +358,23 @@ }, { "args": { - "centroids_array_name": "Centroids", - "feature_attribute_matrix_path": "RoboMet.3D Image Stack/Pore Data", - "feature_ids_path": "RoboMet.3D Image Stack/Optical Data/FeatureIds", - "input_image_geometry_path": "RoboMet.3D Image Stack" + "centroids_array_name": { + "value": "Centroids", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "RoboMet.3D Image Stack/Pore Data", + "version": 1 + }, + "feature_ids_path": { + "value": "RoboMet.3D Image Stack/Optical Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "RoboMet.3D Image Stack", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -192,12 +385,19 @@ }, { "args": { - "data_object_path": "RoboMet.3D Image Stack/Ensemble Data", - "tuple_dimensions": [ - [ - 3.0 - ] - ] + "data_object_path": { + "value": "RoboMet.3D Image Stack/Ensemble Data", + "version": 1 + }, + "parameters_version": 1, + "tuple_dimensions": { + "value": [ + [ + 3.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -208,21 +408,63 @@ }, { "args": { - "biased_features_array_path": "", - "cell_ensemble_attribute_matrix_path": "RoboMet.3D Image Stack/Ensemble Data", - "centroids_array_path": "RoboMet.3D Image Stack/Pore Data/Centroids", - "clustering_list_array_name": "ClusteringList", - "equivalent_diameters_array_path": "RoboMet.3D Image Stack/Pore Data/EquivalentDiameters", - "feature_phases_array_path": "RoboMet.3D Image Stack/Pore Data/Phases", - "input_image_geometry_path": "RoboMet.3D Image Stack", - "max_min_array_name": "RDFMaxMinDistances", - "number_of_bins": 10, - "phase_number": 2, - "rdf_array_name": "RDF", - "remove_biased_features": false, - "seed_array_name": "ComputeFeatureClustering SeedValue", - "seed_value": 5489, - "set_random_seed": false + "biased_features_array_path": { + "value": "", + "version": 1 + }, + "cell_ensemble_attribute_matrix_path": { + "value": "RoboMet.3D Image Stack/Ensemble Data", + "version": 1 + }, + "centroids_array_path": { + "value": "RoboMet.3D Image Stack/Pore Data/Centroids", + "version": 1 + }, + "clustering_list_array_name": { + "value": "ClusteringList", + "version": 1 + }, + "feature_phases_array_path": { + "value": "RoboMet.3D Image Stack/Pore Data/Phases", + "version": 1 + }, + "input_image_geometry_path": { + "value": "RoboMet.3D Image Stack", + "version": 1 + }, + "max_min_array_name": { + "value": "RDFMaxMinDistances", + "version": 1 + }, + "number_of_bins": { + "value": 10, + "version": 1 + }, + "parameters_version": 1, + "phase_number": { + "value": 2, + "version": 1 + }, + "rdf_array_name": { + "value": "RDF", + "version": 1 + }, + "remove_biased_features": { + "value": false, + "version": 1 + }, + "seed_array_name": { + "value": "ComputeFeatureClustering SeedValue", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "set_random_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -233,8 +475,15 @@ }, { "args": { - "export_file_path": "Data/Output/ImagesStack/Images.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/ImagesStack/Images.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -245,4 +494,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImageFilter.cpp index 91067b2f59..59e3f95804 100644 --- 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 index 0abd0bb98b..ffc1c86e0f 100644 --- 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 index ceeb302be6..d96965350a 100644 --- 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 index 4db56250ff..bb6ba7f392 100644 --- 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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.cpp index 9fd8a59f3f..5ffd0eb248 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.hpp index 28ccdc3973..114425f716 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.cpp index 7e13ba984c..f232f4a8ab 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.hpp index d9ab495696..b20407f528 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/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 index ca08b52c11..9ecd844b76 100644 --- 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 index ccceaac4ef..95382815c3 100644 --- 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 index 4e25455ea6..0c55357638 100644 --- 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 index 8fa24c7bb8..5fb6817529 100644 --- 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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.cpp index b42da735ee..0ff21d60ba 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.cpp +++ b/src/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.hpp index 3456faadac..ea1c79372d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.hpp +++ b/src/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 index 3d37f1f67e..933075c5a0 100644 --- 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 index 112c38d2fe..4e4fe63610 100644 --- 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 index 7ac6cc5185..0bc99dcc53 100644 --- 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 index 4d74a82ea1..91a651970c 100644 --- 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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.cpp index 59a5b3a28e..e2e9928a07 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.hpp index 44afd3f939..b638761964 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.cpp index 3ad03278ca..4cfeed2482 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.hpp index f7d03c996a..d9a3356f77 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.cpp index 38740768f7..297b3894bd 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.hpp index 950a0a51a5..64333789af 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.cpp index 062685803a..7f0507da9d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.cpp +++ b/src/Plugins/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.hpp index afe6ebb205..a489dd4459 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.hpp +++ b/src/Plugins/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.cpp index 4db95097be..03bba69bb8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.cpp +++ b/src/Plugins/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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.hpp index 6a985d4e01..a87b1add66 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.hpp +++ b/src/Plugins/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 diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImageFilter.cpp index 803fc4eccf..2772da3288 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImageFilter.cpp @@ -101,6 +101,12 @@ Parameters ITKBinaryThresholdImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKBinaryThresholdImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKBinaryThresholdImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImageFilter.hpp index aaa61c45a4..9d84a60ffd 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImageFilter.hpp @@ -90,6 +90,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryThresholdImageFilter : 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/ITKBlackTopHatImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImageFilter.cpp index fa1f78d715..725b9ee677 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImageFilter.cpp @@ -97,6 +97,12 @@ Parameters ITKBlackTopHatImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKBlackTopHatImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKBlackTopHatImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImageFilter.hpp index 066fbab649..eaaa97d799 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImageFilter.hpp @@ -84,6 +84,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKBlackTopHatImageFilter : 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/ITKBoundedReciprocalImageFIlter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImageFIlter.cpp index afe32c5e0d..97be483e5c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImageFIlter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImageFIlter.cpp @@ -80,6 +80,12 @@ Parameters ITKBoundedReciprocalImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKBoundedReciprocalImageFIlter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKBoundedReciprocalImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImageFilter.hpp index d81e08e096..ed280fab6f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImageFilter.hpp @@ -69,6 +69,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKBoundedReciprocalImageFilter : 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/ITKClosingByReconstructionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImageFilter.cpp index 3ce29eb25d..4ba7ed4f68 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImageFilter.cpp @@ -105,6 +105,12 @@ Parameters ITKClosingByReconstructionImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKClosingByReconstructionImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKClosingByReconstructionImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImageFilter.hpp index 7d5bd73bbd..9f57fdd4a1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImageFilter.hpp @@ -94,6 +94,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKClosingByReconstructionImageFilter : public I */ 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/ITKConnectedComponentImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImageFilter.cpp index 987301d759..da2d5ef546 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImageFilter.cpp @@ -88,6 +88,12 @@ Parameters ITKConnectedComponentImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKConnectedComponentImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKConnectedComponentImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImageFilter.hpp index 659e8aad56..cfa432f321 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImageFilter.hpp @@ -80,6 +80,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKConnectedComponentImageFilter : public IFilte */ 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/ITKCosImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImageFilter.cpp index 6181fd27b2..a78224032d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImageFilter.cpp @@ -82,6 +82,12 @@ Parameters ITKCosImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKCosImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKCosImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImageFilter.hpp index 07a3a9fc11..83c06db6bf 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImageFilter.hpp @@ -95,6 +95,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKCosImageFilter : 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/ITKCurvatureAnisotropicDiffusionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImageFilter.cpp index 35536f80c5..a3ab3dcd69 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImageFilter.cpp @@ -94,6 +94,12 @@ Parameters ITKCurvatureAnisotropicDiffusionImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKCurvatureAnisotropicDiffusionImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKCurvatureAnisotropicDiffusionImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImageFilter.hpp index 8332f9d6ab..3db1532967 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImageFilter.hpp @@ -93,6 +93,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKCurvatureAnisotropicDiffusionImageFilter : 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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImageFilter.cpp index df94ce4c16..78f4957929 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImageFilter.cpp @@ -88,6 +88,12 @@ Parameters ITKCurvatureFlowImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKCurvatureFlowImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKCurvatureFlowImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImageFilter.hpp index 4f5efbc91c..fb6fd15d08 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImageFilter.hpp @@ -107,6 +107,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKCurvatureFlowImageFilter : 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/ITKDanielssonDistanceMapImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImageFilter.cpp index ac3dd4cb6c..3569fe992e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImageFilter.cpp @@ -95,6 +95,12 @@ Parameters ITKDanielssonDistanceMapImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKDanielssonDistanceMapImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKDanielssonDistanceMapImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImageFilter.hpp index cc5957b7c2..b4b2d03d02 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImageFilter.hpp @@ -109,6 +109,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKDanielssonDistanceMapImageFilter : public IFi */ 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/ITKDilateObjectMorphologyImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImageFilter.cpp index 738d31a494..766f046fdf 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImageFilter.cpp @@ -97,6 +97,12 @@ Parameters ITKDilateObjectMorphologyImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKDilateObjectMorphologyImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKDilateObjectMorphologyImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImageFilter.hpp index c102619218..6421f3783c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImageFilter.hpp @@ -88,6 +88,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKDilateObjectMorphologyImageFilter : public IF */ 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/ITKDiscreteGaussianImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImageFilter.cpp index be59671b32..de19cfe76d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImageFilter.cpp @@ -114,6 +114,12 @@ Parameters ITKDiscreteGaussianImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKDiscreteGaussianImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKDiscreteGaussianImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImageFilter.hpp index ed32a0ecb4..3808040f0d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImageFilter.hpp @@ -100,6 +100,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKDiscreteGaussianImageFilter : 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/ITKDoubleThresholdImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImageFilter.cpp index cf1071931c..fedca64229 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImageFilter.cpp @@ -119,6 +119,12 @@ Parameters ITKDoubleThresholdImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKDoubleThresholdImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKDoubleThresholdImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImageFilter.hpp index 9c5d7a9976..c6cf1326cf 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImageFilter.hpp @@ -88,6 +88,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKDoubleThresholdImageFilter : 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/ITKErodeObjectMorphologyImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImageFilter.cpp index 9b5a1316e5..44848c7735 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImageFilter.cpp @@ -100,6 +100,12 @@ Parameters ITKErodeObjectMorphologyImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKErodeObjectMorphologyImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKErodeObjectMorphologyImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImageFilter.hpp index 9332ff899a..d3aac56da9 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImageFilter.hpp @@ -89,6 +89,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKErodeObjectMorphologyImageFilter : public IFi */ 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/ITKExpImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImageFilter.cpp index ab68773f72..425c512640 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImageFilter.cpp @@ -82,6 +82,12 @@ Parameters ITKExpImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKExpImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKExpImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImageFilter.hpp index 47fe7fc0a7..596051634a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImageFilter.hpp @@ -76,6 +76,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKExpImageFilter : 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/ITKExpNegativeImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImageFilter.cpp index 21e86b4821..86fc9dbd4f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImageFilter.cpp @@ -82,6 +82,12 @@ Parameters ITKExpNegativeImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKExpNegativeImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKExpNegativeImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImageFilter.hpp index 41375e6b96..90079a4983 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImageFilter.hpp @@ -76,6 +76,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKExpNegativeImageFilter : 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/ITKGradientAnisotropicDiffusionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImageFilter.cpp index c983c69b98..cb1c80bac9 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImageFilter.cpp @@ -96,6 +96,12 @@ Parameters ITKGradientAnisotropicDiffusionImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKGradientAnisotropicDiffusionImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKGradientAnisotropicDiffusionImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImageFilter.hpp index a3f574b202..5fdf41c425 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImageFilter.hpp @@ -89,6 +89,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientAnisotropicDiffusionImageFilter : 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/ITKGradientMagnitudeImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImageFilter.cpp index 9213c50b80..8a259902ce 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImageFilter.cpp @@ -92,6 +92,12 @@ Parameters ITKGradientMagnitudeImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKGradientMagnitudeImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKGradientMagnitudeImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImageFilter.hpp index 4782f42f2a..56b0881f86 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImageFilter.hpp @@ -86,6 +86,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientMagnitudeImageFilter : 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/ITKGradientMagnitudeRecursiveGaussianImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImageFilter.cpp index 2002a6ca19..5bf26a9452 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImageFilter.cpp @@ -90,6 +90,12 @@ Parameters ITKGradientMagnitudeRecursiveGaussianImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKGradientMagnitudeRecursiveGaussianImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKGradientMagnitudeRecursiveGaussianImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImageFilter.hpp index 17b1352df4..8eaa9a72f3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImageFilter.hpp @@ -71,6 +71,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientMagnitudeRecursiveGaussianImageFilter */ 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/ITKGrayscaleDilateImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImageFilter.cpp index 0476af5111..c59bec6789 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImageFilter.cpp @@ -93,6 +93,12 @@ Parameters ITKGrayscaleDilateImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKGrayscaleDilateImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKGrayscaleDilateImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImageFilter.hpp index 2ef5915f19..0414623958 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImageFilter.hpp @@ -82,6 +82,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleDilateImageFilter : 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/ITKGrayscaleErodeImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImageFilter.cpp index bc0cbf67fb..4673007c26 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImageFilter.cpp @@ -93,6 +93,12 @@ Parameters ITKGrayscaleErodeImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKGrayscaleErodeImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKGrayscaleErodeImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImageFilter.hpp index 6a64645e66..dab3c09fac 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImageFilter.hpp @@ -82,6 +82,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleErodeImageFilter : 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/ITKGrayscaleFillholeImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImageFilter.cpp index 0971ba9347..e7ff28c4e2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImageFilter.cpp @@ -90,6 +90,12 @@ Parameters ITKGrayscaleFillholeImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKGrayscaleFillholeImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKGrayscaleFillholeImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImageFilter.hpp index 5184741ad8..f8a2ea403a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImageFilter.hpp @@ -92,6 +92,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleFillholeImageFilter : 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/ITKGrayscaleGrindPeakImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImageFilter.cpp index 0e3dcaa687..8243ffcaec 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImageFilter.cpp @@ -90,6 +90,12 @@ Parameters ITKGrayscaleGrindPeakImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKGrayscaleGrindPeakImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKGrayscaleGrindPeakImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImageFilter.hpp index 72548b3d53..b20c85b563 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImageFilter.hpp @@ -94,6 +94,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleGrindPeakImageFilter : public IFilte */ 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/ITKGrayscaleMorphologicalClosingImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImageFilter.cpp index d955e122b8..2aa36d7783 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImageFilter.cpp @@ -97,6 +97,12 @@ Parameters ITKGrayscaleMorphologicalClosingImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKGrayscaleMorphologicalClosingImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKGrayscaleMorphologicalClosingImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImageFilter.hpp index 6517dd674b..cc31f72b4a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImageFilter.hpp @@ -83,6 +83,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleMorphologicalClosingImageFilter : 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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImageFilter.cpp index 79e6d02df5..edec0a1dbb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImageFilter.cpp @@ -97,6 +97,12 @@ Parameters ITKGrayscaleMorphologicalOpeningImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKGrayscaleMorphologicalOpeningImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKGrayscaleMorphologicalOpeningImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImageFilter.hpp index 7b5d57f3a3..f893839baf 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImageFilter.hpp @@ -83,6 +83,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleMorphologicalOpeningImageFilter : 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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImageFilter.cpp index 44576cbba2..0142cee894 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImageFilter.cpp @@ -97,6 +97,12 @@ Parameters ITKHConvexImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKHConvexImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKHConvexImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImageFilter.hpp index 94eda018a3..fac8b779b9 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImageFilter.hpp @@ -89,6 +89,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKHConvexImageFilter : 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/ITKHMaximaImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImageFilter.cpp index 1b067b0f7b..ebc88516dc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImageFilter.cpp @@ -90,6 +90,12 @@ Parameters ITKHMaximaImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKHMaximaImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKHMaximaImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImageFilter.hpp index 63ba651dad..0cef069484 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImageFilter.hpp @@ -94,6 +94,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKHMaximaImageFilter : 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/ITKHMinimaImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImageFilter.cpp index 9b057bd7c6..de775cc0f3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImageFilter.cpp @@ -97,6 +97,12 @@ Parameters ITKHMinimaImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKHMinimaImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKHMinimaImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImageFilter.hpp index a414d9f235..8bb02d4a1a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImageFilter.hpp @@ -92,6 +92,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKHMinimaImageFilter : 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/ITKImageReaderFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReaderFilter.cpp index 69f0201bff..8089c5f3ca 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReaderFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReaderFilter.cpp @@ -98,6 +98,12 @@ Parameters ITKImageReaderFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKImageReaderFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKImageReaderFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReaderFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReaderFilter.hpp index 5588cc6ac7..5249a4179a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReaderFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReaderFilter.hpp @@ -84,6 +84,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKImageReaderFilter : 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/ITKImageWriterFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriterFilter.cpp index 62c6653161..a5018abe95 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriterFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriterFilter.cpp @@ -308,6 +308,12 @@ Parameters ITKImageWriterFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKImageWriterFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKImageWriterFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriterFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriterFilter.hpp index 8b5800ed3b..02a6f38111 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriterFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriterFilter.hpp @@ -77,6 +77,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKImageWriterFilter : 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/ITKImportFijiMontageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp index 7a995cae4d..28b8225ff0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp @@ -105,6 +105,12 @@ Parameters ITKImportFijiMontageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKImportFijiMontageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKImportFijiMontageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp index 31d89f64ad..cbdf2b0d75 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp @@ -79,6 +79,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKImportFijiMontageFilter : 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/ITKImportImageStackFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStackFilter.cpp index 5fed3331a7..decf92dda6 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStackFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStackFilter.cpp @@ -361,6 +361,12 @@ Parameters ITKImportImageStackFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKImportImageStackFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKImportImageStackFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStackFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStackFilter.hpp index 2ec23a3f59..2552044b76 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStackFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStackFilter.hpp @@ -80,6 +80,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKImportImageStackFilter : 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/ITKIntensityWindowingImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImageFilter.cpp index e82ba3651e..4a920f8695 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImageFilter.cpp @@ -96,6 +96,12 @@ Parameters ITKIntensityWindowingImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKIntensityWindowingImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKIntensityWindowingImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImageFilter.hpp index 8048407a29..16995a578d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImageFilter.hpp @@ -87,6 +87,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKIntensityWindowingImageFilter : public IFilte */ 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/ITKInvertIntensityImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImageFilter.cpp index 33789ba39f..ce7179b772 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImageFilter.cpp @@ -88,6 +88,12 @@ Parameters ITKInvertIntensityImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKInvertIntensityImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKInvertIntensityImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImageFilter.hpp index bb00f23dcb..47dabdd527 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImageFilter.hpp @@ -83,6 +83,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKInvertIntensityImageFilter : 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/ITKIsoContourDistanceImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImageFilter.cpp index f97be5323f..88bc929f51 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImageFilter.cpp @@ -88,6 +88,12 @@ Parameters ITKIsoContourDistanceImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKIsoContourDistanceImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKIsoContourDistanceImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImageFilter.hpp index 0c2805be4c..d6252b8f6d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImageFilter.hpp @@ -77,6 +77,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKIsoContourDistanceImageFilter : public IFilte */ 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/ITKLabelContourImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImageFilter.cpp index 7c78b59702..618a30e713 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImageFilter.cpp @@ -95,6 +95,12 @@ Parameters ITKLabelContourImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKLabelContourImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKLabelContourImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImageFilter.hpp index d66c58015b..49568450ec 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImageFilter.hpp @@ -88,6 +88,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKLabelContourImageFilter : 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/ITKLaplacianRecursiveGaussianImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImageFilter.cpp index 80ee0dd448..7d908aeb3c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImageFilter.cpp @@ -90,6 +90,12 @@ Parameters ITKLaplacianRecursiveGaussianImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKLaplacianRecursiveGaussianImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKLaplacianRecursiveGaussianImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImageFilter.hpp index 6e491ba899..0a59bc3e5e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImageFilter.hpp @@ -71,6 +71,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKLaplacianRecursiveGaussianImageFilter : 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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10ImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10ImageFilter.cpp index e312f2b74f..e840eb74c4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10ImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10ImageFilter.cpp @@ -82,6 +82,12 @@ Parameters ITKLog10ImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKLog10ImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKLog10ImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10ImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10ImageFilter.hpp index 406766de0b..867660aa15 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10ImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10ImageFilter.hpp @@ -76,6 +76,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKLog10ImageFilter : 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/ITKLogImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImageFilter.cpp index 2f9a3292b1..48ec531a3e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImageFilter.cpp @@ -82,6 +82,12 @@ Parameters ITKLogImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKLogImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKLogImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImageFilter.hpp index 5f7174890c..b49cf2f7ba 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImageFilter.hpp @@ -76,6 +76,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKLogImageFilter : 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/ITKMaskImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImageFilter.cpp index 1f9c90f68d..f7ae4c6378 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImageFilter.cpp @@ -164,6 +164,12 @@ Parameters ITKMaskImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKMaskImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKMaskImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImageFilter.hpp index 0746c8d63b..dc9a48ce4b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImageFilter.hpp @@ -101,6 +101,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKMaskImageFilter : 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/ITKMeanProjectionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImageFilter.cpp index cf711ae2e4..c9fd14a17d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImageFilter.cpp @@ -86,6 +86,12 @@ Parameters ITKMeanProjectionImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKMeanProjectionImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKMeanProjectionImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImageFilter.hpp index 3415b45c25..20970df02a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImageFilter.hpp @@ -93,6 +93,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKMeanProjectionImageFilter : 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/ITKMedianImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImageFilter.cpp index 6601352312..9810d9833d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImageFilter.cpp @@ -95,6 +95,12 @@ Parameters ITKMedianImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKMedianImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKMedianImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImageFilter.hpp index 20dc00e245..91b6d00930 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImageFilter.hpp @@ -92,6 +92,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKMedianImageFilter : 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/ITKMhaFileReaderFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReaderFilter.cpp index 1dd624f522..e0c72a7bcc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReaderFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReaderFilter.cpp @@ -300,6 +300,12 @@ Parameters ITKMhaFileReaderFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKMhaFileReaderFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKMhaFileReaderFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReaderFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReaderFilter.hpp index 2c0a40d0cc..f42661c2ef 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReaderFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReaderFilter.hpp @@ -62,6 +62,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKMhaFileReaderFilter : public IFilter */ [[nodiscard]] 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/ITKMinMaxCurvatureFlowImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImageFilter.cpp index af6eb5162d..7c5e088b9d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImageFilter.cpp @@ -92,6 +92,12 @@ Parameters ITKMinMaxCurvatureFlowImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKMinMaxCurvatureFlowImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKMinMaxCurvatureFlowImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImageFilter.hpp index 970207b2eb..246ea2d028 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImageFilter.hpp @@ -100,6 +100,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKMinMaxCurvatureFlowImageFilter : public IFilt */ 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/ITKMorphologicalGradientImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImageFilter.cpp index 1c2bb4f4ec..aa6274831d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImageFilter.cpp @@ -93,6 +93,12 @@ Parameters ITKMorphologicalGradientImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKMorphologicalGradientImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKMorphologicalGradientImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImageFilter.hpp index 4d2824e81e..94d075edfe 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImageFilter.hpp @@ -80,6 +80,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalGradientImageFilter : public IFi */ 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/ITKMorphologicalWatershedFromMarkersImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImageFilter.cpp index 039da520c1..f671fd921c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImageFilter.cpp @@ -91,6 +91,12 @@ Parameters ITKMorphologicalWatershedFromMarkersImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKMorphologicalWatershedFromMarkersImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKMorphologicalWatershedFromMarkersImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImageFilter.hpp index 007658e578..0f8686fd3b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImageFilter.hpp @@ -100,6 +100,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalWatershedFromMarkersImageFilter */ 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/ITKMorphologicalWatershedImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImageFilter.cpp index 2c947c7f78..33a80a03e0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImageFilter.cpp @@ -101,6 +101,12 @@ Parameters ITKMorphologicalWatershedImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKMorphologicalWatershedImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKMorphologicalWatershedImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImageFilter.hpp index 4f97bcf2b3..6a7d860a95 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImageFilter.hpp @@ -91,6 +91,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalWatershedImageFilter : public IF */ 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/ITKNormalizeImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImageFilter.cpp index 9ebe4c64c8..b67ad9ce24 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImageFilter.cpp @@ -83,6 +83,12 @@ Parameters ITKNormalizeImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKNormalizeImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKNormalizeImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImageFilter.hpp index 4b086ea1a1..32e51437a2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImageFilter.hpp @@ -82,6 +82,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKNormalizeImageFilter : 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/ITKNormalizeToConstantImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImageFilter.cpp index 84a383130c..075ace9511 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImageFilter.cpp @@ -86,6 +86,12 @@ Parameters ITKNormalizeToConstantImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKNormalizeToConstantImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKNormalizeToConstantImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImageFilter.hpp index 4c9f479b59..74700f4dbf 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImageFilter.hpp @@ -86,6 +86,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKNormalizeToConstantImageFilter : public IFilt */ 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/ITKNotImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImageFilter.cpp index 6f71bf80b2..2b9e3dc9fb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImageFilter.cpp @@ -81,6 +81,12 @@ Parameters ITKNotImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKNotImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKNotImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImageFilter.hpp index ebbddabb33..9aef67b35f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImageFilter.hpp @@ -97,6 +97,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKNotImageFilter : 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/ITKOpeningByReconstructionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImageFilter.cpp index 835ddbd8b6..76773fb5eb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImageFilter.cpp @@ -105,6 +105,12 @@ Parameters ITKOpeningByReconstructionImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKOpeningByReconstructionImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKOpeningByReconstructionImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImageFilter.hpp index 8ed1736c7d..1bacb5a3cc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImageFilter.hpp @@ -94,6 +94,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKOpeningByReconstructionImageFilter : public I */ 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/ITKOtsuMultipleThresholdsImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImageFilter.cpp index 9f3002ebc5..f710b7d1f7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImageFilter.cpp @@ -103,6 +103,12 @@ Parameters ITKOtsuMultipleThresholdsImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKOtsuMultipleThresholdsImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKOtsuMultipleThresholdsImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImageFilter.hpp index 0a919ecefd..d4d1f3bbc0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImageFilter.hpp @@ -95,6 +95,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKOtsuMultipleThresholdsImageFilter : public IF */ 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/ITKRegionalMaximaImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImageFilter.cpp index 6d3c3a5a34..5e7b7f1931 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImageFilter.cpp @@ -100,6 +100,12 @@ Parameters ITKRegionalMaximaImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKRegionalMaximaImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKRegionalMaximaImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImageFilter.hpp index a97122d81b..bc87832635 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImageFilter.hpp @@ -89,6 +89,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKRegionalMaximaImageFilter : 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/ITKRegionalMinimaImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImageFilter.cpp index 0e7ffc920e..c3494d1cfc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImageFilter.cpp @@ -100,6 +100,12 @@ Parameters ITKRegionalMinimaImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKRegionalMinimaImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKRegionalMinimaImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImageFilter.hpp index a843592924..a5b04cbaa1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImageFilter.hpp @@ -87,6 +87,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKRegionalMinimaImageFilter : 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/ITKRelabelComponentImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImageFilter.cpp index eab159a2ee..7489a3d9eb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImageFilter.cpp @@ -95,6 +95,12 @@ Parameters ITKRelabelComponentImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKRelabelComponentImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKRelabelComponentImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImageFilter.hpp index 67506de012..9c29f7d622 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImageFilter.hpp @@ -96,6 +96,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKRelabelComponentImageFilter : 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/ITKRescaleIntensityImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImageFilter.cpp index fc6c061c27..42bad40119 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImageFilter.cpp @@ -91,6 +91,12 @@ Parameters ITKRescaleIntensityImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKRescaleIntensityImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKRescaleIntensityImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImageFilter.hpp index af0c260ca6..c1d268e158 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImageFilter.hpp @@ -93,6 +93,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKRescaleIntensityImageFilter : 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/ITKSigmoidImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImageFilter.cpp index ae2623b065..d81418319b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImageFilter.cpp @@ -96,6 +96,12 @@ Parameters ITKSigmoidImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKSigmoidImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKSigmoidImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImageFilter.hpp index 8137848d33..f6500eeded 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImageFilter.hpp @@ -84,6 +84,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKSigmoidImageFilter : 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/ITKSignedDanielssonDistanceMapImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImageFilter.cpp index 022a44f935..96396d48dc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImageFilter.cpp @@ -92,6 +92,12 @@ Parameters ITKSignedDanielssonDistanceMapImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKSignedDanielssonDistanceMapImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKSignedDanielssonDistanceMapImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImageFilter.hpp index e3b28cf587..ae65225a67 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImageFilter.hpp @@ -94,6 +94,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKSignedDanielssonDistanceMapImageFilter : publ */ 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/ITKSignedMaurerDistanceMapImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImageFilter.cpp index 8c7bead453..588566b5bb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImageFilter.cpp @@ -100,6 +100,12 @@ Parameters ITKSignedMaurerDistanceMapImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKSignedMaurerDistanceMapImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKSignedMaurerDistanceMapImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImageFilter.hpp index 78ef84b50f..9677665fc9 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImageFilter.hpp @@ -96,6 +96,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKSignedMaurerDistanceMapImageFilter : public I */ 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/ITKSinImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImageFilter.cpp index 460d0e2026..94c9189023 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImageFilter.cpp @@ -82,6 +82,12 @@ Parameters ITKSinImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKSinImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKSinImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImageFilter.hpp index cb65ced8ef..c424333ee3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImageFilter.hpp @@ -76,6 +76,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKSinImageFilter : 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/ITKSmoothingRecursiveGaussianImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImageFilter.cpp index 821ca52d6c..a7faf7abd7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImageFilter.cpp @@ -95,6 +95,12 @@ Parameters ITKSmoothingRecursiveGaussianImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKSmoothingRecursiveGaussianImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKSmoothingRecursiveGaussianImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImageFilter.hpp index 7b5a148a82..94c276da69 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImageFilter.hpp @@ -73,6 +73,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKSmoothingRecursiveGaussianImageFilter : 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/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImageFilter.cpp index 17af359739..8d5ec17c8b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImageFilter.cpp @@ -81,6 +81,12 @@ Parameters ITKSqrtImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKSqrtImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKSqrtImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImageFilter.hpp index 09d2f5eb0c..88c2f2f157 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImageFilter.hpp @@ -76,6 +76,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKSqrtImageFilter : 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/ITKSquareImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImageFilter.cpp index 5f3155c124..6e7783a8b8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImageFilter.cpp @@ -81,6 +81,12 @@ Parameters ITKSquareImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKSquareImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKSquareImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImageFilter.hpp index 99e3722aac..971b5c36e3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImageFilter.hpp @@ -76,6 +76,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKSquareImageFilter : 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/ITKStandardDeviationProjectionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImageFilter.cpp index 4f3de195f3..e4d6826c56 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImageFilter.cpp @@ -85,6 +85,12 @@ Parameters ITKStandardDeviationProjectionImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKStandardDeviationProjectionImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKStandardDeviationProjectionImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImageFilter.hpp index e8311dc05a..f493f684e3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImageFilter.hpp @@ -96,6 +96,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKStandardDeviationProjectionImageFilter : publ */ 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/ITKSumProjectionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImageFilter.cpp index b502a7fa71..a6ff4f618e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImageFilter.cpp @@ -86,6 +86,12 @@ Parameters ITKSumProjectionImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKSumProjectionImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKSumProjectionImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImageFilter.hpp index 4663eaafc7..a2805c9d3c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImageFilter.hpp @@ -96,6 +96,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKSumProjectionImageFilter : 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/ITKTanImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImageFilter.cpp index 41923f3a7b..57faab19b7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImageFilter.cpp @@ -81,6 +81,12 @@ Parameters ITKTanImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKTanImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKTanImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImageFilter.hpp index f64a374add..fda6edcfba 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImageFilter.hpp @@ -76,6 +76,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKTanImageFilter : 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/ITKThresholdImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImageFilter.cpp index 53b7c8e1bb..0ec3567feb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImageFilter.cpp @@ -94,6 +94,12 @@ Parameters ITKThresholdImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKThresholdImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKThresholdImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImageFilter.hpp index 6bab14c05a..fda5ff9bd0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImageFilter.hpp @@ -91,6 +91,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKThresholdImageFilter : 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/ITKThresholdMaximumConnectedComponentsImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImageFilter.cpp index ec77a397f3..23466638dc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImageFilter.cpp @@ -118,6 +118,12 @@ Parameters ITKThresholdMaximumConnectedComponentsImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKThresholdMaximumConnectedComponentsImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKThresholdMaximumConnectedComponentsImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImageFilter.hpp index 76bdbaac15..0b0b1c15a9 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImageFilter.hpp @@ -98,6 +98,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKThresholdMaximumConnectedComponentsImageFilte */ 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/ITKValuedRegionalMaximaImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImageFilter.cpp index fd7a98ce85..48af9ca266 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImageFilter.cpp @@ -89,6 +89,12 @@ Parameters ITKValuedRegionalMaximaImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKValuedRegionalMaximaImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKValuedRegionalMaximaImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImageFilter.hpp index cd079e65e1..b453494c5d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImageFilter.hpp @@ -90,6 +90,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKValuedRegionalMaximaImageFilter : public IFil */ 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/ITKValuedRegionalMinimaImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImageFilter.cpp index b60f06cd3e..a30f97749f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImageFilter.cpp @@ -89,6 +89,12 @@ Parameters ITKValuedRegionalMinimaImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKValuedRegionalMinimaImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKValuedRegionalMinimaImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImageFilter.hpp index acc0d455cd..2af8eda592 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImageFilter.hpp @@ -87,6 +87,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKValuedRegionalMinimaImageFilter : public IFil */ 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/ITKWhiteTopHatImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImageFilter.cpp index 1e7337ec94..e5428e66d0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImageFilter.cpp @@ -97,6 +97,12 @@ Parameters ITKWhiteTopHatImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKWhiteTopHatImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKWhiteTopHatImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImageFilter.hpp index e3bc4681c6..2d7b280d14 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImageFilter.hpp @@ -81,6 +81,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKWhiteTopHatImageFilter : 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/ITKZeroCrossingImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImageFilter.cpp index 72ce82fcca..40ba663386 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImageFilter.cpp @@ -88,6 +88,12 @@ Parameters ITKZeroCrossingImageFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ITKZeroCrossingImageFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ITKZeroCrossingImageFilter::clone() const { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImageFilter.hpp index 92426fd2bf..5255e5b70c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImageFilter.hpp @@ -98,6 +98,14 @@ class ITKIMAGEPROCESSING_EXPORT ITKZeroCrossingImageFilter : 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/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline index cec2628bdc..da23126eab 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline @@ -1,34 +1,46 @@ { "isDisabled": false, "name": "AlignSectionsMutualInformation.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, "read_h5_ebsd_object": { - "end_slice": 117, - "euler_representation": 0, - "hdf5_data_paths": [ - "Confidence Index", - "EulerAngles", - "Fit", - "Image Quality", - "Phases", - "SEM Signal", - "X Position", - "Y Position" - ], - "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", - "start_slice": 1, - "use_recommended_transform": true + "value": { + "end_slice": 117, + "euler_representation": 0, + "hdf5_data_paths": [ + "Confidence Index", + "EulerAngles", + "Fit", + "Image Quality", + "Phases", + "SEM Signal", + "X Position", + "Y Position" + ], + "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", + "start_slice": 1, + "use_recommended_transform": true + }, + "version": 1 } }, "comments": "", "filter": { - "name": "simplnx::ReadH5EbsdFilter", + "name": "nx::core::ReadH5EbsdFilter", "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" }, "isDisabled": false @@ -36,82 +48,157 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Image Quality", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 120.0 - }, - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 - }, - "output_data_array_name": "Mask" + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "DataContainer/Cell Data/Image Quality", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 120.0 + }, + { + "array_path": "DataContainer/Cell Data/Confidence Index", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.1 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "input_orientation_array_path": "DataContainer/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 + "input_orientation_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "input_representation_index": { + "value": 0, + "version": 1 + }, + "output_orientation_array_name": { + "value": "Quats", + "version": 1 + }, + "output_representation_index": { + "value": 2, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ConvertOrientations", + "name": "nx::core::ConvertOrientationsFilter", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false }, { "args": { - "alignment_shift_file_name": "Data/Output/OrientationAnalysis/Alignment_By_Mutual_Information_Shifts.txt", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "input_image_geometry_path": "DataContainer", - "use_mask": true, - "write_alignment_shifts": true + "alignment_shift_file_name": { + "value": "Data/Output/OrientationAnalysis/Alignment_By_Mutual_Information_Shifts.txt", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "misorientation_tolerance": { + "value": 5.0, + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + }, + "write_alignment_shifts": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::AlignSectionsMutualInformationFilter", + "name": "nx::core::AlignSectionsMutualInformationFilter", "uuid": "3cf33ad9-8322-4d40-96de-14bbe40969cc" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/OrientationAnalysis/SmallIN100_AlignSectionsMutualInformation.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/OrientationAnalysis/SmallIN100_AlignSectionsMutualInformation.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline index 47bb27ec36..736ed32685 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline @@ -1,73 +1,114 @@ { "isDisabled": false, "name": "CI_Histogram.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "input_file": "Data/Small_IN100/Slice_1.ang" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "input_file": { + "value": "Data/Small_IN100/Slice_1.ang", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadAngDataFilter", + "name": "nx::core::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false }, { "args": { - "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis_angle": [ - 0.0, - 0.0, - 1.0, - 90.0 - ] + "euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "parameters_version": 1, + "rotation_axis_angle": { + "value": [ + 0.0, + 0.0, + 1.0, + 90.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateEulerRefFrameFilter", + "name": "nx::core::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false }, { "args": { - "output_image_geometry_path": "DataContainer", - "remove_original_geometry": true, - "rotate_slice_by_slice": false, - "rotation_axis_angle": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "rotation_matrix": [ - [ + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "rotate_slice_by_slice": { + "value": false, + "version": 1 + }, + "rotation_axis_angle": { + "value": [ 0.0, + 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 0.0 + "version": 1 + }, + "rotation_matrix": { + "value": [ + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ] ], - [ - 0.0, - 0.0, - 0.0 - ] - ], - "rotation_representation_index": 0, - "input_image_geometry_path": "DataContainer" + "version": 1 + }, + "rotation_representation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateSampleRefFrameFilter", + "name": "nx::core::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -75,87 +116,190 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 1, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "DataContainer/Cell Data/Confidence Index", + "comparison": 1, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.1 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 }, - "output_data_array_name": "Mask" + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "conditional_array_path": "DataContainer/Cell Data/Mask", - "invert_mask": false, - "remove_value": "0", - "replace_value": "0", - "selected_array_path": "DataContainer/Cell Data/Confidence Index", - "use_conditional": true + "conditional_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "invert_mask": { + "value": false, + "version": 1 + }, + "parameters_version": 1, + "remove_value": { + "value": "0", + "version": 1 + }, + "replace_value": { + "value": "0", + "version": 1 + }, + "selected_array_path": { + "value": "DataContainer/Cell Data/Confidence Index", + "version": 1 + }, + "use_conditional": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ConditionalSetValueFilter", + "name": "nx::core::ConditionalSetValueFilter", "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881" }, "isDisabled": false }, { "args": { - "new_data_group_path": "DataContainer/Statistics", - "histogram_bin_count_suffix": " Histogram Counts", - "histogram_bin_range_suffix": " Histogram Bin Ranges", - "max_range": 1.0, - "min_range": 0.0, - "create_new_data_group": true, - "output_data_group_path": "", - "number_of_bins": 25, - "selected_array_paths": [ - "DataContainer/Cell Data/Confidence Index" - ], - "user_defined_range": true + "create_new_data_group": { + "value": true, + "version": 1 + }, + "histogram_bin_count_suffix": { + "value": " Histogram Counts", + "version": 1 + }, + "histogram_bin_range_suffix": { + "value": " Histogram Bin Ranges", + "version": 1 + }, + "max_range": { + "value": 1.0, + "version": 1 + }, + "min_range": { + "value": 0.0, + "version": 1 + }, + "new_data_group_path": { + "value": "DataContainer/Statistics", + "version": 1 + }, + "number_of_bins": { + "value": 25, + "version": 1 + }, + "output_data_group_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "selected_array_paths": { + "value": [ + "DataContainer/Cell Data/Confidence Index" + ], + "version": 1 + }, + "user_defined_range": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeArrayHistogramFilter", + "name": "nx::core::ComputeArrayHistogramFilter", "uuid": "c6b6d9e5-301d-4767-abf7-530f5ef5007d" }, "isDisabled": false }, { "args": { - "delimiter_index": 2, - "file_extension": ".csv", - "header_option_index": 1, - "max_val_per_line": 0, - "output_dir": "Data/Output/OrientationAnalysis/Test", - "output_style_index": 0, - "input_data_array_paths": [ - "DataContainer/Statistics/Confidence Index Histogram Counts", - "DataContainer/Statistics/Confidence Index Histogram Bin Ranges" - ] + "delimiter_index": { + "value": 2, + "version": 1 + }, + "file_extension": { + "value": ".csv", + "version": 1 + }, + "header_option_index": { + "value": 1, + "version": 1 + }, + "input_data_array_paths": { + "value": [ + "DataContainer/Statistics/Confidence Index Histogram Counts", + "DataContainer/Statistics/Confidence Index Histogram Bin Ranges" + ], + "version": 1 + }, + "max_val_per_line": { + "value": 0, + "version": 1 + }, + "output_dir": { + "value": "Data/Output/OrientationAnalysis/Test", + "version": 1 + }, + "output_path": { + "value": "", + "version": 1 + }, + "output_style_index": { + "value": 0, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::WriteASCIIDataFilter", + "name": "nx::core::WriteASCIIDataFilter", "uuid": "06c8bfe8-2b42-4956-aca3-580bc0620716" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/OrientationAnalysis/pipelines/ComputeGBCD-GBPDMetricBased.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ComputeGBCD-GBPDMetricBased.d3dpipeline index 90b0d67a2f..141abfd9b3 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ComputeGBCD-GBPDMetricBased.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ComputeGBCD-GBPDMetricBased.d3dpipeline @@ -1,1353 +1,281 @@ { "isDisabled": false, "name": "ComputeGBCD-GBPDMetricBased.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/NewGrain Data", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", - "TriangleDataContainer/SharedVertexList", - "TriangleDataContainer/FaceData", - "TriangleDataContainer/Vertex Data", - "TriangleDataContainer/Face Data/FaceLabels", - "TriangleDataContainer/Vertex Data/NodeType", - "TriangleDataContainer/Edge List", - "TriangleDataContainer/Face Data/FaceAreas", - "TriangleDataContainer/Face Data/FaceNormals", - "TriangleDataContainer/Face Data/FaceDihedralAngles", - "TriangleDataContainer/Face Data/FaceIPFColors", - "TriangleDataContainer/Face Data/FaceMisorientationColors" - ], - "file_path": "Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d" + "value": { + "data_paths": [ + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/Cell Data/ParentIds", + "DataContainer/Cell Data/IPFColors", + "DataContainer/Cell Data/GBManhattanDistances", + "DataContainer/Cell Data/TJManhattanDistances", + "DataContainer/Cell Data/QPManhattanDistances", + "DataContainer/Cell Data/FeatureReferenceMisorientations", + "DataContainer/Cell Data/KernelAverageMisorientations", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer/NewGrain Data", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Feature Data/Active", + "DataContainer/Cell Feature Data/AspectRatios", + "DataContainer/Cell Feature Data/AvgEulerAngles", + "DataContainer/Cell Feature Data/AvgQuats", + "DataContainer/Cell Feature Data/AxisEulerAngles", + "DataContainer/Cell Feature Data/AxisLengths", + "DataContainer/Cell Feature Data/Centroids", + "DataContainer/Cell Feature Data/EquivalentDiameters", + "DataContainer/Cell Feature Data/FeatureAvgMisorientations", + "DataContainer/Cell Feature Data/Neighborhoods", + "DataContainer/Cell Feature Data/NumElements", + "DataContainer/Cell Feature Data/NumNeighbors", + "DataContainer/Cell Feature Data/Omega3s", + "DataContainer/Cell Feature Data/ParentIds", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/Cell Feature Data/Poles", + "DataContainer/Cell Feature Data/Schmids", + "DataContainer/Cell Feature Data/Shape Volumes", + "DataContainer/Cell Feature Data/SlipSystems", + "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", + "TriangleDataContainer", + "TriangleDataContainer/SharedTriList", + "TriangleDataContainer/SharedVertexList", + "TriangleDataContainer/FaceData", + "TriangleDataContainer/Vertex Data", + "TriangleDataContainer/Face Data/FaceLabels", + "TriangleDataContainer/Vertex Data/NodeType", + "TriangleDataContainer/Edge List", + "TriangleDataContainer/Face Data/FaceAreas", + "TriangleDataContainer/Face Data/FaceNormals", + "TriangleDataContainer/Face Data/FaceDihedralAngles", + "TriangleDataContainer/Face Data/FaceIPFColors", + "TriangleDataContainer/Face Data/FaceMisorientationColors" + ], + "file_path": "Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d" + }, + "version": 1 }, - "Imported Pipeline": { - "isDisabled": false, - "name": "(03) Small IN100 Mesh Statistics", - "pipeline": [ - { - "args": { - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/NewGrain Data", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", - "TriangleDataContainer/SharedVertexList", - "TriangleDataContainer/FaceData", - "TriangleDataContainer/Vertex Data", - "TriangleDataContainer/Face Data/FaceLabels", - "TriangleDataContainer/Vertex Data/NodeType", - "TriangleDataContainer/Edge List" - ], - "file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d" - }, - "Imported Pipeline": { - "isDisabled": false, - "name": "(02) Small IN100 Smooth Mesh", - "pipeline": [ - { - "args": { - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/NewGrain Data", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", - "TriangleDataContainer/SharedVertexList", - "TriangleDataContainer/FaceData", - "TriangleDataContainer/Vertex Data", - "TriangleDataContainer/Face Data/FaceLabels", - "TriangleDataContainer/Vertex Data/NodeType" - ], - "file_path": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d" - }, - "Imported Pipeline": { - "isDisabled": false, - "name": "(01) Small IN100 Quick Mesh", - "pipeline": [ - { - "args": { - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/NeighborList", - "DataContainer/Cell Feature Data/SharedSurfaceAreaList", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NeighborhoodList", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/MisorientationList", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations" - ], - "file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d" - }, - "Imported Pipeline": { - "isDisabled": false, - "name": "(05) Small IN100 Crystallographic Statistics", - "pipeline": [ - { - "args": { - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/NeighborList", - "DataContainer/Cell Feature Data/SharedSurfaceAreaList", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NeighborhoodList", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio" - ], - "file_path": "Data/Output/Statistics/SmallIN100_Morph.dream3d" - }, - "Imported Pipeline": { - "isDisabled": false, - "name": "(01) Small IN100 Morphological Statistics", - "pipeline": [ - { - "args": { - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors" - ], - "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" - }, - "Imported Pipeline": { - "isDisabled": false, - "name": "(08) Small IN100 Full Reconstruction", - "pipeline": [ - { - "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "read_h5_ebsd_object": { - "end_slice": 117, - "euler_representation": 0, - "hdf5_data_paths": [ - "Confidence Index", - "EulerAngles", - "Fit", - "Image Quality", - "Phases", - "SEM Signal", - "X Position", - "Y Position" - ], - "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", - "start_slice": 1, - "use_recommended_transform": true - } - }, - "comments": "", - "filter": { - "name": "simplnx::ReadH5EbsdFilter", - "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" - }, - "isDisabled": false - }, - { - "args": { - "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Image Quality", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 120.0 - }, - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 - }, - "output_data_array_name": "Mask" - }, - "comments": "", - "filter": { - "name": "simplnx::MultiThresholdObjects", - "uuid": "4246245e-1011-4add-8436-0af6bed19228" - }, - "isDisabled": false - }, - { - "args": { - "input_orientation_array_path": "DataContainer/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 - }, - "comments": "", - "filter": { - "name": "simplnx::ConvertOrientations", - "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Misorientation_Shifts.txt", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "input_image_geometry_path": "DataContainer", - "use_mask": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "simplnx::AlignSectionsMisorientationFilter", - "uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced" - }, - "isDisabled": false - }, - { - "args": { - "fill_holes": false, - "mask_array_path": "DataContainer/Cell Data/Mask", - "image_geometry": "DataContainer" - }, - "comments": "", - "filter": { - "name": "simplnx::IdentifySampleFilter", - "uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_slice": 0, - "selected_cell_data_path": "DataContainer/Cell Data", - "input_image_geometry_path": "DataContainer", - "use_reference_slice": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "simplnx::AlignSectionsFeatureCentroidFilter", - "uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "input_image_geometry_path": "DataContainer", - "misorientation_tolerance": 5.0, - "number_of_neighbors": 4, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "simplnx::BadDataNeighborOrientationCheckFilter", - "uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "correlation_array_path": "DataContainer/Cell Data/Confidence Index", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "level": 2, - "min_confidence": 0.20000000298023224, - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "simplnx::NeighborOrientationCorrelationFilter", - "uuid": "4625c192-7e46-4333-a294-67a2eb64cb37" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "cell_feature_attribute_matrix_name": "Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_name": "FeatureIds", - "mask_array_path": "DataContainer/Cell Data/Mask", - "input_image_geometry_path": "DataContainer", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "randomize_features": true, - "use_mask": true - }, - "comments": "", - "filter": { - "name": "simplnx::EBSDSegmentFeaturesFilter", - "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" - }, - "isDisabled": false - }, - { - "args": { - "cell_features_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_array_name": "Phases" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeFeaturePhasesFilter", - "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" - }, - "isDisabled": false - }, - { - "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeAvgOrientationsFilter", - "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList2", - "number_of_neighbors_name": "NumNeighbors2", - "shared_surface_area_list_name": "SharedSurfaceAreaList2", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "simplnx::FindNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "angle_tolerance": 2.0, - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "axis_tolerance": 3.0, - "cell_parent_ids_array_name": "ParentIds", - "contiguous_neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborList2", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_parent_ids_array_name": "ParentIds", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "created_feature_attribute_matrix_name": "NewGrain Data", - "non_contiguous_neighbor_list_array_path": "", - "use_non_contiguous_neighbors": false - }, - "comments": "", - "filter": { - "name": "simplnx::MergeTwinsFilter", - "uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9" - }, - "isDisabled": false - }, - { - "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeFeatureSizesFilter", - "uuid": "c666ee17-ca58-4969-80d0-819986c72485" - }, - "isDisabled": false - }, - { - "args": { - "apply_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "", - "input_image_geometry_path": "DataContainer", - "min_allowed_features_size": 16, - "num_cells_path": "DataContainer/Cell Feature Data/NumElements", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "simplnx::RequireMinimumSizeFeaturesFilter", - "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "simplnx::FindNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "apply_to_single_phase": false, - "cell_attribute_matrix_path": "DataContainer/Cell Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "Data Container/Feature Data/Phases", - "ignored_voxel_arrays": [], - "image_geom": "DataContainer", - "min_num_neighbors": 2, - "num_neighbors_path": "DataContainer/Cell Feature Data/NumNeighbors", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "simplnx::RequireMinNumNeighborsFilter", - "uuid": "4ab5153f-6014-4e6d-bbd6-194068620389" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "min_allowed_defect_size": 1000, - "input_image_geometry_path": "DataContainer", - "store_as_new_phase": false - }, - "comments": "", - "filter": { - "name": "simplnx::FillBadDataFilter", - "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "num_iterations": 2, - "operation_index": 0, - "input_image_geometry_path": "DataContainer", - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "simplnx::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "num_iterations": 2, - "operation_index": 1, - "input_image_geometry_path": "DataContainer", - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "simplnx::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeIPFColorsFilter", - "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "simplnx::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ] - } - }, - "comments": "", - "filter": { - "name": "simplnx::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "centroids_array_name": "Centroids", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeFeatureCentroidsFilter", - "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" - }, - "isDisabled": false - }, - { - "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Size Volumes" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeFeatureSizesFilter", - "uuid": "c666ee17-ca58-4969-80d0-819986c72485" - }, - "isDisabled": false - }, - { - "args": { - "aspect_ratios_array_name": "AspectRatios", - "axis_euler_angles_array_name": "AxisEulerAngles", - "axis_lengths_array_name": "AxisLengths", - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "omega3s_array_name": "Omega3s", - "input_image_geometry_path": "DataContainer", - "volumes_array_name": "Shape Volumes" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeShapesFilter", - "uuid": "036b17d5-23bb-4a24-9187-c4a8dd918792" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "simplnx::FindNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "equivalent_diameters_array_path": "DataContainer/Cell Feature Data/EquivalentDiameters", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "multiples_of_average": 1.0, - "neighborhood_list_array_name": "NeighborhoodList", - "neighborhoods_array_name": "Neighborhoods", - "input_image_geometry_path": "DataContainer" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeNeighborhoodsFilter", - "uuid": "924c10e3-2f39-4c08-9d7a-7fe029f74f6d" - }, - "isDisabled": false - }, - { - "args": { - "calc_manhattan_dist": true, - "do_boundaries": true, - "do_quad_points": true, - "do_triple_lines": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "g_bdistances_array_name": "GBManhattanDistances", - "nearest_neighbors_array_name": "NearestNeighbors", - "q_pdistances_array_name": "QPManhattanDistances", - "save_nearest_neighbors": false, - "input_image_geometry_path": "DataContainer", - "t_jdistances_array_name": "TJManhattanDistances" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeEuclideanDistMapFilter", - "uuid": "ba9ae8f6-443e-41d3-bb45-a08a139325c1" - }, - "isDisabled": false - }, - { - "args": { - "calculate_sphericity": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "num_cells_array_path": "DataContainer/Cell Feature Data/NumElements", - "input_image_geometry_path": "DataContainer", - "sphericity_array_name": "Sphericity", - "surface_area_volume_ratio_array_name": "SurfaceAreaVolumeRatio" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeSurfaceAreaToVolumeFilter", - "uuid": "94e83e4f-797d-4594-b130-3819b7676f01" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Statistics/SmallIN100_Morph.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "simplnx::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ] - } - }, - "comments": "", - "filter": { - "name": "simplnx::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [] - }, - "comments": "", - "filter": { - "name": "simplnx::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" - }, - "isDisabled": false - }, - { - "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeAvgOrientationsFilter", - "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" - }, - "isDisabled": false - }, - { - "args": { - "avg_misorientations_array_name": "AvgMisorientations", - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "find_avg_misors": false, - "misorientation_list_array_name": "MisorientationList", - "neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborhoodList" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeMisorientationsFilter", - "uuid": "0b68fe25-b5ef-4805-ae32-20acb8d4e823" - }, - "isDisabled": false - }, - { - "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "lambdas_array_name": "Schmid_Lambdas", - "loading_direction": [ - 1.0, - 1.0, - 1.0 - ], - "override_system": false, - "phis_array_name": "Schmid_Phis", - "poles_array_name": "Poles", - "schmids_array_name": "Schmids", - "slip_direction": [ - 1.0, - 0.0, - 0.0 - ], - "slip_plane": [ - 0.0, - 0.0, - 1.0 - ], - "slip_systems_array_name": "SlipSystems", - "store_angle_components": false - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeSchmidsFilter", - "uuid": "b4681855-0a3d-4237-97f2-5aec509115c4" - }, - "isDisabled": false - }, - { - "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_avg_misorientations_array_name": "FeatureAvgMisorientations", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_reference_misorientations_array_name": "FeatureReferenceMisorientations", - "gb_euclidean_distances_array_path": "Cell Data/GBEuclideanDistances", - "quats_array_path": "DataContainer/Cell Data/Quats", - "reference_orientation_index": 0 - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeFeatureReferenceMisorientationsFilter", - "uuid": "24b54daf-3bf5-4331-93f6-03a49f719bf1" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "kernel_average_misorientations_array_name": "KernelAverageMisorientations", - "kernel_size": [ - 1, - 1, - 1 - ], - "quats_array_path": "DataContainer/Cell Data/Quats", - "input_image_geometry_path": "DataContainer" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeKernelAvgMisorientationsFilter", - "uuid": "61cfc9c1-aa0e-452b-b9ef-d3b9e6268035" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "simplnx::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ] - } - }, - "comments": "", - "filter": { - "name": "simplnx::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "output_image_geometry_path": "DataContainer", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "max_voxel": [ - 140, - 140, - 99 - ], - "min_voxel": [ - 41, - 41, - 0 - ], - "remove_original_geometry": true, - "renumber_features": true, - "input_image_geometry_path": "DataContainer", - "use_physical_bounds": false - }, - "comments": "", - "filter": { - "name": "simplnx::CropImageGeometryFilter", - "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" - }, - "isDisabled": false - }, - { - "args": { - "data": "DataContainer/Cell Ensemble Data", - "new_parent": "DataContainer" - }, - "comments": "", - "filter": { - "name": "simplnx::MoveDataFilter", - "uuid": "651e5894-ab7c-4176-b7f0-ea466c521753" - }, - "isDisabled": false - }, - { - "args": { - "face_data_group_name": "Face Data", - "face_feature_attribute_matrix_name": "Face Feature Data", - "face_labels_array_name": "FaceLabels", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "fix_problem_voxels": false, - "generate_triple_lines": false, - "input_grid_geometry_path": "DataContainer", - "node_types_array_name": "NodeType", - "input_data_array_paths": [], - "output_triangle_geometry_path": "TriangleDataContainer", - "vertex_data_group_name": "Vertex Data" - }, - "comments": "", - "filter": { - "name": "simplnx::QuickSurfaceMeshFilter", - "uuid": "13dd00bd-ad49-4e04-95eb-3267952fd6e5" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "simplnx::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ] - } - }, - "comments": "", - "filter": { - "name": "simplnx::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "iteration_steps": 100, - "lambda_value": 0.25, - "mu_factor": 0.20000000298023224, - "quad_point_lambda": 0.15000000596046448, - "surface_mesh_node_type_array_path": "TriangleDataContainer/Vertex Data/NodeType", - "surface_point_lambda": 0.0, - "surface_quad_point_lambda": 0.0, - "surface_triple_line_lambda": 0.0, - "input_triangle_geometry_path": "TriangleDataContainer", - "triple_line_lambda": 0.20000000298023224, - "use_taubin_smoothing": true - }, - "comments": "", - "filter": { - "name": "simplnx::LaplacianSmoothingFilter", - "uuid": "0dd0916e-9305-4a7b-98cf-a6cfb97cb501" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "simplnx::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ] - } - }, - "comments": "", - "filter": { - "name": "simplnx::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "triangle_areas_array_name": "FaceAreas", - "input_triangle_geometry_path": "TriangleDataContainer" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeTriangleAreasFilter", - "uuid": "b149addd-c0c8-4010-a264-596005eaf2a5" - }, - "isDisabled": false - }, - { - "args": { - "output_normals_array_name": "FaceNormals", - "input_triangle_geometry_path": "TriangleDataContainer" - }, - "comments": "", - "filter": { - "name": "simplnx::TriangleNormalFilter", - "uuid": "8133d419-1919-4dbf-a5bf-1c97282ba63f" - }, - "isDisabled": false - }, - { - "args": { - "surface_mesh_triangle_dihedral_angles_array_name": "FaceDihedralAngles", - "input_triangle_geometry_path": "TriangleDataContainer" - }, - "comments": "", - "filter": { - "name": "simplnx::TriangleDihedralAngleFilter", - "uuid": "dd42c521-4ae5-485d-ad35-d1276547d2f1" - }, - "isDisabled": false - }, - { - "args": { - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_euler_angles_array_path": "DataContainer/Cell Feature Data/AvgEulerAngles", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "surface_mesh_face_ipf_colors_array_name": "FaceIPFColors", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_normals_array_path": "TriangleDataContainer/Face Data/FaceNormals" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeFaceIPFColoringFilter", - "uuid": "30759600-7c02-4650-b5ca-e7036d6b568e" - }, - "isDisabled": false - }, - { - "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_misorientation_colors_array_name": "FaceMisorientationColors" - }, - "comments": "", - "filter": { - "name": "simplnx::GenerateFaceMisorientationColoringFilter", - "uuid": "f3473af9-db77-43db-bd25-60df7230ea73" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "simplnx::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ] - } + "parameters_version": 1 }, "comments": "The input for this pipeline requires the output dream3d file from the (03) Small IN100 Mesh Statistics bookmarked pipeline.", "filter": { - "name": "simplnx::ReadDREAM3DFilter", + "name": "nx::core::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false }, { "args": { - "face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "feature_face_ids_array_name": "FeatureFaceId", - "feature_face_labels_array_name": "FaceLabels", - "feature_num_triangles_array_name": "NumTriangles", - "grain_boundary_attribute_matrix_name": "Face Feature Data", - "input_triangle_geometry_path": "TriangleDataContainer" + "face_labels_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels", + "version": 1 + }, + "feature_face_ids_array_name": { + "value": "FeatureFaceId", + "version": 1 + }, + "feature_face_labels_array_name": { + "value": "FaceLabels", + "version": 1 + }, + "feature_num_triangles_array_name": { + "value": "NumTriangles", + "version": 1 + }, + "grain_boundary_attribute_matrix_name": { + "value": "Face Feature Data", + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1, + "randomize_features": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::SharedFeatureFaceFilter", + "name": "nx::core::SharedFeatureFaceFilter", "uuid": "aaf7a258-fc92-48d7-9d06-ba317a3769e8" }, "isDisabled": false }, { "args": { - "chosen_limit_dists_index": 2, - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "dist_output_file": "Data/Output/Examples/gbcd_distribution.dat", - "err_output_file": "Data/Output/Examples/gbcd_distribution_errors.dat", - "exclude_triple_lines": true, - "feature_euler_angles_array_path": "DataContainer/Cell Feature Data/AxisEulerAngles", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "misorientation_rotation": [ - 1.0, - 1.0, - 1.0, - 17.899999618530273 - ], - "node_types_array_path": "TriangleDataContainer/Vertex Data/NodeType", - "num_sampl_pts": 3000, - "phase_of_interest": 1, - "save_relative_err": true, - "surface_mesh_face_areas_array_path": "TriangleDataContainer/Face Data/FaceAreas", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_normals_array_path": "TriangleDataContainer/Face Data/FaceNormals", - "surface_mesh_feature_face_labels_array_path": "TriangleDataContainer/Face Feature Data/FaceLabels", - "input_triangle_geometry_path": "TriangleDataContainer" + "chosen_limit_dists_index": { + "value": 2, + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "dist_output_file": { + "value": "Data/Output/Examples/gbcd_distribution.dat", + "version": 1 + }, + "err_output_file": { + "value": "Data/Output/Examples/gbcd_distribution_errors.dat", + "version": 1 + }, + "exclude_triple_lines": { + "value": true, + "version": 1 + }, + "feature_euler_angles_array_path": { + "value": "DataContainer/Cell Feature Data/AxisEulerAngles", + "version": 1 + }, + "feature_phases_array_path": { + "value": "DataContainer/Cell Feature Data/Phases", + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "misorientation_rotation": { + "value": [ + 1.0, + 1.0, + 1.0, + 17.899999618530273 + ], + "version": 1 + }, + "node_types_array_path": { + "value": "TriangleDataContainer/Vertex Data/NodeType", + "version": 1 + }, + "num_sampl_pts": { + "value": 3000, + "version": 1 + }, + "parameters_version": 1, + "phase_of_interest": { + "value": 1, + "version": 1 + }, + "save_relative_err": { + "value": true, + "version": 1 + }, + "surface_mesh_face_areas_array_path": { + "value": "TriangleDataContainer/Face Data/FaceAreas", + "version": 1 + }, + "surface_mesh_face_labels_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels", + "version": 1 + }, + "surface_mesh_face_normals_array_path": { + "value": "TriangleDataContainer/Face Data/FaceNormals", + "version": 1 + }, + "surface_mesh_feature_face_labels_array_path": { + "value": "TriangleDataContainer/Face Feature Data/FaceLabels", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeGBCDMetricBasedFilter", + "name": "nx::core::ComputeGBCDMetricBasedFilter", "uuid": "fc0d695a-e381-4f11-a8fd-26d5b5cda30a" }, "isDisabled": false }, { "args": { - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "dist_output_file": "Data/Output/Examples/gbpd_distribution.dat", - "err_output_file": "Data/Output/Examples/gbpd_distribution_errors.dat", - "exclude_triple_lines": true, - "feature_euler_angles_array_path": "DataContainer/Cell Feature Data/AxisEulerAngles", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "limit_dist": 7.0, - "node_types_array_path": "TriangleDataContainer/Vertex Data/NodeType", - "num_sampl_pts": 3000, - "phase_of_interest": 1, - "save_relative_err": false, - "surface_mesh_face_areas_array_path": "TriangleDataContainer/Face Data/FaceAreas", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_normals_array_path": "TriangleDataContainer/Face Data/FaceNormals", - "surface_mesh_feature_face_labels_array_path": "TriangleDataContainer/Face Feature Data/FaceLabels", - "input_triangle_geometry_path": "TriangleDataContainer" + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "dist_output_file": { + "value": "Data/Output/Examples/gbpd_distribution.dat", + "version": 1 + }, + "err_output_file": { + "value": "Data/Output/Examples/gbpd_distribution_errors.dat", + "version": 1 + }, + "exclude_triple_lines": { + "value": true, + "version": 1 + }, + "feature_euler_angles_array_path": { + "value": "DataContainer/Cell Feature Data/AxisEulerAngles", + "version": 1 + }, + "feature_phases_array_path": { + "value": "DataContainer/Cell Feature Data/Phases", + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "limit_dist": { + "value": 7.0, + "version": 1 + }, + "node_types_array_path": { + "value": "TriangleDataContainer/Vertex Data/NodeType", + "version": 1 + }, + "num_sampl_pts": { + "value": 3000, + "version": 1 + }, + "parameters_version": 1, + "phase_of_interest": { + "value": 1, + "version": 1 + }, + "save_relative_err": { + "value": false, + "version": 1 + }, + "surface_mesh_face_areas_array_path": { + "value": "TriangleDataContainer/Face Data/FaceAreas", + "version": 1 + }, + "surface_mesh_face_labels_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels", + "version": 1 + }, + "surface_mesh_face_normals_array_path": { + "value": "TriangleDataContainer/Face Data/FaceNormals", + "version": 1 + }, + "surface_mesh_feature_face_labels_array_path": { + "value": "TriangleDataContainer/Face Feature Data/FaceLabels", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::FindGBPDMetricBasedFilter", + "name": "nx::core::ComputeGBPDMetricBasedFilter", "uuid": "8267878b-d23a-4666-83a0-f1a7711861ce" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline index a9d5643824..204ce2f37c 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline @@ -5,26 +5,44 @@ { "args": { "input_file_list_object": { - "end_index": 117, - "file_extension": ".ang", - "file_prefix": "Slice_", - "file_suffix": "", - "increment_index": 1, - "input_path": "Data/Small_IN100", - "ordering": 0, - "padding_digits": 0, - "start_index": 1 + "value": { + "end_index": 117, + "file_extension": ".ang", + "file_prefix": "Slice_", + "file_suffix": "", + "increment_index": 1, + "input_path": "Data/Small_IN100", + "ordering": 0, + "padding_digits": 0, + "start_index": 1 + }, + "version": 1 }, - "output_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", - "reference_frame_index": 0, - "stacking_order_index": 1, - "z_spacing": 0.25 + "output_file_path": { + "value": "Data/Output/Reconstruction/Small_IN100.h5ebsd", + "version": 1 + }, + "parameters_version": 1, + "reference_frame_index": { + "value": 0, + "version": 1 + }, + "stacking_order_index": { + "value": 1, + "version": 1 + }, + "z_spacing": { + "value": 0.25, + "version": 1 + } }, + "comments": "", "filter": { - "name": "simplnx::EbsdToH5EbsdFilter", + "name": "nx::core::EbsdToH5EbsdFilter", "uuid": "2d05ca72-0a1b-4aec-b9b0-bc470845c448" }, "isDisabled": false } - ] + ], + "version": 1 } diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline index 7ce94aed6d..068ac0e26d 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline @@ -4,25 +4,38 @@ "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, "read_h5_ebsd_object": { - "end_slice": 117, - "euler_representation": 0, - "hdf5_data_paths": [ - "Confidence Index", - "EulerAngles", - "Fit", - "Image Quality", - "Phases", - "SEM Signal", - "X Position", - "Y Position" - ], - "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", - "start_slice": 1, - "use_recommended_transform": true + "value": { + "end_slice": 117, + "euler_representation": 0, + "hdf5_data_paths": [ + "Confidence Index", + "EulerAngles", + "Fit", + "Image Quality", + "Phases", + "SEM Signal", + "X Position", + "Y Position" + ], + "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", + "start_slice": 1, + "use_recommended_transform": true + }, + "version": 1 } }, "comments": "", @@ -35,34 +48,56 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Image Quality", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 120.0 - }, - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "DataContainer/Cell Data/Image Quality", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 120.0 + }, + { + "array_path": "DataContainer/Cell Data/Confidence Index", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.1 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 }, - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "output_data_array_name": "Mask", - "use_custom_false_value": false, - "use_custom_true_value": false + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -73,10 +108,23 @@ }, { "args": { - "input_orientation_array_path": "DataContainer/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 + "input_orientation_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "input_representation_index": { + "value": 0, + "version": 1 + }, + "output_orientation_array_name": { + "value": "Quats", + "version": 1 + }, + "output_representation_index": { + "value": 2, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -87,15 +135,43 @@ }, { "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Misorientation_Shifts.txt", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "use_mask": true, - "write_alignment_shifts": false + "alignment_shift_file_name": { + "value": "Data/Output/Alignment_By_Misorientation_Shifts.txt", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "misorientation_tolerance": { + "value": 5.0, + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + }, + "write_alignment_shifts": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -106,9 +182,19 @@ }, { "args": { - "fill_holes": false, - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask" + "fill_holes": { + "value": false, + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -119,13 +205,35 @@ }, { "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_slice": 0, - "selected_cell_data_path": "DataContainer/Cell Data", - "use_reference_slice": true, - "write_alignment_shifts": false + "alignment_shift_file_name": { + "value": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "parameters_version": 1, + "reference_slice": { + "value": 0, + "version": 1 + }, + "selected_cell_data_path": { + "value": "DataContainer/Cell Data", + "version": 1 + }, + "use_reference_slice": { + "value": true, + "version": 1 + }, + "write_alignment_shifts": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -136,13 +244,35 @@ }, { "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "number_of_neighbors": 4, - "quats_array_path": "DataContainer/Cell Data/Quats" + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "misorientation_tolerance": { + "value": 5.0, + "version": 1 + }, + "number_of_neighbors": { + "value": 4, + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + } }, "comments": "", "filter": { @@ -153,15 +283,43 @@ }, { "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "correlation_array_path": "DataContainer/Cell Data/Confidence Index", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "level": 2, - "min_confidence": 0.20000000298023224, - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats" + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "correlation_array_path": { + "value": "DataContainer/Cell Data/Confidence Index", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "ignored_data_array_paths": { + "value": [], + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "level": { + "value": 2, + "version": 1 + }, + "min_confidence": { + "value": 0.20000000298023224, + "version": 1 + }, + "misorientation_tolerance": { + "value": 5.0, + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + } }, "comments": "", "filter": { @@ -172,17 +330,51 @@ }, { "args": { - "active_array_name": "Active", - "cell_feature_attribute_matrix_name": "Cell Feature Data", - "cell_mask_array_path": "DataContainer/Cell Data/Mask", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_name": "FeatureIds", - "input_image_geometry_path": "DataContainer", - "misorientation_tolerance": 5.0, - "randomize_features": true, - "use_mask": true + "active_array_name": { + "value": "Active", + "version": 1 + }, + "cell_feature_attribute_matrix_name": { + "value": "Cell Feature Data", + "version": 1 + }, + "cell_mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "cell_quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_ids_array_name": { + "value": "FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "misorientation_tolerance": { + "value": 5.0, + "version": 1 + }, + "parameters_version": 1, + "randomize_features": { + "value": true, + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -193,10 +385,23 @@ }, { "args": { - "cell_features_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_array_name": "Phases" + "cell_features_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "feature_phases_array_name": { + "value": "Phases", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -207,13 +412,35 @@ }, { "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" + "avg_euler_angles_array_name": { + "value": "AvgEulerAngles", + "version": 1 + }, + "avg_quats_array_name": { + "value": "AvgQuats", + "version": 1 + }, + "cell_feature_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "cell_feature_ids_array_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "cell_quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -224,16 +451,47 @@ }, { "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList2", - "number_of_neighbors_name": "NumNeighbors2", - "shared_surface_area_list_name": "SharedSurfaceAreaList2", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" + "boundary_cells_name": { + "value": "BoundaryCells", + "version": 1 + }, + "cell_feature_array_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "neighbor_list_name": { + "value": "NeighborList2", + "version": 1 + }, + "number_of_neighbors_name": { + "value": "NumNeighbors2", + "version": 1 + }, + "parameters_version": 1, + "shared_surface_area_list_name": { + "value": "SharedSurfaceAreaList2", + "version": 1 + }, + "store_boundary_cells": { + "value": false, + "version": 1 + }, + "store_surface_features": { + "value": false, + "version": 1 + }, + "surface_features_name": { + "value": "SurfaceFeatures", + "version": 1 + } }, "comments": "", "filter": { @@ -244,20 +502,63 @@ }, { "args": { - "active_array_name": "Active", - "angle_tolerance": 2.0, - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "axis_tolerance": 3.0, - "cell_parent_ids_array_name": "ParentIds", - "contiguous_neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborList2", - "created_feature_attribute_matrix_name": "NewGrain Data", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_parent_ids_array_name": "ParentIds", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "seed_array_name": "MergeTwins SeedValue", - "seed_value": 5489, - "use_seed": false + "active_array_name": { + "value": "Active", + "version": 1 + }, + "angle_tolerance": { + "value": 2.0, + "version": 1 + }, + "avg_quats_array_path": { + "value": "DataContainer/Cell Feature Data/AvgQuats", + "version": 1 + }, + "axis_tolerance": { + "value": 3.0, + "version": 1 + }, + "cell_parent_ids_array_name": { + "value": "ParentIds", + "version": 1 + }, + "contiguous_neighbor_list_array_path": { + "value": "DataContainer/Cell Feature Data/NeighborList2", + "version": 1 + }, + "created_feature_attribute_matrix_name": { + "value": "NewGrain Data", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "feature_parent_ids_array_name": { + "value": "ParentIds", + "version": 1 + }, + "feature_phases_array_path": { + "value": "DataContainer/Cell Feature Data/Phases", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "MergeTwins SeedValue", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -268,13 +569,35 @@ }, { "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" + "equivalent_diameters_name": { + "value": "EquivalentDiameters", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "num_elements_name": { + "value": "NumElements", + "version": 1 + }, + "parameters_version": 1, + "save_element_sizes": { + "value": false, + "version": 1 + }, + "volumes_name": { + "value": "Volumes", + "version": 1 + } }, "comments": "", "filter": { @@ -285,13 +608,35 @@ }, { "args": { - "apply_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "", - "input_image_geometry_path": "DataContainer", - "min_allowed_features_size": 16, - "num_cells_path": "DataContainer/Cell Feature Data/NumElements", - "phase_number": 0 + "apply_single_phase": { + "value": false, + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "feature_phases_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "min_allowed_features_size": { + "value": 16, + "version": 1 + }, + "num_cells_path": { + "value": "DataContainer/Cell Feature Data/NumElements", + "version": 1 + }, + "parameters_version": 1, + "phase_number": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -302,9 +647,13 @@ }, { "args": { - "removed_data_path": [ - "DataContainer/Cell Feature Data/NumNeighbors2" - ] + "parameters_version": 1, + "removed_data_path": { + "value": [ + "DataContainer/Cell Feature Data/NumNeighbors2" + ], + "version": 1 + } }, "comments": "", "filter": { @@ -315,16 +664,47 @@ }, { "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" + "boundary_cells_name": { + "value": "BoundaryCells", + "version": 1 + }, + "cell_feature_array_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "neighbor_list_name": { + "value": "NeighborList", + "version": 1 + }, + "number_of_neighbors_name": { + "value": "NumNeighbors", + "version": 1 + }, + "parameters_version": 1, + "shared_surface_area_list_name": { + "value": "SharedSurfaceAreaList", + "version": 1 + }, + "store_boundary_cells": { + "value": false, + "version": 1 + }, + "store_surface_features": { + "value": false, + "version": 1 + }, + "surface_features_name": { + "value": "SurfaceFeatures", + "version": 1 + } }, "comments": "", "filter": { @@ -335,14 +715,39 @@ }, { "args": { - "apply_to_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "Data Container/Feature Data/Phases", - "ignored_voxel_arrays": [], - "input_image_geometry_path": "DataContainer", - "min_num_neighbors": 2, - "num_neighbors_path": "DataContainer/Cell Feature Data/NumNeighbors", - "phase_number": 0 + "apply_to_single_phase": { + "value": false, + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "feature_phases_path": { + "value": "Data Container/Feature Data/Phases", + "version": 1 + }, + "ignored_voxel_arrays": { + "value": [], + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "min_num_neighbors": { + "value": 2, + "version": 1 + }, + "num_neighbors_path": { + "value": "DataContainer/Cell Feature Data/NumNeighbors", + "version": 1 + }, + "parameters_version": 1, + "phase_number": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -353,17 +758,21 @@ }, { "args": { - "removed_data_path": [ - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Volumes" - ] + "parameters_version": 1, + "removed_data_path": { + "value": [ + "DataContainer/Cell Feature Data/NumNeighbors", + "DataContainer/Cell Feature Data/Active", + "DataContainer/Cell Feature Data/AvgEulerAngles", + "DataContainer/Cell Feature Data/AvgQuats", + "DataContainer/Cell Feature Data/EquivalentDiameters", + "DataContainer/Cell Feature Data/NumElements", + "DataContainer/Cell Feature Data/ParentIds", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/Cell Feature Data/Volumes" + ], + "version": 1 + } }, "comments": "", "filter": { @@ -374,12 +783,31 @@ }, { "args": { - "cell_phases_array_path": "Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "min_allowed_defect_size": 1000, - "store_as_new_phase": false + "cell_phases_array_path": { + "value": "Phases", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "ignored_data_array_paths": { + "value": [], + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "min_allowed_defect_size": { + "value": 1000, + "version": 1 + }, + "parameters_version": 1, + "store_as_new_phase": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -390,14 +818,39 @@ }, { "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "num_iterations": 2, - "operation_index": 0, - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "ignored_data_array_paths": { + "value": [], + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "num_iterations": { + "value": 2, + "version": 1 + }, + "operation_index": { + "value": 0, + "version": 1 + }, + "parameters_version": 1, + "x_dir_on": { + "value": true, + "version": 1 + }, + "y_dir_on": { + "value": true, + "version": 1 + }, + "z_dir_on": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -408,14 +861,39 @@ }, { "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "num_iterations": 2, - "operation_index": 1, - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "ignored_data_array_paths": { + "value": [], + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "num_iterations": { + "value": 2, + "version": 1 + }, + "operation_index": { + "value": 1, + "version": 1 + }, + "parameters_version": 1, + "x_dir_on": { + "value": true, + "version": 1 + }, + "y_dir_on": { + "value": true, + "version": 1 + }, + "z_dir_on": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -426,17 +904,39 @@ }, { "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true + "cell_euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPFColors", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -447,8 +947,15 @@ }, { "args": { - "export_file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Reconstruction/SmallIN100_Final.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -459,4 +966,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline index c0f4267ab2..f7a8ab8903 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline @@ -4,492 +4,34 @@ "pipeline": [ { "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(08) Small IN100 Full Reconstruction", - "pipeline": [ - { - "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "read_h5_ebsd_object": { - "end_slice": 117, - "euler_representation": 0, - "hdf5_data_paths": [ - "Confidence Index", - "EulerAngles", - "Fit", - "Image Quality", - "Phases", - "SEM Signal", - "X Position", - "Y Position" - ], - "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", - "start_slice": 1, - "use_recommended_transform": true - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadH5EbsdFilter", - "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" - }, - "isDisabled": false - }, - { - "args": { - "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Image Quality", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 120.0 - }, - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 - }, - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "output_data_array_name": "Mask", - "use_custom_false_value": false, - "use_custom_true_value": false - }, - "comments": "", - "filter": { - "name": "nx::core::MultiThresholdObjectsFilter", - "uuid": "4246245e-1011-4add-8436-0af6bed19228" - }, - "isDisabled": false - }, - { - "args": { - "input_orientation_array_path": "DataContainer/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 - }, - "comments": "", - "filter": { - "name": "nx::core::ConvertOrientationsFilter", - "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Misorientation_Shifts.txt", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "use_mask": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "nx::core::AlignSectionsMisorientationFilter", - "uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced" - }, - "isDisabled": false - }, - { - "args": { - "fill_holes": false, - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask" - }, - "comments": "", - "filter": { - "name": "nx::core::IdentifySampleFilter", - "uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_slice": 0, - "selected_cell_data_path": "DataContainer/Cell Data", - "use_reference_slice": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "nx::core::AlignSectionsFeatureCentroidFilter", - "uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "number_of_neighbors": 4, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "nx::core::BadDataNeighborOrientationCheckFilter", - "uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "correlation_array_path": "DataContainer/Cell Data/Confidence Index", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "level": 2, - "min_confidence": 0.20000000298023224, - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "nx::core::NeighborOrientationCorrelationFilter", - "uuid": "4625c192-7e46-4333-a294-67a2eb64cb37" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "cell_feature_attribute_matrix_name": "Cell Feature Data", - "cell_mask_array_path": "DataContainer/Cell Data/Mask", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_name": "FeatureIds", - "input_image_geometry_path": "DataContainer", - "misorientation_tolerance": 5.0, - "randomize_features": true, - "use_mask": true - }, - "comments": "", - "filter": { - "name": "nx::core::EBSDSegmentFeaturesFilter", - "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" - }, - "isDisabled": false - }, - { - "args": { - "cell_features_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_array_name": "Phases" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeaturePhasesFilter", - "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" - }, - "isDisabled": false - }, - { - "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeAvgOrientationsFilter", - "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList2", - "number_of_neighbors_name": "NumNeighbors2", - "shared_surface_area_list_name": "SharedSurfaceAreaList2", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "angle_tolerance": 2.0, - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "axis_tolerance": 3.0, - "cell_parent_ids_array_name": "ParentIds", - "contiguous_neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborList2", - "created_feature_attribute_matrix_name": "NewGrain Data", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_parent_ids_array_name": "ParentIds", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "seed_array_name": "MergeTwins SeedValue", - "seed_value": 5489, - "use_seed": false - }, - "comments": "", - "filter": { - "name": "nx::core::MergeTwinsFilter", - "uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9" - }, - "isDisabled": false - }, - { - "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureSizesFilter", - "uuid": "c666ee17-ca58-4969-80d0-819986c72485" - }, - "isDisabled": false - }, - { - "args": { - "apply_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "", - "input_image_geometry_path": "DataContainer", - "min_allowed_features_size": 16, - "num_cells_path": "DataContainer/Cell Feature Data/NumElements", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "nx::core::RequireMinimumSizeFeaturesFilter", - "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [ - "DataContainer/Cell Feature Data/NumNeighbors2" - ] - }, - "comments": "", - "filter": { - "name": "nx::core::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "apply_to_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "Data Container/Feature Data/Phases", - "ignored_voxel_arrays": [], - "input_image_geometry_path": "DataContainer", - "min_num_neighbors": 2, - "num_neighbors_path": "DataContainer/Cell Feature Data/NumNeighbors", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "nx::core::RequireMinNumNeighborsFilter", - "uuid": "4ab5153f-6014-4e6d-bbd6-194068620389" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [ - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Volumes" - ] - }, - "comments": "", - "filter": { - "name": "nx::core::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "min_allowed_defect_size": 1000, - "store_as_new_phase": false - }, - "comments": "", - "filter": { - "name": "nx::core::FillBadDataFilter", - "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "num_iterations": 2, - "operation_index": 0, - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "nx::core::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "num_iterations": 2, - "operation_index": 1, - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "nx::core::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeIPFColorsFilter", - "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], + "import_data_object": { + "value": { + "data_paths": [ + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/NewGrain Data", + "DataContainer/Cell Data/ParentIds", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Data/IPFColors" + ], + "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" + }, "version": 1 }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors" - ], - "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" - } + "parameters_version": 1 }, "comments": "", "filter": { @@ -500,10 +42,23 @@ }, { "args": { - "cell_features_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_array_name": "Phases" + "cell_features_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "feature_phases_array_name": { + "value": "Phases", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -514,10 +69,23 @@ }, { "args": { - "centroids_array_name": "Centroids", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer" + "centroids_array_name": { + "value": "Centroids", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -528,13 +96,35 @@ }, { "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Size Volumes" + "equivalent_diameters_name": { + "value": "EquivalentDiameters", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "num_elements_name": { + "value": "NumElements", + "version": 1 + }, + "parameters_version": 1, + "save_element_sizes": { + "value": false, + "version": 1 + }, + "volumes_name": { + "value": "Size Volumes", + "version": 1 + } }, "comments": "", "filter": { @@ -545,14 +135,39 @@ }, { "args": { - "aspect_ratios_array_name": "AspectRatios", - "axis_euler_angles_array_name": "AxisEulerAngles", - "axis_lengths_array_name": "AxisLengths", - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "omega3s_array_name": "Omega3s", - "volumes_array_name": "Shape Volumes" + "aspect_ratios_array_name": { + "value": "AspectRatios", + "version": 1 + }, + "axis_euler_angles_array_name": { + "value": "AxisEulerAngles", + "version": 1 + }, + "axis_lengths_array_name": { + "value": "AxisLengths", + "version": 1 + }, + "centroids_array_path": { + "value": "DataContainer/Cell Feature Data/Centroids", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "omega3s_array_name": { + "value": "Omega3s", + "version": 1 + }, + "parameters_version": 1, + "volumes_array_name": { + "value": "Shape Volumes", + "version": 1 + } }, "comments": "", "filter": { @@ -563,16 +178,47 @@ }, { "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" + "boundary_cells_name": { + "value": "BoundaryCells", + "version": 1 + }, + "cell_feature_array_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "neighbor_list_name": { + "value": "NeighborList", + "version": 1 + }, + "number_of_neighbors_name": { + "value": "NumNeighbors", + "version": 1 + }, + "parameters_version": 1, + "shared_surface_area_list_name": { + "value": "SharedSurfaceAreaList", + "version": 1 + }, + "store_boundary_cells": { + "value": false, + "version": 1 + }, + "store_surface_features": { + "value": false, + "version": 1 + }, + "surface_features_name": { + "value": "SurfaceFeatures", + "version": 1 + } }, "comments": "", "filter": { @@ -583,13 +229,35 @@ }, { "args": { - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "equivalent_diameters_array_path": "DataContainer/Cell Feature Data/EquivalentDiameters", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "input_image_geometry_path": "DataContainer", - "multiples_of_average": 1.0, - "neighborhood_list_array_name": "NeighborhoodList", - "neighborhoods_array_name": "Neighborhoods" + "centroids_array_path": { + "value": "DataContainer/Cell Feature Data/Centroids", + "version": 1 + }, + "equivalent_diameters_array_path": { + "value": "DataContainer/Cell Feature Data/EquivalentDiameters", + "version": 1 + }, + "feature_phases_array_path": { + "value": "DataContainer/Cell Feature Data/Phases", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "multiples_of_average": { + "value": 1.0, + "version": 1 + }, + "neighborhood_list_array_name": { + "value": "NeighborhoodList", + "version": 1 + }, + "neighborhoods_array_name": { + "value": "Neighborhoods", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -600,17 +268,51 @@ }, { "args": { - "calc_manhattan_dist": true, - "do_boundaries": true, - "do_quad_points": true, - "do_triple_lines": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "g_bdistances_array_name": "GBManhattanDistances", - "input_image_geometry_path": "DataContainer", - "nearest_neighbors_array_name": "NearestNeighbors", - "q_pdistances_array_name": "QPManhattanDistances", - "save_nearest_neighbors": false, - "t_jdistances_array_name": "TJManhattanDistances" + "calc_manhattan_dist": { + "value": true, + "version": 1 + }, + "do_boundaries": { + "value": true, + "version": 1 + }, + "do_quad_points": { + "value": true, + "version": 1 + }, + "do_triple_lines": { + "value": true, + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "g_bdistances_array_name": { + "value": "GBManhattanDistances", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "nearest_neighbors_array_name": { + "value": "NearestNeighbors", + "version": 1 + }, + "parameters_version": 1, + "q_pdistances_array_name": { + "value": "QPManhattanDistances", + "version": 1 + }, + "save_nearest_neighbors": { + "value": false, + "version": 1 + }, + "t_jdistances_array_name": { + "value": "TJManhattanDistances", + "version": 1 + } }, "comments": "", "filter": { @@ -621,12 +323,31 @@ }, { "args": { - "calculate_sphericity": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_cells_array_path": "DataContainer/Cell Feature Data/NumElements", - "sphericity_array_name": "Sphericity", - "surface_area_volume_ratio_array_name": "SurfaceAreaVolumeRatio" + "calculate_sphericity": { + "value": true, + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "num_cells_array_path": { + "value": "DataContainer/Cell Feature Data/NumElements", + "version": 1 + }, + "parameters_version": 1, + "sphericity_array_name": { + "value": "Sphericity", + "version": 1 + }, + "surface_area_volume_ratio_array_name": { + "value": "SurfaceAreaVolumeRatio", + "version": 1 + } }, "comments": "", "filter": { @@ -637,8 +358,15 @@ }, { "args": { - "export_file_path": "Data/Output/Statistics/SmallIN100_Morph.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Statistics/SmallIN100_Morph.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -649,4 +377,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline index 6f1926145b..9081ab3b9a 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline @@ -1,782 +1,329 @@ { "isDisabled": false, "name": "(05) Small IN100 Crystallographic Statistics.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/NeighborList", - "DataContainer/Cell Feature Data/SharedSurfaceAreaList", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NeighborhoodList", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio" - ], - "file_path": "Data/Output/Statistics/SmallIN100_Morph.dream3d" - }, - "Imported Pipeline": { - "isDisabled": false, - "name": "(01) Small IN100 Morphological Statistics", - "pipeline": [ - { - "args": { - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors" - ], - "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" - }, - "Imported Pipeline": { - "isDisabled": false, - "name": "(08) Small IN100 Full Reconstruction", - "pipeline": [ - { - "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "read_h5_ebsd_object": { - "end_slice": 117, - "euler_representation": 0, - "hdf5_data_paths": [ - "Confidence Index", - "EulerAngles", - "Fit", - "Image Quality", - "Phases", - "SEM Signal", - "X Position", - "Y Position" - ], - "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", - "start_slice": 1, - "use_recommended_transform": true - } - }, - "comments": "", - "filter": { - "name": "simplnx::ReadH5EbsdFilter", - "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" - }, - "isDisabled": false - }, - { - "args": { - "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Image Quality", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 120.0 - }, - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 - }, - "output_data_array_name": "Mask" - }, - "comments": "", - "filter": { - "name": "simplnx::MultiThresholdObjects", - "uuid": "4246245e-1011-4add-8436-0af6bed19228" - }, - "isDisabled": false - }, - { - "args": { - "input_orientation_array_path": "DataContainer/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 - }, - "comments": "", - "filter": { - "name": "simplnx::ConvertOrientations", - "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Misorientation_Shifts.txt", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "input_image_geometry_path": "DataContainer", - "use_mask": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "simplnx::AlignSectionsMisorientationFilter", - "uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced" - }, - "isDisabled": false - }, - { - "args": { - "fill_holes": false, - "mask_array_path": "DataContainer/Cell Data/Mask", - "image_geometry": "DataContainer" - }, - "comments": "", - "filter": { - "name": "simplnx::IdentifySampleFilter", - "uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_slice": 0, - "selected_cell_data_path": "DataContainer/Cell Data", - "input_image_geometry_path": "DataContainer", - "use_reference_slice": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "simplnx::AlignSectionsFeatureCentroidFilter", - "uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "input_image_geometry_path": "DataContainer", - "misorientation_tolerance": 5.0, - "number_of_neighbors": 4, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "simplnx::BadDataNeighborOrientationCheckFilter", - "uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "correlation_array_path": "DataContainer/Cell Data/Confidence Index", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "level": 2, - "min_confidence": 0.20000000298023224, - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "simplnx::NeighborOrientationCorrelationFilter", - "uuid": "4625c192-7e46-4333-a294-67a2eb64cb37" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "cell_feature_attribute_matrix_name": "Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_name": "FeatureIds", - "mask_array_path": "DataContainer/Cell Data/Mask", - "input_image_geometry_path": "DataContainer", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "randomize_features": true, - "use_mask": true - }, - "comments": "", - "filter": { - "name": "simplnx::EBSDSegmentFeaturesFilter", - "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" - }, - "isDisabled": false - }, - { - "args": { - "cell_features_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_array_name": "Phases" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeFeaturePhasesFilter", - "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" - }, - "isDisabled": false - }, - { - "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeAvgOrientationsFilter", - "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList2", - "number_of_neighbors_name": "NumNeighbors2", - "shared_surface_area_list_name": "SharedSurfaceAreaList2", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "simplnx::FindNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "angle_tolerance": 2.0, - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "axis_tolerance": 3.0, - "cell_parent_ids_array_name": "ParentIds", - "contiguous_neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborList2", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_parent_ids_array_name": "ParentIds", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "created_feature_attribute_matrix_name": "NewGrain Data", - "non_contiguous_neighbor_list_array_path": "", - "use_non_contiguous_neighbors": false - }, - "comments": "", - "filter": { - "name": "simplnx::MergeTwinsFilter", - "uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9" - }, - "isDisabled": false - }, - { - "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeFeatureSizesFilter", - "uuid": "c666ee17-ca58-4969-80d0-819986c72485" - }, - "isDisabled": false - }, - { - "args": { - "apply_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "", - "input_image_geometry_path": "DataContainer", - "min_allowed_features_size": 16, - "num_cells_path": "DataContainer/Cell Feature Data/NumElements", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "simplnx::RequireMinimumSizeFeaturesFilter", - "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "simplnx::FindNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "apply_to_single_phase": false, - "cell_attribute_matrix_path": "DataContainer/Cell Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "Data Container/Feature Data/Phases", - "ignored_voxel_arrays": [], - "image_geom": "DataContainer", - "min_num_neighbors": 2, - "num_neighbors_path": "DataContainer/Cell Feature Data/NumNeighbors", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "simplnx::RequireMinNumNeighborsFilter", - "uuid": "4ab5153f-6014-4e6d-bbd6-194068620389" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "min_allowed_defect_size": 1000, - "input_image_geometry_path": "DataContainer", - "store_as_new_phase": false - }, - "comments": "", - "filter": { - "name": "simplnx::FillBadDataFilter", - "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "num_iterations": 2, - "operation_index": 0, - "input_image_geometry_path": "DataContainer", - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "simplnx::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "num_iterations": 2, - "operation_index": 1, - "input_image_geometry_path": "DataContainer", - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "simplnx::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeIPFColorsFilter", - "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "simplnx::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ] - } - }, - "comments": "", - "filter": { - "name": "simplnx::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "centroids_array_name": "Centroids", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeFeatureCentroidsFilter", - "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" - }, - "isDisabled": false - }, - { - "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Size Volumes" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeFeatureSizesFilter", - "uuid": "c666ee17-ca58-4969-80d0-819986c72485" - }, - "isDisabled": false - }, - { - "args": { - "aspect_ratios_array_name": "AspectRatios", - "axis_euler_angles_array_name": "AxisEulerAngles", - "axis_lengths_array_name": "AxisLengths", - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "omega3s_array_name": "Omega3s", - "input_image_geometry_path": "DataContainer", - "volumes_array_name": "Shape Volumes" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeShapesFilter", - "uuid": "036b17d5-23bb-4a24-9187-c4a8dd918792" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "simplnx::FindNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "equivalent_diameters_array_path": "DataContainer/Cell Feature Data/EquivalentDiameters", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "multiples_of_average": 1.0, - "neighborhood_list_array_name": "NeighborhoodList", - "neighborhoods_array_name": "Neighborhoods", - "input_image_geometry_path": "DataContainer" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeNeighborhoodsFilter", - "uuid": "924c10e3-2f39-4c08-9d7a-7fe029f74f6d" - }, - "isDisabled": false - }, - { - "args": { - "calc_manhattan_dist": true, - "do_boundaries": true, - "do_quad_points": true, - "do_triple_lines": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "g_bdistances_array_name": "GBManhattanDistances", - "nearest_neighbors_array_name": "NearestNeighbors", - "q_pdistances_array_name": "QPManhattanDistances", - "save_nearest_neighbors": false, - "input_image_geometry_path": "DataContainer", - "t_jdistances_array_name": "TJManhattanDistances" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeEuclideanDistMapFilter", - "uuid": "ba9ae8f6-443e-41d3-bb45-a08a139325c1" - }, - "isDisabled": false - }, - { - "args": { - "calculate_sphericity": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "num_cells_array_path": "DataContainer/Cell Feature Data/NumElements", - "input_image_geometry_path": "DataContainer", - "sphericity_array_name": "Sphericity", - "surface_area_volume_ratio_array_name": "SurfaceAreaVolumeRatio" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeSurfaceAreaToVolumeFilter", - "uuid": "94e83e4f-797d-4594-b130-3819b7676f01" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Statistics/SmallIN100_Morph.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "simplnx::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ] - } + "value": { + "data_paths": [ + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/NewGrain Data", + "DataContainer/Cell Data/ParentIds", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Data/IPFColors", + "DataContainer/Cell Feature Data/Centroids", + "DataContainer/Cell Feature Data/EquivalentDiameters", + "DataContainer/Cell Feature Data/NumElements", + "DataContainer/Cell Feature Data/Omega3s", + "DataContainer/Cell Feature Data/AxisLengths", + "DataContainer/Cell Feature Data/AxisEulerAngles", + "DataContainer/Cell Feature Data/AspectRatios", + "DataContainer/Cell Feature Data/Shape Volumes", + "DataContainer/Cell Feature Data/NumNeighbors", + "DataContainer/Cell Feature Data/NeighborList", + "DataContainer/Cell Feature Data/SharedSurfaceAreaList", + "DataContainer/Cell Feature Data/Neighborhoods", + "DataContainer/Cell Feature Data/NeighborhoodList", + "DataContainer/Cell Data/GBManhattanDistances", + "DataContainer/Cell Data/TJManhattanDistances", + "DataContainer/Cell Data/QPManhattanDistances", + "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio" + ], + "file_path": "Data/Output/Statistics/SmallIN100_Morph.dream3d" + }, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadDREAM3DFilter", + "name": "nx::core::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false }, { "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" + "avg_euler_angles_array_name": { + "value": "AvgEulerAngles", + "version": 1 + }, + "avg_quats_array_name": { + "value": "AvgQuats", + "version": 1 + }, + "cell_feature_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "cell_feature_ids_array_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "cell_quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ComputeAvgOrientationsFilter", + "name": "nx::core::ComputeAvgOrientationsFilter", "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" }, "isDisabled": false }, { "args": { - "avg_misorientations_array_name": "AvgMisorientations", - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "compute_avg_misors": false, - "misorientation_list_array_name": "MisorientationList", - "neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborhoodList" + "avg_misorientations_array_name": { + "value": "AvgMisorientations", + "version": 1 + }, + "avg_quats_array_path": { + "value": "DataContainer/Cell Feature Data/AvgQuats", + "version": 1 + }, + "compute_avg_misors": { + "value": false, + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_phases_array_path": { + "value": "DataContainer/Cell Feature Data/Phases", + "version": 1 + }, + "misorientation_list_array_name": { + "value": "MisorientationList", + "version": 1 + }, + "neighbor_list_array_path": { + "value": "DataContainer/Cell Feature Data/NeighborhoodList", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ComputeMisorientationsFilter", + "name": "nx::core::ComputeMisorientationsFilter", "uuid": "0b68fe25-b5ef-4805-ae32-20acb8d4e823" }, "isDisabled": false }, { "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "lambdas_array_name": "Schmid_Lambdas", - "loading_direction": [ - 1.0, - 1.0, - 1.0 - ], - "override_system": false, - "phis_array_name": "Schmid_Phis", - "poles_array_name": "Poles", - "schmids_array_name": "Schmids", - "slip_direction": [ - 1.0, - 0.0, - 0.0 - ], - "slip_plane": [ - 0.0, - 0.0, - 1.0 - ], - "slip_systems_array_name": "SlipSystems", - "store_angle_components": false + "avg_quats_array_path": { + "value": "DataContainer/Cell Feature Data/AvgQuats", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_phases_array_path": { + "value": "DataContainer/Cell Feature Data/Phases", + "version": 1 + }, + "lambdas_array_name": { + "value": "Schmid_Lambdas", + "version": 1 + }, + "loading_direction": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "override_system": { + "value": false, + "version": 1 + }, + "parameters_version": 1, + "phis_array_name": { + "value": "Schmid_Phis", + "version": 1 + }, + "poles_array_name": { + "value": "Poles", + "version": 1 + }, + "schmids_array_name": { + "value": "Schmids", + "version": 1 + }, + "slip_direction": { + "value": [ + 1.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "slip_plane": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "slip_systems_array_name": { + "value": "SlipSystems", + "version": 1 + }, + "store_angle_components": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeSchmidsFilter", + "name": "nx::core::ComputeSchmidsFilter", "uuid": "b4681855-0a3d-4237-97f2-5aec509115c4" }, "isDisabled": false }, { "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_avg_misorientations_array_name": "FeatureAvgMisorientations", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_reference_misorientations_array_name": "FeatureReferenceMisorientations", - "gb_euclidean_distances_array_path": "Cell Data/GBEuclideanDistances", - "quats_array_path": "DataContainer/Cell Data/Quats", - "reference_orientation_index": 0 + "avg_quats_array_path": { + "value": "DataContainer/Cell Feature Data/AvgQuats", + "version": 1 + }, + "cell_feature_attribute_matrix_path": { + "value": "Cell Feature Data", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_avg_misorientations_array_name": { + "value": "FeatureAvgMisorientations", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "feature_reference_misorientations_array_name": { + "value": "FeatureReferenceMisorientations", + "version": 1 + }, + "gb_euclidean_distances_array_path": { + "value": "Cell Data/GBEuclideanDistances", + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + }, + "reference_orientation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeFeatureReferenceMisorientationsFilter", + "name": "nx::core::ComputeFeatureReferenceMisorientationsFilter", "uuid": "24b54daf-3bf5-4331-93f6-03a49f719bf1" }, "isDisabled": false }, { "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "kernel_average_misorientations_array_name": "KernelAverageMisorientations", - "kernel_size": [ - 1, - 1, - 1 - ], - "quats_array_path": "DataContainer/Cell Data/Quats", - "input_image_geometry_path": "DataContainer" + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "kernel_average_misorientations_array_name": { + "value": "KernelAverageMisorientations", + "version": 1 + }, + "kernel_size": { + "value": [ + 1, + 1, + 1 + ], + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeKernelAvgMisorientationsFilter", + "name": "nx::core::ComputeKernelAvgMisorientationsFilter", "uuid": "61cfc9c1-aa0e-452b-b9ef-d3b9e6268035" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline index 042356da66..2ce75d5f7b 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline @@ -1,146 +1,250 @@ { "isDisabled": false, "name": "(01) Small IN100 Quick Mesh.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { "import_data_object": { - "data_paths": [ - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/NeighborList", - "DataContainer/Cell Feature Data/SharedSurfaceAreaList", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NeighborhoodList", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/MisorientationList", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations" - ], - "file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d" + "value": { + "data_paths": [ + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/NewGrain Data", + "DataContainer/Cell Data/ParentIds", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Data/IPFColors", + "DataContainer/Cell Feature Data/Centroids", + "DataContainer/Cell Feature Data/EquivalentDiameters", + "DataContainer/Cell Feature Data/NumElements", + "DataContainer/Cell Feature Data/Omega3s", + "DataContainer/Cell Feature Data/AxisLengths", + "DataContainer/Cell Feature Data/AxisEulerAngles", + "DataContainer/Cell Feature Data/AspectRatios", + "DataContainer/Cell Feature Data/Shape Volumes", + "DataContainer/Cell Feature Data/NumNeighbors", + "DataContainer/Cell Feature Data/NeighborList", + "DataContainer/Cell Feature Data/SharedSurfaceAreaList", + "DataContainer/Cell Feature Data/Neighborhoods", + "DataContainer/Cell Feature Data/NeighborhoodList", + "DataContainer/Cell Data/GBManhattanDistances", + "DataContainer/Cell Data/TJManhattanDistances", + "DataContainer/Cell Data/QPManhattanDistances", + "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", + "DataContainer/Cell Feature Data/AvgQuats", + "DataContainer/Cell Feature Data/AvgEulerAngles", + "DataContainer/Cell Feature Data/MisorientationList", + "DataContainer/Cell Feature Data/Schmids", + "DataContainer/Cell Feature Data/SlipSystems", + "DataContainer/Cell Feature Data/Poles", + "DataContainer/Cell Data/FeatureReferenceMisorientations", + "DataContainer/Cell Feature Data/FeatureAvgMisorientations", + "DataContainer/Cell Data/KernelAverageMisorientations" + ], + "file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d" + }, + "version": 1 }, - "Imported Pipeline": { - "isDisabled": false, - "name": "Untitled Pipeline", - "pipeline": [] - } + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadDREAM3DFilter", + "name": "nx::core::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false }, { "args": { - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "output_image_geometry_path": "DataContainer", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "max_voxel": [ - 140, - 140, - 99 - ], - "min_voxel": [ - 41, - 41, - 0 - ], - "remove_original_geometry": true, - "renumber_features": true, - "input_image_geometry_path": "DataContainer", - "use_physical_bounds": false + "cell_feature_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "crop_x_dim": { + "value": true, + "version": 1 + }, + "crop_y_dim": { + "value": true, + "version": 1 + }, + "crop_z_dim": { + "value": true, + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "max_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "max_voxel": { + "value": [ + 140, + 140, + 99 + ], + "version": 1 + }, + "min_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "min_voxel": { + "value": [ + 41, + 41, + 0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "renumber_features": { + "value": true, + "version": 1 + }, + "use_physical_bounds": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CropImageGeometryFilter", + "name": "nx::core::CropImageGeometryFilter", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false }, { "args": { - "source_data_paths": ["DataContainer/Cell Ensemble Data"], - "destination_parent_path": "DataContainer" + "destination_parent_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, + "source_data_paths": { + "value": [ + "DataContainer/Cell Ensemble Data" + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MoveDataFilter", + "name": "nx::core::MoveDataFilter", "uuid": "651e5894-ab7c-4176-b7f0-ea466c521753" }, "isDisabled": true }, { "args": { - "face_data_group_name": "Face Data", - "face_feature_attribute_matrix_name": "QM Face Feature Data", - "face_labels_array_name": "FaceLabels", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "fix_problem_voxels": false, - "generate_triple_lines": false, - "input_grid_geometry_path": "DataContainer", - "node_types_array_name": "NodeType", - "input_data_array_paths": [], - "output_triangle_geometry_path": "TriangleDataContainer", - "vertex_data_group_name": "Vertex Data" + "face_data_group_name": { + "value": "Face Data", + "version": 1 + }, + "face_feature_attribute_matrix_name": { + "value": "QM Face Feature Data", + "version": 1 + }, + "face_labels_array_name": { + "value": "FaceLabels", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "fix_problem_voxels": { + "value": false, + "version": 1 + }, + "generate_triple_lines": { + "value": false, + "version": 1 + }, + "input_data_array_paths": { + "value": [], + "version": 1 + }, + "input_grid_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "node_types_array_name": { + "value": "NodeType", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1, + "vertex_data_group_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::QuickSurfaceMeshFilter", + "name": "nx::core::QuickSurfaceMeshFilter", "uuid": "13dd00bd-ad49-4e04-95eb-3267952fd6e5" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline index 516ca172aa..fa29156682 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline @@ -1,108 +1,150 @@ { "isDisabled": false, "name": "(02) SmallIN100 Smooth Mesh.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/NewGrain Data", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", - "TriangleDataContainer/SharedVertexList", - "TriangleDataContainer/Face Data", - "TriangleDataContainer/Vertex Data", - "TriangleDataContainer/Vertex Data/NodeType", - "TriangleDataContainer/Face Data/FaceLabels", - "TriangleDataContainer/QM Face Feature Data" - ], - "file_path": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d" + "value": { + "data_paths": [ + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/Cell Data/ParentIds", + "DataContainer/Cell Data/IPFColors", + "DataContainer/Cell Data/GBManhattanDistances", + "DataContainer/Cell Data/TJManhattanDistances", + "DataContainer/Cell Data/QPManhattanDistances", + "DataContainer/Cell Data/FeatureReferenceMisorientations", + "DataContainer/Cell Data/KernelAverageMisorientations", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer/NewGrain Data", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Feature Data/AspectRatios", + "DataContainer/Cell Feature Data/AvgEulerAngles", + "DataContainer/Cell Feature Data/AvgQuats", + "DataContainer/Cell Feature Data/AxisEulerAngles", + "DataContainer/Cell Feature Data/AxisLengths", + "DataContainer/Cell Feature Data/Centroids", + "DataContainer/Cell Feature Data/EquivalentDiameters", + "DataContainer/Cell Feature Data/FeatureAvgMisorientations", + "DataContainer/Cell Feature Data/Neighborhoods", + "DataContainer/Cell Feature Data/NumElements", + "DataContainer/Cell Feature Data/NumNeighbors", + "DataContainer/Cell Feature Data/Omega3s", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/Cell Feature Data/Poles", + "DataContainer/Cell Feature Data/Schmids", + "DataContainer/Cell Feature Data/Shape Volumes", + "DataContainer/Cell Feature Data/SlipSystems", + "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", + "TriangleDataContainer", + "TriangleDataContainer/SharedTriList", + "TriangleDataContainer/SharedVertexList", + "TriangleDataContainer/Face Data", + "TriangleDataContainer/Vertex Data", + "TriangleDataContainer/Vertex Data/NodeType", + "TriangleDataContainer/Face Data/FaceLabels", + "TriangleDataContainer/QM Face Feature Data" + ], + "file_path": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d" + }, + "version": 1 }, - "Imported Pipeline": { - "isDisabled": false, - "name": "Untitled Pipeline", - "pipeline": [] - } + "parameters_version": 1 }, + "comments": "", "filter": { - "name": "simplnx::ReadDREAM3DFilter", + "name": "nx::core::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false }, { "args": { - "iteration_steps": 100, - "lambda_value": 0.25, - "mu_factor": 0.20000000298023224, - "quad_point_lambda": 0.15000000596046448, - "surface_mesh_node_type_array_path": "TriangleDataContainer/Vertex Data/NodeType", - "surface_point_lambda": 0.0, - "surface_quad_point_lambda": 0.0, - "surface_triple_line_lambda": 0.0, - "input_triangle_geometry_path": "TriangleDataContainer", - "triple_line_lambda": 0.20000000298023224, - "use_taubin_smoothing": true + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "iteration_steps": { + "value": 100, + "version": 1 + }, + "lambda_value": { + "value": 0.25, + "version": 1 + }, + "mu_factor": { + "value": 0.20000000298023224, + "version": 1 + }, + "parameters_version": 1, + "quad_point_lambda": { + "value": 0.15000000596046448, + "version": 1 + }, + "surface_mesh_node_type_array_path": { + "value": "TriangleDataContainer/Vertex Data/NodeType", + "version": 1 + }, + "surface_point_lambda": { + "value": 0.0, + "version": 1 + }, + "surface_quad_point_lambda": { + "value": 0.0, + "version": 1 + }, + "surface_triple_line_lambda": { + "value": 0.0, + "version": 1 + }, + "triple_line_lambda": { + "value": 0.20000000298023224, + "version": 1 + }, + "use_taubin_smoothing": { + "value": true, + "version": 1 + } }, + "comments": "", "filter": { - "name": "simplnx::LaplacianSmoothingFilter", + "name": "nx::core::LaplacianSmoothingFilter", "uuid": "0dd0916e-9305-4a7b-98cf-a6cfb97cb501" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, + "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline index e0c29cbe79..fe0128a028 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline @@ -4,1152 +4,66 @@ "pipeline": [ { "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(02) Small IN100 Smooth Mesh", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(01) Small IN100 Quick Mesh", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(05) Small IN100 Crystallographic Statistics", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(01) Small IN100 Morphological Statistics", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(08) Small IN100 Full Reconstruction", - "pipeline": [ - { - "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "read_h5_ebsd_object": { - "end_slice": 117, - "euler_representation": 0, - "hdf5_data_paths": [ - "Confidence Index", - "EulerAngles", - "Fit", - "Image Quality", - "Phases", - "SEM Signal", - "X Position", - "Y Position" - ], - "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", - "start_slice": 1, - "use_recommended_transform": true - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadH5EbsdFilter", - "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" - }, - "isDisabled": false - }, - { - "args": { - "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Image Quality", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 120.0 - }, - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 - }, - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "output_data_array_name": "Mask", - "use_custom_false_value": false, - "use_custom_true_value": false - }, - "comments": "", - "filter": { - "name": "nx::core::MultiThresholdObjectsFilter", - "uuid": "4246245e-1011-4add-8436-0af6bed19228" - }, - "isDisabled": false - }, - { - "args": { - "input_orientation_array_path": "DataContainer/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 - }, - "comments": "", - "filter": { - "name": "nx::core::ConvertOrientationsFilter", - "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Misorientation_Shifts.txt", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "use_mask": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "nx::core::AlignSectionsMisorientationFilter", - "uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced" - }, - "isDisabled": false - }, - { - "args": { - "fill_holes": false, - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask" - }, - "comments": "", - "filter": { - "name": "nx::core::IdentifySampleFilter", - "uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_slice": 0, - "selected_cell_data_path": "DataContainer/Cell Data", - "use_reference_slice": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "nx::core::AlignSectionsFeatureCentroidFilter", - "uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "number_of_neighbors": 4, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "nx::core::BadDataNeighborOrientationCheckFilter", - "uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "correlation_array_path": "DataContainer/Cell Data/Confidence Index", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "level": 2, - "min_confidence": 0.20000000298023224, - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "nx::core::NeighborOrientationCorrelationFilter", - "uuid": "4625c192-7e46-4333-a294-67a2eb64cb37" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "cell_feature_attribute_matrix_name": "Cell Feature Data", - "cell_mask_array_path": "DataContainer/Cell Data/Mask", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_name": "FeatureIds", - "input_image_geometry_path": "DataContainer", - "misorientation_tolerance": 5.0, - "randomize_features": true, - "use_mask": true - }, - "comments": "", - "filter": { - "name": "nx::core::EBSDSegmentFeaturesFilter", - "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" - }, - "isDisabled": false - }, - { - "args": { - "cell_features_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_array_name": "Phases" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeaturePhasesFilter", - "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" - }, - "isDisabled": false - }, - { - "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeAvgOrientationsFilter", - "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList2", - "number_of_neighbors_name": "NumNeighbors2", - "shared_surface_area_list_name": "SharedSurfaceAreaList2", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "angle_tolerance": 2.0, - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "axis_tolerance": 3.0, - "cell_parent_ids_array_name": "ParentIds", - "contiguous_neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborList2", - "created_feature_attribute_matrix_name": "NewGrain Data", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_parent_ids_array_name": "ParentIds", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "seed_array_name": "MergeTwins SeedValue", - "seed_value": 5489, - "use_seed": false - }, - "comments": "", - "filter": { - "name": "nx::core::MergeTwinsFilter", - "uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9" - }, - "isDisabled": false - }, - { - "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureSizesFilter", - "uuid": "c666ee17-ca58-4969-80d0-819986c72485" - }, - "isDisabled": false - }, - { - "args": { - "apply_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "", - "input_image_geometry_path": "DataContainer", - "min_allowed_features_size": 16, - "num_cells_path": "DataContainer/Cell Feature Data/NumElements", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "nx::core::RequireMinimumSizeFeaturesFilter", - "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [ - "DataContainer/Cell Feature Data/NumNeighbors2" - ] - }, - "comments": "", - "filter": { - "name": "nx::core::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "apply_to_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "Data Container/Feature Data/Phases", - "ignored_voxel_arrays": [], - "input_image_geometry_path": "DataContainer", - "min_num_neighbors": 2, - "num_neighbors_path": "DataContainer/Cell Feature Data/NumNeighbors", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "nx::core::RequireMinNumNeighborsFilter", - "uuid": "4ab5153f-6014-4e6d-bbd6-194068620389" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [ - "DataContainer/Cell Feature Data/NumNeighbors" - ] - }, - "comments": "", - "filter": { - "name": "nx::core::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "min_allowed_defect_size": 1000, - "store_as_new_phase": false - }, - "comments": "", - "filter": { - "name": "nx::core::FillBadDataFilter", - "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "num_iterations": 2, - "operation_index": 0, - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "nx::core::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "num_iterations": 2, - "operation_index": 1, - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "nx::core::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeIPFColorsFilter", - "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors" - ], - "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "centroids_array_name": "Centroids", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureCentroidsFilter", - "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" - }, - "isDisabled": false - }, - { - "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Size Volumes" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureSizesFilter", - "uuid": "c666ee17-ca58-4969-80d0-819986c72485" - }, - "isDisabled": false - }, - { - "args": { - "aspect_ratios_array_name": "AspectRatios", - "axis_euler_angles_array_name": "AxisEulerAngles", - "axis_lengths_array_name": "AxisLengths", - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "omega3s_array_name": "Omega3s", - "volumes_array_name": "Shape Volumes" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeShapesFilter", - "uuid": "036b17d5-23bb-4a24-9187-c4a8dd918792" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "equivalent_diameters_array_path": "DataContainer/Cell Feature Data/EquivalentDiameters", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "input_image_geometry_path": "DataContainer", - "multiples_of_average": 1.0, - "neighborhood_list_array_name": "NeighborhoodList", - "neighborhoods_array_name": "Neighborhoods" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeNeighborhoodsFilter", - "uuid": "924c10e3-2f39-4c08-9d7a-7fe029f74f6d" - }, - "isDisabled": false - }, - { - "args": { - "calc_manhattan_dist": true, - "do_boundaries": true, - "do_quad_points": true, - "do_triple_lines": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "g_bdistances_array_name": "GBManhattanDistances", - "input_image_geometry_path": "DataContainer", - "nearest_neighbors_array_name": "NearestNeighbors", - "q_pdistances_array_name": "QPManhattanDistances", - "save_nearest_neighbors": false, - "t_jdistances_array_name": "TJManhattanDistances" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeEuclideanDistMapFilter", - "uuid": "ba9ae8f6-443e-41d3-bb45-a08a139325c1" - }, - "isDisabled": false - }, - { - "args": { - "calculate_sphericity": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_cells_array_path": "DataContainer/Cell Feature Data/NumElements", - "sphericity_array_name": "Sphericity", - "surface_area_volume_ratio_array_name": "SurfaceAreaVolumeRatio" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeSurfaceAreaToVolumeFilter", - "uuid": "94e83e4f-797d-4594-b130-3819b7676f01" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Statistics/SmallIN100_Morph.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/NeighborList", - "DataContainer/Cell Feature Data/SharedSurfaceAreaList", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NeighborhoodList", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio" - ], - "file_path": "Data/Output/Statistics/SmallIN100_Morph.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [] - }, - "comments": "", - "filter": { - "name": "nx::core::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" - }, - "isDisabled": false - }, - { - "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeAvgOrientationsFilter", - "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" - }, - "isDisabled": false - }, - { - "args": { - "avg_misorientations_array_name": "AvgMisorientations", - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "compute_avg_misors": false, - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "misorientation_list_array_name": "MisorientationList", - "neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborhoodList" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeMisorientationsFilter", - "uuid": "0b68fe25-b5ef-4805-ae32-20acb8d4e823" - }, - "isDisabled": false - }, - { - "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "lambdas_array_name": "Schmid_Lambdas", - "loading_direction": [ - 1.0, - 1.0, - 1.0 - ], - "override_system": false, - "phis_array_name": "Schmid_Phis", - "poles_array_name": "Poles", - "schmids_array_name": "Schmids", - "slip_direction": [ - 1.0, - 0.0, - 0.0 - ], - "slip_plane": [ - 0.0, - 0.0, - 1.0 - ], - "slip_systems_array_name": "SlipSystems", - "store_angle_components": false - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeSchmidsFilter", - "uuid": "b4681855-0a3d-4237-97f2-5aec509115c4" - }, - "isDisabled": false - }, - { - "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_avg_misorientations_array_name": "FeatureAvgMisorientations", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_reference_misorientations_array_name": "FeatureReferenceMisorientations", - "gb_euclidean_distances_array_path": "Cell Data/GBEuclideanDistances", - "quats_array_path": "DataContainer/Cell Data/Quats", - "reference_orientation_index": 0 - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureReferenceMisorientationsFilter", - "uuid": "24b54daf-3bf5-4331-93f6-03a49f719bf1" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "kernel_average_misorientations_array_name": "KernelAverageMisorientations", - "kernel_size": [ - 1, - 1, - 1 - ], - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeKernelAvgMisorientationsFilter", - "uuid": "61cfc9c1-aa0e-452b-b9ef-d3b9e6268035" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/NeighborList", - "DataContainer/Cell Feature Data/SharedSurfaceAreaList", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NeighborhoodList", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/MisorientationList", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations" - ], - "file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "max_coord": [ - 0.0, - 0.0, - 0.0 - ], - "max_voxel": [ - 140, - 140, - 99 - ], - "min_coord": [ - 0.0, - 0.0, - 0.0 - ], - "min_voxel": [ - 41, - 41, - 0 - ], - "output_image_geometry_path": "DataContainer", - "remove_original_geometry": true, - "renumber_features": true, - "use_physical_bounds": false - }, - "comments": "", - "filter": { - "name": "nx::core::CropImageGeometryFilter", - "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" - }, - "isDisabled": false - }, - { - "args": { - "destination_parent_path": "DataContainer", - "source_data_paths": [ - "DataContainer/Cell Ensemble Data" - ] - }, - "comments": "", - "filter": { - "name": "nx::core::MoveDataFilter", - "uuid": "651e5894-ab7c-4176-b7f0-ea466c521753" - }, - "isDisabled": false - }, - { - "args": { - "face_data_group_name": "Face Data", - "face_feature_attribute_matrix_name": "QM Face Feature Data", - "face_labels_array_name": "FaceLabels", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "fix_problem_voxels": false, - "generate_triple_lines": false, - "input_data_array_paths": [], - "input_grid_geometry_path": "DataContainer", - "node_types_array_name": "NodeType", - "output_triangle_geometry_path": "TriangleDataContainer", - "vertex_data_group_name": "Vertex Data" - }, - "comments": "", - "filter": { - "name": "nx::core::QuickSurfaceMeshFilter", - "uuid": "13dd00bd-ad49-4e04-95eb-3267952fd6e5" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/NewGrain Data", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", - "TriangleDataContainer/SharedVertexList", - "TriangleDataContainer/Face Data", - "TriangleDataContainer/Vertex Data", - "TriangleDataContainer/Vertex Data/NodeType", - "TriangleDataContainer/Face Data/FaceLabels", - "TriangleDataContainer/QM Face Feature Data" - ], - "file_path": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "iteration_steps": 100, - "lambda_value": 0.25, - "mu_factor": 0.20000000298023224, - "quad_point_lambda": 0.15000000596046448, - "surface_mesh_node_type_array_path": "TriangleDataContainer/Vertex Data/NodeType", - "surface_point_lambda": 0.0, - "surface_quad_point_lambda": 0.0, - "surface_triple_line_lambda": 0.0, - "triple_line_lambda": 0.20000000298023224, - "use_taubin_smoothing": true - }, - "comments": "", - "filter": { - "name": "nx::core::LaplacianSmoothingFilter", - "uuid": "0dd0916e-9305-4a7b-98cf-a6cfb97cb501" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], + "import_data_object": { + "value": { + "data_paths": [ + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/Cell Data/ParentIds", + "DataContainer/Cell Data/IPFColors", + "DataContainer/Cell Data/GBManhattanDistances", + "DataContainer/Cell Data/TJManhattanDistances", + "DataContainer/Cell Data/QPManhattanDistances", + "DataContainer/Cell Data/FeatureReferenceMisorientations", + "DataContainer/Cell Data/KernelAverageMisorientations", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer/NewGrain Data", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Feature Data/AspectRatios", + "DataContainer/Cell Feature Data/AvgEulerAngles", + "DataContainer/Cell Feature Data/AvgQuats", + "DataContainer/Cell Feature Data/AxisEulerAngles", + "DataContainer/Cell Feature Data/AxisLengths", + "DataContainer/Cell Feature Data/Centroids", + "DataContainer/Cell Feature Data/EquivalentDiameters", + "DataContainer/Cell Feature Data/FeatureAvgMisorientations", + "DataContainer/Cell Feature Data/Neighborhoods", + "DataContainer/Cell Feature Data/NumElements", + "DataContainer/Cell Feature Data/NumNeighbors", + "DataContainer/Cell Feature Data/Omega3s", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/Cell Feature Data/Poles", + "DataContainer/Cell Feature Data/Schmids", + "DataContainer/Cell Feature Data/Shape Volumes", + "DataContainer/Cell Feature Data/SlipSystems", + "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", + "TriangleDataContainer", + "TriangleDataContainer/SharedTriList", + "TriangleDataContainer/SharedVertexList", + "TriangleDataContainer/Face Data", + "TriangleDataContainer/Vertex Data", + "TriangleDataContainer/Vertex Data/NodeType", + "TriangleDataContainer/Face Data/FaceLabels", + "TriangleDataContainer/QM Face Feature Data", + "TriangleDataContainer/Edge List" + ], + "file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d" + }, "version": 1 }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/NewGrain Data", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", - "TriangleDataContainer/SharedVertexList", - "TriangleDataContainer/Face Data", - "TriangleDataContainer/Vertex Data", - "TriangleDataContainer/Vertex Data/NodeType", - "TriangleDataContainer/Face Data/FaceLabels", - "TriangleDataContainer/QM Face Feature Data", - "TriangleDataContainer/Edge List" - ], - "file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d" - } + "parameters_version": 1 }, "comments": "", "filter": { @@ -1160,8 +74,15 @@ }, { "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "triangle_areas_array_name": "FaceAreas" + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1, + "triangle_areas_array_name": { + "value": "FaceAreas", + "version": 1 + } }, "comments": "", "filter": { @@ -1172,8 +93,15 @@ }, { "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "output_normals_array_name": "FaceNormals" + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "output_normals_array_name": { + "value": "FaceNormals", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -1184,8 +112,15 @@ }, { "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "surface_mesh_triangle_dihedral_angles_array_name": "FaceDihedralAngles" + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1, + "surface_mesh_triangle_dihedral_angles_array_name": { + "value": "FaceDihedralAngles", + "version": 1 + } }, "comments": "", "filter": { @@ -1196,12 +131,31 @@ }, { "args": { - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_euler_angles_array_path": "DataContainer/Cell Feature Data/AvgEulerAngles", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "surface_mesh_face_ipf_colors_array_name": "FaceIPFColors", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_normals_array_path": "TriangleDataContainer/Face Data/FaceNormals" + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_euler_angles_array_path": { + "value": "DataContainer/Cell Feature Data/AvgEulerAngles", + "version": 1 + }, + "feature_phases_array_path": { + "value": "DataContainer/Cell Feature Data/Phases", + "version": 1 + }, + "parameters_version": 1, + "surface_mesh_face_ipf_colors_array_name": { + "value": "FaceIPFColors", + "version": 1 + }, + "surface_mesh_face_labels_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels", + "version": 1 + }, + "surface_mesh_face_normals_array_path": { + "value": "TriangleDataContainer/Face Data/FaceNormals", + "version": 1 + } }, "comments": "", "filter": { @@ -1212,11 +166,27 @@ }, { "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_misorientation_colors_array_name": "FaceMisorientationColors" + "avg_quats_array_path": { + "value": "DataContainer/Cell Feature Data/AvgQuats", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_phases_array_path": { + "value": "DataContainer/Cell Feature Data/Phases", + "version": 1 + }, + "parameters_version": 1, + "surface_mesh_face_labels_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels", + "version": 1 + }, + "surface_mesh_face_misorientation_colors_array_name": { + "value": "FaceMisorientationColors", + "version": 1 + } }, "comments": "", "filter": { @@ -1227,8 +197,15 @@ }, { "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -1239,4 +216,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline index ba619c12d3..1c4a2f25cc 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline @@ -4,1328 +4,71 @@ "pipeline": [ { "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(03) Small IN100 Mesh Statistics", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(02) Small IN100 Smooth Mesh", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(01) Small IN100 Quick Mesh", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(05) Small IN100 Crystallographic Statistics", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(01) Small IN100 Morphological Statistics", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(08) Small IN100 Full Reconstruction", - "pipeline": [ - { - "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "read_h5_ebsd_object": { - "end_slice": 117, - "euler_representation": 0, - "hdf5_data_paths": [ - "Confidence Index", - "EulerAngles", - "Fit", - "Image Quality", - "Phases", - "SEM Signal", - "X Position", - "Y Position" - ], - "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", - "start_slice": 1, - "use_recommended_transform": true - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadH5EbsdFilter", - "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" - }, - "isDisabled": false - }, - { - "args": { - "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Image Quality", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 120.0 - }, - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 - }, - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "output_data_array_name": "Mask", - "use_custom_false_value": false, - "use_custom_true_value": false - }, - "comments": "", - "filter": { - "name": "nx::core::MultiThresholdObjectsFilter", - "uuid": "4246245e-1011-4add-8436-0af6bed19228" - }, - "isDisabled": false - }, - { - "args": { - "input_orientation_array_path": "DataContainer/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 - }, - "comments": "", - "filter": { - "name": "nx::core::ConvertOrientationsFilter", - "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Misorientation_Shifts.txt", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "use_mask": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "nx::core::AlignSectionsMisorientationFilter", - "uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced" - }, - "isDisabled": false - }, - { - "args": { - "fill_holes": false, - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask" - }, - "comments": "", - "filter": { - "name": "nx::core::IdentifySampleFilter", - "uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_slice": 0, - "selected_cell_data_path": "DataContainer/Cell Data", - "use_reference_slice": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "nx::core::AlignSectionsFeatureCentroidFilter", - "uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "number_of_neighbors": 4, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "nx::core::BadDataNeighborOrientationCheckFilter", - "uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "correlation_array_path": "DataContainer/Cell Data/Confidence Index", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "level": 2, - "min_confidence": 0.20000000298023224, - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "nx::core::NeighborOrientationCorrelationFilter", - "uuid": "4625c192-7e46-4333-a294-67a2eb64cb37" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "cell_feature_attribute_matrix_name": "Cell Feature Data", - "cell_mask_array_path": "DataContainer/Cell Data/Mask", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_name": "FeatureIds", - "input_image_geometry_path": "DataContainer", - "misorientation_tolerance": 5.0, - "randomize_features": true, - "use_mask": true - }, - "comments": "", - "filter": { - "name": "nx::core::EBSDSegmentFeaturesFilter", - "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" - }, - "isDisabled": false - }, - { - "args": { - "cell_features_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_array_name": "Phases" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeaturePhasesFilter", - "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" - }, - "isDisabled": false - }, - { - "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeAvgOrientationsFilter", - "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList2", - "number_of_neighbors_name": "NumNeighbors2", - "shared_surface_area_list_name": "SharedSurfaceAreaList2", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "angle_tolerance": 2.0, - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "axis_tolerance": 3.0, - "cell_parent_ids_array_name": "ParentIds", - "contiguous_neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborList2", - "created_feature_attribute_matrix_name": "NewGrain Data", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_parent_ids_array_name": "ParentIds", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "seed_array_name": "MergeTwins SeedValue", - "seed_value": 5489, - "use_seed": false - }, - "comments": "", - "filter": { - "name": "nx::core::MergeTwinsFilter", - "uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9" - }, - "isDisabled": false - }, - { - "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureSizesFilter", - "uuid": "c666ee17-ca58-4969-80d0-819986c72485" - }, - "isDisabled": false - }, - { - "args": { - "apply_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "", - "input_image_geometry_path": "DataContainer", - "min_allowed_features_size": 16, - "num_cells_path": "DataContainer/Cell Feature Data/NumElements", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "nx::core::RequireMinimumSizeFeaturesFilter", - "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [ - "DataContainer/Cell Feature Data/NumNeighbors2" - ] - }, - "comments": "", - "filter": { - "name": "nx::core::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "apply_to_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "Data Container/Feature Data/Phases", - "ignored_voxel_arrays": [], - "input_image_geometry_path": "DataContainer", - "min_num_neighbors": 2, - "num_neighbors_path": "DataContainer/Cell Feature Data/NumNeighbors", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "nx::core::RequireMinNumNeighborsFilter", - "uuid": "4ab5153f-6014-4e6d-bbd6-194068620389" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [ - "DataContainer/Cell Feature Data/NumNeighbors" - ] - }, - "comments": "", - "filter": { - "name": "nx::core::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "min_allowed_defect_size": 1000, - "store_as_new_phase": false - }, - "comments": "", - "filter": { - "name": "nx::core::FillBadDataFilter", - "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "num_iterations": 2, - "operation_index": 0, - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "nx::core::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "num_iterations": 2, - "operation_index": 1, - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "nx::core::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeIPFColorsFilter", - "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors" - ], - "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "centroids_array_name": "Centroids", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureCentroidsFilter", - "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" - }, - "isDisabled": false - }, - { - "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Size Volumes" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureSizesFilter", - "uuid": "c666ee17-ca58-4969-80d0-819986c72485" - }, - "isDisabled": false - }, - { - "args": { - "aspect_ratios_array_name": "AspectRatios", - "axis_euler_angles_array_name": "AxisEulerAngles", - "axis_lengths_array_name": "AxisLengths", - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "omega3s_array_name": "Omega3s", - "volumes_array_name": "Shape Volumes" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeShapesFilter", - "uuid": "036b17d5-23bb-4a24-9187-c4a8dd918792" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "equivalent_diameters_array_path": "DataContainer/Cell Feature Data/EquivalentDiameters", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "input_image_geometry_path": "DataContainer", - "multiples_of_average": 1.0, - "neighborhood_list_array_name": "NeighborhoodList", - "neighborhoods_array_name": "Neighborhoods" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeNeighborhoodsFilter", - "uuid": "924c10e3-2f39-4c08-9d7a-7fe029f74f6d" - }, - "isDisabled": false - }, - { - "args": { - "calc_manhattan_dist": true, - "do_boundaries": true, - "do_quad_points": true, - "do_triple_lines": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "g_bdistances_array_name": "GBManhattanDistances", - "input_image_geometry_path": "DataContainer", - "nearest_neighbors_array_name": "NearestNeighbors", - "q_pdistances_array_name": "QPManhattanDistances", - "save_nearest_neighbors": false, - "t_jdistances_array_name": "TJManhattanDistances" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeEuclideanDistMapFilter", - "uuid": "ba9ae8f6-443e-41d3-bb45-a08a139325c1" - }, - "isDisabled": false - }, - { - "args": { - "calculate_sphericity": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_cells_array_path": "DataContainer/Cell Feature Data/NumElements", - "sphericity_array_name": "Sphericity", - "surface_area_volume_ratio_array_name": "SurfaceAreaVolumeRatio" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeSurfaceAreaToVolumeFilter", - "uuid": "94e83e4f-797d-4594-b130-3819b7676f01" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Statistics/SmallIN100_Morph.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/NeighborList", - "DataContainer/Cell Feature Data/SharedSurfaceAreaList", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NeighborhoodList", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio" - ], - "file_path": "Data/Output/Statistics/SmallIN100_Morph.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [] - }, - "comments": "", - "filter": { - "name": "nx::core::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" - }, - "isDisabled": false - }, - { - "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeAvgOrientationsFilter", - "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" - }, - "isDisabled": false - }, - { - "args": { - "avg_misorientations_array_name": "AvgMisorientations", - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "compute_avg_misors": false, - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "misorientation_list_array_name": "MisorientationList", - "neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborhoodList" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeMisorientationsFilter", - "uuid": "0b68fe25-b5ef-4805-ae32-20acb8d4e823" - }, - "isDisabled": false - }, - { - "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "lambdas_array_name": "Schmid_Lambdas", - "loading_direction": [ - 1.0, - 1.0, - 1.0 - ], - "override_system": false, - "phis_array_name": "Schmid_Phis", - "poles_array_name": "Poles", - "schmids_array_name": "Schmids", - "slip_direction": [ - 1.0, - 0.0, - 0.0 - ], - "slip_plane": [ - 0.0, - 0.0, - 1.0 - ], - "slip_systems_array_name": "SlipSystems", - "store_angle_components": false - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeSchmidsFilter", - "uuid": "b4681855-0a3d-4237-97f2-5aec509115c4" - }, - "isDisabled": false - }, - { - "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_avg_misorientations_array_name": "FeatureAvgMisorientations", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_reference_misorientations_array_name": "FeatureReferenceMisorientations", - "gb_euclidean_distances_array_path": "Cell Data/GBEuclideanDistances", - "quats_array_path": "DataContainer/Cell Data/Quats", - "reference_orientation_index": 0 - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureReferenceMisorientationsFilter", - "uuid": "24b54daf-3bf5-4331-93f6-03a49f719bf1" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "kernel_average_misorientations_array_name": "KernelAverageMisorientations", - "kernel_size": [ - 1, - 1, - 1 - ], - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeKernelAvgMisorientationsFilter", - "uuid": "61cfc9c1-aa0e-452b-b9ef-d3b9e6268035" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/NeighborList", - "DataContainer/Cell Feature Data/SharedSurfaceAreaList", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NeighborhoodList", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/MisorientationList", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations" - ], - "file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "max_coord": [ - 0.0, - 0.0, - 0.0 - ], - "max_voxel": [ - 140, - 140, - 99 - ], - "min_coord": [ - 0.0, - 0.0, - 0.0 - ], - "min_voxel": [ - 41, - 41, - 0 - ], - "output_image_geometry_path": "DataContainer", - "remove_original_geometry": true, - "renumber_features": true, - "use_physical_bounds": false - }, - "comments": "", - "filter": { - "name": "nx::core::CropImageGeometryFilter", - "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" - }, - "isDisabled": false - }, - { - "args": { - "destination_parent_path": "DataContainer", - "source_data_paths": [ - "DataContainer/Cell Ensemble Data" - ] - }, - "comments": "", - "filter": { - "name": "nx::core::MoveDataFilter", - "uuid": "651e5894-ab7c-4176-b7f0-ea466c521753" - }, - "isDisabled": false - }, - { - "args": { - "face_data_group_name": "Face Data", - "face_feature_attribute_matrix_name": "QM Face Feature Data", - "face_labels_array_name": "FaceLabels", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "fix_problem_voxels": false, - "generate_triple_lines": false, - "input_data_array_paths": [], - "input_grid_geometry_path": "DataContainer", - "node_types_array_name": "NodeType", - "output_triangle_geometry_path": "TriangleDataContainer", - "vertex_data_group_name": "Vertex Data" - }, - "comments": "", - "filter": { - "name": "nx::core::QuickSurfaceMeshFilter", - "uuid": "13dd00bd-ad49-4e04-95eb-3267952fd6e5" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/NewGrain Data", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", - "TriangleDataContainer/SharedVertexList", - "TriangleDataContainer/Face Data", - "TriangleDataContainer/Vertex Data", - "TriangleDataContainer/Vertex Data/NodeType", - "TriangleDataContainer/Face Data/FaceLabels", - "TriangleDataContainer/QM Face Feature Data" - ], - "file_path": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "iteration_steps": 100, - "lambda_value": 0.25, - "mu_factor": 0.20000000298023224, - "quad_point_lambda": 0.15000000596046448, - "surface_mesh_node_type_array_path": "TriangleDataContainer/Vertex Data/NodeType", - "surface_point_lambda": 0.0, - "surface_quad_point_lambda": 0.0, - "surface_triple_line_lambda": 0.0, - "triple_line_lambda": 0.20000000298023224, - "use_taubin_smoothing": true - }, - "comments": "", - "filter": { - "name": "nx::core::LaplacianSmoothingFilter", - "uuid": "0dd0916e-9305-4a7b-98cf-a6cfb97cb501" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/NewGrain Data", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", - "TriangleDataContainer/SharedVertexList", - "TriangleDataContainer/Face Data", - "TriangleDataContainer/Vertex Data", - "TriangleDataContainer/Vertex Data/NodeType", - "TriangleDataContainer/Face Data/FaceLabels", - "TriangleDataContainer/QM Face Feature Data", - "TriangleDataContainer/Edge List" - ], - "file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "triangle_areas_array_name": "FaceAreas" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeTriangleAreasFilter", - "uuid": "b149addd-c0c8-4010-a264-596005eaf2a5" - }, - "isDisabled": false - }, - { - "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "output_normals_array_name": "FaceNormals" - }, - "comments": "", - "filter": { - "name": "nx::core::TriangleNormalFilter", - "uuid": "8133d419-1919-4dbf-a5bf-1c97282ba63f" - }, - "isDisabled": false - }, - { - "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "surface_mesh_triangle_dihedral_angles_array_name": "FaceDihedralAngles" - }, - "comments": "", - "filter": { - "name": "nx::core::TriangleDihedralAngleFilter", - "uuid": "dd42c521-4ae5-485d-ad35-d1276547d2f1" - }, - "isDisabled": false - }, - { - "args": { - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_euler_angles_array_path": "DataContainer/Cell Feature Data/AvgEulerAngles", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "surface_mesh_face_ipf_colors_array_name": "FaceIPFColors", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_normals_array_path": "TriangleDataContainer/Face Data/FaceNormals" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFaceIPFColoringFilter", - "uuid": "30759600-7c02-4650-b5ca-e7036d6b568e" - }, - "isDisabled": false - }, - { - "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_misorientation_colors_array_name": "FaceMisorientationColors" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureFaceMisorientationFilter", - "uuid": "f3473af9-db77-43db-bd25-60df7230ea73" - }, - "isDisabled": false - }, - { - "args": { - "face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "feature_face_ids_array_name": "SharedFeatureFaceId", - "feature_face_labels_array_name": "FaceLabels", - "feature_num_triangles_array_name": "NumTriangles", - "grain_boundary_attribute_matrix_name": "SharedFeatureFace", - "input_triangle_geometry_path": "TriangleDataContainer", - "randomize_features": false - }, - "comments": "", - "filter": { - "name": "nx::core::SharedFeatureFaceFilter", - "uuid": "aaf7a258-fc92-48d7-9d06-ba317a3769e8" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], + "import_data_object": { + "value": { + "data_paths": [ + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/Cell Data/ParentIds", + "DataContainer/Cell Data/IPFColors", + "DataContainer/Cell Data/GBManhattanDistances", + "DataContainer/Cell Data/TJManhattanDistances", + "DataContainer/Cell Data/QPManhattanDistances", + "DataContainer/Cell Data/FeatureReferenceMisorientations", + "DataContainer/Cell Data/KernelAverageMisorientations", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer/NewGrain Data", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Feature Data/AspectRatios", + "DataContainer/Cell Feature Data/AvgEulerAngles", + "DataContainer/Cell Feature Data/AvgQuats", + "DataContainer/Cell Feature Data/AxisEulerAngles", + "DataContainer/Cell Feature Data/AxisLengths", + "DataContainer/Cell Feature Data/Centroids", + "DataContainer/Cell Feature Data/EquivalentDiameters", + "DataContainer/Cell Feature Data/FeatureAvgMisorientations", + "DataContainer/Cell Feature Data/Neighborhoods", + "DataContainer/Cell Feature Data/NumElements", + "DataContainer/Cell Feature Data/NumNeighbors", + "DataContainer/Cell Feature Data/Omega3s", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/Cell Feature Data/Poles", + "DataContainer/Cell Feature Data/Schmids", + "DataContainer/Cell Feature Data/Shape Volumes", + "DataContainer/Cell Feature Data/SlipSystems", + "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", + "TriangleDataContainer", + "TriangleDataContainer/SharedTriList", + "TriangleDataContainer/SharedVertexList", + "TriangleDataContainer/Face Data", + "TriangleDataContainer/Vertex Data", + "TriangleDataContainer/Vertex Data/NodeType", + "TriangleDataContainer/Face Data/FaceLabels", + "TriangleDataContainer/QM Face Feature Data", + "TriangleDataContainer/Edge List", + "TriangleDataContainer/Face Data/FaceAreas", + "TriangleDataContainer/Face Data/FaceNormals", + "TriangleDataContainer/Face Data/FaceDihedralAngles", + "TriangleDataContainer/Face Data/FaceIPFColors", + "TriangleDataContainer/Face Data/FaceMisorientationColors" + ], + "file_path": "Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d" + }, "version": 1 }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/NewGrain Data", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", - "TriangleDataContainer/SharedVertexList", - "TriangleDataContainer/Face Data", - "TriangleDataContainer/Vertex Data", - "TriangleDataContainer/Vertex Data/NodeType", - "TriangleDataContainer/Face Data/FaceLabels", - "TriangleDataContainer/QM Face Feature Data", - "TriangleDataContainer/Edge List", - "TriangleDataContainer/Face Data/FaceAreas", - "TriangleDataContainer/Face Data/FaceNormals", - "TriangleDataContainer/Face Data/FaceDihedralAngles", - "TriangleDataContainer/Face Data/FaceIPFColors", - "TriangleDataContainer/Face Data/FaceMisorientationColors" - ], - "file_path": "Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d" - } + "parameters_version": 1 }, "comments": "", "filter": { @@ -1336,16 +79,47 @@ }, { "args": { - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "face_ensemble_attribute_matrix_name": "Face Ensemble Data", - "feature_euler_angles_array_path": "DataContainer/Cell Feature Data/AvgEulerAngles", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "gbcd_array_name": "GBCD", - "gbcd_resolution": 9.0, - "input_triangle_geometry_path": "TriangleDataContainer", - "surface_mesh_face_areas_array_path": "TriangleDataContainer/Face Data/FaceAreas", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_normals_array_path": "TriangleDataContainer/Face Data/FaceNormals" + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "face_ensemble_attribute_matrix_name": { + "value": "Face Ensemble Data", + "version": 1 + }, + "feature_euler_angles_array_path": { + "value": "DataContainer/Cell Feature Data/AvgEulerAngles", + "version": 1 + }, + "feature_phases_array_path": { + "value": "DataContainer/Cell Feature Data/Phases", + "version": 1 + }, + "gbcd_array_name": { + "value": "GBCD", + "version": 1 + }, + "gbcd_resolution": { + "value": 9.0, + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1, + "surface_mesh_face_areas_array_path": { + "value": "TriangleDataContainer/Face Data/FaceAreas", + "version": 1 + }, + "surface_mesh_face_labels_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels", + "version": 1 + }, + "surface_mesh_face_normals_array_path": { + "value": "TriangleDataContainer/Face Data/FaceNormals", + "version": 1 + } }, "comments": "", "filter": { @@ -1356,19 +130,44 @@ }, { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_intensity_array_name": "MRD", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "gbcd_array_path": "TriangleDataContainer/Face Ensemble Data/GBCD", - "misorientation_rotation": [ - 60.0, - 1.0, - 1.0, - 1.0 - ], - "output_image_dimension": 100, - "output_image_geometry_path": "GBCD Pole Figure [Sigma 3]", - "phase_of_interest": 1 + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_intensity_array_name": { + "value": "MRD", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "gbcd_array_path": { + "value": "TriangleDataContainer/Face Ensemble Data/GBCD", + "version": 1 + }, + "misorientation_rotation": { + "value": [ + 60.0, + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "output_image_dimension": { + "value": 100, + "version": 1 + }, + "output_image_geometry_path": { + "value": "GBCD Pole Figure [Sigma 3]", + "version": 1 + }, + "parameters_version": 1, + "phase_of_interest": { + "value": 1, + "version": 1 + } }, "comments": "", "filter": { @@ -1379,19 +178,44 @@ }, { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_intensity_array_name": "MRD", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "gbcd_array_path": "TriangleDataContainer/Face Ensemble Data/GBCD", - "misorientation_rotation": [ - 39.0, - 1.0, - 1.0, - 0.0 - ], - "output_image_dimension": 100, - "output_image_geometry_path": "GBCD Pole Figure [Sigma 9]", - "phase_of_interest": 1 + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_intensity_array_name": { + "value": "MRD", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "gbcd_array_path": { + "value": "TriangleDataContainer/Face Ensemble Data/GBCD", + "version": 1 + }, + "misorientation_rotation": { + "value": [ + 39.0, + 1.0, + 1.0, + 0.0 + ], + "version": 1 + }, + "output_image_dimension": { + "value": 100, + "version": 1 + }, + "output_image_geometry_path": { + "value": "GBCD Pole Figure [Sigma 9]", + "version": 1 + }, + "parameters_version": 1, + "phase_of_interest": { + "value": 1, + "version": 1 + } }, "comments": "", "filter": { @@ -1402,19 +226,44 @@ }, { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_intensity_array_name": "MRD", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "gbcd_array_path": "TriangleDataContainer/Face Ensemble Data/GBCD", - "misorientation_rotation": [ - 50.5, - 1.0, - 1.0, - 0.0 - ], - "output_image_dimension": 100, - "output_image_geometry_path": "GBCD Pole Figure [Sigma 11]", - "phase_of_interest": 1 + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_intensity_array_name": { + "value": "MRD", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "gbcd_array_path": { + "value": "TriangleDataContainer/Face Ensemble Data/GBCD", + "version": 1 + }, + "misorientation_rotation": { + "value": [ + 50.5, + 1.0, + 1.0, + 0.0 + ], + "version": 1 + }, + "output_image_dimension": { + "value": 100, + "version": 1 + }, + "output_image_geometry_path": { + "value": "GBCD Pole Figure [Sigma 11]", + "version": 1 + }, + "parameters_version": 1, + "phase_of_interest": { + "value": 1, + "version": 1 + } }, "comments": "", "filter": { @@ -1425,16 +274,32 @@ }, { "args": { - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "gbcd_array_path": "TriangleDataContainer/Face Ensemble Data/GBCD", - "misorientation_rotation": [ - 60.0, - 1.0, - 1.0, - 1.0 - ], - "output_file": "Data/Output/SmallIN100GBCD/SmallIn100GMT_1.dat", - "phase_of_interest": 1 + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "gbcd_array_path": { + "value": "TriangleDataContainer/Face Ensemble Data/GBCD", + "version": 1 + }, + "misorientation_rotation": { + "value": [ + 60.0, + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "output_file": { + "value": "Data/Output/SmallIN100GBCD/SmallIn100GMT_1.dat", + "version": 1 + }, + "parameters_version": 1, + "phase_of_interest": { + "value": 1, + "version": 1 + } }, "comments": "", "filter": { @@ -1445,11 +310,27 @@ }, { "args": { - "feature_euler_angles_array_path": "DataContainer/Cell Feature Data/AvgEulerAngles", - "output_file": "Data/Output/SmallIN100GBCD/SmallIn100Triangles.ph", - "surface_mesh_face_areas_array_path": "TriangleDataContainer/Face Data/FaceAreas", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_normals_array_path": "TriangleDataContainer/Face Data/FaceNormals" + "feature_euler_angles_array_path": { + "value": "DataContainer/Cell Feature Data/AvgEulerAngles", + "version": 1 + }, + "output_file": { + "value": "Data/Output/SmallIN100GBCD/SmallIn100Triangles.ph", + "version": 1 + }, + "parameters_version": 1, + "surface_mesh_face_areas_array_path": { + "value": "TriangleDataContainer/Face Data/FaceAreas", + "version": 1 + }, + "surface_mesh_face_labels_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels", + "version": 1 + }, + "surface_mesh_face_normals_array_path": { + "value": "TriangleDataContainer/Face Data/FaceNormals", + "version": 1 + } }, "comments": "", "filter": { @@ -1460,8 +341,15 @@ }, { "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_GBCD.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/SurfaceMesh/SmallIN100_GBCD.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -1472,4 +360,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline index 8ec317f307..fe15dd2a49 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline @@ -4,1328 +4,71 @@ "pipeline": [ { "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(03) Small IN100 Mesh Statistics", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(02) Small IN100 Smooth Mesh", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(01) Small IN100 Quick Mesh", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(05) Small IN100 Crystallographic Statistics", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(01) Small IN100 Morphological Statistics", - "pipeline": [ - { - "args": { - "Imported Pipeline": { - "isDisabled": false, - "name": "(08) Small IN100 Full Reconstruction", - "pipeline": [ - { - "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "read_h5_ebsd_object": { - "end_slice": 117, - "euler_representation": 0, - "hdf5_data_paths": [ - "Confidence Index", - "EulerAngles", - "Fit", - "Image Quality", - "Phases", - "SEM Signal", - "X Position", - "Y Position" - ], - "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", - "start_slice": 1, - "use_recommended_transform": true - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadH5EbsdFilter", - "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" - }, - "isDisabled": false - }, - { - "args": { - "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Image Quality", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 120.0 - }, - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 - }, - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "output_data_array_name": "Mask", - "use_custom_false_value": false, - "use_custom_true_value": false - }, - "comments": "", - "filter": { - "name": "nx::core::MultiThresholdObjectsFilter", - "uuid": "4246245e-1011-4add-8436-0af6bed19228" - }, - "isDisabled": false - }, - { - "args": { - "input_orientation_array_path": "DataContainer/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 - }, - "comments": "", - "filter": { - "name": "nx::core::ConvertOrientationsFilter", - "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Misorientation_Shifts.txt", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "use_mask": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "nx::core::AlignSectionsMisorientationFilter", - "uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced" - }, - "isDisabled": false - }, - { - "args": { - "fill_holes": false, - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask" - }, - "comments": "", - "filter": { - "name": "nx::core::IdentifySampleFilter", - "uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_slice": 0, - "selected_cell_data_path": "DataContainer/Cell Data", - "use_reference_slice": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "nx::core::AlignSectionsFeatureCentroidFilter", - "uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "number_of_neighbors": 4, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "nx::core::BadDataNeighborOrientationCheckFilter", - "uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "correlation_array_path": "DataContainer/Cell Data/Confidence Index", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "level": 2, - "min_confidence": 0.20000000298023224, - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "nx::core::NeighborOrientationCorrelationFilter", - "uuid": "4625c192-7e46-4333-a294-67a2eb64cb37" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "cell_feature_attribute_matrix_name": "Cell Feature Data", - "cell_mask_array_path": "DataContainer/Cell Data/Mask", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_name": "FeatureIds", - "input_image_geometry_path": "DataContainer", - "misorientation_tolerance": 5.0, - "randomize_features": true, - "use_mask": true - }, - "comments": "", - "filter": { - "name": "nx::core::EBSDSegmentFeaturesFilter", - "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" - }, - "isDisabled": false - }, - { - "args": { - "cell_features_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_array_name": "Phases" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeaturePhasesFilter", - "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" - }, - "isDisabled": false - }, - { - "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeAvgOrientationsFilter", - "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList2", - "number_of_neighbors_name": "NumNeighbors2", - "shared_surface_area_list_name": "SharedSurfaceAreaList2", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "angle_tolerance": 2.0, - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "axis_tolerance": 3.0, - "cell_parent_ids_array_name": "ParentIds", - "contiguous_neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborList2", - "created_feature_attribute_matrix_name": "NewGrain Data", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_parent_ids_array_name": "ParentIds", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "seed_array_name": "MergeTwins SeedValue", - "seed_value": 5489, - "use_seed": false - }, - "comments": "", - "filter": { - "name": "nx::core::MergeTwinsFilter", - "uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9" - }, - "isDisabled": false - }, - { - "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureSizesFilter", - "uuid": "c666ee17-ca58-4969-80d0-819986c72485" - }, - "isDisabled": false - }, - { - "args": { - "apply_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "", - "input_image_geometry_path": "DataContainer", - "min_allowed_features_size": 16, - "num_cells_path": "DataContainer/Cell Feature Data/NumElements", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "nx::core::RequireMinimumSizeFeaturesFilter", - "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [ - "DataContainer/Cell Feature Data/NumNeighbors2" - ] - }, - "comments": "", - "filter": { - "name": "nx::core::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "apply_to_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "Data Container/Feature Data/Phases", - "ignored_voxel_arrays": [], - "input_image_geometry_path": "DataContainer", - "min_num_neighbors": 2, - "num_neighbors_path": "DataContainer/Cell Feature Data/NumNeighbors", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "nx::core::RequireMinNumNeighborsFilter", - "uuid": "4ab5153f-6014-4e6d-bbd6-194068620389" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [ - "DataContainer/Cell Feature Data/NumNeighbors" - ] - }, - "comments": "", - "filter": { - "name": "nx::core::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "min_allowed_defect_size": 1000, - "store_as_new_phase": false - }, - "comments": "", - "filter": { - "name": "nx::core::FillBadDataFilter", - "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "num_iterations": 2, - "operation_index": 0, - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "nx::core::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "num_iterations": 2, - "operation_index": 1, - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "nx::core::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeIPFColorsFilter", - "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors" - ], - "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "centroids_array_name": "Centroids", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureCentroidsFilter", - "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" - }, - "isDisabled": false - }, - { - "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Size Volumes" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureSizesFilter", - "uuid": "c666ee17-ca58-4969-80d0-819986c72485" - }, - "isDisabled": false - }, - { - "args": { - "aspect_ratios_array_name": "AspectRatios", - "axis_euler_angles_array_name": "AxisEulerAngles", - "axis_lengths_array_name": "AxisLengths", - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "omega3s_array_name": "Omega3s", - "volumes_array_name": "Shape Volumes" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeShapesFilter", - "uuid": "036b17d5-23bb-4a24-9187-c4a8dd918792" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "equivalent_diameters_array_path": "DataContainer/Cell Feature Data/EquivalentDiameters", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "input_image_geometry_path": "DataContainer", - "multiples_of_average": 1.0, - "neighborhood_list_array_name": "NeighborhoodList", - "neighborhoods_array_name": "Neighborhoods" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeNeighborhoodsFilter", - "uuid": "924c10e3-2f39-4c08-9d7a-7fe029f74f6d" - }, - "isDisabled": false - }, - { - "args": { - "calc_manhattan_dist": true, - "do_boundaries": true, - "do_quad_points": true, - "do_triple_lines": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "g_bdistances_array_name": "GBManhattanDistances", - "input_image_geometry_path": "DataContainer", - "nearest_neighbors_array_name": "NearestNeighbors", - "q_pdistances_array_name": "QPManhattanDistances", - "save_nearest_neighbors": false, - "t_jdistances_array_name": "TJManhattanDistances" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeEuclideanDistMapFilter", - "uuid": "ba9ae8f6-443e-41d3-bb45-a08a139325c1" - }, - "isDisabled": false - }, - { - "args": { - "calculate_sphericity": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_cells_array_path": "DataContainer/Cell Feature Data/NumElements", - "sphericity_array_name": "Sphericity", - "surface_area_volume_ratio_array_name": "SurfaceAreaVolumeRatio" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeSurfaceAreaToVolumeFilter", - "uuid": "94e83e4f-797d-4594-b130-3819b7676f01" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Statistics/SmallIN100_Morph.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/NeighborList", - "DataContainer/Cell Feature Data/SharedSurfaceAreaList", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NeighborhoodList", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio" - ], - "file_path": "Data/Output/Statistics/SmallIN100_Morph.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [] - }, - "comments": "", - "filter": { - "name": "nx::core::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" - }, - "isDisabled": false - }, - { - "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeAvgOrientationsFilter", - "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" - }, - "isDisabled": false - }, - { - "args": { - "avg_misorientations_array_name": "AvgMisorientations", - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "compute_avg_misors": false, - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "misorientation_list_array_name": "MisorientationList", - "neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborhoodList" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeMisorientationsFilter", - "uuid": "0b68fe25-b5ef-4805-ae32-20acb8d4e823" - }, - "isDisabled": false - }, - { - "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "lambdas_array_name": "Schmid_Lambdas", - "loading_direction": [ - 1.0, - 1.0, - 1.0 - ], - "override_system": false, - "phis_array_name": "Schmid_Phis", - "poles_array_name": "Poles", - "schmids_array_name": "Schmids", - "slip_direction": [ - 1.0, - 0.0, - 0.0 - ], - "slip_plane": [ - 0.0, - 0.0, - 1.0 - ], - "slip_systems_array_name": "SlipSystems", - "store_angle_components": false - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeSchmidsFilter", - "uuid": "b4681855-0a3d-4237-97f2-5aec509115c4" - }, - "isDisabled": false - }, - { - "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_avg_misorientations_array_name": "FeatureAvgMisorientations", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_reference_misorientations_array_name": "FeatureReferenceMisorientations", - "gb_euclidean_distances_array_path": "Cell Data/GBEuclideanDistances", - "quats_array_path": "DataContainer/Cell Data/Quats", - "reference_orientation_index": 0 - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureReferenceMisorientationsFilter", - "uuid": "24b54daf-3bf5-4331-93f6-03a49f719bf1" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "kernel_average_misorientations_array_name": "KernelAverageMisorientations", - "kernel_size": [ - 1, - 1, - 1 - ], - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeKernelAvgMisorientationsFilter", - "uuid": "61cfc9c1-aa0e-452b-b9ef-d3b9e6268035" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/NeighborList", - "DataContainer/Cell Feature Data/SharedSurfaceAreaList", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NeighborhoodList", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/MisorientationList", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations" - ], - "file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "max_coord": [ - 0.0, - 0.0, - 0.0 - ], - "max_voxel": [ - 140, - 140, - 99 - ], - "min_coord": [ - 0.0, - 0.0, - 0.0 - ], - "min_voxel": [ - 41, - 41, - 0 - ], - "output_image_geometry_path": "DataContainer", - "remove_original_geometry": true, - "renumber_features": true, - "use_physical_bounds": false - }, - "comments": "", - "filter": { - "name": "nx::core::CropImageGeometryFilter", - "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" - }, - "isDisabled": false - }, - { - "args": { - "destination_parent_path": "DataContainer", - "source_data_paths": [ - "DataContainer/Cell Ensemble Data" - ] - }, - "comments": "", - "filter": { - "name": "nx::core::MoveDataFilter", - "uuid": "651e5894-ab7c-4176-b7f0-ea466c521753" - }, - "isDisabled": false - }, - { - "args": { - "face_data_group_name": "Face Data", - "face_feature_attribute_matrix_name": "QM Face Feature Data", - "face_labels_array_name": "FaceLabels", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "fix_problem_voxels": false, - "generate_triple_lines": false, - "input_data_array_paths": [], - "input_grid_geometry_path": "DataContainer", - "node_types_array_name": "NodeType", - "output_triangle_geometry_path": "TriangleDataContainer", - "vertex_data_group_name": "Vertex Data" - }, - "comments": "", - "filter": { - "name": "nx::core::QuickSurfaceMeshFilter", - "uuid": "13dd00bd-ad49-4e04-95eb-3267952fd6e5" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/NewGrain Data", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", - "TriangleDataContainer/SharedVertexList", - "TriangleDataContainer/Face Data", - "TriangleDataContainer/Vertex Data", - "TriangleDataContainer/Vertex Data/NodeType", - "TriangleDataContainer/Face Data/FaceLabels", - "TriangleDataContainer/QM Face Feature Data" - ], - "file_path": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "iteration_steps": 100, - "lambda_value": 0.25, - "mu_factor": 0.20000000298023224, - "quad_point_lambda": 0.15000000596046448, - "surface_mesh_node_type_array_path": "TriangleDataContainer/Vertex Data/NodeType", - "surface_point_lambda": 0.0, - "surface_quad_point_lambda": 0.0, - "surface_triple_line_lambda": 0.0, - "triple_line_lambda": 0.20000000298023224, - "use_taubin_smoothing": true - }, - "comments": "", - "filter": { - "name": "nx::core::LaplacianSmoothingFilter", - "uuid": "0dd0916e-9305-4a7b-98cf-a6cfb97cb501" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], - "version": 1 - }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/NewGrain Data", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", - "TriangleDataContainer/SharedVertexList", - "TriangleDataContainer/Face Data", - "TriangleDataContainer/Vertex Data", - "TriangleDataContainer/Vertex Data/NodeType", - "TriangleDataContainer/Face Data/FaceLabels", - "TriangleDataContainer/QM Face Feature Data", - "TriangleDataContainer/Edge List" - ], - "file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d" - } - }, - "comments": "", - "filter": { - "name": "nx::core::ReadDREAM3DFilter", - "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" - }, - "isDisabled": false - }, - { - "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "triangle_areas_array_name": "FaceAreas" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeTriangleAreasFilter", - "uuid": "b149addd-c0c8-4010-a264-596005eaf2a5" - }, - "isDisabled": false - }, - { - "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "output_normals_array_name": "FaceNormals" - }, - "comments": "", - "filter": { - "name": "nx::core::TriangleNormalFilter", - "uuid": "8133d419-1919-4dbf-a5bf-1c97282ba63f" - }, - "isDisabled": false - }, - { - "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "surface_mesh_triangle_dihedral_angles_array_name": "FaceDihedralAngles" - }, - "comments": "", - "filter": { - "name": "nx::core::TriangleDihedralAngleFilter", - "uuid": "dd42c521-4ae5-485d-ad35-d1276547d2f1" - }, - "isDisabled": false - }, - { - "args": { - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_euler_angles_array_path": "DataContainer/Cell Feature Data/AvgEulerAngles", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "surface_mesh_face_ipf_colors_array_name": "FaceIPFColors", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_normals_array_path": "TriangleDataContainer/Face Data/FaceNormals" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFaceIPFColoringFilter", - "uuid": "30759600-7c02-4650-b5ca-e7036d6b568e" - }, - "isDisabled": false - }, - { - "args": { - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_misorientation_colors_array_name": "FaceMisorientationColors" - }, - "comments": "", - "filter": { - "name": "nx::core::ComputeFeatureFaceMisorientationFilter", - "uuid": "f3473af9-db77-43db-bd25-60df7230ea73" - }, - "isDisabled": false - }, - { - "args": { - "face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "feature_face_ids_array_name": "SharedFeatureFaceId", - "feature_face_labels_array_name": "FaceLabels", - "feature_num_triangles_array_name": "NumTriangles", - "grain_boundary_attribute_matrix_name": "SharedFeatureFace", - "input_triangle_geometry_path": "TriangleDataContainer", - "randomize_features": false - }, - "comments": "", - "filter": { - "name": "nx::core::SharedFeatureFaceFilter", - "uuid": "aaf7a258-fc92-48d7-9d06-ba317a3769e8" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "nx::core::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ], + "import_data_object": { + "value": { + "data_paths": [ + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/Cell Data/ParentIds", + "DataContainer/Cell Data/IPFColors", + "DataContainer/Cell Data/GBManhattanDistances", + "DataContainer/Cell Data/TJManhattanDistances", + "DataContainer/Cell Data/QPManhattanDistances", + "DataContainer/Cell Data/FeatureReferenceMisorientations", + "DataContainer/Cell Data/KernelAverageMisorientations", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer/NewGrain Data", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Feature Data/AspectRatios", + "DataContainer/Cell Feature Data/AvgEulerAngles", + "DataContainer/Cell Feature Data/AvgQuats", + "DataContainer/Cell Feature Data/AxisEulerAngles", + "DataContainer/Cell Feature Data/AxisLengths", + "DataContainer/Cell Feature Data/Centroids", + "DataContainer/Cell Feature Data/EquivalentDiameters", + "DataContainer/Cell Feature Data/FeatureAvgMisorientations", + "DataContainer/Cell Feature Data/Neighborhoods", + "DataContainer/Cell Feature Data/NumElements", + "DataContainer/Cell Feature Data/NumNeighbors", + "DataContainer/Cell Feature Data/Omega3s", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/Cell Feature Data/Poles", + "DataContainer/Cell Feature Data/Schmids", + "DataContainer/Cell Feature Data/Shape Volumes", + "DataContainer/Cell Feature Data/SlipSystems", + "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", + "TriangleDataContainer", + "TriangleDataContainer/SharedTriList", + "TriangleDataContainer/SharedVertexList", + "TriangleDataContainer/Face Data", + "TriangleDataContainer/Vertex Data", + "TriangleDataContainer/Vertex Data/NodeType", + "TriangleDataContainer/Face Data/FaceLabels", + "TriangleDataContainer/QM Face Feature Data", + "TriangleDataContainer/Edge List", + "TriangleDataContainer/Face Data/FaceAreas", + "TriangleDataContainer/Face Data/FaceNormals", + "TriangleDataContainer/Face Data/FaceDihedralAngles", + "TriangleDataContainer/Face Data/FaceIPFColors", + "TriangleDataContainer/Face Data/FaceMisorientationColors" + ], + "file_path": "Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d" + }, "version": 1 }, - "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/NewGrain Data", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", - "TriangleDataContainer/SharedVertexList", - "TriangleDataContainer/Face Data", - "TriangleDataContainer/Vertex Data", - "TriangleDataContainer/Vertex Data/NodeType", - "TriangleDataContainer/Face Data/FaceLabels", - "TriangleDataContainer/QM Face Feature Data", - "TriangleDataContainer/Edge List", - "TriangleDataContainer/Face Data/FaceAreas", - "TriangleDataContainer/Face Data/FaceNormals", - "TriangleDataContainer/Face Data/FaceDihedralAngles", - "TriangleDataContainer/Face Data/FaceIPFColors", - "TriangleDataContainer/Face Data/FaceMisorientationColors" - ], - "file_path": "Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d" - } + "parameters_version": 1 }, "comments": "", "filter": { @@ -1336,13 +79,35 @@ }, { "args": { - "face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "feature_face_ids_array_name": "SharedFeatureFaceId", - "feature_face_labels_array_name": "FaceLabels", - "feature_num_triangles_array_name": "NumTriangles", - "grain_boundary_attribute_matrix_name": "SharedFeatureFace", - "input_triangle_geometry_path": "TriangleDataContainer", - "randomize_features": false + "face_labels_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels", + "version": 1 + }, + "feature_face_ids_array_name": { + "value": "SharedFeatureFaceId", + "version": 1 + }, + "feature_face_labels_array_name": { + "value": "FaceLabels", + "version": 1 + }, + "feature_num_triangles_array_name": { + "value": "NumTriangles", + "version": 1 + }, + "grain_boundary_attribute_matrix_name": { + "value": "SharedFeatureFace", + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1, + "randomize_features": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -1353,28 +118,80 @@ }, { "args": { - "chosen_limit_dists_index": 0, - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "dist_output_file": "Data/Output/SurfaceMesh/7_0_small_in100_distribution_1.dat", - "err_output_file": "Data/Output/SurfaceMesh/7_0_small_in100_distribution_errors_1.dat", - "exclude_triple_lines": false, - "feature_euler_angles_array_path": "DataContainer/Cell Feature Data/AvgEulerAngles", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "input_triangle_geometry_path": "TriangleDataContainer", - "misorientation_rotation": [ - 1.0, - 1.0, - 1.0, - 60.0 - ], - "node_types_array_path": "TriangleDataContainer/Vertex Data/NodeType", - "num_sampl_pts": 3000, - "phase_of_interest": 1, - "save_relative_err": false, - "surface_mesh_face_areas_array_path": "TriangleDataContainer/Face Data/FaceAreas", - "surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "surface_mesh_face_normals_array_path": "TriangleDataContainer/Face Data/FaceNormals", - "surface_mesh_feature_face_labels_array_path": "TriangleDataContainer/SharedFeatureFace/FaceLabels" + "chosen_limit_dists_index": { + "value": 0, + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "dist_output_file": { + "value": "Data/Output/SurfaceMesh/7_0_small_in100_distribution_1.dat", + "version": 1 + }, + "err_output_file": { + "value": "Data/Output/SurfaceMesh/7_0_small_in100_distribution_errors_1.dat", + "version": 1 + }, + "exclude_triple_lines": { + "value": false, + "version": 1 + }, + "feature_euler_angles_array_path": { + "value": "DataContainer/Cell Feature Data/AvgEulerAngles", + "version": 1 + }, + "feature_phases_array_path": { + "value": "DataContainer/Cell Feature Data/Phases", + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "misorientation_rotation": { + "value": [ + 1.0, + 1.0, + 1.0, + 60.0 + ], + "version": 1 + }, + "node_types_array_path": { + "value": "TriangleDataContainer/Vertex Data/NodeType", + "version": 1 + }, + "num_sampl_pts": { + "value": 3000, + "version": 1 + }, + "parameters_version": 1, + "phase_of_interest": { + "value": 1, + "version": 1 + }, + "save_relative_err": { + "value": false, + "version": 1 + }, + "surface_mesh_face_areas_array_path": { + "value": "TriangleDataContainer/Face Data/FaceAreas", + "version": 1 + }, + "surface_mesh_face_labels_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels", + "version": 1 + }, + "surface_mesh_face_normals_array_path": { + "value": "TriangleDataContainer/Face Data/FaceNormals", + "version": 1 + }, + "surface_mesh_feature_face_labels_array_path": { + "value": "TriangleDataContainer/SharedFeatureFace/FaceLabels", + "version": 1 + } }, "comments": "", "filter": { @@ -1385,8 +202,15 @@ }, { "args": { - "export_file_path": "Data/Output/SurfaceMesh/SmallIN100_GBCD_Metric.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/SurfaceMesh/SmallIN100_GBCD_Metric.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -1397,4 +221,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD_Hexagonal_Data_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD_Hexagonal_Data_Analysis.d3dpipeline index b9842906e6..a95869bc64 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD_Hexagonal_Data_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD_Hexagonal_Data_Analysis.d3dpipeline @@ -4,10 +4,23 @@ "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "input_file": "Data/OrientationAnalysis/Combo-EBSD-120130.osc_r0c0.ang", - "output_image_geometry_path": "DataContainer" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "input_file": { + "value": "Data/OrientationAnalysis/Combo-EBSD-120130.osc_r0c0.ang", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -18,43 +31,65 @@ }, { "args": { - "input_image_geometry_path": "DataContainer", - "output_image_geometry_path": "", - "remove_original_geometry": true, - "rotate_slice_by_slice": false, - "rotation_axis_angle": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "rotation_matrix": [ - [ - 1.0, - 0.0, - 0.0, - 0.0 - ], - [ + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "output_image_geometry_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "rotate_slice_by_slice": { + "value": false, + "version": 1 + }, + "rotation_axis_angle": { + "value": [ 0.0, 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 1.0, - 0.0 + "version": 1 + }, + "rotation_matrix": { + "value": [ + [ + 1.0, + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] ], - [ - 0.0, - 0.0, - 0.0, - 1.0 - ] - ], - "rotation_representation_index": 0 + "version": 1 + }, + "rotation_representation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -65,13 +100,20 @@ }, { "args": { - "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis_angle": [ - 0.0, - 0.0, - 1.0, - 90.0 - ] + "euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "parameters_version": 1, + "rotation_axis_angle": { + "value": [ + 0.0, + 0.0, + 1.0, + 90.0 + ], + "version": 1 + } }, "comments": "", "filter": { @@ -83,26 +125,48 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "DataContainer/Cell Data/Confidence Index", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.1 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 }, - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "output_data_array_name": "Mask", - "use_custom_false_value": false, - "use_custom_true_value": false + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -113,17 +177,39 @@ }, { "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true + "cell_euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPFColors", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -134,11 +220,27 @@ }, { "args": { - "file_name": "Data/Output/Examples/Combo-EBSD-osc_r0c0.png", - "image_array_path": "DataContainer/Cell Data/IPFColors", - "index_offset": 0, - "input_image_geometry_path": "DataContainer", - "plane_index": 0 + "file_name": { + "value": "Data/Output/Examples/Combo-EBSD-osc_r0c0.png", + "version": 1 + }, + "image_array_path": { + "value": "DataContainer/Cell Data/IPFColors", + "version": 1 + }, + "index_offset": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -149,10 +251,23 @@ }, { "args": { - "input_orientation_array_path": "DataContainer/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 + "input_orientation_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "input_representation_index": { + "value": 0, + "version": 1 + }, + "output_orientation_array_name": { + "value": "Quats", + "version": 1 + }, + "output_representation_index": { + "value": 2, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -163,17 +278,51 @@ }, { "args": { - "active_array_name": "Active", - "cell_feature_attribute_matrix_name": "Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_name": "FeatureIds", - "input_image_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "randomize_feature_ids": true, - "use_mask": true + "active_array_name": { + "value": "Active", + "version": 1 + }, + "cell_feature_attribute_matrix_name": { + "value": "Cell Feature Data", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_ids_array_name": { + "value": "FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "misorientation_tolerance": { + "value": 5.0, + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + }, + "randomize_feature_ids": { + "value": true, + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -184,12 +333,31 @@ }, { "args": { - "avg_c_axes_array_name": "AvgCAxes", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "quats_array_path": "DataContainer/Cell Data/Quats" + "avg_c_axes_array_name": { + "value": "AvgCAxes", + "version": 1 + }, + "cell_feature_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_ids_array_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + } }, "comments": "", "filter": { @@ -200,15 +368,43 @@ }, { "args": { - "avg_c_axes_array_path": "DataContainer/Cell Feature Data/AvgCAxes", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_avg_c_axis_misorientations_array_name": "AvgCAxisMisorientation", - "feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "feature_reference_c_axis_misorientations_array_name": "FeatureRefCAxisMisorientation", - "feature_stdev_c_axis_misorientations_array_name": "StdevCAxisMisorientation", - "input_image_geometry_path": "DataContainer", - "quats_array_path": "DataContainer/Cell Data/Quats" + "avg_c_axes_array_path": { + "value": "DataContainer/Cell Feature Data/AvgCAxes", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_avg_c_axis_misorientations_array_name": { + "value": "AvgCAxisMisorientation", + "version": 1 + }, + "feature_ids_array_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "feature_reference_c_axis_misorientations_array_name": { + "value": "FeatureRefCAxisMisorientation", + "version": 1 + }, + "feature_stdev_c_axis_misorientations_array_name": { + "value": "StdevCAxisMisorientation", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + } }, "comments": "", "filter": { @@ -219,10 +415,23 @@ }, { "args": { - "c_axis_locations_array_name": "CAxisLocations", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "quats_array_path": "DataContainer/Cell Data/Quats" + "c_axis_locations_array_name": { + "value": "CAxisLocations", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + } }, "comments": "", "filter": { @@ -234,26 +443,48 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 1, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "DataContainer/Cell Data/Confidence Index", + "comparison": 1, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.1 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 }, - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "output_data_array_name": "Mask Inverse", - "use_custom_false_value": false, - "use_custom_true_value": false + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask Inverse", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -264,16 +495,35 @@ }, { "args": { - "input_data_array_path": "DataContainer/Cell Data/FeatureIds", - "invalid_color_value": [ - 0, - 0, - 0 - ], - "mask_array_path": "DataContainer/Cell Data/Mask Inverse", - "output_rgb_array_name": "Feature Ids (Color)", - "selected_preset": "hsv", - "use_mask": true + "input_data_array_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "invalid_color_value": { + "value": [ + 0, + 0, + 0 + ], + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask Inverse", + "version": 1 + }, + "output_rgb_array_name": { + "value": "Feature Ids (Color)", + "version": 1 + }, + "parameters_version": 1, + "selected_preset": { + "value": "hsv", + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -284,11 +534,27 @@ }, { "args": { - "file_name": "Data/Output/Examples/Combo-EBSD-osc_r0c0._feature_ids.png", - "image_array_path": "DataContainer/Cell Data/Feature Ids (Color)", - "index_offset": 0, - "input_image_geometry_path": "DataContainer", - "plane_index": 0 + "file_name": { + "value": "Data/Output/Examples/Combo-EBSD-osc_r0c0._feature_ids.png", + "version": 1 + }, + "image_array_path": { + "value": "DataContainer/Cell Data/Feature Ids (Color)", + "version": 1 + }, + "index_offset": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -299,10 +565,23 @@ }, { "args": { - "cell_features_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_array_name": "Phases" + "cell_features_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "feature_phases_array_name": { + "value": "Phases", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -313,13 +592,35 @@ }, { "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" + "avg_euler_angles_array_name": { + "value": "AvgEulerAngles", + "version": 1 + }, + "avg_quats_array_name": { + "value": "AvgQuats", + "version": 1 + }, + "cell_feature_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "cell_feature_ids_array_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "cell_quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -330,33 +631,86 @@ }, { "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" + "boundary_cells_name": { + "value": "BoundaryCells", + "version": 1 + }, + "cell_feature_array_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "neighbor_list_name": { + "value": "NeighborList", + "version": 1 + }, + "number_of_neighbors_name": { + "value": "NumNeighbors", + "version": 1 + }, + "parameters_version": 1, + "shared_surface_area_list_name": { + "value": "SharedSurfaceAreaList", + "version": 1 + }, + "store_boundary_cells": { + "value": false, + "version": 1 + }, + "store_surface_features": { + "value": false, + "version": 1 + }, + "surface_features_name": { + "value": "SurfaceFeatures", + "version": 1 + } }, "comments": "", "filter": { - "name": "nx::core::FindNeighborsFilter", + "name": "nx::core::ComputeFeatureNeighborsFilter", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false }, { "args": { - "avg_c_axis_misalignments_array_name": "AvgCAxisMisalignments", - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "c_axis_misalignment_list_array_name": "CAxisMisalignmentList", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "find_avg_misals": true, - "neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborList" + "avg_c_axis_misalignments_array_name": { + "value": "AvgCAxisMisalignments", + "version": 1 + }, + "avg_quats_array_path": { + "value": "DataContainer/Cell Feature Data/AvgQuats", + "version": 1 + }, + "c_axis_misalignment_list_array_name": { + "value": "CAxisMisalignmentList", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_phases_array_path": { + "value": "DataContainer/Cell Feature Data/Phases", + "version": 1 + }, + "find_avg_misals": { + "value": true, + "version": 1 + }, + "neighbor_list_array_path": { + "value": "DataContainer/Cell Feature Data/NeighborList", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -367,8 +721,15 @@ }, { "args": { - "export_file_path": "Data/Output/Examples/Combo-EBSD-osc_r0c0_CAxis.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Examples/Combo-EBSD-osc_r0c0_CAxis.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline index 09d32ad46d..b0b6d72713 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline @@ -1,73 +1,114 @@ { "isDisabled": false, "name": "Edax_IPF_Colors.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "input_file": "Data/Small_IN100/Slice_1.ang" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "input_file": { + "value": "Data/Small_IN100/Slice_1.ang", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadAngDataFilter", + "name": "nx::core::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false }, { "args": { - "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis_angle": [ - 0.0, - 0.0, - 1.0, - 90.0 - ] + "euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "parameters_version": 1, + "rotation_axis_angle": { + "value": [ + 0.0, + 0.0, + 1.0, + 90.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateEulerRefFrameFilter", + "name": "nx::core::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false }, { "args": { - "output_image_geometry_path": "DataContainer", - "remove_original_geometry": true, - "rotate_slice_by_slice": false, - "rotation_axis_angle": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "rotation_matrix": [ - [ + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "rotate_slice_by_slice": { + "value": false, + "version": 1 + }, + "rotation_axis_angle": { + "value": [ 0.0, + 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 0.0 + "version": 1 + }, + "rotation_matrix": { + "value": [ + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ] ], - [ - 0.0, - 0.0, - 0.0 - ] - ], - "rotation_representation_index": 0, - "input_image_geometry_path": "DataContainer" + "version": 1 + }, + "rotation_representation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateSampleRefFrameFilter", + "name": "nx::core::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -75,65 +116,130 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "DataContainer/Cell Data/Confidence Index", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.1 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 }, - "output_data_array_name": "Mask" + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true + "cell_euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPFColors", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeIPFColorsFilter", + "name": "nx::core::ComputeIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false }, { "args": { - "file_name": "Data/Output/Edax_IPF_Colors/Small_IN100_Slice_1.png", - "image_array_path": "DataContainer/Cell Data/IPFColors", - "input_image_geometry_path": "DataContainer", - "index_offset": 0, - "plane_index": 0 + "file_name": { + "value": "Data/Output/Edax_IPF_Colors/Small_IN100_Slice_1.png", + "version": 1 + }, + "image_array_path": { + "value": "DataContainer/Cell Data/IPFColors", + "version": 1 + }, + "index_offset": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ITKImageWriter", + "name": "nx::core::ITKImageWriterFilter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline index eab706dee4..486e198199 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline @@ -1,141 +1,260 @@ { "isDisabled": false, "name": "ReadEnsembleInfo.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_data_name": "Cell Data", - "dimensions": [ - 100, - 100, - 2 - ], - "output_image_geometry_path": "[Image Geometry]", - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "spacing": [ - 1.0, - 1.0, - 1.0 - ] + "cell_data_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 100, + 100, + 2 + ], + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "[Image Geometry]", + "version": 1 + }, + "parameters_version": 1, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CreateImageGeometryFilter", + "name": "nx::core::CreateImageGeometryFilter", "uuid": "c4320659-1a84-461d-939e-c7c10229a504" }, "isDisabled": false }, { "args": { - "created_attribute_array_path": "[Image Geometry]/Cell Data/Quats", - "endian_index": 0, - "input_file": "Data/OrientationAnalysis/quats.raw", - "number_of_components": 4, - "scalar_type_index": 8, - "skip_header_bytes": 0, - "tuple_dimensions": [ - [ - 2.0, - 100.0, - 100.0 - ] - ] + "created_attribute_array_path": { + "value": "[Image Geometry]/Cell Data/Quats", + "version": 1 + }, + "endian_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/OrientationAnalysis/quats.raw", + "version": 1 + }, + "number_of_components": { + "value": 4, + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + }, + "skip_header_bytes": { + "value": 0, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 2.0, + 100.0, + 100.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadRawBinaryFilter", + "name": "nx::core::ReadRawBinaryFilter", "uuid": "dd159366-5f12-42db-af6d-a33592ae8a89" }, "isDisabled": false }, { "args": { - "input_orientation_array_path": "[Image Geometry]/Cell Data/Quats", - "input_representation_index": 2, - "output_orientation_array_name": "Eulers", - "output_representation_index": 0 + "input_orientation_array_path": { + "value": "[Image Geometry]/Cell Data/Quats", + "version": 1 + }, + "input_representation_index": { + "value": 2, + "version": 1 + }, + "output_orientation_array_name": { + "value": "Eulers", + "version": 1 + }, + "output_representation_index": { + "value": 0, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ConvertOrientations", + "name": "nx::core::ConvertOrientationsFilter", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false }, { "args": { - "component_count": 1, - "initialization_value_str": "1", - "numeric_type_index": 4, - "output_array_path": "[Image Geometry]/Cell Data/Phases", - "tuple_dimensions": [ - [ - 2.0, - 100.0, - 100.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "1", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "[Image Geometry]/Cell Data/Phases", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 2.0, + 100.0, + 100.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false }, { "args": { - "cell_ensemble_attribute_matrix_name": "Cell Ensemble", - "crystal_structures_array_name": "CrystalStructures", - "parent_group_path": "[Image Geometry]", - "input_file": "Data/OrientationAnalysis/Ensemble.ini", - "phase_types_array_name": "PhaseTypes" + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble", + "version": 1 + }, + "crystal_structures_array_name": { + "value": "CrystalStructures", + "version": 1 + }, + "input_file": { + "value": "Data/OrientationAnalysis/Ensemble.ini", + "version": 1 + }, + "parameters_version": 1, + "parent_group_path": { + "value": "[Image Geometry]", + "version": 1 + }, + "phase_types_array_name": { + "value": "PhaseTypes", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadEnsembleInfoFilter", + "name": "nx::core::ReadEnsembleInfoFilter", "uuid": "ecf1ec45-bc27-4ddb-b2c0-3d465b8c182a" }, "isDisabled": false }, { "args": { - "cell_euler_angles_array_path": "[Image Geometry]/Cell Data/Eulers", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "[Image Geometry]/Cell Data/Phases", - "crystal_structures_array_path": "[Image Geometry]/Cell Ensemble/CrystalStructures", - "mask_array_path": "", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": false + "cell_euler_angles_array_path": { + "value": "[Image Geometry]/Cell Data/Eulers", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPFColors", + "version": 1 + }, + "cell_phases_array_path": { + "value": "[Image Geometry]/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "[Image Geometry]/Cell Ensemble/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeIPFColorsFilter", + "name": "nx::core::ComputeIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/Examples/EnsembleInfoReaderExample.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Examples/EnsembleInfoReaderExample.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline index 4dbfc0e1e2..612314e2a4 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline @@ -1,48 +1,79 @@ { "isDisabled": false, "name": "ImportBrukerNanoEspritData.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "degrees_to_radians": true, - "output_image_geometry_path": "ImageGeom", - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "read_pattern_data": false, - "selected_scan_names": { - "input_file_path": "Data/OrientationAnalysis/H5EspritReaderTest.h5", - "scan_names": [ - "Section_435" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "degrees_to_radians": { + "value": true, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 ], - "stacking_order": 0 + "version": 1 + }, + "output_image_geometry_path": { + "value": "ImageGeom", + "version": 1 }, - "z_spacing": 1.0 + "parameters_version": 1, + "read_pattern_data": { + "value": false, + "version": 1 + }, + "selected_scan_names": { + "value": { + "input_file_path": "Data/OrientationAnalysis/H5EspritReaderTest.h5", + "scan_names": [ + "Section_435" + ], + "stacking_order": 0 + }, + "version": 1 + }, + "z_spacing": { + "value": 1.0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadH5EspritDataFilter", + "name": "nx::core::ReadH5EspritDataFilter", "uuid": "694a0d54-b492-41bc-993b-ce0f5006e927" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/Examples/H5EspritData.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Examples/H5EspritData.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline index ba54570a98..7a25210064 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline @@ -4,115 +4,173 @@ "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "ImageGeom", - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "read_pattern_data": false, - "selected_scan_names": { - "input_file_path": "Data/Hikari_Ni_Sequence.h5", - "scan_names": [ - "Scan 1", - "Scan 2", - "Scan 3", - "Scan 4", - "Scan 5", - "Scan 6", - "Scan 7", - "Scan 8", - "Scan 9" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 ], - "stacking_order": 0 + "version": 1 + }, + "output_image_geometry_path": { + "value": "ImageGeom", + "version": 1 + }, + "parameters_version": 1, + "read_pattern_data": { + "value": false, + "version": 1 + }, + "selected_scan_names": { + "value": { + "input_file_path": "Data/Hikari_Ni_Sequence.h5", + "scan_names": [ + "Scan 1", + "Scan 2", + "Scan 3", + "Scan 4", + "Scan 5", + "Scan 6", + "Scan 7", + "Scan 8", + "Scan 9" + ], + "stacking_order": 0 + }, + "version": 1 }, - "z_spacing": 1.0 + "z_spacing": { + "value": 1.0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadH5OimDataFilter", + "name": "nx::core::ReadH5OimDataFilter", "uuid": "4ad3d47c-b1e1-4429-bc65-5e021be62ba0" }, "isDisabled": false }, { "args": { - "euler_angles_array_path": "ImageGeom/Cell Data/EulerAngles", - "rotation_axis_angle": [ - 0.0, - 0.0, - 1.0, - 90.0 - ] + "euler_angles_array_path": { + "value": "ImageGeom/Cell Data/EulerAngles", + "version": 1 + }, + "parameters_version": 1, + "rotation_axis_angle": { + "value": [ + 0.0, + 0.0, + 1.0, + 90.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateEulerRefFrameFilter", + "name": "nx::core::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false }, { "args": { - "output_image_geometry_path": "", - "remove_original_geometry": true, - "rotate_slice_by_slice": true, - "rotation_axis_angle": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "rotation_matrix": [ - [ - 1.0, - 0.0, - 0.0, - 0.0 - ], - [ + "input_image_geometry_path": { + "value": "ImageGeom", + "version": 1 + }, + "output_image_geometry_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "rotate_slice_by_slice": { + "value": true, + "version": 1 + }, + "rotation_axis_angle": { + "value": [ 0.0, 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 1.0, - 0.0 + "version": 1 + }, + "rotation_matrix": { + "value": [ + [ + 1.0, + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] ], - [ - 0.0, - 0.0, - 0.0, - 1.0 - ] - ], - "rotation_representation_index": 0, - "input_image_geometry_path": "ImageGeom" + "version": 1 + }, + "rotation_representation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateSampleRefFrameFilter", + "name": "nx::core::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/Examples/EdaxOIMData.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Examples/EdaxOIMData.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline index be30ca684c..d22ef35ab3 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline @@ -4,69 +4,111 @@ "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "input_file": "Data/Small_IN100/Slice_1.ang" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "input_file": { + "value": "Data/Small_IN100/Slice_1.ang", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadAngDataFilter", + "name": "nx::core::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false }, { "args": { - "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis_angle": [ - 0.0, - 0.0, - 1.0, - 90.0 - ] + "euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "parameters_version": 1, + "rotation_axis_angle": { + "value": [ + 0.0, + 0.0, + 1.0, + 90.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateEulerRefFrameFilter", + "name": "nx::core::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false }, { "args": { - "output_image_geometry_path": "DataContainer", - "remove_original_geometry": true, - "rotate_slice_by_slice": false, - "rotation_axis_angle": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "rotation_matrix": [ - [ + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "rotate_slice_by_slice": { + "value": false, + "version": 1 + }, + "rotation_axis_angle": { + "value": [ 0.0, + 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 0.0 + "version": 1 + }, + "rotation_matrix": { + "value": [ + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ] ], - [ - 0.0, - 0.0, - 0.0 - ] - ], - "rotation_representation_index": 0, - "input_image_geometry_path": "DataContainer" + "version": 1 + }, + "rotation_representation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateSampleRefFrameFilter", + "name": "nx::core::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -74,55 +116,99 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 1, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 - }, - "output_data_array_name": "Mask", - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "use_custom_false_value": false, - "use_custom_true_value": false + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "DataContainer/Cell Data/Confidence Index", + "comparison": 1, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.1 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": false + "cell_euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPFColors", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeIPFColorsFilter", + "name": "nx::core::ComputeIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline index 603c9f9d82..011ec98cee 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline @@ -4,63 +4,104 @@ "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "degrees_to_radians": true, - "edax_hexagonal_alignment": false, - "input_file": "Data/T12-MAI-2010/fw-ar-IF1-aptr12-corr.ctf" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "degrees_to_radians": { + "value": true, + "version": 1 + }, + "edax_hexagonal_alignment": { + "value": false, + "version": 1 + }, + "input_file": { + "value": "Data/T12-MAI-2010/fw-ar-IF1-aptr12-corr.ctf", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadCtfDataFilter", + "name": "nx::core::ReadCtfDataFilter", "uuid": "7751923c-afb9-4032-8372-8078325c69a4" }, "isDisabled": false }, { "args": { - "output_image_geometry_path": "", - "remove_original_geometry": true, - "rotate_slice_by_slice": false, - "rotation_axis_angle": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "rotation_matrix": [ - [ - 1.0, - 0.0, - 0.0, - 0.0 - ], - [ + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "output_image_geometry_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "rotate_slice_by_slice": { + "value": false, + "version": 1 + }, + "rotation_axis_angle": { + "value": [ 0.0, 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 1.0, - 0.0 + "version": 1 + }, + "rotation_matrix": { + "value": [ + [ + 1.0, + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] ], - [ - 0.0, - 0.0, - 0.0, - 1.0 - ] - ], - "rotation_representation_index": 0, - "input_image_geometry_path": "DataContainer" + "version": 1 + }, + "rotation_representation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateSampleRefFrameFilter", + "name": "nx::core::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -68,55 +109,99 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Error", - "comparison": 2, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.0 - } - ], - "type": "collection", - "union": 0 - }, - "output_data_array_name": "Mask", - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "use_custom_false_value": false, - "use_custom_true_value": false + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "DataContainer/Cell Data/Error", + "comparison": 2, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true + "cell_euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPFColors", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeIPFColorsFilter", + "name": "nx::core::ComputeIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline index d5f7dfcb67..337d94d7a8 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline @@ -1,85 +1,181 @@ { "isDisabled": false, "name": "TxCopper_Exposed.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "EBSD Scan Data", - "cell_ensemble_attribute_matrix_name": "Phase Data", - "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", - "degrees_to_radians": true, - "edax_hexagonal_alignment": true, - "input_file": "Data/Textured_Copper/Cugrid_after 2nd_15kv_2kx_2.ctf" + "cell_attribute_matrix_name": { + "value": "EBSD Scan Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Phase Data", + "version": 1 + }, + "degrees_to_radians": { + "value": true, + "version": 1 + }, + "edax_hexagonal_alignment": { + "value": true, + "version": 1 + }, + "input_file": { + "value": "Data/Textured_Copper/Cugrid_after 2nd_15kv_2kx_2.ctf", + "version": 1 + }, + "output_image_geometry_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadCtfDataFilter", + "name": "nx::core::ReadCtfDataFilter", "uuid": "7751923c-afb9-4032-8372-8078325c69a4" }, "isDisabled": false }, { "args": { - "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2 [ROTATED]", - "remove_original_geometry": true, - "rotate_slice_by_slice": false, - "rotation_axis_angle": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "rotation_matrix": [ - [ + "input_image_geometry_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2", + "version": 1 + }, + "output_image_geometry_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2 [ROTATED]", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "rotate_slice_by_slice": { + "value": false, + "version": 1 + }, + "rotation_axis_angle": { + "value": [ 0.0, + 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 0.0 + "version": 1 + }, + "rotation_matrix": { + "value": [ + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ] ], - [ - 0.0, - 0.0, - 0.0 - ] - ], - "rotation_representation_index": 0, - "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2" + "version": 1 + }, + "rotation_representation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateSampleRefFrameFilter", + "name": "nx::core::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false }, { "args": { - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", - "feature_ids_path": "", - "max_voxel": [ - 460, - 399, - 0 - ], - "min_voxel": [ - 0, - 0, - 0 - ], - "remove_original_geometry": true, - "renumber_features": false, - "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", - "use_physical_bounds": false + "cell_feature_attribute_matrix_path": { + "value": "Cell Feature Data", + "version": 1 + }, + "crop_x_dim": { + "value": true, + "version": 1 + }, + "crop_y_dim": { + "value": true, + "version": 1 + }, + "crop_z_dim": { + "value": true, + "version": 1 + }, + "feature_ids_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2", + "version": 1 + }, + "max_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "max_voxel": { + "value": [ + 460, + 399, + 0 + ], + "version": 1 + }, + "min_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "min_voxel": { + "value": [ + 0, + 0, + 0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "renumber_features": { + "value": false, + "version": 1 + }, + "use_physical_bounds": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CropImageGeometryFilter", + "name": "nx::core::CropImageGeometryFilter", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false @@ -87,92 +183,233 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Error", - "comparison": 2, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.0 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Error", + "comparison": 2, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 }, - "output_data_array_name": "Mask" + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "cell_euler_angles_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles", - "cell_ipf_colors_array_name": "IPF_Exposed_001", - "cell_phases_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases", - "crystal_structures_array_path": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures", - "mask_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true + "cell_euler_angles_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPF_Exposed_001", + "version": 1 + }, + "cell_phases_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeIPFColorsFilter", + "name": "nx::core::ComputeIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false }, { "args": { - "file_name": "Data/Output/TexturedCopper/IPF_Exposed.png", - "image_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/IPF_Exposed_001", - "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", - "index_offset": 0, - "plane_index": 0 + "file_name": { + "value": "Data/Output/TexturedCopper/IPF_Exposed.png", + "version": 1 + }, + "image_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/IPF_Exposed_001", + "version": 1 + }, + "index_offset": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ITKImageWriter", + "name": "nx::core::ITKImageWriterFilter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false }, { "args": { - "cell_euler_angles_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles", - "cell_phases_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases", - "crystal_structures_array_path": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures", - "generation_algorithm_index": 0, - "mask_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask", - "output_image_geometry_path": "PoleFigure", - "image_layout_index": 2, - "image_prefix": "Cugrid_after 2nd_15kv_2kx_2_Exposed_", - "image_size": 1024, - "lambert_size": 64, - "material_name_array_path": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/MaterialName", - "num_colors": 32, - "output_path": "Data/Output/TexturedCopper", - "save_as_image_geometry": true, - "title": "Cugrid_after 2nd_15kv_2kx_2 Exposed", - "use_mask": true, - "write_image_to_disk": true + "cell_euler_angles_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles", + "version": 1 + }, + "cell_phases_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures", + "version": 1 + }, + "generation_algorithm_index": { + "value": 0, + "version": 1 + }, + "image_layout_index": { + "value": 2, + "version": 1 + }, + "image_prefix": { + "value": "Cugrid_after 2nd_15kv_2kx_2_Exposed_", + "version": 1 + }, + "image_size": { + "value": 1024, + "version": 1 + }, + "intensity_geometry_path": { + "value": "Intensity Data", + "version": 1 + }, + "intensity_plot_1_name": { + "value": "<001>", + "version": 1 + }, + "intensity_plot_2_name": { + "value": "<011>", + "version": 1 + }, + "intensity_plot_3_name": { + "value": "<111>", + "version": 1 + }, + "lambert_size": { + "value": 64, + "version": 1 + }, + "mask_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask", + "version": 1 + }, + "material_name_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/MaterialName", + "version": 1 + }, + "normalize_to_mrd": { + "value": true, + "version": 1 + }, + "num_colors": { + "value": 32, + "version": 1 + }, + "output_image_geometry_path": { + "value": "PoleFigure", + "version": 1 + }, + "output_path": { + "value": "Data/Output/TexturedCopper", + "version": 1 + }, + "parameters_version": 1, + "save_as_image_geometry": { + "value": true, + "version": 1 + }, + "save_intensity_plots": { + "value": true, + "version": 1 + }, + "title": { + "value": "Cugrid_after 2nd_15kv_2kx_2 Exposed", + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + }, + "write_image_to_disk": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WritePoleFigureFilter", + "name": "nx::core::WritePoleFigureFilter", "uuid": "00cbb97e-a5c2-43e6-9a35-17a0f9ce26ed" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline index e52d9ccb27..a1f3dc368d 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline @@ -1,85 +1,181 @@ { "isDisabled": false, "name": "TxCopper_Unexposed.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "EBSD Scan Data", - "cell_ensemble_attribute_matrix_name": "Phase Data", - "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", - "degrees_to_radians": true, - "edax_hexagonal_alignment": true, - "input_file": "Data/Textured_Copper/Cugrid_after 2nd_15kv_2kx_2.ctf" + "cell_attribute_matrix_name": { + "value": "EBSD Scan Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Phase Data", + "version": 1 + }, + "degrees_to_radians": { + "value": true, + "version": 1 + }, + "edax_hexagonal_alignment": { + "value": true, + "version": 1 + }, + "input_file": { + "value": "Data/Textured_Copper/Cugrid_after 2nd_15kv_2kx_2.ctf", + "version": 1 + }, + "output_image_geometry_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadCtfDataFilter", + "name": "nx::core::ReadCtfDataFilter", "uuid": "7751923c-afb9-4032-8372-8078325c69a4" }, "isDisabled": false }, { "args": { - "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2 [ROTATED]", - "remove_original_geometry": true, - "rotate_slice_by_slice": false, - "rotation_axis_angle": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "rotation_matrix": [ - [ + "input_image_geometry_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2", + "version": 1 + }, + "output_image_geometry_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2 [ROTATED]", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "rotate_slice_by_slice": { + "value": false, + "version": 1 + }, + "rotation_axis_angle": { + "value": [ 0.0, + 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 0.0 + "version": 1 + }, + "rotation_matrix": { + "value": [ + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ] ], - [ - 0.0, - 0.0, - 0.0 - ] - ], - "rotation_representation_index": 0, - "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2" + "version": 1 + }, + "rotation_representation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateSampleRefFrameFilter", + "name": "nx::core::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false }, { "args": { - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", - "feature_ids_path": "", - "max_voxel": [ - 549, - 399, - 0 - ], - "min_voxel": [ - 488, - 0, - 0 - ], - "remove_original_geometry": true, - "renumber_features": false, - "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", - "use_physical_bounds": false + "cell_feature_attribute_matrix_path": { + "value": "Cell Feature Data", + "version": 1 + }, + "crop_x_dim": { + "value": true, + "version": 1 + }, + "crop_y_dim": { + "value": true, + "version": 1 + }, + "crop_z_dim": { + "value": true, + "version": 1 + }, + "feature_ids_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2", + "version": 1 + }, + "max_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "max_voxel": { + "value": [ + 549, + 399, + 0 + ], + "version": 1 + }, + "min_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "min_voxel": { + "value": [ + 488, + 0, + 0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "renumber_features": { + "value": false, + "version": 1 + }, + "use_physical_bounds": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CropImageGeometryFilter", + "name": "nx::core::CropImageGeometryFilter", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false @@ -87,92 +183,233 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Error", - "comparison": 2, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.0 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Error", + "comparison": 2, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 }, - "output_data_array_name": "Mask" + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "cell_euler_angles_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles", - "cell_ipf_colors_array_name": "IPF_Unexposed_001", - "cell_phases_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases", - "crystal_structures_array_path": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures", - "mask_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true + "cell_euler_angles_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPF_Unexposed_001", + "version": 1 + }, + "cell_phases_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeIPFColorsFilter", + "name": "nx::core::ComputeIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false }, { "args": { - "file_name": "Data/Output/TexturedCopper/IPF_Unexposed.png", - "image_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/IPF_Unexposed_001", - "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", - "index_offset": 0, - "plane_index": 0 + "file_name": { + "value": "Data/Output/TexturedCopper/IPF_Unexposed.png", + "version": 1 + }, + "image_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/IPF_Unexposed_001", + "version": 1 + }, + "index_offset": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ITKImageWriter", + "name": "nx::core::ITKImageWriterFilter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false }, { "args": { - "cell_euler_angles_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles", - "cell_phases_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases", - "crystal_structures_array_path": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures", - "generation_algorithm_index": 0, - "mask_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask", - "output_image_geometry_path": "PoleFigure", - "image_layout_index": 2, - "image_prefix": "Cugrid_after 2nd_15kv_2kx_2_Unexposed_", - "image_size": 1024, - "lambert_size": 64, - "material_name_array_path": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/MaterialName", - "num_colors": 32, - "output_path": "Data/Output/TexturedCopper", - "save_as_image_geometry": true, - "title": "Cugrid_after 2nd_15kv_2kx_2 Unexposed", - "use_mask": true, - "write_image_to_disk": true + "cell_euler_angles_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles", + "version": 1 + }, + "cell_phases_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures", + "version": 1 + }, + "generation_algorithm_index": { + "value": 0, + "version": 1 + }, + "image_layout_index": { + "value": 2, + "version": 1 + }, + "image_prefix": { + "value": "Cugrid_after 2nd_15kv_2kx_2_Unexposed_", + "version": 1 + }, + "image_size": { + "value": 1024, + "version": 1 + }, + "intensity_geometry_path": { + "value": "Intensity Data", + "version": 1 + }, + "intensity_plot_1_name": { + "value": "<001>", + "version": 1 + }, + "intensity_plot_2_name": { + "value": "<011>", + "version": 1 + }, + "intensity_plot_3_name": { + "value": "<111>", + "version": 1 + }, + "lambert_size": { + "value": 64, + "version": 1 + }, + "mask_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask", + "version": 1 + }, + "material_name_array_path": { + "value": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/MaterialName", + "version": 1 + }, + "normalize_to_mrd": { + "value": true, + "version": 1 + }, + "num_colors": { + "value": 32, + "version": 1 + }, + "output_image_geometry_path": { + "value": "PoleFigure", + "version": 1 + }, + "output_path": { + "value": "Data/Output/TexturedCopper", + "version": 1 + }, + "parameters_version": 1, + "save_as_image_geometry": { + "value": true, + "version": 1 + }, + "save_intensity_plots": { + "value": true, + "version": 1 + }, + "title": { + "value": "Cugrid_after 2nd_15kv_2kx_2 Unexposed", + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + }, + "write_image_to_disk": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WritePoleFigureFilter", + "name": "nx::core::WritePoleFigureFilter", "uuid": "00cbb97e-a5c2-43e6-9a35-17a0f9ce26ed" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline index 29a75c7f7a..dca6811a8c 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline @@ -4,12 +4,31 @@ "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "degrees_to_radians": true, - "edax_hexagonal_alignment": true, - "input_file": "Data/T12-MAI-2010/fw-ar-IF1-aptr12-corr.ctf", - "output_image_geometry_path": "fw-ar-IF1-aptr12-corr" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "degrees_to_radians": { + "value": true, + "version": 1 + }, + "edax_hexagonal_alignment": { + "value": true, + "version": 1 + }, + "input_file": { + "value": "Data/T12-MAI-2010/fw-ar-IF1-aptr12-corr.ctf", + "version": 1 + }, + "output_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -20,43 +39,65 @@ }, { "args": { - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", - "output_image_geometry_path": "", - "remove_original_geometry": true, - "rotate_slice_by_slice": false, - "rotation_axis_angle": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "rotation_matrix": [ - [ - 1.0, - 0.0, - 0.0, - 0.0 - ], - [ + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "output_image_geometry_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "rotate_slice_by_slice": { + "value": false, + "version": 1 + }, + "rotation_axis_angle": { + "value": [ 0.0, 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 1.0, - 0.0 + "version": 1 + }, + "rotation_matrix": { + "value": [ + [ + 1.0, + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] ], - [ - 0.0, - 0.0, - 0.0, - 1.0 - ] - ], - "rotation_representation_index": 0 + "version": 1 + }, + "rotation_representation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -68,26 +109,48 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Error", - "comparison": 2, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.0 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Error", + "comparison": 2, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 }, - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "output_data_array_name": "ThresholdArray", - "use_custom_false_value": false, - "use_custom_true_value": false + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "ThresholdArray", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -98,10 +161,23 @@ }, { "args": { - "input_orientation_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 + "input_orientation_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/EulerAngles", + "version": 1 + }, + "input_representation_index": { + "value": 0, + "version": 1 + }, + "output_orientation_array_name": { + "value": "Quats", + "version": 1 + }, + "output_representation_index": { + "value": 2, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -112,11 +188,27 @@ }, { "args": { - "comparison_data_path": "fw-ar-IF1-aptr12-corr/Cell Data/Error", - "comparison_index": 0, - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", - "loop": true, - "min_confidence": 0.0 + "comparison_data_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/Error", + "version": 1 + }, + "comparison_index": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "loop": { + "value": true, + "version": 1 + }, + "min_confidence": { + "value": 0.0, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -127,17 +219,39 @@ }, { "args": { - "cell_euler_angles_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPF_001", - "cell_phases_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", - "crystal_structures_array_path": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": false + "cell_euler_angles_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPF_001", + "version": 1 + }, + "cell_phases_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -148,11 +262,27 @@ }, { "args": { - "file_name": "Data/Output/fw-ar-IF1-aptr12-corr/fw-ar-IF1-aptr12-corr_001.png", - "image_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/IPF_001", - "index_offset": 0, - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", - "plane_index": 0 + "file_name": { + "value": "Data/Output/fw-ar-IF1-aptr12-corr/fw-ar-IF1-aptr12-corr_001.png", + "version": 1 + }, + "image_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/IPF_001", + "version": 1 + }, + "index_offset": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -163,17 +293,39 @@ }, { "args": { - "cell_euler_angles_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPF_010", - "cell_phases_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", - "crystal_structures_array_path": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "", - "reference_dir": [ - 0.0, - 1.0, - 0.0 - ], - "use_mask": false + "cell_euler_angles_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPF_010", + "version": 1 + }, + "cell_phases_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 1.0, + 0.0 + ], + "version": 1 + }, + "use_mask": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -184,11 +336,27 @@ }, { "args": { - "file_name": "Data/Output/fw-ar-IF1-aptr12-corr/fw-ar-IF1-aptr12-corr_010.png", - "image_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/IPF_010", - "index_offset": 0, - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", - "plane_index": 0 + "file_name": { + "value": "Data/Output/fw-ar-IF1-aptr12-corr/fw-ar-IF1-aptr12-corr_010.png", + "version": 1 + }, + "image_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/IPF_010", + "version": 1 + }, + "index_offset": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -199,17 +367,39 @@ }, { "args": { - "cell_euler_angles_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPF_100", - "cell_phases_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", - "crystal_structures_array_path": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "", - "reference_dir": [ - 1.0, - 0.0, - 0.0 - ], - "use_mask": false + "cell_euler_angles_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPF_100", + "version": 1 + }, + "cell_phases_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 1.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "use_mask": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -220,11 +410,27 @@ }, { "args": { - "file_name": "Data/Output/fw-ar-IF1-aptr12-corr/fw-ar-IF1-aptr12-corr_100.png", - "image_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/IPF_100", - "index_offset": 0, - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", - "plane_index": 0 + "file_name": { + "value": "Data/Output/fw-ar-IF1-aptr12-corr/fw-ar-IF1-aptr12-corr_100.png", + "version": 1 + }, + "image_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/IPF_100", + "version": 1 + }, + "index_offset": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -235,17 +441,51 @@ }, { "args": { - "active_array_name": "Active", - "cell_feature_attribute_matrix_name": "Cell Feature Data", - "cell_mask_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/ThresholdArray", - "cell_phases_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", - "cell_quats_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Quats", - "crystal_structures_array_path": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_name": "FeatureIds", - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", - "misorientation_tolerance": 5.0, - "randomize_features": true, - "use_mask": true + "active_array_name": { + "value": "Active", + "version": 1 + }, + "cell_feature_attribute_matrix_name": { + "value": "Cell Feature Data", + "version": 1 + }, + "cell_mask_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/ThresholdArray", + "version": 1 + }, + "cell_phases_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", + "version": 1 + }, + "cell_quats_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/Quats", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_ids_array_name": { + "value": "FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "misorientation_tolerance": { + "value": 5.0, + "version": 1 + }, + "parameters_version": 1, + "randomize_features": { + "value": true, + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -256,12 +496,31 @@ }, { "args": { - "cell_phases_array_path": "Phases", - "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", - "min_allowed_defect_size": 10, - "store_as_new_phase": false + "cell_phases_array_path": { + "value": "Phases", + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "ignored_data_array_paths": { + "value": [], + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "min_allowed_defect_size": { + "value": 10, + "version": 1 + }, + "parameters_version": 1, + "store_as_new_phase": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -272,13 +531,35 @@ }, { "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "fw-ar-IF1-aptr12-corr/Cell Feature Data", - "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" + "equivalent_diameters_name": { + "value": "EquivalentDiameters", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "num_elements_name": { + "value": "NumElements", + "version": 1 + }, + "parameters_version": 1, + "save_element_sizes": { + "value": false, + "version": 1 + }, + "volumes_name": { + "value": "Volumes", + "version": 1 + } }, "comments": "", "filter": { @@ -289,13 +570,35 @@ }, { "args": { - "apply_single_phase": false, - "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", - "feature_phases_path": "", - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", - "min_allowed_features_size": 5, - "num_cells_path": "fw-ar-IF1-aptr12-corr/Cell Feature Data/NumElements", - "phase_number": 0 + "apply_single_phase": { + "value": false, + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "feature_phases_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "min_allowed_features_size": { + "value": 5, + "version": 1 + }, + "num_cells_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Feature Data/NumElements", + "version": 1 + }, + "parameters_version": 1, + "phase_number": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -306,12 +609,16 @@ }, { "args": { - "removed_data_path": [ - "fw-ar-IF1-aptr12-corr/Cell Feature Data/Active", - "fw-ar-IF1-aptr12-corr/Cell Feature Data/EquivalentDiameters", - "fw-ar-IF1-aptr12-corr/Cell Feature Data/NumElements", - "fw-ar-IF1-aptr12-corr/Cell Feature Data/Volumes" - ] + "parameters_version": 1, + "removed_data_path": { + "value": [ + "fw-ar-IF1-aptr12-corr/Cell Feature Data/Active", + "fw-ar-IF1-aptr12-corr/Cell Feature Data/EquivalentDiameters", + "fw-ar-IF1-aptr12-corr/Cell Feature Data/NumElements", + "fw-ar-IF1-aptr12-corr/Cell Feature Data/Volumes" + ], + "version": 1 + } }, "comments": "", "filter": { @@ -322,13 +629,35 @@ }, { "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "fw-ar-IF1-aptr12-corr/Cell Feature Data", - "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" + "equivalent_diameters_name": { + "value": "EquivalentDiameters", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "num_elements_name": { + "value": "NumElements", + "version": 1 + }, + "parameters_version": 1, + "save_element_sizes": { + "value": false, + "version": 1 + }, + "volumes_name": { + "value": "Volumes", + "version": 1 + } }, "comments": "", "filter": { @@ -339,13 +668,35 @@ }, { "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "fw-ar-IF1-aptr12-corr/Cell Feature Data", - "cell_feature_ids_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", - "cell_phases_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", - "cell_quats_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Quats", - "crystal_structures_array_path": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures" + "avg_euler_angles_array_name": { + "value": "AvgEulerAngles", + "version": 1 + }, + "avg_quats_array_name": { + "value": "AvgQuats", + "version": 1 + }, + "cell_feature_attribute_matrix_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Feature Data", + "version": 1 + }, + "cell_feature_ids_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "cell_phases_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", + "version": 1 + }, + "cell_quats_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/Quats", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -356,17 +707,39 @@ }, { "args": { - "cell_phases_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", - "crystal_structures_array_path": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", - "kernel_average_misorientations_array_name": "KernelAverageMisorientations", - "kernel_size": [ - 1, - 1, - 1 - ], - "quats_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Quats" + "cell_phases_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "kernel_average_misorientations_array_name": { + "value": "KernelAverageMisorientations", + "version": 1 + }, + "kernel_size": { + "value": [ + 1, + 1, + 1 + ], + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/Quats", + "version": 1 + } }, "comments": "", "filter": { @@ -377,10 +750,23 @@ }, { "args": { - "centroids_array_name": "Centroids", - "feature_attribute_matrix_path": "fw-ar-IF1-aptr12-corr/Cell Feature Data", - "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr" + "centroids_array_name": { + "value": "Centroids", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -391,17 +777,51 @@ }, { "args": { - "calc_manhattan_dist": true, - "do_boundaries": true, - "do_quad_points": false, - "do_triple_lines": false, - "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", - "g_bdistances_array_name": "GBManhattanDistances", - "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", - "nearest_neighbors_array_name": "NearestNeighbors", - "q_pdistances_array_name": "QPManhattanDistances", - "save_nearest_neighbors": false, - "t_jdistances_array_name": "TJManhattanDistances" + "calc_manhattan_dist": { + "value": true, + "version": 1 + }, + "do_boundaries": { + "value": true, + "version": 1 + }, + "do_quad_points": { + "value": false, + "version": 1 + }, + "do_triple_lines": { + "value": false, + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "g_bdistances_array_name": { + "value": "GBManhattanDistances", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "nearest_neighbors_array_name": { + "value": "NearestNeighbors", + "version": 1 + }, + "parameters_version": 1, + "q_pdistances_array_name": { + "value": "QPManhattanDistances", + "version": 1 + }, + "save_nearest_neighbors": { + "value": false, + "version": 1 + }, + "t_jdistances_array_name": { + "value": "TJManhattanDistances", + "version": 1 + } }, "comments": "", "filter": { @@ -412,16 +832,47 @@ }, { "args": { - "avg_quats_array_path": "fw-ar-IF1-aptr12-corr/Cell Feature Data/AvgQuats", - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "cell_phases_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", - "crystal_structures_array_path": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", - "feature_avg_misorientations_array_name": "FeatureAvgMisorientations", - "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", - "feature_reference_misorientations_array_name": "FeatureReferenceMisorientations", - "gb_euclidean_distances_array_path": "Cell Data/GBEuclideanDistances", - "quats_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Quats", - "reference_orientation_index": 0 + "avg_quats_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Feature Data/AvgQuats", + "version": 1 + }, + "cell_feature_attribute_matrix_path": { + "value": "Cell Feature Data", + "version": 1 + }, + "cell_phases_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_avg_misorientations_array_name": { + "value": "FeatureAvgMisorientations", + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "feature_reference_misorientations_array_name": { + "value": "FeatureReferenceMisorientations", + "version": 1 + }, + "gb_euclidean_distances_array_path": { + "value": "Cell Data/GBEuclideanDistances", + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Data/Quats", + "version": 1 + }, + "reference_orientation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -432,11 +883,27 @@ }, { "args": { - "cell_feature_attribute_matrix_path": "fw-ar-IF1-aptr12-corr/Cell Feature Data", - "delimiter_index": 2, - "feature_data_file": "Data/Output/fw-ar-IF1-aptr12-corr/Feature_Data.csv", - "write_neighborlist_data": false, - "write_num_features_line": true + "cell_feature_attribute_matrix_path": { + "value": "fw-ar-IF1-aptr12-corr/Cell Feature Data", + "version": 1 + }, + "delimiter_index": { + "value": 2, + "version": 1 + }, + "feature_data_file": { + "value": "Data/Output/fw-ar-IF1-aptr12-corr/Feature_Data.csv", + "version": 1 + }, + "parameters_version": 1, + "write_neighborlist_data": { + "value": false, + "version": 1 + }, + "write_num_features_line": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -447,18 +914,49 @@ }, { "args": { - "create_new_data_group": true, - "histogram_bin_count_suffix": " Histogram Counts", - "histogram_bin_range_suffix": " Histogram Bin Ranges", - "max_range": 1.0, - "min_range": 0.0, - "new_data_group_path": "fw-ar-IF1-aptr12-corr/Histograms", - "number_of_bins": 256, - "output_data_group_path": "", - "selected_array_paths": [ - "fw-ar-IF1-aptr12-corr/Cell Feature Data/EquivalentDiameters" - ], - "user_defined_range": false + "create_new_data_group": { + "value": true, + "version": 1 + }, + "histogram_bin_count_suffix": { + "value": " Histogram Counts", + "version": 1 + }, + "histogram_bin_range_suffix": { + "value": " Histogram Bin Ranges", + "version": 1 + }, + "max_range": { + "value": 1.0, + "version": 1 + }, + "min_range": { + "value": 0.0, + "version": 1 + }, + "new_data_group_path": { + "value": "fw-ar-IF1-aptr12-corr/Histograms", + "version": 1 + }, + "number_of_bins": { + "value": 256, + "version": 1 + }, + "output_data_group_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "selected_array_paths": { + "value": [ + "fw-ar-IF1-aptr12-corr/Cell Feature Data/EquivalentDiameters" + ], + "version": 1 + }, + "user_defined_range": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -469,16 +967,42 @@ }, { "args": { - "delimiter_index": 2, - "file_extension": ".csv", - "header_option_index": 1, - "input_data_array_paths": [ - "fw-ar-IF1-aptr12-corr/Histograms/EquivalentDiameters Histogram Counts", - "fw-ar-IF1-aptr12-corr/Histograms/EquivalentDiameters Histogram Bin Ranges" - ], - "max_val_per_line": 0, - "output_dir": "Data/Output/fw-ar-IF1-aptr12-corr", - "output_style_index": 0 + "delimiter_index": { + "value": 2, + "version": 1 + }, + "file_extension": { + "value": ".csv", + "version": 1 + }, + "header_option_index": { + "value": 1, + "version": 1 + }, + "input_data_array_paths": { + "value": [ + "fw-ar-IF1-aptr12-corr/Histograms/EquivalentDiameters Histogram Counts", + "fw-ar-IF1-aptr12-corr/Histograms/EquivalentDiameters Histogram Bin Ranges" + ], + "version": 1 + }, + "max_val_per_line": { + "value": 0, + "version": 1 + }, + "output_dir": { + "value": "Data/Output/fw-ar-IF1-aptr12-corr", + "version": 1 + }, + "output_path": { + "value": "", + "version": 1 + }, + "output_style_index": { + "value": 0, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -489,8 +1013,15 @@ }, { "args": { - "export_file_path": "Data/Output/fw-ar-IF1-aptr12-corr/fw-ar-IF1-aptr12-corr.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/fw-ar-IF1-aptr12-corr/fw-ar-IF1-aptr12-corr.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -501,4 +1032,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline index 0022ca5a01..1b4910e6dc 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline @@ -4,12 +4,31 @@ "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "degrees_to_radians": true, - "edax_hexagonal_alignment": true, - "input_file": "Data/T12-MAI-2010/fw-ar-IF1-avtr12-corr.ctf", - "output_image_geometry_path": "fw-ar-IF1-avtr12-corr" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "degrees_to_radians": { + "value": true, + "version": 1 + }, + "edax_hexagonal_alignment": { + "value": true, + "version": 1 + }, + "input_file": { + "value": "Data/T12-MAI-2010/fw-ar-IF1-avtr12-corr.ctf", + "version": 1 + }, + "output_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -20,43 +39,65 @@ }, { "args": { - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", - "output_image_geometry_path": "", - "remove_original_geometry": true, - "rotate_slice_by_slice": false, - "rotation_axis_angle": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "rotation_matrix": [ - [ - 1.0, - 0.0, - 0.0, - 0.0 - ], - [ + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "output_image_geometry_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "rotate_slice_by_slice": { + "value": false, + "version": 1 + }, + "rotation_axis_angle": { + "value": [ 0.0, 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 1.0, - 0.0 + "version": 1 + }, + "rotation_matrix": { + "value": [ + [ + 1.0, + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] ], - [ - 0.0, - 0.0, - 0.0, - 1.0 - ] - ], - "rotation_representation_index": 0 + "version": 1 + }, + "rotation_representation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -68,26 +109,48 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Error", - "comparison": 2, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.0 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Error", + "comparison": 2, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 }, - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "output_data_array_name": "ThresholdArray", - "use_custom_false_value": false, - "use_custom_true_value": false + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "ThresholdArray", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -98,10 +161,23 @@ }, { "args": { - "input_orientation_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 + "input_orientation_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/EulerAngles", + "version": 1 + }, + "input_representation_index": { + "value": 0, + "version": 1 + }, + "output_orientation_array_name": { + "value": "Quats", + "version": 1 + }, + "output_representation_index": { + "value": 2, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -112,11 +188,27 @@ }, { "args": { - "comparison_data_path": "fw-ar-IF1-avtr12-corr/Cell Data/Error", - "comparison_index": 0, - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", - "loop": true, - "min_confidence": 0.0 + "comparison_data_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/Error", + "version": 1 + }, + "comparison_index": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "loop": { + "value": true, + "version": 1 + }, + "min_confidence": { + "value": 0.0, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -127,17 +219,39 @@ }, { "args": { - "cell_euler_angles_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPF_001", - "cell_phases_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", - "crystal_structures_array_path": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": false + "cell_euler_angles_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPF_001", + "version": 1 + }, + "cell_phases_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -148,11 +262,27 @@ }, { "args": { - "file_name": "Data/Output/fw-ar-IF1-avtr12-corr/fw-ar-IF1-avtr12-corr_001.png", - "image_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/IPF_001", - "index_offset": 0, - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", - "plane_index": 0 + "file_name": { + "value": "Data/Output/fw-ar-IF1-avtr12-corr/fw-ar-IF1-avtr12-corr_001.png", + "version": 1 + }, + "image_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/IPF_001", + "version": 1 + }, + "index_offset": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -163,17 +293,39 @@ }, { "args": { - "cell_euler_angles_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPF_010", - "cell_phases_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", - "crystal_structures_array_path": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "", - "reference_dir": [ - 0.0, - 1.0, - 0.0 - ], - "use_mask": false + "cell_euler_angles_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPF_010", + "version": 1 + }, + "cell_phases_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 1.0, + 0.0 + ], + "version": 1 + }, + "use_mask": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -184,11 +336,27 @@ }, { "args": { - "file_name": "Data/Output/fw-ar-IF1-avtr12-corr/fw-ar-IF1-avtr12-corr_010.png", - "image_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/IPF_010", - "index_offset": 0, - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", - "plane_index": 0 + "file_name": { + "value": "Data/Output/fw-ar-IF1-avtr12-corr/fw-ar-IF1-avtr12-corr_010.png", + "version": 1 + }, + "image_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/IPF_010", + "version": 1 + }, + "index_offset": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -199,17 +367,39 @@ }, { "args": { - "cell_euler_angles_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPF_100", - "cell_phases_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", - "crystal_structures_array_path": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "", - "reference_dir": [ - 1.0, - 0.0, - 0.0 - ], - "use_mask": false + "cell_euler_angles_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPF_100", + "version": 1 + }, + "cell_phases_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 1.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "use_mask": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -220,11 +410,27 @@ }, { "args": { - "file_name": "Data/Output/fw-ar-IF1-avtr12-corr/fw-ar-IF1-avtr12-corr_100.png", - "image_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/IPF_100", - "index_offset": 0, - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", - "plane_index": 0 + "file_name": { + "value": "Data/Output/fw-ar-IF1-avtr12-corr/fw-ar-IF1-avtr12-corr_100.png", + "version": 1 + }, + "image_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/IPF_100", + "version": 1 + }, + "index_offset": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -235,17 +441,51 @@ }, { "args": { - "active_array_name": "Active", - "cell_feature_attribute_matrix_name": "Cell Feature Data", - "cell_mask_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/ThresholdArray", - "cell_phases_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", - "cell_quats_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Quats", - "crystal_structures_array_path": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_name": "FeatureIds", - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", - "misorientation_tolerance": 5.0, - "randomize_features": false, - "use_mask": true + "active_array_name": { + "value": "Active", + "version": 1 + }, + "cell_feature_attribute_matrix_name": { + "value": "Cell Feature Data", + "version": 1 + }, + "cell_mask_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/ThresholdArray", + "version": 1 + }, + "cell_phases_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", + "version": 1 + }, + "cell_quats_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/Quats", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_ids_array_name": { + "value": "FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "misorientation_tolerance": { + "value": 5.0, + "version": 1 + }, + "parameters_version": 1, + "randomize_features": { + "value": false, + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -256,12 +496,31 @@ }, { "args": { - "cell_phases_array_path": "Phases", - "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", - "min_allowed_defect_size": 10, - "store_as_new_phase": false + "cell_phases_array_path": { + "value": "Phases", + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "ignored_data_array_paths": { + "value": [], + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "min_allowed_defect_size": { + "value": 10, + "version": 1 + }, + "parameters_version": 1, + "store_as_new_phase": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -272,13 +531,35 @@ }, { "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "fw-ar-IF1-avtr12-corr/Cell Feature Data", - "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" + "equivalent_diameters_name": { + "value": "EquivalentDiameters", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "num_elements_name": { + "value": "NumElements", + "version": 1 + }, + "parameters_version": 1, + "save_element_sizes": { + "value": false, + "version": 1 + }, + "volumes_name": { + "value": "Volumes", + "version": 1 + } }, "comments": "", "filter": { @@ -289,13 +570,35 @@ }, { "args": { - "apply_single_phase": false, - "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", - "feature_phases_path": "", - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", - "min_allowed_features_size": 5, - "num_cells_path": "fw-ar-IF1-avtr12-corr/Cell Feature Data/NumElements", - "phase_number": 0 + "apply_single_phase": { + "value": false, + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "feature_phases_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "min_allowed_features_size": { + "value": 5, + "version": 1 + }, + "num_cells_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Feature Data/NumElements", + "version": 1 + }, + "parameters_version": 1, + "phase_number": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -306,12 +609,16 @@ }, { "args": { - "removed_data_path": [ - "fw-ar-IF1-avtr12-corr/Cell Feature Data/Active", - "fw-ar-IF1-avtr12-corr/Cell Feature Data/EquivalentDiameters", - "fw-ar-IF1-avtr12-corr/Cell Feature Data/NumElements", - "fw-ar-IF1-avtr12-corr/Cell Feature Data/Volumes" - ] + "parameters_version": 1, + "removed_data_path": { + "value": [ + "fw-ar-IF1-avtr12-corr/Cell Feature Data/Active", + "fw-ar-IF1-avtr12-corr/Cell Feature Data/EquivalentDiameters", + "fw-ar-IF1-avtr12-corr/Cell Feature Data/NumElements", + "fw-ar-IF1-avtr12-corr/Cell Feature Data/Volumes" + ], + "version": 1 + } }, "comments": "", "filter": { @@ -322,13 +629,35 @@ }, { "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "fw-ar-IF1-avtr12-corr/Cell Feature Data", - "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" + "equivalent_diameters_name": { + "value": "EquivalentDiameters", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "num_elements_name": { + "value": "NumElements", + "version": 1 + }, + "parameters_version": 1, + "save_element_sizes": { + "value": false, + "version": 1 + }, + "volumes_name": { + "value": "Volumes", + "version": 1 + } }, "comments": "", "filter": { @@ -339,13 +668,35 @@ }, { "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "fw-ar-IF1-avtr12-corr/Cell Feature Data", - "cell_feature_ids_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", - "cell_phases_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", - "cell_quats_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Quats", - "crystal_structures_array_path": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures" + "avg_euler_angles_array_name": { + "value": "AvgEulerAngles", + "version": 1 + }, + "avg_quats_array_name": { + "value": "AvgQuats", + "version": 1 + }, + "cell_feature_attribute_matrix_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Feature Data", + "version": 1 + }, + "cell_feature_ids_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "cell_phases_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", + "version": 1 + }, + "cell_quats_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/Quats", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -356,17 +707,39 @@ }, { "args": { - "cell_phases_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", - "crystal_structures_array_path": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", - "kernel_average_misorientations_array_name": "KernelAverageMisorientations", - "kernel_size": [ - 1, - 1, - 1 - ], - "quats_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Quats" + "cell_phases_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "kernel_average_misorientations_array_name": { + "value": "KernelAverageMisorientations", + "version": 1 + }, + "kernel_size": { + "value": [ + 1, + 1, + 1 + ], + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/Quats", + "version": 1 + } }, "comments": "", "filter": { @@ -377,10 +750,23 @@ }, { "args": { - "centroids_array_name": "Centroids", - "feature_attribute_matrix_path": "fw-ar-IF1-avtr12-corr/Cell Feature Data", - "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr" + "centroids_array_name": { + "value": "Centroids", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -391,17 +777,51 @@ }, { "args": { - "calc_manhattan_dist": true, - "do_boundaries": true, - "do_quad_points": false, - "do_triple_lines": false, - "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", - "g_bdistances_array_name": "GBManhattanDistances", - "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", - "nearest_neighbors_array_name": "NearestNeighbors", - "q_pdistances_array_name": "QPManhattanDistances", - "save_nearest_neighbors": false, - "t_jdistances_array_name": "TJManhattanDistances" + "calc_manhattan_dist": { + "value": true, + "version": 1 + }, + "do_boundaries": { + "value": true, + "version": 1 + }, + "do_quad_points": { + "value": false, + "version": 1 + }, + "do_triple_lines": { + "value": false, + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "g_bdistances_array_name": { + "value": "GBManhattanDistances", + "version": 1 + }, + "input_image_geometry_path": { + "value": "fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "nearest_neighbors_array_name": { + "value": "NearestNeighbors", + "version": 1 + }, + "parameters_version": 1, + "q_pdistances_array_name": { + "value": "QPManhattanDistances", + "version": 1 + }, + "save_nearest_neighbors": { + "value": false, + "version": 1 + }, + "t_jdistances_array_name": { + "value": "TJManhattanDistances", + "version": 1 + } }, "comments": "", "filter": { @@ -412,16 +832,47 @@ }, { "args": { - "avg_quats_array_path": "fw-ar-IF1-avtr12-corr/Cell Feature Data/AvgQuats", - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "cell_phases_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", - "crystal_structures_array_path": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", - "feature_avg_misorientations_array_name": "FeatureAvgMisorientations", - "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", - "feature_reference_misorientations_array_name": "FeatureReferenceMisorientations", - "gb_euclidean_distances_array_path": "Cell Data/GBEuclideanDistances", - "quats_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Quats", - "reference_orientation_index": 0 + "avg_quats_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Feature Data/AvgQuats", + "version": 1 + }, + "cell_feature_attribute_matrix_path": { + "value": "Cell Feature Data", + "version": 1 + }, + "cell_phases_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_avg_misorientations_array_name": { + "value": "FeatureAvgMisorientations", + "version": 1 + }, + "feature_ids_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", + "version": 1 + }, + "feature_reference_misorientations_array_name": { + "value": "FeatureReferenceMisorientations", + "version": 1 + }, + "gb_euclidean_distances_array_path": { + "value": "Cell Data/GBEuclideanDistances", + "version": 1 + }, + "parameters_version": 1, + "quats_array_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Data/Quats", + "version": 1 + }, + "reference_orientation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -432,11 +883,27 @@ }, { "args": { - "cell_feature_attribute_matrix_path": "fw-ar-IF1-avtr12-corr/Cell Feature Data", - "delimiter_index": 2, - "feature_data_file": "Data/Output/fw-ar-IF1-avtr12-corr/Feature_Data.csv", - "write_neighborlist_data": false, - "write_num_features_line": true + "cell_feature_attribute_matrix_path": { + "value": "fw-ar-IF1-avtr12-corr/Cell Feature Data", + "version": 1 + }, + "delimiter_index": { + "value": 2, + "version": 1 + }, + "feature_data_file": { + "value": "Data/Output/fw-ar-IF1-avtr12-corr/Feature_Data.csv", + "version": 1 + }, + "parameters_version": 1, + "write_neighborlist_data": { + "value": false, + "version": 1 + }, + "write_num_features_line": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -447,18 +914,49 @@ }, { "args": { - "create_new_data_group": true, - "histogram_bin_count_suffix": " Histogram Counts", - "histogram_bin_range_suffix": " Histogram Bin Ranges", - "max_range": 1.0, - "min_range": 0.0, - "new_data_group_path": "fw-ar-IF1-avtr12-corr/Histograms", - "number_of_bins": 256, - "output_data_group_path": "", - "selected_array_paths": [ - "fw-ar-IF1-avtr12-corr/Cell Feature Data/EquivalentDiameters" - ], - "user_defined_range": false + "create_new_data_group": { + "value": true, + "version": 1 + }, + "histogram_bin_count_suffix": { + "value": " Histogram Counts", + "version": 1 + }, + "histogram_bin_range_suffix": { + "value": " Histogram Bin Ranges", + "version": 1 + }, + "max_range": { + "value": 1.0, + "version": 1 + }, + "min_range": { + "value": 0.0, + "version": 1 + }, + "new_data_group_path": { + "value": "fw-ar-IF1-avtr12-corr/Histograms", + "version": 1 + }, + "number_of_bins": { + "value": 256, + "version": 1 + }, + "output_data_group_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "selected_array_paths": { + "value": [ + "fw-ar-IF1-avtr12-corr/Cell Feature Data/EquivalentDiameters" + ], + "version": 1 + }, + "user_defined_range": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -469,16 +967,42 @@ }, { "args": { - "delimiter_index": 2, - "file_extension": ".csv", - "header_option_index": 1, - "input_data_array_paths": [ - "fw-ar-IF1-avtr12-corr/Histograms/EquivalentDiameters Histogram Counts", - "fw-ar-IF1-avtr12-corr/Histograms/EquivalentDiameters Histogram Bin Ranges" - ], - "max_val_per_line": 0, - "output_dir": "Data/Output/fw-ar-IF1-avtr12-corr", - "output_style_index": 0 + "delimiter_index": { + "value": 2, + "version": 1 + }, + "file_extension": { + "value": ".csv", + "version": 1 + }, + "header_option_index": { + "value": 1, + "version": 1 + }, + "input_data_array_paths": { + "value": [ + "fw-ar-IF1-avtr12-corr/Histograms/EquivalentDiameters Histogram Counts", + "fw-ar-IF1-avtr12-corr/Histograms/EquivalentDiameters Histogram Bin Ranges" + ], + "version": 1 + }, + "max_val_per_line": { + "value": 0, + "version": 1 + }, + "output_dir": { + "value": "Data/Output/fw-ar-IF1-avtr12-corr", + "version": 1 + }, + "output_path": { + "value": "", + "version": 1 + }, + "output_style_index": { + "value": 0, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -489,8 +1013,15 @@ }, { "args": { - "export_file_path": "Data/Output/fw-ar-IF1-avtr12-corr/fw-ar-IF1-avtr12-corr.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/fw-ar-IF1-avtr12-corr/fw-ar-IF1-avtr12-corr.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -501,4 +1032,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp index 217d2f2fa3..41e83413bd 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp @@ -107,6 +107,12 @@ Parameters AlignSectionsMisorientationFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType AlignSectionsMisorientationFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer AlignSectionsMisorientationFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp index 7169e0c753..715acd2d0b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp @@ -80,6 +80,14 @@ class ORIENTATIONANALYSIS_EXPORT AlignSectionsMisorientationFilter : public IFil */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp index 623e4f0072..8c607bb1dd 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp @@ -93,6 +93,12 @@ Parameters AlignSectionsMutualInformationFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType AlignSectionsMutualInformationFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer AlignSectionsMutualInformationFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.hpp index 4b53255083..b890320382 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.hpp @@ -78,6 +78,14 @@ class ORIENTATIONANALYSIS_EXPORT AlignSectionsMutualInformationFilter : public I */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp index 7abdc0aed9..bc7be5d7ee 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp @@ -84,6 +84,12 @@ Parameters BadDataNeighborOrientationCheckFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType BadDataNeighborOrientationCheckFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer BadDataNeighborOrientationCheckFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp index b39f4ee47e..91f154f038 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp @@ -75,6 +75,14 @@ class ORIENTATIONANALYSIS_EXPORT BadDataNeighborOrientationCheckFilter : public */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.cpp index d0ba642215..09e699e5b1 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.cpp @@ -103,6 +103,12 @@ Parameters CAxisSegmentFeaturesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CAxisSegmentFeaturesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CAxisSegmentFeaturesFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp index 58d5904107..cbbaa8e885 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp @@ -79,6 +79,14 @@ class ORIENTATIONANALYSIS_EXPORT CAxisSegmentFeaturesFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgCAxesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgCAxesFilter.cpp index c6e0c1e61c..4748c97a96 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgCAxesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgCAxesFilter.cpp @@ -67,6 +67,12 @@ Parameters ComputeAvgCAxesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeAvgCAxesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeAvgCAxesFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgCAxesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgCAxesFilter.hpp index c2b33e70e3..4c0acb9d6b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgCAxesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgCAxesFilter.hpp @@ -74,6 +74,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeAvgCAxesFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgOrientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgOrientationsFilter.cpp index 343de018b7..914441ca6a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgOrientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgOrientationsFilter.cpp @@ -86,6 +86,12 @@ Parameters ComputeAvgOrientationsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeAvgOrientationsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeAvgOrientationsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgOrientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgOrientationsFilter.hpp index b06a57b158..a8b8386d83 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgOrientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeAvgOrientationsFilter.hpp @@ -75,6 +75,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeAvgOrientationsFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeBoundaryStrengthsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeBoundaryStrengthsFilter.cpp index f8fc81a3e9..8b0c8ae4b5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeBoundaryStrengthsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeBoundaryStrengthsFilter.cpp @@ -80,6 +80,12 @@ Parameters ComputeBoundaryStrengthsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeBoundaryStrengthsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeBoundaryStrengthsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeBoundaryStrengthsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeBoundaryStrengthsFilter.hpp index add6fec564..025e92a839 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeBoundaryStrengthsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeBoundaryStrengthsFilter.hpp @@ -77,6 +77,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeBoundaryStrengthsFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeCAxisLocationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeCAxisLocationsFilter.cpp index 060fc13471..fbf79c6b87 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeCAxisLocationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeCAxisLocationsFilter.cpp @@ -65,6 +65,12 @@ Parameters ComputeCAxisLocationsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeCAxisLocationsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeCAxisLocationsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeCAxisLocationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeCAxisLocationsFilter.hpp index 34135b066e..128b30ad5a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeCAxisLocationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeCAxisLocationsFilter.hpp @@ -73,6 +73,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeCAxisLocationsFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFZQuaternionsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFZQuaternionsFilter.cpp index 5d42b500c6..c0fca09d69 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFZQuaternionsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFZQuaternionsFilter.cpp @@ -174,6 +174,12 @@ Parameters ComputeFZQuaternionsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFZQuaternionsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeFZQuaternionsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFZQuaternionsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFZQuaternionsFilter.hpp index 89e59782d7..90b32f1bc1 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFZQuaternionsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFZQuaternionsFilter.hpp @@ -74,6 +74,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeFZQuaternionsFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFaceIPFColoringFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFaceIPFColoringFilter.cpp index 1ea6159d28..234ead5818 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFaceIPFColoringFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFaceIPFColoringFilter.cpp @@ -71,6 +71,12 @@ Parameters ComputeFaceIPFColoringFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFaceIPFColoringFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeFaceIPFColoringFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFaceIPFColoringFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFaceIPFColoringFilter.hpp index 0082c47c4e..1dcaa618ce 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFaceIPFColoringFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFaceIPFColoringFilter.hpp @@ -74,6 +74,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeFaceIPFColoringFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureFaceMisorientationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureFaceMisorientationFilter.cpp index 5968a36986..5415c1faf2 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureFaceMisorientationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureFaceMisorientationFilter.cpp @@ -69,6 +69,12 @@ Parameters ComputeFeatureFaceMisorientationFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFeatureFaceMisorientationFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeFeatureFaceMisorientationFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureFaceMisorientationFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureFaceMisorientationFilter.hpp index 6f319218bd..ab3abdb9d2 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureFaceMisorientationFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureFaceMisorientationFilter.hpp @@ -74,6 +74,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeFeatureFaceMisorientationFilter : public */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureNeighborCAxisMisalignmentsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureNeighborCAxisMisalignmentsFilter.cpp index 4cfaf903fe..186ff3831e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureNeighborCAxisMisalignmentsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureNeighborCAxisMisalignmentsFilter.cpp @@ -79,6 +79,12 @@ Parameters ComputeFeatureNeighborCAxisMisalignmentsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFeatureNeighborCAxisMisalignmentsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeFeatureNeighborCAxisMisalignmentsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureNeighborCAxisMisalignmentsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureNeighborCAxisMisalignmentsFilter.hpp index 30ae6efb54..b280efea67 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureNeighborCAxisMisalignmentsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureNeighborCAxisMisalignmentsFilter.hpp @@ -75,6 +75,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeFeatureNeighborCAxisMisalignmentsFilter */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceCAxisMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceCAxisMisorientationsFilter.cpp index 0881546ac7..0dd1c527af 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceCAxisMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceCAxisMisorientationsFilter.cpp @@ -80,6 +80,12 @@ Parameters ComputeFeatureReferenceCAxisMisorientationsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFeatureReferenceCAxisMisorientationsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeFeatureReferenceCAxisMisorientationsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceCAxisMisorientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceCAxisMisorientationsFilter.hpp index cad723c4b9..5f87656766 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceCAxisMisorientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceCAxisMisorientationsFilter.hpp @@ -77,6 +77,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeFeatureReferenceCAxisMisorientationsFilt */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceMisorientationsFilter.cpp index eed924916f..1b544ef5de 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceMisorientationsFilter.cpp @@ -101,6 +101,12 @@ Parameters ComputeFeatureReferenceMisorientationsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFeatureReferenceMisorientationsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeFeatureReferenceMisorientationsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceMisorientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceMisorientationsFilter.hpp index 72da06cdc1..1840b276d1 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceMisorientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeFeatureReferenceMisorientationsFilter.hpp @@ -78,6 +78,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeFeatureReferenceMisorientationsFilter : */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDFilter.cpp index 0b104a060f..01f0afa31e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDFilter.cpp @@ -87,6 +87,12 @@ Parameters ComputeGBCDFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeGBCDFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeGBCDFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDFilter.hpp index 7ec2b2ae3c..960a1fc205 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDFilter.hpp @@ -78,6 +78,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeGBCDFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDMetricBasedFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDMetricBasedFilter.cpp index 187640b4d2..3993c1d2d4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDMetricBasedFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDMetricBasedFilter.cpp @@ -111,6 +111,12 @@ Parameters ComputeGBCDMetricBasedFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeGBCDMetricBasedFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeGBCDMetricBasedFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDMetricBasedFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDMetricBasedFilter.hpp index 988a11d147..2e2d5c8992 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDMetricBasedFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDMetricBasedFilter.hpp @@ -85,6 +85,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeGBCDMetricBasedFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDPoleFigureFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDPoleFigureFilter.cpp index 5aaccc141d..b3d1f46986 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDPoleFigureFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDPoleFigureFilter.cpp @@ -76,6 +76,12 @@ Parameters ComputeGBCDPoleFigureFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeGBCDPoleFigureFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeGBCDPoleFigureFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDPoleFigureFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDPoleFigureFilter.hpp index eb16ec5412..3911c797a2 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDPoleFigureFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDPoleFigureFilter.hpp @@ -76,6 +76,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeGBCDPoleFigureFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBPDMetricBasedFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBPDMetricBasedFilter.cpp index 25d0427f6b..33bd851def 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBPDMetricBasedFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBPDMetricBasedFilter.cpp @@ -95,6 +95,12 @@ Parameters ComputeGBPDMetricBasedFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeGBPDMetricBasedFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeGBPDMetricBasedFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBPDMetricBasedFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBPDMetricBasedFilter.hpp index ac6c814655..7bc23dfd78 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBPDMetricBasedFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBPDMetricBasedFilter.hpp @@ -84,6 +84,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeGBPDMetricBasedFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeIPFColorsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeIPFColorsFilter.cpp index b351cc523a..d134421935 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeIPFColorsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeIPFColorsFilter.cpp @@ -91,6 +91,12 @@ Parameters ComputeIPFColorsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeIPFColorsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeIPFColorsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeIPFColorsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeIPFColorsFilter.hpp index 0546787bad..259337d35a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeIPFColorsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeIPFColorsFilter.hpp @@ -75,6 +75,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeIPFColorsFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeKernelAvgMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeKernelAvgMisorientationsFilter.cpp index 5c325f1681..82def0432f 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeKernelAvgMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeKernelAvgMisorientationsFilter.cpp @@ -78,6 +78,12 @@ Parameters ComputeKernelAvgMisorientationsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeKernelAvgMisorientationsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeKernelAvgMisorientationsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeKernelAvgMisorientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeKernelAvgMisorientationsFilter.hpp index 9f30365ed0..be29a1bd82 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeKernelAvgMisorientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeKernelAvgMisorientationsFilter.hpp @@ -75,6 +75,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeKernelAvgMisorientationsFilter : public */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeMisorientationsFilter.cpp index 718ee6e8a1..56dff094be 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeMisorientationsFilter.cpp @@ -85,6 +85,12 @@ Parameters ComputeMisorientationsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeMisorientationsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeMisorientationsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeMisorientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeMisorientationsFilter.hpp index 7889d06a1d..4d9f75bc15 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeMisorientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeMisorientationsFilter.hpp @@ -75,6 +75,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeMisorientationsFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeQuaternionConjugateFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeQuaternionConjugateFilter.cpp index 3600c3df4b..753ecaa330 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeQuaternionConjugateFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeQuaternionConjugateFilter.cpp @@ -70,6 +70,12 @@ Parameters ComputeQuaternionConjugateFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeQuaternionConjugateFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeQuaternionConjugateFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeQuaternionConjugateFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeQuaternionConjugateFilter.hpp index 830eb2ac88..678e8a31b7 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeQuaternionConjugateFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeQuaternionConjugateFilter.hpp @@ -71,6 +71,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeQuaternionConjugateFilter : public IFilt */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSchmidsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSchmidsFilter.cpp index 5ab74072ea..b5fffb93b7 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSchmidsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSchmidsFilter.cpp @@ -95,6 +95,12 @@ Parameters ComputeSchmidsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeSchmidsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeSchmidsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSchmidsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSchmidsFilter.hpp index 0664b9b13c..74e3afb80e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSchmidsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSchmidsFilter.hpp @@ -81,6 +81,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeSchmidsFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeShapesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeShapesFilter.cpp index 33a7670ce1..2680e9eaef 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeShapesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeShapesFilter.cpp @@ -76,6 +76,12 @@ Parameters ComputeShapesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeShapesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeShapesFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeShapesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeShapesFilter.hpp index 273773750a..0604d1d463 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeShapesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeShapesFilter.hpp @@ -77,6 +77,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeShapesFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSlipTransmissionMetricsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSlipTransmissionMetricsFilter.cpp index 0ee21f4582..f7c5745254 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSlipTransmissionMetricsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSlipTransmissionMetricsFilter.cpp @@ -73,6 +73,12 @@ Parameters ComputeSlipTransmissionMetricsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeSlipTransmissionMetricsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeSlipTransmissionMetricsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSlipTransmissionMetricsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSlipTransmissionMetricsFilter.hpp index 0e6ce31bcd..36692c29d5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSlipTransmissionMetricsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeSlipTransmissionMetricsFilter.hpp @@ -76,6 +76,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeSlipTransmissionMetricsFilter : public I */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeTriangleGeomShapesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeTriangleGeomShapesFilter.cpp index 8c20b62cea..cec6254079 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeTriangleGeomShapesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeTriangleGeomShapesFilter.cpp @@ -73,6 +73,12 @@ Parameters ComputeTriangleGeomShapesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeTriangleGeomShapesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeTriangleGeomShapesFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeTriangleGeomShapesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeTriangleGeomShapesFilter.hpp index fc3090b623..fc9d090f4d 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeTriangleGeomShapesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeTriangleGeomShapesFilter.hpp @@ -70,6 +70,14 @@ class ORIENTATIONANALYSIS_EXPORT ComputeTriangleGeomShapesFilter : public IFilte */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.cpp index 27932e0500..9705ff7557 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.cpp @@ -103,6 +103,12 @@ Parameters ConvertHexGridToSquareGridFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ConvertHexGridToSquareGridFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ConvertHexGridToSquareGridFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.hpp index 2a2bd082d5..211f97eda2 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.hpp @@ -67,6 +67,14 @@ class ORIENTATIONANALYSIS_EXPORT ConvertHexGridToSquareGridFilter : public IFilt */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientationsFilter.cpp index d268fd6b74..2ee2089de3 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientationsFilter.cpp @@ -349,6 +349,12 @@ Parameters ConvertOrientationsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ConvertOrientationsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ConvertOrientationsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientationsFilter.hpp index e0e3ba67dd..6a5838408d 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientationsFilter.hpp @@ -83,6 +83,14 @@ class ORIENTATIONANALYSIS_EXPORT ConvertOrientationsFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp index 170cf8fe5c..f1a4323fc8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp @@ -75,6 +75,12 @@ Parameters ConvertQuaternionFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ConvertQuaternionFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ConvertQuaternionFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp index f079db7a77..175bd827ca 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp @@ -72,6 +72,14 @@ class ORIENTATIONANALYSIS_EXPORT ConvertQuaternionFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp index 623adc149c..e1eb835307 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp @@ -67,6 +67,12 @@ Parameters CreateEnsembleInfoFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CreateEnsembleInfoFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CreateEnsembleInfoFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp index eb6b20884b..79ac6d2436 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp @@ -73,6 +73,14 @@ class ORIENTATIONANALYSIS_EXPORT CreateEnsembleInfoFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp index d09003c457..30b0ddc218 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp @@ -101,6 +101,12 @@ Parameters EBSDSegmentFeaturesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType EBSDSegmentFeaturesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer EBSDSegmentFeaturesFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp index a2fbfbee89..87d3af4194 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp @@ -79,6 +79,14 @@ class ORIENTATIONANALYSIS_EXPORT EBSDSegmentFeaturesFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.cpp index e5e1685c82..c75735acba 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.cpp @@ -71,6 +71,12 @@ Parameters EbsdToH5EbsdFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType EbsdToH5EbsdFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer EbsdToH5EbsdFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp index a12cde467f..163c24cb89 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp @@ -66,6 +66,14 @@ class ORIENTATIONANALYSIS_EXPORT EbsdToH5EbsdFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp index 0798368c47..ada4f1f6e8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp @@ -105,6 +105,12 @@ Parameters MergeTwinsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType MergeTwinsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer MergeTwinsFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.hpp index 9dddaad50c..dcd4b2cfd3 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.hpp @@ -82,6 +82,14 @@ class ORIENTATIONANALYSIS_EXPORT MergeTwinsFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp index e5d104212d..fc3e8913b0 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp @@ -84,6 +84,12 @@ Parameters NeighborOrientationCorrelationFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType NeighborOrientationCorrelationFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer NeighborOrientationCorrelationFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp index 2079e981e7..ed1771631c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp @@ -77,6 +77,14 @@ class ORIENTATIONANALYSIS_EXPORT NeighborOrientationCorrelationFilter : public I */ 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp index c717d2c4ba..e5b99ab994 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp @@ -74,6 +74,12 @@ Parameters ReadAngDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadAngDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadAngDataFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.hpp index 4c1155d44f..3bc5371676 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.hpp @@ -78,6 +78,14 @@ class ORIENTATIONANALYSIS_EXPORT ReadAngDataFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp index ad0a8dce05..995f152b71 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp @@ -81,6 +81,12 @@ Parameters ReadCtfDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadCtfDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadCtfDataFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.hpp index b2268873d1..6f23cc7551 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.hpp @@ -75,6 +75,14 @@ class ORIENTATIONANALYSIS_EXPORT ReadCtfDataFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp index 32d8bd1a1f..0da9c2c12c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp @@ -72,6 +72,12 @@ Parameters ReadEnsembleInfoFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadEnsembleInfoFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadEnsembleInfoFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp index 9c49850031..dccc0e3a43 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp @@ -73,6 +73,14 @@ class ORIENTATIONANALYSIS_EXPORT ReadEnsembleInfoFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp index 5e2b587395..d2504ab777 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp @@ -75,6 +75,12 @@ Parameters ReadH5EbsdFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadH5EbsdFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadH5EbsdFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp index dd83ecaf3d..81002a3cbb 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp @@ -72,6 +72,14 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5EbsdFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp index 8a01b54fd4..e027831d96 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp @@ -86,6 +86,12 @@ Parameters ReadH5EspritDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadH5EspritDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadH5EspritDataFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp index 47264f6e7e..4c64c34d1a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp @@ -76,6 +76,14 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5EspritDataFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp index f266249329..2eef6e0813 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp @@ -82,6 +82,12 @@ Parameters ReadH5OimDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadH5OimDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadH5OimDataFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp index f1c83e0f07..d13f5de223 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp @@ -76,6 +76,14 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5OimDataFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp index e8761110db..95a14b371b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp @@ -84,6 +84,12 @@ Parameters ReadH5OinaDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadH5OinaDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadH5OinaDataFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.hpp index c147dd00d3..4b69c04dd9 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.hpp @@ -70,6 +70,14 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5OinaDataFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp index 6c9e59fbb4..c547bd2839 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp @@ -70,6 +70,12 @@ Parameters RodriguesConvertorFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType RodriguesConvertorFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer RodriguesConvertorFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp index dddb6c62d2..e1e75ca265 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp @@ -71,6 +71,14 @@ class ORIENTATIONANALYSIS_EXPORT RodriguesConvertorFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp index 1e4de6f403..1749651feb 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp @@ -60,6 +60,12 @@ Parameters RotateEulerRefFrameFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType RotateEulerRefFrameFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer RotateEulerRefFrameFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp index a2fbe14eca..7495674c56 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp @@ -70,6 +70,14 @@ class ORIENTATIONANALYSIS_EXPORT RotateEulerRefFrameFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp index 4f708564cd..5289cf995a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp @@ -72,6 +72,12 @@ Parameters WriteGBCDGMTFileFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteGBCDGMTFileFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteGBCDGMTFileFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp index 35707d5e49..f6682585ee 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp @@ -73,6 +73,14 @@ class ORIENTATIONANALYSIS_EXPORT WriteGBCDGMTFileFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp index 6762343d3b..518367fb82 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp @@ -75,6 +75,12 @@ Parameters WriteGBCDTriangleDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteGBCDTriangleDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteGBCDTriangleDataFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp index 81943048ed..5fbebd25ef 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp @@ -73,6 +73,14 @@ class ORIENTATIONANALYSIS_EXPORT WriteGBCDTriangleDataFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp index c17f9fadc8..d2cc4a2f92 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp @@ -82,6 +82,12 @@ Parameters WriteINLFileFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteINLFileFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteINLFileFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp index 013602a27c..7a82310fa5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp @@ -76,6 +76,14 @@ class ORIENTATIONANALYSIS_EXPORT WriteINLFileFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp index 83549ba095..11feb1d554 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp @@ -153,6 +153,12 @@ Parameters WritePoleFigureFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WritePoleFigureFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WritePoleFigureFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp index 806309745a..479ecf1020 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp @@ -92,6 +92,14 @@ class ORIENTATIONANALYSIS_EXPORT WritePoleFigureFilter : 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/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp index 23038d414b..684cac805f 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp @@ -83,6 +83,12 @@ Parameters WriteStatsGenOdfAngleFileFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteStatsGenOdfAngleFileFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteStatsGenOdfAngleFileFilter::clone() const { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp index 645472ae23..279f8a9957 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp @@ -83,6 +83,14 @@ class ORIENTATIONANALYSIS_EXPORT WriteStatsGenOdfAngleFileFilter : public IFilte */ 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/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.cpp index 1fc0404efa..e2ee8745df 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.cpp @@ -40,8 +40,14 @@ IParameter::AcceptedTypes OEMEbsdScanSelectionParameter::acceptedTypes() const return {typeid(ValueType)}; } +//------------------------------------------------------------------------------ +IParameter::VersionType OEMEbsdScanSelectionParameter::getVersion() const +{ + return 1; +} + //----------------------------------------------------------------------------- -nlohmann::json OEMEbsdScanSelectionParameter::toJson(const std::any& value) const +nlohmann::json OEMEbsdScanSelectionParameter::toJsonImpl(const std::any& value) const { const auto& data = GetAnyRef(value); nlohmann::json json; @@ -67,7 +73,7 @@ nlohmann::json OEMEbsdScanSelectionParameter::toJson(const std::any& value) cons } //----------------------------------------------------------------------------- -Result OEMEbsdScanSelectionParameter::fromJson(const nlohmann::json& json) const +Result OEMEbsdScanSelectionParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'OEMEbsdScanSelectionParameter' Error: "; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h index f757382c54..54ae991fb2 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h @@ -78,29 +78,25 @@ class SIMPLNX_EXPORT OEMEbsdScanSelectionParameter : public ValueParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + UniquePointer clone() const override; /** * @brief * @return */ - UniquePointer clone() const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - std::any defaultValue() const override; + VersionType getVersion() const override; /** * @brief @@ -121,6 +117,19 @@ class SIMPLNX_EXPORT OEMEbsdScanSelectionParameter : public ValueParameter */ EbsdReaderType getReaderType() const; +protected: + /** + * @brief + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; ExtensionsType m_AvailableExtensions = {}; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.cpp index 27fb833804..654e95e027 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.cpp @@ -47,8 +47,14 @@ IParameter::AcceptedTypes ReadH5EbsdFileParameter::acceptedTypes() const return {typeid(ValueType)}; } +//------------------------------------------------------------------------------ +IParameter::VersionType ReadH5EbsdFileParameter::getVersion() const +{ + return 1; +} + //----------------------------------------------------------------------------- -nlohmann::json ReadH5EbsdFileParameter::toJson(const std::any& value) const +nlohmann::json ReadH5EbsdFileParameter::toJsonImpl(const std::any& value) const { const auto& data = GetAnyRef(value); nlohmann::json json; @@ -77,7 +83,7 @@ nlohmann::json ReadH5EbsdFileParameter::toJson(const std::any& value) const } //----------------------------------------------------------------------------- -Result ReadH5EbsdFileParameter::fromJson(const nlohmann::json& json) const +Result ReadH5EbsdFileParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'ReadH5EbsdFileParameter' Error: "; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h index f76d5a0062..08b8efb059 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h @@ -60,34 +60,43 @@ class SIMPLNX_EXPORT ReadH5EbsdFileParameter : public ValueParameter /** * @brief - * @param value + * @return */ - nlohmann::json toJson(const std::any& value) const override; + UniquePointer clone() const override; /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - UniquePointer clone() const override; + VersionType getVersion() const override; /** * @brief + * @param value * @return */ - std::any defaultValue() const override; + Result<> validate(const std::any& value) const override; +protected: /** * @brief * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief * @return */ - Result<> validate(const std::any& value) const override; + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; private: ValueType m_DefaultValue = {}; diff --git a/src/Plugins/SimplnxCore/pipelines/AppendImageGeometry.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/AppendImageGeometry.d3dpipeline index 5e0dedf726..a5ef221cab 100644 --- a/src/Plugins/SimplnxCore/pipelines/AppendImageGeometry.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/AppendImageGeometry.d3dpipeline @@ -4,39 +4,103 @@ "pipeline": [ { "args": { - "array_handling_index": 0, - "cell_attribute_matrix_name": "Cell Data", - "dimensions": [ - 60, - 80, - 100 - ], - "edge_attribute_matrix_name": "Edge Data", - "edge_list_path": "", - "face_attribute_matrix_name": "Face Data", - "geometry_type_index": 0, - "hexahedral_list_path": "", - "length_unit_index": 7, - "origin": [ - 100.0, - 100.0, - 0.0 - ], - "output_geometry_path": "Image Geometry", - "quadrilateral_list_path": "", - "spacing": [ - 1.0, - 1.0, - 1.0 - ], - "tetrahedral_list_path": "", - "triangle_list_path": "", - "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_path": "", - "warnings_as_errors": false, - "x_bounds_path": "", - "y_bounds_path": "", - "z_bounds_path": "" + "array_handling_index": { + "value": 0, + "version": 1 + }, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 60, + 80, + 100 + ], + "version": 1 + }, + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "edge_list_path": { + "value": "", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "geometry_type_index": { + "value": 0, + "version": 1 + }, + "hexahedral_list_path": { + "value": "", + "version": 1 + }, + "length_unit_index": { + "value": 7, + "version": 1 + }, + "origin": { + "value": [ + 100.0, + 100.0, + 0.0 + ], + "version": 1 + }, + "output_geometry_path": { + "value": "Image Geometry", + "version": 1 + }, + "parameters_version": 1, + "quadrilateral_list_path": { + "value": "", + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "tetrahedral_list_path": { + "value": "", + "version": 1 + }, + "triangle_list_path": { + "value": "", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_list_path": { + "value": "", + "version": 1 + }, + "warnings_as_errors": { + "value": false, + "version": 1 + }, + "x_bounds_path": { + "value": "", + "version": 1 + }, + "y_bounds_path": { + "value": "", + "version": 1 + }, + "z_bounds_path": { + "value": "", + "version": 1 + } }, "comments": "", "filter": { @@ -47,19 +111,47 @@ }, { "args": { - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/ConfidenceIndex.csv", - "number_comp": 1, - "number_tuples": [ - [ - 0.0 - ] - ], - "output_data_array_path": "Image Geometry/Cell Data/Confidence Index", - "scalar_type_index": 8, - "set_tuple_dimensions": false, - "skip_line_count": 0 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/ConfidenceIndex.csv", + "version": 1 + }, + "number_comp": { + "value": 1, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "Image Geometry/Cell Data/Confidence Index", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -70,19 +162,47 @@ }, { "args": { - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/FeatureIds.csv", - "number_comp": 1, - "number_tuples": [ - [ - 0.0 - ] - ], - "output_data_array_path": "Image Geometry/Cell Data/FeatureIds", - "scalar_type_index": 4, - "set_tuple_dimensions": false, - "skip_line_count": 0 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/FeatureIds.csv", + "version": 1 + }, + "number_comp": { + "value": 1, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "Image Geometry/Cell Data/FeatureIds", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 4, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -93,19 +213,47 @@ }, { "args": { - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/ImageQuality.csv", - "number_comp": 1, - "number_tuples": [ - [ - 0.0 - ] - ], - "output_data_array_path": "Image Geometry/Cell Data/Image Quality", - "scalar_type_index": 4, - "set_tuple_dimensions": false, - "skip_line_count": 0 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/ImageQuality.csv", + "version": 1 + }, + "number_comp": { + "value": 1, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "Image Geometry/Cell Data/Image Quality", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 4, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -116,19 +264,47 @@ }, { "args": { - "data_format": "", - "delimiter_index": 0, - "input_file": "/Users/mjackson/Applications/NXData/Data/ASCIIData/IPFColor.csv", - "number_comp": 3, - "number_tuples": [ - [ - 0.0 - ] - ], - "output_data_array_path": "Image Geometry/Cell Data/IPFColors", - "scalar_type_index": 1, - "set_tuple_dimensions": false, - "skip_line_count": 0 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "/Users/mjackson/Applications/NXData/Data/ASCIIData/IPFColor.csv", + "version": 1 + }, + "number_comp": { + "value": 3, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "Image Geometry/Cell Data/IPFColors", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 1, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -139,33 +315,79 @@ }, { "args": { - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "feature_ids_path": "", - "input_image_geometry_path": "Image Geometry", - "max_coord": [ - 0.0, - 0.0, - 0.0 - ], - "max_voxel": [ - 59, - 79, - 50 - ], - "min_coord": [ - 0.0, - 0.0, - 0.0 - ], - "min_voxel": [ - 0, - 0, - 0 - ], - "output_image_geometry_path": "CroppedBottomHalf", - "remove_original_geometry": false, - "renumber_features": false, - "use_physical_bounds": false + "cell_feature_attribute_matrix_path": { + "value": "Cell Feature Data", + "version": 1 + }, + "crop_x_dim": { + "value": true, + "version": 1 + }, + "crop_y_dim": { + "value": true, + "version": 1 + }, + "crop_z_dim": { + "value": true, + "version": 1 + }, + "feature_ids_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Image Geometry", + "version": 1 + }, + "max_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "max_voxel": { + "value": [ + 59, + 79, + 50 + ], + "version": 1 + }, + "min_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "min_voxel": { + "value": [ + 0, + 0, + 0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "CroppedBottomHalf", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": false, + "version": 1 + }, + "renumber_features": { + "value": false, + "version": 1 + }, + "use_physical_bounds": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -176,33 +398,79 @@ }, { "args": { - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "feature_ids_path": "", - "input_image_geometry_path": "Image Geometry", - "max_coord": [ - 0.0, - 0.0, - 0.0 - ], - "max_voxel": [ - 59, - 79, - 99 - ], - "min_coord": [ - 0.0, - 0.0, - 0.0 - ], - "min_voxel": [ - 0, - 0, - 51 - ], - "output_image_geometry_path": "CroppedTopHalf", - "remove_original_geometry": false, - "renumber_features": false, - "use_physical_bounds": false + "cell_feature_attribute_matrix_path": { + "value": "Cell Feature Data", + "version": 1 + }, + "crop_x_dim": { + "value": true, + "version": 1 + }, + "crop_y_dim": { + "value": true, + "version": 1 + }, + "crop_z_dim": { + "value": true, + "version": 1 + }, + "feature_ids_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Image Geometry", + "version": 1 + }, + "max_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "max_voxel": { + "value": [ + 59, + 79, + 99 + ], + "version": 1 + }, + "min_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "min_voxel": { + "value": [ + 0, + 0, + 51 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "CroppedTopHalf", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": false, + "version": 1 + }, + "renumber_features": { + "value": false, + "version": 1 + }, + "use_physical_bounds": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -213,11 +481,35 @@ }, { "args": { - "check_resolution": true, - "destination_image_geometry_path": "CroppedTopHalf", - "input_image_geometry_path": "CroppedBottomHalf", - "output_image_geometry_path": "Appended Image Geometry", - "save_as_new_geometry": true + "check_resolution": { + "value": true, + "version": 1 + }, + "destination_image_geometry_path": { + "value": "CroppedTopHalf", + "version": 1 + }, + "direction_index": { + "value": 2, + "version": 1 + }, + "input_image_geometries_paths": { + "value": [], + "version": 1 + }, + "mirror_geometry": { + "value": false, + "version": 1 + }, + "output_image_geometry_path": { + "value": "Appended Image Geometry", + "version": 1 + }, + "parameters_version": 1, + "save_as_new_geometry": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -228,8 +520,15 @@ }, { "args": { - "export_file_path": "Data/Output/Examples/AppendImageGeometry.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Examples/AppendImageGeometry.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -240,4 +539,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline index 0df9fc92ba..3e595710dd 100644 --- a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline @@ -4,39 +4,103 @@ "pipeline": [ { "args": { - "array_handling_index": 0, - "cell_attribute_matrix_name": "Cell Data", - "dimensions": [ - 10, - 10, - 2 - ], - "edge_attribute_matrix_name": "Edge Data", - "edge_list_path": "", - "face_attribute_matrix_name": "Face Data", - "geometry_type_index": 0, - "hexahedral_list_path": "", - "length_unit_index": 7, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "output_geometry_path": "Geometry", - "quadrilateral_list_path": "", - "spacing": [ - 1.0, - 1.0, - 1.0 - ], - "tetrahedral_list_path": "", - "triangle_list_path": "", - "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_path": "", - "warnings_as_errors": false, - "x_bounds_path": "", - "y_bounds_path": "", - "z_bounds_path": "" + "array_handling_index": { + "value": 0, + "version": 1 + }, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 10, + 10, + 2 + ], + "version": 1 + }, + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "edge_list_path": { + "value": "", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "geometry_type_index": { + "value": 0, + "version": 1 + }, + "hexahedral_list_path": { + "value": "", + "version": 1 + }, + "length_unit_index": { + "value": 7, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_geometry_path": { + "value": "Geometry", + "version": 1 + }, + "parameters_version": 1, + "quadrilateral_list_path": { + "value": "", + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "tetrahedral_list_path": { + "value": "", + "version": 1 + }, + "triangle_list_path": { + "value": "", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_list_path": { + "value": "", + "version": 1 + }, + "warnings_as_errors": { + "value": false, + "version": 1 + }, + "x_bounds_path": { + "value": "", + "version": 1 + }, + "y_bounds_path": { + "value": "", + "version": 1 + }, + "z_bounds_path": { + "value": "", + "version": 1 + } }, "comments": "", "filter": { @@ -47,19 +111,41 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "2", - "numeric_type_index": 4, - "output_array_path": "Geometry/Cell Data/Data", - "set_tuple_dimensions": false, - "tuple_dimensions": [ - [ - 2.0, - 10.0, - 10.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "2", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Cell Data/Data", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 2.0, + 10.0, + 10.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -70,54 +156,85 @@ }, { "args": { - "cell_attribute_matrix_path": "Geometry/Cell Data", - "computed_transformation_matrix_path": "", - "input_image_geometry_path": "Geometry", - "interpolation_type_index": 0, - "manual_transformation_matrix": [ - [ - 1.0, - 0.0, - 0.0, - 0.0 + "cell_attribute_matrix_path": { + "value": "Geometry/Cell Data", + "version": 1 + }, + "computed_transformation_matrix_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Geometry", + "version": 1 + }, + "interpolation_type_index": { + "value": 0, + "version": 1 + }, + "manual_transformation_matrix": { + "value": [ + [ + 1.0, + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] ], - [ + "version": 1 + }, + "parameters_version": 1, + "rotation": { + "value": [ 0.0, - 1.0, 0.0, - 0.0 + 1.0, + 45.0 ], - [ + "version": 1 + }, + "scale": { + "value": [ + 2.0, + 2.0, + 2.0 + ], + "version": 1 + }, + "transformation_type_index": { + "value": 3, + "version": 1 + }, + "translate_geometry_to_global_origin": { + "value": false, + "version": 1 + }, + "translation": { + "value": [ 0.0, 0.0, - 1.0, 0.0 ], - [ - 0.0, - 0.0, - 0.0, - 1.0 - ] - ], - "rotation": [ - 0.0, - 0.0, - 1.0, - 45.0 - ], - "scale": [ - 2.0, - 2.0, - 2.0 - ], - "transformation_type_index": 3, - "translate_geometry_to_global_origin": false, - "translation": [ - 0.0, - 0.0, - 0.0 - ] + "version": 1 + } }, "comments": "", "filter": { @@ -128,4 +245,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline index 304b0c524f..d56a0214a7 100644 --- a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline @@ -1,389 +1,633 @@ { "isDisabled": false, "name": "ApplyTransformation_Image.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "Small IN100", - "input_file": "Data/Small_IN100/Slice_1.ang" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "input_file": { + "value": "Data/Small_IN100/Slice_1.ang", + "version": 1 + }, + "output_image_geometry_path": { + "value": "Small IN100", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadAngDataFilter", + "name": "nx::core::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "Transform [Rotate]", - "input_file": "Data/Small_IN100/Slice_1.ang" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "input_file": { + "value": "Data/Small_IN100/Slice_1.ang", + "version": 1 + }, + "output_image_geometry_path": { + "value": "Transform [Rotate]", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadAngDataFilter", + "name": "nx::core::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_path": "Transform [Rotate]/Cell Data", - "computed_transformation_matrix_path": "", - "interpolation_type_index": 1, - "manual_transformation_matrix": [ - [ - 1.0, - 0.0, - 0.0, - 0.0 + "cell_attribute_matrix_path": { + "value": "Transform [Rotate]/Cell Data", + "version": 1 + }, + "computed_transformation_matrix_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Transform [Rotate]", + "version": 1 + }, + "interpolation_type_index": { + "value": 1, + "version": 1 + }, + "manual_transformation_matrix": { + "value": [ + [ + 1.0, + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] ], - [ + "version": 1 + }, + "parameters_version": 1, + "rotation": { + "value": [ 0.0, 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, + "version": 1 + }, + "scale": { + "value": [ 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "transformation_type_index": { + "value": 3, + "version": 1 + }, + "translate_geometry_to_global_origin": { + "value": false, + "version": 1 + }, + "translation": { + "value": [ + 10.0, + 10.0, 0.0 ], - [ - 0.0, - 0.0, - 0.0, - 1.0 - ] - ], - "rotation": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ], - "input_image_geometry_path": "Transform [Rotate]", - "transformation_type_index": 3, - "translation": [ - 10.0, - 10.0, - 0.0 - ] + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ApplyTransformationToGeometryFilter", + "name": "nx::core::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "Transform [Scale]", - "input_file": "Data/Small_IN100/Slice_1.ang" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "input_file": { + "value": "Data/Small_IN100/Slice_1.ang", + "version": 1 + }, + "output_image_geometry_path": { + "value": "Transform [Scale]", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadAngDataFilter", + "name": "nx::core::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_path": "Transform [Scale]/Cell Data", - "computed_transformation_matrix_path": "", - "interpolation_type_index": 1, - "manual_transformation_matrix": [ - [ - 1.0, - 0.0, - 0.0, - 0.0 + "cell_attribute_matrix_path": { + "value": "Transform [Scale]/Cell Data", + "version": 1 + }, + "computed_transformation_matrix_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Transform [Scale]", + "version": 1 + }, + "interpolation_type_index": { + "value": 1, + "version": 1 + }, + "manual_transformation_matrix": { + "value": [ + [ + 1.0, + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] ], - [ + "version": 1 + }, + "parameters_version": 1, + "rotation": { + "value": [ 0.0, 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 1.0, + "version": 1 + }, + "scale": { + "value": [ + 2.0, + 2.0, + 1.0 + ], + "version": 1 + }, + "transformation_type_index": { + "value": 5, + "version": 1 + }, + "translate_geometry_to_global_origin": { + "value": false, + "version": 1 + }, + "translation": { + "value": [ + 10.0, + 10.0, 0.0 ], - [ - 0.0, - 0.0, - 0.0, - 1.0 - ] - ], - "rotation": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "scale": [ - 2.0, - 2.0, - 1.0 - ], - "input_image_geometry_path": "Transform [Scale]", - "transformation_type_index": 5, - "translation": [ - 10.0, - 10.0, - 0.0 - ] + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ApplyTransformationToGeometryFilter", + "name": "nx::core::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "Transform [Translate]", - "input_file": "Data/Small_IN100/Slice_1.ang" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "input_file": { + "value": "Data/Small_IN100/Slice_1.ang", + "version": 1 + }, + "output_image_geometry_path": { + "value": "Transform [Translate]", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadAngDataFilter", + "name": "nx::core::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_path": "Transform [Translate]/Cell Data", - "computed_transformation_matrix_path": "", - "interpolation_type_index": 1, - "manual_transformation_matrix": [ - [ - 1.0, + "cell_attribute_matrix_path": { + "value": "Transform [Translate]/Cell Data", + "version": 1 + }, + "computed_transformation_matrix_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Transform [Translate]", + "version": 1 + }, + "interpolation_type_index": { + "value": 1, + "version": 1 + }, + "manual_transformation_matrix": { + "value": [ + [ + 1.0, + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] + ], + "version": 1 + }, + "parameters_version": 1, + "rotation": { + "value": [ 0.0, 0.0, - 0.0 + 1.0, + 90.0 ], - [ - 0.0, + "version": 1 + }, + "scale": { + "value": [ 1.0, - 0.0, - 0.0 + 1.0, + 1.0 ], - [ - 0.0, + "version": 1 + }, + "transformation_type_index": { + "value": 4, + "version": 1 + }, + "translate_geometry_to_global_origin": { + "value": false, + "version": 1 + }, + "translation": { + "value": [ + 50.0, 0.0, - 1.0, 0.0 ], - [ - 0.0, - 0.0, - 0.0, - 1.0 - ] - ], - "rotation": [ - 0.0, - 0.0, - 1.0, - 90.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ], - "input_image_geometry_path": "Transform [Translate]", - "transformation_type_index": 4, - "translation": [ - 50.0, - 0.0, - 0.0 - ] + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ApplyTransformationToGeometryFilter", + "name": "nx::core::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "Transform [Rotation-Interpolation]", - "input_file": "Data/Small_IN100/Slice_1.ang" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "input_file": { + "value": "Data/Small_IN100/Slice_1.ang", + "version": 1 + }, + "output_image_geometry_path": { + "value": "Transform [Rotation-Interpolation]", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadAngDataFilter", + "name": "nx::core::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_path": "Transform [Rotation-Interpolation]/Cell Data", - "computed_transformation_matrix_path": "", - "interpolation_type_index": 1, - "manual_transformation_matrix": [ - [ - 222.0, - 123.0, - 0.0, - 0.0 + "cell_attribute_matrix_path": { + "value": "Transform [Rotation-Interpolation]/Cell Data", + "version": 1 + }, + "computed_transformation_matrix_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Transform [Rotation-Interpolation]", + "version": 1 + }, + "interpolation_type_index": { + "value": 1, + "version": 1 + }, + "manual_transformation_matrix": { + "value": [ + [ + 222.0, + 123.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 222.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] ], - [ + "version": 1 + }, + "parameters_version": 1, + "rotation": { + "value": [ + 0.0, 0.0, 1.0, - 222.0, - 0.0 + 45.0 ], - [ - 0.0, - 0.0, + "version": 1 + }, + "scale": { + "value": [ + 1.0, 1.0, + 1.0 + ], + "version": 1 + }, + "transformation_type_index": { + "value": 3, + "version": 1 + }, + "translate_geometry_to_global_origin": { + "value": false, + "version": 1 + }, + "translation": { + "value": [ + 10.0, + 10.0, 0.0 ], - [ - 0.0, - 0.0, - 0.0, - 1.0 - ] - ], - "rotation": [ - 0.0, - 0.0, - 1.0, - 45.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ], - "input_image_geometry_path": "Transform [Rotation-Interpolation]", - "transformation_type_index": 3, - "translation": [ - 10.0, - 10.0, - 0.0 - ] + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ApplyTransformationToGeometryFilter", + "name": "nx::core::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "Transform [Scale-Interpolation]", - "input_file": "Data/Small_IN100/Slice_1.ang" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "input_file": { + "value": "Data/Small_IN100/Slice_1.ang", + "version": 1 + }, + "output_image_geometry_path": { + "value": "Transform [Scale-Interpolation]", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadAngDataFilter", + "name": "nx::core::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_path": "Transform [Scale-Interpolation]/Cell Data", - "computed_transformation_matrix_path": "", - "interpolation_type_index": 1, - "manual_transformation_matrix": [ - [ - 222.0, - 123.0, - 0.0, - 0.0 + "cell_attribute_matrix_path": { + "value": "Transform [Scale-Interpolation]/Cell Data", + "version": 1 + }, + "computed_transformation_matrix_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Transform [Scale-Interpolation]", + "version": 1 + }, + "interpolation_type_index": { + "value": 1, + "version": 1 + }, + "manual_transformation_matrix": { + "value": [ + [ + 222.0, + 123.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 222.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] ], - [ - 0.0, - 1.0, - 222.0, - 0.0 - ], - [ + "version": 1 + }, + "parameters_version": 1, + "rotation": { + "value": [ 0.0, 0.0, 1.0, - 0.0 + 45.0 ], - [ - 0.0, - 0.0, - 0.0, + "version": 1 + }, + "scale": { + "value": [ + 3.0, + 3.0, 1.0 - ] - ], - "rotation": [ - 0.0, - 0.0, - 1.0, - 45.0 - ], - "scale": [ - 3.0, - 3.0, - 1.0 - ], - "input_image_geometry_path": "Transform [Scale-Interpolation]", - "transformation_type_index": 5, - "translation": [ - 10.0, - 10.0, - 0.0 - ] + ], + "version": 1 + }, + "transformation_type_index": { + "value": 5, + "version": 1 + }, + "translate_geometry_to_global_origin": { + "value": false, + "version": 1 + }, + "translation": { + "value": [ + 10.0, + 10.0, + 0.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ApplyTransformationToGeometryFilter", + "name": "nx::core::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/Transformation/ApplyTransformation_Image.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Transformation/ApplyTransformation_Image.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline index 95d258a111..0278a6abb4 100644 --- a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline @@ -1,247 +1,449 @@ { "isDisabled": false, "name": "ApplyTransformation_Node.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "output_triangle_geometry_path": "Blade", - "scale_factor": 1.0, - "scale_output": false, - "stl_file_path": "Data/STL_Models/ASTMD638_specimen.stl" + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "face_normals_name": { + "value": "Face Normals", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "Blade", + "version": 1 + }, + "parameters_version": 1, + "scale_factor": { + "value": 1.0, + "version": 1 + }, + "scale_output": { + "value": false, + "version": 1 + }, + "stl_file_path": { + "value": "Data/STL_Models/ASTMD638_specimen.stl", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadStlFileFilter", + "name": "nx::core::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false }, { "args": { - "output_triangle_geometry_path": "Blade [Rotation]", - "scale_factor": 1.0, - "scale_output": false, - "stl_file_path": "Data/STL_Models/ASTMD638_specimen.stl" + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "face_normals_name": { + "value": "Face Normals", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "Blade [Rotation]", + "version": 1 + }, + "parameters_version": 1, + "scale_factor": { + "value": 1.0, + "version": 1 + }, + "scale_output": { + "value": false, + "version": 1 + }, + "stl_file_path": { + "value": "Data/STL_Models/ASTMD638_specimen.stl", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadStlFileFilter", + "name": "nx::core::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_path": "", - "computed_transformation_matrix_path": "", - "interpolation_type_index": 2, - "manual_transformation_matrix": [ - [ + "cell_attribute_matrix_path": { + "value": "", + "version": 1 + }, + "computed_transformation_matrix_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Blade [Rotation]", + "version": 1 + }, + "interpolation_type_index": { + "value": 2, + "version": 1 + }, + "manual_transformation_matrix": { + "value": [ + [ + 1.0, + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] + ], + "version": 1 + }, + "parameters_version": 1, + "rotation": { + "value": [ 1.0, 0.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, + "version": 1 + }, + "scale": { + "value": [ 1.0, - 0.0, - 0.0 + 1.0, + 1.0 ], - [ + "version": 1 + }, + "transformation_type_index": { + "value": 3, + "version": 1 + }, + "translate_geometry_to_global_origin": { + "value": false, + "version": 1 + }, + "translation": { + "value": [ 0.0, 0.0, - 1.0, 0.0 ], - [ - 0.0, - 0.0, - 0.0, - 1.0 - ] - ], - "rotation": [ - 1.0, - 0.0, - 0.0, - 180.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ], - "input_image_geometry_path": "Blade [Rotation]", - "transformation_type_index": 3, - "translation": [ - 0.0, - 0.0, - 0.0 - ] + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ApplyTransformationToGeometryFilter", + "name": "nx::core::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false }, { "args": { - "output_triangle_geometry_path": "Blade [Translation]", - "scale_factor": 1.0, - "scale_output": false, - "stl_file_path": "Data/STL_Models/ASTMD638_specimen.stl" + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "face_normals_name": { + "value": "Face Normals", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "Blade [Translation]", + "version": 1 + }, + "parameters_version": 1, + "scale_factor": { + "value": 1.0, + "version": 1 + }, + "scale_output": { + "value": false, + "version": 1 + }, + "stl_file_path": { + "value": "Data/STL_Models/ASTMD638_specimen.stl", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadStlFileFilter", + "name": "nx::core::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_path": "", - "computed_transformation_matrix_path": "", - "interpolation_type_index": 2, - "manual_transformation_matrix": [ - [ - 1.0, - 0.0, - 0.0, - 0.0 + "cell_attribute_matrix_path": { + "value": "", + "version": 1 + }, + "computed_transformation_matrix_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Blade [Translation]", + "version": 1 + }, + "interpolation_type_index": { + "value": 2, + "version": 1 + }, + "manual_transformation_matrix": { + "value": [ + [ + 1.0, + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] ], - [ - 0.0, + "version": 1 + }, + "parameters_version": 1, + "rotation": { + "value": [ 1.0, - 0.0, - 0.0 - ], - [ - 0.0, - 0.0, 1.0, - 0.0 + 1.0, + 45.0 ], - [ - 0.0, - 0.0, - 0.0, + "version": 1 + }, + "scale": { + "value": [ + 1.0, + 1.0, 1.0 - ] - ], - "rotation": [ - 1.0, - 1.0, - 1.0, - 45.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ], - "input_image_geometry_path": "Blade [Translation]", - "transformation_type_index": 4, - "translation": [ - 10.0, - 10.0, - 10.0 - ] + ], + "version": 1 + }, + "transformation_type_index": { + "value": 4, + "version": 1 + }, + "translate_geometry_to_global_origin": { + "value": false, + "version": 1 + }, + "translation": { + "value": [ + 10.0, + 10.0, + 10.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ApplyTransformationToGeometryFilter", + "name": "nx::core::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false }, { "args": { - "output_triangle_geometry_path": "Blade [Scale]", - "scale_factor": 1.0, - "scale_output": false, - "stl_file_path": "Data/STL_Models/ASTMD638_specimen.stl" + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "face_normals_name": { + "value": "Face Normals", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "Blade [Scale]", + "version": 1 + }, + "parameters_version": 1, + "scale_factor": { + "value": 1.0, + "version": 1 + }, + "scale_output": { + "value": false, + "version": 1 + }, + "stl_file_path": { + "value": "Data/STL_Models/ASTMD638_specimen.stl", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadStlFileFilter", + "name": "nx::core::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_path": "", - "computed_transformation_matrix_path": "", - "interpolation_type_index": 2, - "manual_transformation_matrix": [ - [ - 1.0, - 0.0, - 0.0, - 0.0 + "cell_attribute_matrix_path": { + "value": "", + "version": 1 + }, + "computed_transformation_matrix_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Blade [Scale]", + "version": 1 + }, + "interpolation_type_index": { + "value": 2, + "version": 1 + }, + "manual_transformation_matrix": { + "value": [ + [ + 1.0, + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 1.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 1.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0, + 1.0 + ] ], - [ - 0.0, + "version": 1 + }, + "parameters_version": 1, + "rotation": { + "value": [ 1.0, - 0.0, - 0.0 - ], - [ - 0.0, - 0.0, 1.0, - 0.0 + 1.0, + 45.0 ], - [ - 0.0, - 0.0, - 0.0, + "version": 1 + }, + "scale": { + "value": [ + 0.5, + 0.5, 1.0 - ] - ], - "rotation": [ - 1.0, - 1.0, - 1.0, - 45.0 - ], - "scale": [ - 0.5, - 0.5, - 1.0 - ], - "input_image_geometry_path": "Blade [Scale]", - "transformation_type_index": 5, - "translation": [ - 10.0, - 10.0, - 10.0 - ] + ], + "version": 1 + }, + "transformation_type_index": { + "value": 5, + "version": 1 + }, + "translate_geometry_to_global_origin": { + "value": false, + "version": 1 + }, + "translation": { + "value": [ + 10.0, + 10.0, + 10.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ApplyTransformationToGeometryFilter", + "name": "nx::core::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/ApplyTransformation_Node.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/ApplyTransformation_Node.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline index 51e5b64ebc..de454e40c3 100644 --- a/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline @@ -4,174 +4,314 @@ "pipeline": [ { "args": { - "component_count": 1, - "initialization_value_str": "2", - "numeric_type_index": 4, - "output_array_path": "TestArray", - "tuple_dimensions": [ - [ - 10.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "2", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "TestArray", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 10.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false }, { "args": { - "component_count": 1, - "initialization_value_str": "1.23878", - "numeric_type_index": 8, - "output_array_path": "Confidence Index", - "tuple_dimensions": [ - [ - 10.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "1.23878", + "version": 1 + }, + "numeric_type_index": { + "value": 8, + "version": 1 + }, + "output_array_path": { + "value": "Confidence Index", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 10.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false }, { "args": { - "component_count": 3, - "initialization_value_str": "1.23878", - "numeric_type_index": 8, - "output_array_path": "EulerAngles", - "tuple_dimensions": [ - [ - 10.0 - ] - ] + "component_count": { + "value": 3, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "1.23878", + "version": 1 + }, + "numeric_type_index": { + "value": 8, + "version": 1 + }, + "output_array_path": { + "value": "EulerAngles", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 10.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false }, { "args": { - "calculated_array_path": "Caclulated_TestArray", + "calculated_array_path": { + "value": "Caclulated_TestArray", + "version": 1 + }, "calculator_parameter": { - "equation": "TestArray+TestArray", - "selected_group": "", - "units": 0 + "value": { + "equation": "TestArray+TestArray", + "selected_group": "", + "units": 0 + }, + "version": 1 }, - "scalar_type_index": 8 + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ArrayCalculatorFilter", + "name": "nx::core::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false }, { "args": { - "calculated_array_path": "Caclulated_TestArray 2", + "calculated_array_path": { + "value": "Caclulated_TestArray 2", + "version": 1 + }, "calculator_parameter": { - "equation": "TestArray+TestArray", - "selected_group": "", - "units": 0 + "value": { + "equation": "TestArray+TestArray", + "selected_group": "", + "units": 0 + }, + "version": 1 }, - "scalar_type_index": 8 + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ArrayCalculatorFilter", + "name": "nx::core::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false }, { "args": { - "calculated_array_path": "Caclulated_TestArray 3", + "calculated_array_path": { + "value": "Caclulated_TestArray 3", + "version": 1 + }, "calculator_parameter": { - "equation": "TestArray+TestArray", - "selected_group": "", - "units": 0 + "value": { + "equation": "TestArray+TestArray", + "selected_group": "", + "units": 0 + }, + "version": 1 }, - "scalar_type_index": 8 + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ArrayCalculatorFilter", + "name": "nx::core::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false }, { "args": { - "calculated_array_path": "Caclulated_ConfidenceIndex", + "calculated_array_path": { + "value": "Caclulated_ConfidenceIndex", + "version": 1 + }, "calculator_parameter": { - "equation": "Confidence Index*100", - "selected_group": "", - "units": 0 + "value": { + "equation": "Confidence Index*100", + "selected_group": "", + "units": 0 + }, + "version": 1 }, - "scalar_type_index": 9 + "parameters_version": 1, + "scalar_type_index": { + "value": 9, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ArrayCalculatorFilter", + "name": "nx::core::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false }, { "args": { - "calculated_array_path": "Caclulated_EulerAngles", + "calculated_array_path": { + "value": "Caclulated_EulerAngles", + "version": 1 + }, "calculator_parameter": { - "equation": "EulerAngles/2", - "selected_group": "", - "units": 0 + "value": { + "equation": "EulerAngles/2", + "selected_group": "", + "units": 0 + }, + "version": 1 }, - "scalar_type_index": 8 + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ArrayCalculatorFilter", + "name": "nx::core::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false }, { "args": { - "calculated_array_path": "Caclulated_EulerAngles2", + "calculated_array_path": { + "value": "Caclulated_EulerAngles2", + "version": 1 + }, "calculator_parameter": { - "equation": "EulerAngles[0]+EulerAngles[1]", - "selected_group": "", - "units": 0 + "value": { + "equation": "EulerAngles[0]+EulerAngles[1]", + "selected_group": "", + "units": 0 + }, + "version": 1 }, - "scalar_type_index": 8 + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ArrayCalculatorFilter", + "name": "nx::core::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/ArrayCalculatorExampleResults.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/ArrayCalculatorExampleResults.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } - ] -} \ No newline at end of file + ], + "version": 1 +} diff --git a/src/Plugins/SimplnxCore/pipelines/AvizoWriters.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/AvizoWriters.d3dpipeline index 99fbc31248..1d18cc4be9 100644 --- a/src/Plugins/SimplnxCore/pipelines/AvizoWriters.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/AvizoWriters.d3dpipeline @@ -1,84 +1,118 @@ { "isDisabled": false, "name": "AvizoWriters.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/X Position", - "DataContainer/Cell Data/Y Position", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/Volumes", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Data/IPFColors" - ], - "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" - } + "value": { + "data_paths": [ + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/X Position", + "DataContainer/Cell Data/Y Position", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Feature Data/Active", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/Cell Feature Data/AvgQuats", + "DataContainer/Cell Feature Data/AvgEulerAngles", + "DataContainer/NewGrain Data", + "DataContainer/Cell Data/ParentIds", + "DataContainer/Cell Feature Data/ParentIds", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Feature Data/Volumes", + "DataContainer/Cell Feature Data/EquivalentDiameters", + "DataContainer/Cell Feature Data/NumElements", + "DataContainer/Cell Feature Data/NumNeighbors", + "DataContainer/Cell Data/IPFColors" + ], + "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" + }, + "version": 1 + }, + "parameters_version": 1 }, "comments": "This pipeline requires the output from the (08) Small IN100 Full Reconstruction pipeline as input", "filter": { - "name": "simplnx::ReadDREAM3DFilter", + "name": "nx::core::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false }, { "args": { - "feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "output_file": "Data/Output/Examples/SmallIN100_AvizoUniform.am", - "units": "meters", - "write_binary_file": false + "feature_ids_array_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "output_file": { + "value": "Data/Output/Examples/SmallIN100_AvizoUniform.am", + "version": 1 + }, + "parameters_version": 1, + "units": { + "value": "meters", + "version": 1 + }, + "write_binary_file": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteAvizoUniformCoordinateFilter", + "name": "nx::core::WriteAvizoUniformCoordinateFilter", "uuid": "0ed4ae48-3295-4a5d-8505-d5d2a6f2a212" }, "isDisabled": false }, { "args": { - "feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "output_file": "Data/Output/Examples/SmallIN100_AvizoRectilinear.am", - "units": "meters", - "write_binary_file": false + "feature_ids_array_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "output_file": { + "value": "Data/Output/Examples/SmallIN100_AvizoRectilinear.am", + "version": 1 + }, + "parameters_version": 1, + "units": { + "value": "meters", + "version": 1 + }, + "write_binary_file": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteAvizoRectilinearCoordinateFilter", + "name": "nx::core::WriteAvizoRectilinearCoordinateFilter", "uuid": "58661ea8-0322-44af-a48e-1dc80e999376" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/CombineStlFiles.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CombineStlFiles.d3dpipeline index c9b93b5cb4..83fcc6bb1e 100644 --- a/src/Plugins/SimplnxCore/pipelines/CombineStlFiles.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CombineStlFiles.d3dpipeline @@ -1,35 +1,85 @@ { "isDisabled": false, "name": "CombineStlFiles.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "face_attribute_matrix_name": "Face Data", - "face_normals_array_name": "FaceNormals", - "stl_files_path": "Data/STL_Models", - "output_triangle_geometry_path": "TriangleGeometry", - "vertex_attribute_matrix_name": "Vertex Data" + "active_array_name": { + "value": "Active", + "version": 1 + }, + "cell_feature_attribute_matrix_name": { + "value": "Cell Feature Data", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "face_label_name": { + "value": "Part Number", + "version": 1 + }, + "face_normals_array_name": { + "value": "FaceNormals", + "version": 1 + }, + "label_faces": { + "value": true, + "version": 1 + }, + "label_vertices": { + "value": true, + "version": 1 + }, + "output_file_list_name": { + "value": "STL File List", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "TriangleGeometry", + "version": 1 + }, + "parameters_version": 1, + "stl_files_path": { + "value": "Data/STL_Models", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_label_name": { + "value": "Part Number", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CombineStlFilesFilter", + "name": "nx::core::CombineStlFilesFilter", "uuid": "76b56f80-fcbe-4d48-a34d-a73d0fc6e5ae" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/CombinedStlFiles.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/CombinedStlFiles.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/ComputeBiasedFeatures.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ComputeBiasedFeatures.d3dpipeline index 494d31692d..8fa7eb0079 100644 --- a/src/Plugins/SimplnxCore/pipelines/ComputeBiasedFeatures.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ComputeBiasedFeatures.d3dpipeline @@ -1,137 +1,221 @@ { "isDisabled": false, "name": "ComputeBiasedFeatures.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Feature Data/MisorientationList", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations" - ], - "file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d" - }, - "Imported Pipeline": { - "isDisabled": false, - "name": "Untitled Pipeline", - "pipeline": [] - } + "value": { + "data_paths": [ + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Feature Data/Active", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/NewGrain Data", + "DataContainer/Cell Data/ParentIds", + "DataContainer/Cell Feature Data/ParentIds", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Data/IPFColors", + "DataContainer/Cell Data/GBManhattanDistances", + "DataContainer/Cell Data/TJManhattanDistances", + "DataContainer/Cell Data/QPManhattanDistances", + "DataContainer/Cell Feature Data/MisorientationList", + "DataContainer/Cell Feature Data/Schmids", + "DataContainer/Cell Feature Data/SlipSystems", + "DataContainer/Cell Feature Data/Poles", + "DataContainer/Cell Data/FeatureReferenceMisorientations", + "DataContainer/Cell Feature Data/FeatureAvgMisorientations", + "DataContainer/Cell Data/KernelAverageMisorientations" + ], + "file_path": "Data/Output/Statistics/SmallIN100_CrystalStats.dream3d" + }, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadDREAM3DFilter", + "name": "nx::core::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false }, { "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" + "boundary_cells_name": { + "value": "BoundaryCells", + "version": 1 + }, + "cell_feature_array_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "neighbor_list_name": { + "value": "NeighborList", + "version": 1 + }, + "number_of_neighbors_name": { + "value": "NumNeighbors", + "version": 1 + }, + "parameters_version": 1, + "shared_surface_area_list_name": { + "value": "SharedSurfaceAreaList", + "version": 1 + }, + "store_boundary_cells": { + "value": false, + "version": 1 + }, + "store_surface_features": { + "value": false, + "version": 1 + }, + "surface_features_name": { + "value": "SurfaceFeatures", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::FindNeighborsFilter", + "name": "nx::core::ComputeFeatureNeighborsFilter", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false }, { "args": { - "centroids_array_name": "Centroids", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer" + "centroids_array_name": { + "value": "Centroids", + "version": 1 + }, + "feature_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ComputeFeatureCentroidsFilter", + "name": "nx::core::ComputeFeatureCentroidsFilter", "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" }, "isDisabled": false }, { "args": { - "input_image_geometry_path": "DataContainer", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "mark_feature_0_neighbors": true, - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "surface_features_array_name": "SurfaceFeatures" + "feature_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "mark_feature_0_neighbors": { + "value": true, + "version": 1 + }, + "parameters_version": 1, + "surface_features_array_name": { + "value": "SurfaceFeatures", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeSurfaceFeaturesFilter", + "name": "nx::core::ComputeSurfaceFeaturesFilter", "uuid": "0893e490-5d24-4c21-95e7-e8372baa8948" }, "isDisabled": false }, { "args": { - "biased_features_array_name": "BiasedFeatures", - "calc_by_phase": true, - "centroids_array_path": "DataContainer/Cell Feature Data/Centroids", - "input_image_geometry_path": "DataContainer", - "phases_array_path": "DataContainer/Cell Feature Data/Phases", - "surface_features_array_path": "DataContainer/Cell Feature Data/SurfaceFeatures" + "biased_features_array_name": { + "value": "BiasedFeatures", + "version": 1 + }, + "calc_by_phase": { + "value": true, + "version": 1 + }, + "centroids_array_path": { + "value": "DataContainer/Cell Feature Data/Centroids", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, + "phases_array_path": { + "value": "DataContainer/Cell Feature Data/Phases", + "version": 1 + }, + "surface_features_array_path": { + "value": "DataContainer/Cell Feature Data/SurfaceFeatures", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::FindBoundingBoxFeaturesFilter", + "name": "nx::core::ComputeBiasedFeaturesFilter", "uuid": "d46f2fd7-dc68-4b57-bca3-693016512b2f" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/Examples/ComputeBiasedFeatures.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Examples/ComputeBiasedFeatures.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/ComputeBoundaryCells.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ComputeBoundaryCells.d3dpipeline index 25546c19b7..960fd6c73d 100644 --- a/src/Plugins/SimplnxCore/pipelines/ComputeBoundaryCells.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ComputeBoundaryCells.d3dpipeline @@ -1,86 +1,106 @@ { "isDisabled": false, "name": "ComputeBoundaryCells.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/X Position", - "DataContainer/Cell Data/Y Position", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/Volumes", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Data/IPFColors" - ], - "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" + "value": { + "data_paths": [ + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/X Position", + "DataContainer/Cell Data/Y Position", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Feature Data/Active", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/Cell Feature Data/AvgQuats", + "DataContainer/Cell Feature Data/AvgEulerAngles", + "DataContainer/NewGrain Data", + "DataContainer/Cell Data/ParentIds", + "DataContainer/Cell Feature Data/ParentIds", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Feature Data/Volumes", + "DataContainer/Cell Feature Data/EquivalentDiameters", + "DataContainer/Cell Feature Data/NumElements", + "DataContainer/Cell Feature Data/NumNeighbors", + "DataContainer/Cell Data/IPFColors" + ], + "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" + }, + "version": 1 }, - "Imported Pipeline": { - "isDisabled": false, - "name": "Untitled Pipeline", - "pipeline": [] - } + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadDREAM3DFilter", + "name": "nx::core::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false }, { "args": { - "boundary_cells_array_name": "BoundaryCells", - "feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "ignore_feature_zero": true, - "input_image_geometry_path": "DataContainer", - "include_volume_boundary": true + "boundary_cells_array_name": { + "value": "BoundaryCells", + "version": 1 + }, + "feature_ids_array_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "ignore_feature_zero": { + "value": true, + "version": 1 + }, + "include_volume_boundary": { + "value": true, + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ComputeBoundaryCellsFilter", + "name": "nx::core::ComputeBoundaryCellsFilter", "uuid": "a1dd1c29-9152-4648-836c-3b6967e32600" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/Examples/SmallIN100_BoundaryCells.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Examples/SmallIN100_BoundaryCells.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/ComputeLargestCrossSections.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ComputeLargestCrossSections.d3dpipeline index aa70b977a8..43ef6b626b 100644 --- a/src/Plugins/SimplnxCore/pipelines/ComputeLargestCrossSections.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ComputeLargestCrossSections.d3dpipeline @@ -1,34 +1,46 @@ { "isDisabled": false, "name": "ComputeLargestCrossSections.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, "read_h5_ebsd_object": { - "end_slice": 117, - "euler_representation": 0, - "hdf5_data_paths": [ - "Confidence Index", - "EulerAngles", - "Fit", - "Image Quality", - "Phases", - "SEM Signal", - "X Position", - "Y Position" - ], - "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", - "start_slice": 1, - "use_recommended_transform": true + "value": { + "end_slice": 117, + "euler_representation": 0, + "hdf5_data_paths": [ + "Confidence Index", + "EulerAngles", + "Fit", + "Image Quality", + "Phases", + "SEM Signal", + "X Position", + "Y Position" + ], + "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", + "start_slice": 1, + "use_recommended_transform": true + }, + "version": 1 } }, "comments": "", "filter": { - "name": "simplnx::ReadH5EbsdFilter", + "name": "nx::core::ReadH5EbsdFilter", "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" }, "isDisabled": false @@ -36,99 +48,196 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Image Quality", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 120.0 - }, - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 - }, - "output_data_array_name": "Mask" + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "DataContainer/Cell Data/Image Quality", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 120.0 + }, + { + "array_path": "DataContainer/Cell Data/Confidence Index", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.1 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "input_orientation_array_path": "DataContainer/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 + "input_orientation_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "input_representation_index": { + "value": 0, + "version": 1 + }, + "output_orientation_array_name": { + "value": "Quats", + "version": 1 + }, + "output_representation_index": { + "value": 2, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ConvertOrientations", + "name": "nx::core::ConvertOrientationsFilter", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false }, { "args": { - "active_array_name": "Active", - "cell_feature_attribute_matrix_name": "Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_name": "FeatureIds", - "cell_mask_array_path": "DataContainer/Cell Data/Mask", - "input_image_geometry_path": "DataContainer", - "misorientation_tolerance": 5.0, - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "randomize_features": true, - "use_mask": true + "active_array_name": { + "value": "Active", + "version": 1 + }, + "cell_feature_attribute_matrix_name": { + "value": "Cell Feature Data", + "version": 1 + }, + "cell_mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "cell_quats_array_path": { + "value": "DataContainer/Cell Data/Quats", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "feature_ids_array_name": { + "value": "FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "misorientation_tolerance": { + "value": 5.0, + "version": 1 + }, + "parameters_version": 1, + "randomize_features": { + "value": true, + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::EBSDSegmentFeaturesFilter", + "name": "nx::core::EBSDSegmentFeaturesFilter", "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" }, "isDisabled": false }, { "args": { - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "largest_cross_sections_array_name": "LargestCrossSections", - "plane_index": 0 + "cell_feature_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "feature_ids_array_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "largest_cross_sections_array_name": { + "value": "LargestCrossSections", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeLargestCrossSectionsFilter", + "name": "nx::core::ComputeLargestCrossSectionsFilter", "uuid": "18ba2f7a-4e3a-4547-bd8c-b0955d542a9f" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/Examples/SmallIN100_LargestCrossSections.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Examples/SmallIN100_LargestCrossSections.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/Compute_Feature_Face_Curvature.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Compute_Feature_Face_Curvature.d3dpipeline index 6c93fd018c..826c88c12a 100644 --- a/src/Plugins/SimplnxCore/pipelines/Compute_Feature_Face_Curvature.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Compute_Feature_Face_Curvature.d3dpipeline @@ -1,61 +1,64 @@ { "isDisabled": false, "name": "Compute_Feature_Face_Curvature.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/Centroids", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/Omega3s", - "DataContainer/Cell Feature Data/AxisLengths", - "DataContainer/Cell Feature Data/AxisEulerAngles", - "DataContainer/Cell Feature Data/AspectRatios", - "DataContainer/Cell Feature Data/Shape Volumes", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Feature Data/NeighborList", - "DataContainer/Cell Feature Data/SharedSurfaceAreaList", - "DataContainer/Cell Feature Data/Neighborhoods", - "DataContainer/Cell Feature Data/NeighborhoodList", - "DataContainer/Cell Data/GBManhattanDistances", - "DataContainer/Cell Data/TJManhattanDistances", - "DataContainer/Cell Data/QPManhattanDistances", - "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - "DataContainer/Cell Feature Data/MisorientationList", - "DataContainer/Cell Feature Data/Schmids", - "DataContainer/Cell Feature Data/SlipSystems", - "DataContainer/Cell Feature Data/Poles", - "DataContainer/Cell Data/FeatureReferenceMisorientations", - "DataContainer/Cell Feature Data/FeatureAvgMisorientations", - "DataContainer/Cell Data/KernelAverageMisorientations" - ], - "file_path": "/Users/mjackson/DREAM3DNXData/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d" - } + "value": { + "data_paths": [ + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/NewGrain Data", + "DataContainer/Cell Data/ParentIds", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Data/IPFColors", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/Cell Feature Data/Centroids", + "DataContainer/Cell Feature Data/EquivalentDiameters", + "DataContainer/Cell Feature Data/NumElements", + "DataContainer/Cell Feature Data/Omega3s", + "DataContainer/Cell Feature Data/AxisLengths", + "DataContainer/Cell Feature Data/AxisEulerAngles", + "DataContainer/Cell Feature Data/AspectRatios", + "DataContainer/Cell Feature Data/Shape Volumes", + "DataContainer/Cell Feature Data/NumNeighbors", + "DataContainer/Cell Feature Data/NeighborList", + "DataContainer/Cell Feature Data/SharedSurfaceAreaList", + "DataContainer/Cell Feature Data/Neighborhoods", + "DataContainer/Cell Feature Data/NeighborhoodList", + "DataContainer/Cell Data/GBManhattanDistances", + "DataContainer/Cell Data/TJManhattanDistances", + "DataContainer/Cell Data/QPManhattanDistances", + "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", + "DataContainer/Cell Feature Data/AvgQuats", + "DataContainer/Cell Feature Data/AvgEulerAngles", + "DataContainer/Cell Feature Data/MisorientationList", + "DataContainer/Cell Feature Data/Schmids", + "DataContainer/Cell Feature Data/SlipSystems", + "DataContainer/Cell Feature Data/Poles", + "DataContainer/Cell Data/FeatureReferenceMisorientations", + "DataContainer/Cell Feature Data/FeatureAvgMisorientations", + "DataContainer/Cell Data/KernelAverageMisorientations" + ], + "file_path": "/Users/mjackson/DREAM3DNXData/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d" + }, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -66,36 +69,79 @@ }, { "args": { - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "crop_x_dim": true, - "crop_y_dim": true, - "crop_z_dim": true, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "max_coord": [ - 0.0, - 0.0, - 0.0 - ], - "max_voxel": [ - 140, - 140, - 99 - ], - "min_coord": [ - 0.0, - 0.0, - 0.0 - ], - "min_voxel": [ - 41, - 41, - 0 - ], - "output_image_geometry_path": "DataContainer", - "remove_original_geometry": true, - "renumber_features": true, - "use_physical_bounds": false + "cell_feature_attribute_matrix_path": { + "value": "DataContainer/Cell Feature Data", + "version": 1 + }, + "crop_x_dim": { + "value": true, + "version": 1 + }, + "crop_y_dim": { + "value": true, + "version": 1 + }, + "crop_z_dim": { + "value": true, + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "max_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "max_voxel": { + "value": [ + 140, + 140, + 99 + ], + "version": 1 + }, + "min_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "min_voxel": { + "value": [ + 41, + 41, + 0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "renumber_features": { + "value": true, + "version": 1 + }, + "use_physical_bounds": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -106,19 +152,59 @@ }, { "args": { - "apply_smoothing": true, - "face_data_group_name": "Face Data", - "face_feature_attribute_matrix_name": "Face Feature Data", - "face_labels_array_name": "FaceLabels", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_data_array_paths": [], - "input_grid_geometry_path": "DataContainer", - "max_distance_from_voxel": 1.0, - "node_types_array_name": "NodeTypes", - "output_triangle_geometry_path": "TriangleDataContainer", - "relaxation_factor": 0.5, - "smoothing_iterations": 20, - "vertex_data_group_name": "Vertex Data" + "apply_smoothing": { + "value": true, + "version": 1 + }, + "face_data_group_name": { + "value": "Face Data", + "version": 1 + }, + "face_feature_attribute_matrix_name": { + "value": "Face Feature Data", + "version": 1 + }, + "face_labels_array_name": { + "value": "FaceLabels", + "version": 1 + }, + "feature_ids_path": { + "value": "DataContainer/Cell Data/FeatureIds", + "version": 1 + }, + "input_data_array_paths": { + "value": [], + "version": 1 + }, + "input_grid_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "max_distance_from_voxel": { + "value": 1.0, + "version": 1 + }, + "node_types_array_name": { + "value": "NodeTypes", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1, + "relaxation_factor": { + "value": 0.5, + "version": 1 + }, + "smoothing_iterations": { + "value": 20, + "version": 1 + }, + "vertex_data_group_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { @@ -129,13 +215,35 @@ }, { "args": { - "face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels", - "feature_face_ids_array_name": "SharedFeatureFaceId", - "feature_face_labels_array_name": "FaceLabels", - "feature_num_triangles_array_name": "NumTriangles", - "grain_boundary_attribute_matrix_name": "SharedFeatureFace", - "input_triangle_geometry_path": "TriangleDataContainer", - "randomize_features": false + "face_labels_array_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels", + "version": 1 + }, + "feature_face_ids_array_name": { + "value": "SharedFeatureFaceId", + "version": 1 + }, + "feature_face_labels_array_name": { + "value": "FaceLabels", + "version": 1 + }, + "feature_num_triangles_array_name": { + "value": "NumTriangles", + "version": 1 + }, + "grain_boundary_attribute_matrix_name": { + "value": "SharedFeatureFace", + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1, + "randomize_features": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -146,8 +254,15 @@ }, { "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "output_normals_array_name": "Face Normals" + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "output_normals_array_name": { + "value": "Face Normals", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -158,8 +273,15 @@ }, { "args": { - "centroids_array_name": "Centroids", - "input_triangle_geometry_path": "TriangleDataContainer" + "centroids_array_name": { + "value": "Centroids", + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -170,25 +292,83 @@ }, { "args": { - "compute_gaussian_curvature": true, - "compute_mean_curvature_path": true, - "compute_principal_direction": true, - "compute_weingarten_matrix": true, - "face_attribute_matrix_path": "TriangleDataContainer/Face Data", - "face_centroids_path": "TriangleDataContainer/Face Data/Centroids", - "face_labels_path": "TriangleDataContainer/Face Data/FaceLabels", - "face_normals_path": "TriangleDataContainer/Face Data/Face Normals", - "feature_face_ids_path": "TriangleDataContainer/Face Data/SharedFeatureFaceId", - "gaussian_curvature_path": "Gaussian Curvature", - "input_triangle_geometry_path": "TriangleDataContainer", - "mean_curvature_path": "Mean Curvature", - "neighborhood_ring": 1, - "principal_curvature_1_path": "Principal Curvature 1", - "principal_curvature_2_path": "Principal Curvature 2", - "principal_direction_1_path": "Principal Direction 1", - "principal_direction_2_path": "Principal Direction 2", - "use_normals": true, - "weingarten_matrix_path": "Weingarten Matrix" + "compute_gaussian_curvature": { + "value": true, + "version": 1 + }, + "compute_mean_curvature_path": { + "value": true, + "version": 1 + }, + "compute_principal_direction": { + "value": true, + "version": 1 + }, + "compute_weingarten_matrix": { + "value": true, + "version": 1 + }, + "face_attribute_matrix_path": { + "value": "TriangleDataContainer/Face Data", + "version": 1 + }, + "face_centroids_path": { + "value": "TriangleDataContainer/Face Data/Centroids", + "version": 1 + }, + "face_labels_path": { + "value": "TriangleDataContainer/Face Data/FaceLabels", + "version": 1 + }, + "face_normals_path": { + "value": "TriangleDataContainer/Face Data/Face Normals", + "version": 1 + }, + "feature_face_ids_path": { + "value": "TriangleDataContainer/Face Data/SharedFeatureFaceId", + "version": 1 + }, + "gaussian_curvature_path": { + "value": "Gaussian Curvature", + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "mean_curvature_path": { + "value": "Mean Curvature", + "version": 1 + }, + "neighborhood_ring": { + "value": 1, + "version": 1 + }, + "parameters_version": 1, + "principal_curvature_1_path": { + "value": "Principal Curvature 1", + "version": 1 + }, + "principal_curvature_2_path": { + "value": "Principal Curvature 2", + "version": 1 + }, + "principal_direction_1_path": { + "value": "Principal Direction 1", + "version": 1 + }, + "principal_direction_2_path": { + "value": "Principal Direction 2", + "version": 1 + }, + "use_normals": { + "value": true, + "version": 1 + }, + "weingarten_matrix_path": { + "value": "Weingarten Matrix", + "version": 1 + } }, "comments": "", "filter": { @@ -199,8 +379,15 @@ }, { "args": { - "export_file_path": "/Users/mjackson/DREAM3DNXData/Small IN100 Face Curvature.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "/Users/mjackson/DREAM3DNXData/Small IN100 Face Curvature.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -210,6 +397,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/Compute_Feature_Face_Curvature_2.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Compute_Feature_Face_Curvature_2.d3dpipeline index 393ddad99b..418443caf3 100644 --- a/src/Plugins/SimplnxCore/pipelines/Compute_Feature_Face_Curvature_2.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Compute_Feature_Face_Curvature_2.d3dpipeline @@ -1,59 +1,71 @@ { "isDisabled": false, "name": "Compute_Feature_Face_Curvature_2.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "created_data_group_path": "Imported Vertex Data", + "created_data_group_path": { + "value": "Imported Vertex Data", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/6_5_Goldfeather/Goldfeather_Nodes.csv", - "Skipped Array Mask": [ - false, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 2452 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 8, + 8, + 8, + 8, + 8, + 8, + 8, + 8, + 8, + 8, + 8, + 8, + 8, + 8 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/6_5_Goldfeather/Goldfeather_Nodes.csv", + "Skipped Array Mask": [ + false, + false, + false, + false, + false, + false, + false, + false, + false, + false, + false, + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 2452 + ] + }, + "version": 1 + }, + "selected_attribute_matrix_path": { + "value": "", + "version": 1 }, - "selected_attribute_matrix_path": "", - "use_existing_group": false + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -64,39 +76,52 @@ }, { "args": { - "created_data_group_path": "Imported Face Data", + "created_data_group_path": { + "value": "Imported Face Data", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 7, - 7, - 7, - 8, - 8, - 8 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/6_5_Goldfeather/Goldfeather_Faces.csv", - "Skipped Array Mask": [ - false, - false, - false, - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 4900 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 7, + 7, + 7, + 8, + 8, + 8 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/6_5_Goldfeather/Goldfeather_Faces.csv", + "Skipped Array Mask": [ + false, + false, + false, + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 4900 + ] + }, + "version": 1 + }, + "selected_attribute_matrix_path": { + "value": "", + "version": 1 }, - "selected_attribute_matrix_path": "", - "use_existing_group": false + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -107,14 +132,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Vertex Data/X", - "Imported Vertex Data/Y", - "Imported Vertex Data/Z" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Shared Vertex List" + "input_data_array_paths": { + "value": [ + "Imported Vertex Data/X", + "Imported Vertex Data/Y", + "Imported Vertex Data/Z" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Shared Vertex List", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -125,14 +163,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Face Data/Node_0", - "Imported Face Data/Node_1", - "Imported Face Data/Node_2" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "SharedTriangleList" + "input_data_array_paths": { + "value": [ + "Imported Face Data/Node_0", + "Imported Face Data/Node_1", + "Imported Face Data/Node_2" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "SharedTriangleList", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -143,14 +194,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Face Data/Normal_0", - "Imported Face Data/Normal_1", - "Imported Face Data/Normal_2" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Normals" + "input_data_array_paths": { + "value": [ + "Imported Face Data/Normal_0", + "Imported Face Data/Normal_1", + "Imported Face Data/Normal_2" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Normals", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -161,14 +225,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Vertex Data/Normal_X", - "Imported Vertex Data/Normal_Y", - "Imported Vertex Data/Normal_Z" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Vertex Normals" + "input_data_array_paths": { + "value": [ + "Imported Vertex Data/Normal_X", + "Imported Vertex Data/Normal_Y", + "Imported Vertex Data/Normal_Z" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Vertex Normals", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -179,13 +256,26 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Vertex Data/PrincipalCurvature_0", - "Imported Vertex Data/PrincipalCurvature_1" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Principal Curvature" + "input_data_array_paths": { + "value": [ + "Imported Vertex Data/PrincipalCurvature_0", + "Imported Vertex Data/PrincipalCurvature_1" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Principal Curvature", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -196,14 +286,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Vertex Data/PrincipalDirection1_0", - "Imported Vertex Data/PrincipalDirection1_1", - "Imported Vertex Data/PrincipalDirection1_2" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Principal Direction 1" + "input_data_array_paths": { + "value": [ + "Imported Vertex Data/PrincipalDirection1_0", + "Imported Vertex Data/PrincipalDirection1_1", + "Imported Vertex Data/PrincipalDirection1_2" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Principal Direction 1", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -214,14 +317,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Vertex Data/PrincipalDirection2_0", - "Imported Vertex Data/PrincipalDirection2_1", - "Imported Vertex Data/PrincipalDirection2_2" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Principal Direction 2" + "input_data_array_paths": { + "value": [ + "Imported Vertex Data/PrincipalDirection2_0", + "Imported Vertex Data/PrincipalDirection2_1", + "Imported Vertex Data/PrincipalDirection2_2" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Principal Direction 2", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -232,39 +348,103 @@ }, { "args": { - "array_handling_index": 1, - "cell_attribute_matrix_name": "Cell Data", - "dimensions": [ - 20, - 60, - 200 - ], - "edge_attribute_matrix_name": "Edge Data", - "edge_list_path": "", - "face_attribute_matrix_name": "Face Data", - "geometry_type_index": 4, - "hexahedral_list_path": "", - "length_unit_index": 7, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "output_geometry_path": "Geometry", - "quadrilateral_list_path": "", - "spacing": [ - 1.0, - 1.0, - 1.0 - ], - "tetrahedral_list_path": "", - "triangle_list_path": "Imported Face Data/SharedTriangleList", - "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_path": "Imported Vertex Data/Shared Vertex List", - "warnings_as_errors": false, - "x_bounds_path": "", - "y_bounds_path": "", - "z_bounds_path": "" + "array_handling_index": { + "value": 1, + "version": 1 + }, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 20, + 60, + 200 + ], + "version": 1 + }, + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "edge_list_path": { + "value": "", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "geometry_type_index": { + "value": 4, + "version": 1 + }, + "hexahedral_list_path": { + "value": "", + "version": 1 + }, + "length_unit_index": { + "value": 7, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_geometry_path": { + "value": "Geometry", + "version": 1 + }, + "parameters_version": 1, + "quadrilateral_list_path": { + "value": "", + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "tetrahedral_list_path": { + "value": "", + "version": 1 + }, + "triangle_list_path": { + "value": "Imported Face Data/SharedTriangleList", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_list_path": { + "value": "Imported Vertex Data/Shared Vertex List", + "version": 1 + }, + "warnings_as_errors": { + "value": false, + "version": 1 + }, + "x_bounds_path": { + "value": "", + "version": 1 + }, + "y_bounds_path": { + "value": "", + "version": 1 + }, + "z_bounds_path": { + "value": "", + "version": 1 + } }, "comments": "", "filter": { @@ -275,10 +455,17 @@ }, { "args": { - "destination_parent_path": "Geometry/Face Data", - "source_data_paths": [ - "Imported Face Data/Normals" - ] + "destination_parent_path": { + "value": "Geometry/Face Data", + "version": 1 + }, + "parameters_version": 1, + "source_data_paths": { + "value": [ + "Imported Face Data/Normals" + ], + "version": 1 + } }, "comments": "", "filter": { @@ -289,13 +476,20 @@ }, { "args": { - "destination_parent_path": "Geometry/Vertex Data", - "source_data_paths": [ - "Imported Vertex Data/Principal Curvature", - "Imported Vertex Data/Principal Direction 1", - "Imported Vertex Data/Principal Direction 2", - "Imported Vertex Data/Vertex Normals" - ] + "destination_parent_path": { + "value": "Geometry/Vertex Data", + "version": 1 + }, + "parameters_version": 1, + "source_data_paths": { + "value": [ + "Imported Vertex Data/Principal Curvature", + "Imported Vertex Data/Principal Direction 1", + "Imported Vertex Data/Principal Direction 2", + "Imported Vertex Data/Vertex Normals" + ], + "version": 1 + } }, "comments": "", "filter": { @@ -306,8 +500,15 @@ }, { "args": { - "export_file_path": "Data/6_5_Goldfeather/6_5_Goldfeather.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/6_5_Goldfeather/6_5_Goldfeather.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -317,6 +518,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/CreateEdgeGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateEdgeGeom.d3dpipeline index 29ee3bb56b..b28c9b9361 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateEdgeGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateEdgeGeom.d3dpipeline @@ -1,35 +1,47 @@ { "isDisabled": false, "name": "CreateEdgeGeom.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "created_data_group_path": "Imported Data", + "created_data_group_path": { + "value": "Imported Data", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 7, - 7 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/Test_Data/EdgeConnectivity.csv", - "Skipped Array Mask": [ - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 264 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 7, + 7 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/Test_Data/EdgeConnectivity.csv", + "Skipped Array Mask": [ + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 264 + ] + }, + "version": 1 + }, + "selected_attribute_matrix_path": { + "value": "", + "version": 1 }, - "selected_attribute_matrix_path": "", - "use_existing_group": false + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -40,13 +52,26 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Data/V0", - "Imported Data/V1" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Faces" + "input_data_array_paths": { + "value": [ + "Imported Data/V0", + "Imported Data/V1" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Faces", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -57,33 +82,46 @@ }, { "args": { - "created_data_group_path": "Imported Data 2", + "created_data_group_path": { + "value": "Imported Data 2", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 8, - 8, - 8 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/Test_Data/VertexCoordinates.csv", - "Skipped Array Mask": [ - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 144 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 8, + 8, + 8 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/Test_Data/VertexCoordinates.csv", + "Skipped Array Mask": [ + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 144 + ] + }, + "version": 1 }, - "selected_attribute_matrix_path": "Imported Data 2", - "use_existing_group": false + "selected_attribute_matrix_path": { + "value": "Imported Data 2", + "version": 1 + }, + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -94,14 +132,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Data 2/x", - "Imported Data 2/y", - "Imported Data 2/z" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Vertices" + "input_data_array_paths": { + "value": [ + "Imported Data 2/x", + "Imported Data 2/y", + "Imported Data 2/z" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Vertices", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -112,39 +163,103 @@ }, { "args": { - "array_handling_index": 1, - "cell_attribute_matrix_name": "Cell Data", - "dimensions": [ - 20, - 60, - 200 - ], - "edge_attribute_matrix_name": "Edge Data", - "edge_list_path": "Imported Data/Faces", - "face_attribute_matrix_name": "Face Data", - "geometry_type_index": 3, - "hexahedral_list_path": "", - "length_unit_index": 7, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "output_geometry_path": "Geometry", - "quadrilateral_list_path": "Imported Data/Faces", - "spacing": [ - 1.0, - 1.0, - 1.0 - ], - "tetrahedral_list_path": "Imported Data/Faces", - "triangle_list_path": "Imported Data/Faces", - "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_path": "Imported Data 2/Vertices", - "warnings_as_errors": false, - "x_bounds_path": "", - "y_bounds_path": "", - "z_bounds_path": "" + "array_handling_index": { + "value": 1, + "version": 1 + }, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 20, + 60, + 200 + ], + "version": 1 + }, + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "edge_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "geometry_type_index": { + "value": 3, + "version": 1 + }, + "hexahedral_list_path": { + "value": "", + "version": 1 + }, + "length_unit_index": { + "value": 7, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_geometry_path": { + "value": "Geometry", + "version": 1 + }, + "parameters_version": 1, + "quadrilateral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "tetrahedral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "triangle_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_list_path": { + "value": "Imported Data 2/Vertices", + "version": 1 + }, + "warnings_as_errors": { + "value": false, + "version": 1 + }, + "x_bounds_path": { + "value": "", + "version": 1 + }, + "y_bounds_path": { + "value": "", + "version": 1 + }, + "z_bounds_path": { + "value": "", + "version": 1 + } }, "comments": "", "filter": { @@ -155,17 +270,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 4, - "output_array_path": "Geometry/Edge Data/Int32Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Edge Data/Int32Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -176,18 +313,55 @@ }, { "args": { - "array_path": "Geometry/Edge Data/Int32Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Edge Data/Int32Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -198,17 +372,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 6, - "output_array_path": "Geometry/Edge Data/Int64Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 6, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Edge Data/Int64Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -219,18 +415,55 @@ }, { "args": { - "array_path": "Geometry/Edge Data/Int64Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue2", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Edge Data/Int64Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue2", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -240,6 +473,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/CreateHexahedralGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateHexahedralGeom.d3dpipeline index 3878797320..15421a9d71 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateHexahedralGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateHexahedralGeom.d3dpipeline @@ -1,47 +1,59 @@ { "isDisabled": false, "name": "CreateHexahedralGeom.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "created_data_group_path": "Imported Data", + "created_data_group_path": { + "value": "Imported Data", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 7, - 7, - 7, - 7, - 7, - 7, - 7, - 7 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/Test_Data/HexaConnectivity.csv", - "Skipped Array Mask": [ - false, - false, - false, - false, - false, - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 3 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/Test_Data/HexaConnectivity.csv", + "Skipped Array Mask": [ + false, + false, + false, + false, + false, + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 3 + ] + }, + "version": 1 + }, + "selected_attribute_matrix_path": { + "value": "", + "version": 1 }, - "selected_attribute_matrix_path": "", - "use_existing_group": false + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -52,19 +64,32 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Data/V0", - "Imported Data/V1", - "Imported Data/V2", - "Imported Data/V3", - "Imported Data/V4", - "Imported Data/V5", - "Imported Data/V6", - "Imported Data/V7" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Faces" + "input_data_array_paths": { + "value": [ + "Imported Data/V0", + "Imported Data/V1", + "Imported Data/V2", + "Imported Data/V3", + "Imported Data/V4", + "Imported Data/V5", + "Imported Data/V6", + "Imported Data/V7" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Faces", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -75,33 +100,46 @@ }, { "args": { - "created_data_group_path": "Imported Data 2", + "created_data_group_path": { + "value": "Imported Data 2", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 8, - 8, - 8 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/Test_Data/HexaVertexCoordinates.csv", - "Skipped Array Mask": [ - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 20 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 8, + 8, + 8 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/Test_Data/HexaVertexCoordinates.csv", + "Skipped Array Mask": [ + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 20 + ] + }, + "version": 1 }, - "selected_attribute_matrix_path": "Imported Data 2", - "use_existing_group": false + "selected_attribute_matrix_path": { + "value": "Imported Data 2", + "version": 1 + }, + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -112,14 +150,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Data 2/x", - "Imported Data 2/y", - "Imported Data 2/z" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Vertices" + "input_data_array_paths": { + "value": [ + "Imported Data 2/x", + "Imported Data 2/y", + "Imported Data 2/z" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Vertices", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -130,39 +181,103 @@ }, { "args": { - "array_handling_index": 1, - "cell_attribute_matrix_name": "Cell Data", - "dimensions": [ - 20, - 60, - 200 - ], - "edge_attribute_matrix_name": "Edge Data", - "edge_list_path": "", - "face_attribute_matrix_name": "Face Data", - "geometry_type_index": 7, - "hexahedral_list_path": "Imported Data/Faces", - "length_unit_index": 7, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "output_geometry_path": "Geometry", - "quadrilateral_list_path": "", - "spacing": [ - 1.0, - 1.0, - 1.0 - ], - "tetrahedral_list_path": "Imported Data/Faces", - "triangle_list_path": "", - "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_path": "Imported Data 2/Vertices", - "warnings_as_errors": false, - "x_bounds_path": "", - "y_bounds_path": "", - "z_bounds_path": "" + "array_handling_index": { + "value": 1, + "version": 1 + }, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 20, + 60, + 200 + ], + "version": 1 + }, + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "edge_list_path": { + "value": "", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "geometry_type_index": { + "value": 7, + "version": 1 + }, + "hexahedral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "length_unit_index": { + "value": 7, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_geometry_path": { + "value": "Geometry", + "version": 1 + }, + "parameters_version": 1, + "quadrilateral_list_path": { + "value": "", + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "tetrahedral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "triangle_list_path": { + "value": "", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_list_path": { + "value": "Imported Data 2/Vertices", + "version": 1 + }, + "warnings_as_errors": { + "value": false, + "version": 1 + }, + "x_bounds_path": { + "value": "", + "version": 1 + }, + "y_bounds_path": { + "value": "", + "version": 1 + }, + "z_bounds_path": { + "value": "", + "version": 1 + } }, "comments": "", "filter": { @@ -173,17 +288,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 4, - "output_array_path": "Geometry/Cell Data/Int32Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Cell Data/Int32Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -194,18 +331,55 @@ }, { "args": { - "array_path": "Geometry/Cell Data/Int32Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Cell Data/Int32Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -216,17 +390,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 6, - "output_array_path": "Geometry/Cell Data/Int64Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 6, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Cell Data/Int64Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -237,18 +433,55 @@ }, { "args": { - "array_path": "Geometry/Cell Data/Int64Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue2", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Cell Data/Int64Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue2", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -258,6 +491,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/CreateImageGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateImageGeom.d3dpipeline index de5010f239..8670cad554 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateImageGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateImageGeom.d3dpipeline @@ -1,43 +1,106 @@ { "isDisabled": false, "name": "CreateImageGeom.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "array_handling_index": 1, - "cell_attribute_matrix_name": "Cell Data", - "dimensions": [ - 5, - 6, - 7 - ], - "edge_attribute_matrix_name": "Edge Data", - "edge_list_path": "Imported Data/Faces", - "face_attribute_matrix_name": "Face Data", - "geometry_type_index": 0, - "hexahedral_list_path": "", - "length_unit_index": 7, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "output_geometry_path": "Image Geometry", - "quadrilateral_list_path": "Imported Data/Faces", - "spacing": [ - 1.0, - 1.0, - 1.0 - ], - "tetrahedral_list_path": "Imported Data/Faces", - "triangle_list_path": "Imported Data/Faces", - "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_path": "Imported Data 2/Vertices", - "warnings_as_errors": false, - "x_bounds_path": "Imported Data/X_Bounds", - "y_bounds_path": "Imported Data/Y_Bounds", - "z_bounds_path": "Imported Data/Z_Bounds" + "array_handling_index": { + "value": 1, + "version": 1 + }, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 5, + 6, + 7 + ], + "version": 1 + }, + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "edge_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "geometry_type_index": { + "value": 0, + "version": 1 + }, + "hexahedral_list_path": { + "value": "", + "version": 1 + }, + "length_unit_index": { + "value": 7, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_geometry_path": { + "value": "Image Geometry", + "version": 1 + }, + "parameters_version": 1, + "quadrilateral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "tetrahedral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "triangle_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_list_path": { + "value": "Imported Data 2/Vertices", + "version": 1 + }, + "warnings_as_errors": { + "value": false, + "version": 1 + }, + "x_bounds_path": { + "value": "Imported Data/X_Bounds", + "version": 1 + }, + "y_bounds_path": { + "value": "Imported Data/Y_Bounds", + "version": 1 + }, + "z_bounds_path": { + "value": "Imported Data/Z_Bounds", + "version": 1 + } }, "comments": "", "filter": { @@ -48,17 +111,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 4, - "output_array_path": "Image Geometry/Cell Data/Int32Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "Image Geometry/Cell Data/Int32Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -69,18 +154,55 @@ }, { "args": { - "array_path": "Image Geometry/Cell Data/Int32Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Image Geometry/Cell Data/Int32Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -91,17 +213,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 6, - "output_array_path": "Image Geometry/Cell Data/Int64Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 6, + "version": 1 + }, + "output_array_path": { + "value": "Image Geometry/Cell Data/Int64Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -112,18 +256,55 @@ }, { "args": { - "array_path": "Image Geometry/Cell Data/Int64Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue2", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Image Geometry/Cell Data/Int64Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue2", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -133,6 +314,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/CreateQuadGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateQuadGeom.d3dpipeline index 22e07a97bb..aa3400a5ee 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateQuadGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateQuadGeom.d3dpipeline @@ -1,39 +1,51 @@ { "isDisabled": false, "name": "CreateQuadGeom.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "created_data_group_path": "Imported Data", + "created_data_group_path": { + "value": "Imported Data", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 7, - 7, - 7, - 7 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/Test_Data/QuadConnectivity.csv", - "Skipped Array Mask": [ - false, - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 121 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 7, + 7, + 7, + 7 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/Test_Data/QuadConnectivity.csv", + "Skipped Array Mask": [ + false, + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 121 + ] + }, + "version": 1 + }, + "selected_attribute_matrix_path": { + "value": "", + "version": 1 }, - "selected_attribute_matrix_path": "", - "use_existing_group": false + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -44,15 +56,28 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Data/V0", - "Imported Data/V1", - "Imported Data/V2", - "Imported Data/V3" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Faces" + "input_data_array_paths": { + "value": [ + "Imported Data/V0", + "Imported Data/V1", + "Imported Data/V2", + "Imported Data/V3" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Faces", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -63,33 +88,46 @@ }, { "args": { - "created_data_group_path": "Imported Data 2", + "created_data_group_path": { + "value": "Imported Data 2", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 8, - 8, - 8 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/Test_Data/VertexCoordinates.csv", - "Skipped Array Mask": [ - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 144 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 8, + 8, + 8 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/Test_Data/VertexCoordinates.csv", + "Skipped Array Mask": [ + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 144 + ] + }, + "version": 1 }, - "selected_attribute_matrix_path": "Imported Data 2", - "use_existing_group": false + "selected_attribute_matrix_path": { + "value": "Imported Data 2", + "version": 1 + }, + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -100,14 +138,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Data 2/x", - "Imported Data 2/y", - "Imported Data 2/z" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Vertices" + "input_data_array_paths": { + "value": [ + "Imported Data 2/x", + "Imported Data 2/y", + "Imported Data 2/z" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Vertices", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -118,39 +169,103 @@ }, { "args": { - "array_handling_index": 1, - "cell_attribute_matrix_name": "Cell Data", - "dimensions": [ - 20, - 60, - 200 - ], - "edge_attribute_matrix_name": "Edge Data", - "edge_list_path": "", - "face_attribute_matrix_name": "Face Data", - "geometry_type_index": 5, - "hexahedral_list_path": "", - "length_unit_index": 7, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "output_geometry_path": "Geometry", - "quadrilateral_list_path": "Imported Data/Faces", - "spacing": [ - 1.0, - 1.0, - 1.0 - ], - "tetrahedral_list_path": "Imported Data/Faces", - "triangle_list_path": "Imported Data/Faces", - "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_path": "Imported Data 2/Vertices", - "warnings_as_errors": false, - "x_bounds_path": "", - "y_bounds_path": "", - "z_bounds_path": "" + "array_handling_index": { + "value": 1, + "version": 1 + }, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 20, + 60, + 200 + ], + "version": 1 + }, + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "edge_list_path": { + "value": "", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "geometry_type_index": { + "value": 5, + "version": 1 + }, + "hexahedral_list_path": { + "value": "", + "version": 1 + }, + "length_unit_index": { + "value": 7, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_geometry_path": { + "value": "Geometry", + "version": 1 + }, + "parameters_version": 1, + "quadrilateral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "tetrahedral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "triangle_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_list_path": { + "value": "Imported Data 2/Vertices", + "version": 1 + }, + "warnings_as_errors": { + "value": false, + "version": 1 + }, + "x_bounds_path": { + "value": "", + "version": 1 + }, + "y_bounds_path": { + "value": "", + "version": 1 + }, + "z_bounds_path": { + "value": "", + "version": 1 + } }, "comments": "", "filter": { @@ -161,17 +276,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 4, - "output_array_path": "Geometry/Face Data/Int32Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Face Data/Int32Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -182,18 +319,55 @@ }, { "args": { - "array_path": "Geometry/Face Data/Int32Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Face Data/Int32Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -204,17 +378,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 6, - "output_array_path": "Geometry/Face Data/Int64Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 6, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Face Data/Int64Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -225,18 +421,55 @@ }, { "args": { - "array_path": "Geometry/Face Data/Int64Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue2", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Face Data/Int64Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue2", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -246,6 +479,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/CreateRectGridGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateRectGridGeom.d3dpipeline index 43f2b04b90..7b7608b3ca 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateRectGridGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateRectGridGeom.d3dpipeline @@ -1,37 +1,49 @@ { "isDisabled": false, "name": "CreateRectGridGeom.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "created_data_group_path": "Imported Data", + "created_data_group_path": { + "value": "Imported Data", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 8, - 8, - 8 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/Test_Data/RectGridBounds.csv", - "Skipped Array Mask": [ - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 6 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 8, + 8, + 8 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/Test_Data/RectGridBounds.csv", + "Skipped Array Mask": [ + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 6 + ] + }, + "version": 1 + }, + "selected_attribute_matrix_path": { + "value": "", + "version": 1 }, - "selected_attribute_matrix_path": "", - "use_existing_group": false + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -42,39 +54,103 @@ }, { "args": { - "array_handling_index": 1, - "cell_attribute_matrix_name": "Cell Data", - "dimensions": [ - 20, - 60, - 200 - ], - "edge_attribute_matrix_name": "Edge Data", - "edge_list_path": "Imported Data/Faces", - "face_attribute_matrix_name": "Face Data", - "geometry_type_index": 1, - "hexahedral_list_path": "", - "length_unit_index": 7, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "output_geometry_path": "Geometry", - "quadrilateral_list_path": "Imported Data/Faces", - "spacing": [ - 1.0, - 1.0, - 1.0 - ], - "tetrahedral_list_path": "Imported Data/Faces", - "triangle_list_path": "Imported Data/Faces", - "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_path": "Imported Data 2/Vertices", - "warnings_as_errors": false, - "x_bounds_path": "Imported Data/X_Bounds", - "y_bounds_path": "Imported Data/Y_Bounds", - "z_bounds_path": "Imported Data/Z_Bounds" + "array_handling_index": { + "value": 1, + "version": 1 + }, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 20, + 60, + 200 + ], + "version": 1 + }, + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "edge_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "geometry_type_index": { + "value": 1, + "version": 1 + }, + "hexahedral_list_path": { + "value": "", + "version": 1 + }, + "length_unit_index": { + "value": 7, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_geometry_path": { + "value": "Geometry", + "version": 1 + }, + "parameters_version": 1, + "quadrilateral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "tetrahedral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "triangle_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_list_path": { + "value": "Imported Data 2/Vertices", + "version": 1 + }, + "warnings_as_errors": { + "value": false, + "version": 1 + }, + "x_bounds_path": { + "value": "Imported Data/X_Bounds", + "version": 1 + }, + "y_bounds_path": { + "value": "Imported Data/Y_Bounds", + "version": 1 + }, + "z_bounds_path": { + "value": "Imported Data/Z_Bounds", + "version": 1 + } }, "comments": "", "filter": { @@ -85,17 +161,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 4, - "output_array_path": "Geometry/Cell Data/Int32Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Cell Data/Int32Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -106,18 +204,55 @@ }, { "args": { - "array_path": "Geometry/Cell Data/Int32Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Cell Data/Int32Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -128,17 +263,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 6, - "output_array_path": "Geometry/Cell Data/Int64Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 6, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Cell Data/Int64Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -149,18 +306,55 @@ }, { "args": { - "array_path": "Geometry/Cell Data/Int64Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue2", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Cell Data/Int64Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue2", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -170,6 +364,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/CreateScanVectors.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateScanVectors.d3dpipeline index 374dc55ef1..94f9e4e8ea 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateScanVectors.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateScanVectors.d3dpipeline @@ -1,17 +1,38 @@ { "isDisabled": false, "name": "CreateScanVectors.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "face_attribute_matrix_name": "Face Data", - "face_normals_name": "Face Normals", - "output_triangle_geometry_path": "TriangleDataContainer", - "scale_factor": 1.0, - "scale_output": false, - "stl_file_path": "Data/STL_Models/Example_Triangle_Geometry.stl", - "vertex_attribute_matrix_name": "Vertex Data" + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "face_normals_name": { + "value": "Face Normals", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1, + "scale_factor": { + "value": 1.0, + "version": 1 + }, + "scale_output": { + "value": false, + "version": 1 + }, + "stl_file_path": { + "value": "Data/STL_Models/Example_Triangle_Geometry.stl", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { @@ -22,10 +43,23 @@ }, { "args": { - "created_region_ids_path": "TriangleDataContainer/Face Data/Region Ids", - "input_triangle_geometry_path": "TriangleDataContainer", - "num_triangles_name": "NumTriangles", - "triangle_attribute_matrix_name": "Cell Feature AM" + "created_region_ids_path": { + "value": "TriangleDataContainer/Face Data/Region Ids", + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "num_triangles_name": { + "value": "NumTriangles", + "version": 1 + }, + "parameters_version": 1, + "triangle_attribute_matrix_name": { + "value": "Cell Feature AM", + "version": 1 + } }, "comments": "", "filter": { @@ -36,17 +70,51 @@ }, { "args": { - "edge_attribute_matrix_name": "Edge Data", - "have_region_ids": true, - "input_triangle_geometry_path": "TriangleDataContainer", - "output_edge_geometry_path": "Edge Geometry", - "region_ids_array_path": "TriangleDataContainer/Face Data/Region Ids", - "slice_attribute_matrix_name": "Slice Feature Data", - "slice_ids_array_name": "Slice Ids", - "slice_range_index": 0, - "slice_spacing_value": 0.33, - "z_end_value": 0.0, - "z_start_value": 0.0 + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "have_region_ids": { + "value": true, + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "output_edge_geometry_path": { + "value": "Edge Geometry", + "version": 1 + }, + "parameters_version": 1, + "region_ids_array_path": { + "value": "TriangleDataContainer/Face Data/Region Ids", + "version": 1 + }, + "slice_attribute_matrix_name": { + "value": "Slice Feature Data", + "version": 1 + }, + "slice_ids_array_name": { + "value": "Slice Ids", + "version": 1 + }, + "slice_range_index": { + "value": 0, + "version": 1 + }, + "slice_spacing_value": { + "value": 0.33000001311302185, + "version": 1 + }, + "z_end_value": { + "value": 0.0, + "version": 1 + }, + "z_start_value": { + "value": 0.0, + "version": 1 + } }, "comments": "", "filter": { @@ -57,19 +125,59 @@ }, { "args": { - "cad_region_ids_array_path": "Edge Geometry/Edge Data/Region Ids", - "cad_slice_data_container_path": "Edge Geometry", - "cad_slice_ids_array_path": "Edge Geometry/Edge Data/Slice Ids", - "hatch_attribute_matrix_name": "Vector Data", - "hatch_data_container_path": "ScanVectorGeometry", - "hatch_spacing": 0.33, - "power": 100.0, - "powers_array_name": "Powers", - "region_ids_array_name": "RegionIds", - "speed": 1000.0, - "stripe_width": 10.0, - "time_array_name": "Times", - "vertex_attribute_matrix_name": "Vector Node Data" + "cad_region_ids_array_path": { + "value": "Edge Geometry/Edge Data/Region Ids", + "version": 1 + }, + "cad_slice_data_container_path": { + "value": "Edge Geometry", + "version": 1 + }, + "cad_slice_ids_array_path": { + "value": "Edge Geometry/Edge Data/Slice Ids", + "version": 1 + }, + "hatch_attribute_matrix_name": { + "value": "Vector Data", + "version": 1 + }, + "hatch_data_container_path": { + "value": "ScanVectorGeometry", + "version": 1 + }, + "hatch_length": { + "value": 7.0, + "version": 1 + }, + "hatch_spacing": { + "value": 0.33000001311302185, + "version": 1 + }, + "parameters_version": 1, + "power": { + "value": 100.0, + "version": 1 + }, + "powers_array_name": { + "value": "Powers", + "version": 1 + }, + "region_ids_array_name": { + "value": "RegionIds", + "version": 1 + }, + "speed": { + "value": 1000.0, + "version": 1 + }, + "time_array_name": { + "value": "Times", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vector Node Data", + "version": 1 + } }, "comments": "", "filter": { @@ -80,8 +188,15 @@ }, { "args": { - "export_file_path": "Data/Output/ScanVectors/ExampleAMScanVectors.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/ScanVectors/ExampleAMScanVectors.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -91,6 +206,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/CreateTetrahedralGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateTetrahedralGeom.d3dpipeline index c1237a6ee9..2136f9c756 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateTetrahedralGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateTetrahedralGeom.d3dpipeline @@ -1,39 +1,51 @@ { "isDisabled": false, "name": "CreateTetrahedralGeom.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "created_data_group_path": "Imported Data", + "created_data_group_path": { + "value": "Imported Data", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 7, - 7, - 7, - 7 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/Test_Data/TetraConnectivity.csv", - "Skipped Array Mask": [ - false, - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 3 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 7, + 7, + 7, + 7 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/Test_Data/TetraConnectivity.csv", + "Skipped Array Mask": [ + false, + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 3 + ] + }, + "version": 1 + }, + "selected_attribute_matrix_path": { + "value": "", + "version": 1 }, - "selected_attribute_matrix_path": "", - "use_existing_group": false + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -44,15 +56,28 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Data/V0", - "Imported Data/V1", - "Imported Data/V2", - "Imported Data/V3" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Faces" + "input_data_array_paths": { + "value": [ + "Imported Data/V0", + "Imported Data/V1", + "Imported Data/V2", + "Imported Data/V3" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Faces", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -63,33 +88,46 @@ }, { "args": { - "created_data_group_path": "Imported Data 2", + "created_data_group_path": { + "value": "Imported Data 2", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 8, - 8, - 8 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/Test_Data/TetraVertexCoordinates.csv", - "Skipped Array Mask": [ - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 9 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 8, + 8, + 8 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/Test_Data/TetraVertexCoordinates.csv", + "Skipped Array Mask": [ + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 9 + ] + }, + "version": 1 }, - "selected_attribute_matrix_path": "Imported Data 2", - "use_existing_group": false + "selected_attribute_matrix_path": { + "value": "Imported Data 2", + "version": 1 + }, + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -100,14 +138,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Data 2/x", - "Imported Data 2/y", - "Imported Data 2/z" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Vertices" + "input_data_array_paths": { + "value": [ + "Imported Data 2/x", + "Imported Data 2/y", + "Imported Data 2/z" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Vertices", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -118,39 +169,103 @@ }, { "args": { - "array_handling_index": 1, - "cell_attribute_matrix_name": "Cell Data", - "dimensions": [ - 20, - 60, - 200 - ], - "edge_attribute_matrix_name": "Edge Data", - "edge_list_path": "", - "face_attribute_matrix_name": "Face Data", - "geometry_type_index": 6, - "hexahedral_list_path": "", - "length_unit_index": 7, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "output_geometry_path": "Geometry", - "quadrilateral_list_path": "", - "spacing": [ - 1.0, - 1.0, - 1.0 - ], - "tetrahedral_list_path": "Imported Data/Faces", - "triangle_list_path": "", - "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_path": "Imported Data 2/Vertices", - "warnings_as_errors": false, - "x_bounds_path": "", - "y_bounds_path": "", - "z_bounds_path": "" + "array_handling_index": { + "value": 1, + "version": 1 + }, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 20, + 60, + 200 + ], + "version": 1 + }, + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "edge_list_path": { + "value": "", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "geometry_type_index": { + "value": 6, + "version": 1 + }, + "hexahedral_list_path": { + "value": "", + "version": 1 + }, + "length_unit_index": { + "value": 7, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_geometry_path": { + "value": "Geometry", + "version": 1 + }, + "parameters_version": 1, + "quadrilateral_list_path": { + "value": "", + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "tetrahedral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "triangle_list_path": { + "value": "", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_list_path": { + "value": "Imported Data 2/Vertices", + "version": 1 + }, + "warnings_as_errors": { + "value": false, + "version": 1 + }, + "x_bounds_path": { + "value": "", + "version": 1 + }, + "y_bounds_path": { + "value": "", + "version": 1 + }, + "z_bounds_path": { + "value": "", + "version": 1 + } }, "comments": "", "filter": { @@ -161,17 +276,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 4, - "output_array_path": "Geometry/Cell Data/Int32Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Cell Data/Int32Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -182,18 +319,55 @@ }, { "args": { - "array_path": "Geometry/Cell Data/Int32Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Cell Data/Int32Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -204,17 +378,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 6, - "output_array_path": "Geometry/Cell Data/Int64Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 6, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Cell Data/Int64Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -225,18 +421,55 @@ }, { "args": { - "array_path": "Geometry/Cell Data/Int64Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue2", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Cell Data/Int64Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue2", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -246,6 +479,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/CreateTriangleGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateTriangleGeom.d3dpipeline index fe4a137f90..1d08caf969 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateTriangleGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateTriangleGeom.d3dpipeline @@ -1,37 +1,49 @@ { "isDisabled": false, "name": "CreateTriangleGeom.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "created_data_group_path": "Imported Data", + "created_data_group_path": { + "value": "Imported Data", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 7, - 7, - 7 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/Test_Data/TriangleConnectivity.csv", - "Skipped Array Mask": [ - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 242 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 7, + 7, + 7 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/Test_Data/TriangleConnectivity.csv", + "Skipped Array Mask": [ + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 242 + ] + }, + "version": 1 + }, + "selected_attribute_matrix_path": { + "value": "", + "version": 1 }, - "selected_attribute_matrix_path": "", - "use_existing_group": false + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -42,14 +54,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Data/V0", - "Imported Data/V1", - "Imported Data/V2" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Faces" + "input_data_array_paths": { + "value": [ + "Imported Data/V0", + "Imported Data/V1", + "Imported Data/V2" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Faces", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -60,33 +85,46 @@ }, { "args": { - "created_data_group_path": "Imported Data 2", + "created_data_group_path": { + "value": "Imported Data 2", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 8, - 8, - 8 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/Test_Data/VertexCoordinates.csv", - "Skipped Array Mask": [ - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 144 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 8, + 8, + 8 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/Test_Data/VertexCoordinates.csv", + "Skipped Array Mask": [ + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 144 + ] + }, + "version": 1 }, - "selected_attribute_matrix_path": "Imported Data 2", - "use_existing_group": false + "selected_attribute_matrix_path": { + "value": "Imported Data 2", + "version": 1 + }, + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -97,14 +135,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Data 2/x", - "Imported Data 2/y", - "Imported Data 2/z" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Vertices" + "input_data_array_paths": { + "value": [ + "Imported Data 2/x", + "Imported Data 2/y", + "Imported Data 2/z" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Vertices", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -115,39 +166,103 @@ }, { "args": { - "array_handling_index": 1, - "cell_attribute_matrix_name": "Cell Data", - "dimensions": [ - 20, - 60, - 200 - ], - "edge_attribute_matrix_name": "Edge Data", - "edge_list_path": "", - "face_attribute_matrix_name": "Face Data", - "geometry_type_index": 4, - "hexahedral_list_path": "", - "length_unit_index": 7, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "output_geometry_path": "Geometry", - "quadrilateral_list_path": "", - "spacing": [ - 1.0, - 1.0, - 1.0 - ], - "tetrahedral_list_path": "Imported Data/Faces", - "triangle_list_path": "Imported Data/Faces", - "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_path": "Imported Data 2/Vertices", - "warnings_as_errors": false, - "x_bounds_path": "", - "y_bounds_path": "", - "z_bounds_path": "" + "array_handling_index": { + "value": 1, + "version": 1 + }, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 20, + 60, + 200 + ], + "version": 1 + }, + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "edge_list_path": { + "value": "", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "geometry_type_index": { + "value": 4, + "version": 1 + }, + "hexahedral_list_path": { + "value": "", + "version": 1 + }, + "length_unit_index": { + "value": 7, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_geometry_path": { + "value": "Geometry", + "version": 1 + }, + "parameters_version": 1, + "quadrilateral_list_path": { + "value": "", + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "tetrahedral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "triangle_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_list_path": { + "value": "Imported Data 2/Vertices", + "version": 1 + }, + "warnings_as_errors": { + "value": false, + "version": 1 + }, + "x_bounds_path": { + "value": "", + "version": 1 + }, + "y_bounds_path": { + "value": "", + "version": 1 + }, + "z_bounds_path": { + "value": "", + "version": 1 + } }, "comments": "", "filter": { @@ -158,17 +273,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 4, - "output_array_path": "Geometry/Face Data/Int32Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Face Data/Int32Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -179,18 +316,55 @@ }, { "args": { - "array_path": "Geometry/Face Data/Int32Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Face Data/Int32Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -201,17 +375,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 6, - "output_array_path": "Geometry/Face Data/Int64Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 6, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Face Data/Int64Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -222,18 +418,55 @@ }, { "args": { - "array_path": "Geometry/Face Data/Int64Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue2", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Face Data/Int64Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue2", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -243,6 +476,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/CreateVertexGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateVertexGeom.d3dpipeline index f461a6c40a..0b68965175 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateVertexGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateVertexGeom.d3dpipeline @@ -1,37 +1,49 @@ { "isDisabled": false, "name": "CreateVertexGeom.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "created_data_group_path": "Imported Data 2", + "created_data_group_path": { + "value": "Imported Data 2", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 8, - 8, - 8 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/Test_Data/VertexCoordinates.csv", - "Skipped Array Mask": [ - false, - false, - false - ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 144 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 8, + 8, + 8 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/Test_Data/VertexCoordinates.csv", + "Skipped Array Mask": [ + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 144 + ] + }, + "version": 1 + }, + "selected_attribute_matrix_path": { + "value": "Imported Data 2", + "version": 1 }, - "selected_attribute_matrix_path": "Imported Data 2", - "use_existing_group": false + "use_existing_group": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -42,14 +54,27 @@ }, { "args": { - "input_data_array_paths": [ - "Imported Data 2/x", - "Imported Data 2/y", - "Imported Data 2/z" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Vertices" + "input_data_array_paths": { + "value": [ + "Imported Data 2/x", + "Imported Data 2/y", + "Imported Data 2/z" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Vertices", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -60,39 +85,103 @@ }, { "args": { - "array_handling_index": 1, - "cell_attribute_matrix_name": "Cell Data", - "dimensions": [ - 20, - 60, - 200 - ], - "edge_attribute_matrix_name": "Edge Data", - "edge_list_path": "Imported Data/Faces", - "face_attribute_matrix_name": "Face Data", - "geometry_type_index": 2, - "hexahedral_list_path": "", - "length_unit_index": 7, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "output_geometry_path": "Geometry", - "quadrilateral_list_path": "Imported Data/Faces", - "spacing": [ - 1.0, - 1.0, - 1.0 - ], - "tetrahedral_list_path": "Imported Data/Faces", - "triangle_list_path": "Imported Data/Faces", - "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_path": "Imported Data 2/Vertices", - "warnings_as_errors": false, - "x_bounds_path": "", - "y_bounds_path": "", - "z_bounds_path": "" + "array_handling_index": { + "value": 1, + "version": 1 + }, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 20, + 60, + 200 + ], + "version": 1 + }, + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "edge_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "geometry_type_index": { + "value": 2, + "version": 1 + }, + "hexahedral_list_path": { + "value": "", + "version": 1 + }, + "length_unit_index": { + "value": 7, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_geometry_path": { + "value": "Geometry", + "version": 1 + }, + "parameters_version": 1, + "quadrilateral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + }, + "tetrahedral_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "triangle_list_path": { + "value": "Imported Data/Faces", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_list_path": { + "value": "Imported Data 2/Vertices", + "version": 1 + }, + "warnings_as_errors": { + "value": false, + "version": 1 + }, + "x_bounds_path": { + "value": "", + "version": 1 + }, + "y_bounds_path": { + "value": "", + "version": 1 + }, + "z_bounds_path": { + "value": "", + "version": 1 + } }, "comments": "", "filter": { @@ -103,17 +192,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 4, - "output_array_path": "Geometry/Vertex Data/Int32Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Vertex Data/Int32Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -124,18 +235,55 @@ }, { "args": { - "array_path": "Geometry/Vertex Data/Int32Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Vertex Data/Int32Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -146,17 +294,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "0", - "numeric_type_index": 6, - "output_array_path": "Geometry/Vertex Data/Int64Array", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 6, + "version": 1 + }, + "output_array_path": { + "value": "Geometry/Vertex Data/Int64Array", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -167,18 +337,55 @@ }, { "args": { - "array_path": "Geometry/Vertex Data/Int64Array", - "init_end_range": "10", - "init_start_range": "-10", - "init_type_index": 3, - "init_value": "1;1;1", - "seed_array_name": "InitializeDataFilter SeedValue2", - "seed_value": 5489, - "standardize_seed": false, - "starting_fill_value": "0;1;2", - "step_operation_index": 0, - "step_value": "1;1;1", - "use_seed": false + "array_path": { + "value": "Geometry/Vertex Data/Int64Array", + "version": 1 + }, + "init_end_range": { + "value": "10", + "version": 1 + }, + "init_start_range": { + "value": "-10", + "version": 1 + }, + "init_type_index": { + "value": 3, + "version": 1 + }, + "init_value": { + "value": "1;1;1", + "version": 1 + }, + "parameters_version": 1, + "seed_array_name": { + "value": "InitializeDataFilter SeedValue2", + "version": 1 + }, + "seed_value": { + "value": 5489, + "version": 1 + }, + "standardize_seed": { + "value": false, + "version": 1 + }, + "starting_fill_value": { + "value": "0;1;2", + "version": 1 + }, + "step_operation_index": { + "value": 0, + "version": 1 + }, + "step_value": { + "value": "1;1;1", + "version": 1 + }, + "use_seed": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -188,6 +395,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/ExecuteProcess.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ExecuteProcess.d3dpipeline index d522dfd992..0b66c19d1e 100644 --- a/src/Plugins/SimplnxCore/pipelines/ExecuteProcess.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ExecuteProcess.d3dpipeline @@ -1,22 +1,34 @@ { "isDisabled": false, "name": "ExecuteProcess.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "arguments": "nxrunner", - "blocking": false, - "output_log_file": "Data/Output/SimplnxCore/ExecuteProcessOutput.txt", - "timeout": 30000 + "arguments": { + "value": "nxrunner", + "version": 1 + }, + "blocking": { + "value": false, + "version": 1 + }, + "output_log_file": { + "value": "Data/Output/SimplnxCore/ExecuteProcessOutput.txt", + "version": 1 + }, + "parameters_version": 1, + "timeout": { + "value": 30000, + "version": 1 + } }, "comments": "This pipeline demonstrates the use of the Execute Process filter in order to execute an external program from DREAM.3D. Here are a few general rules to keep in mind when formatting your command;\n--> The Command Line Arguments parameter should contain the absolute path to the program you wish to execute as well as any arguments that program requires (each separated by spaces). \n--> Path's containing spaces should be enclosed with double quotes (\"). \n--> Linux and MacOS users should be sure to use forward slashes (/) as the path separator instead of backslashes (\\)", "filter": { - "name": "simplnx::ExecuteProcessFilter", + "name": "nx::core::ExecuteProcessFilter", "uuid": "fb511a70-2175-4595-8c11-d1b5b6794221" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/ExtractPipelineToFile.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ExtractPipelineToFile.d3dpipeline index 267807ca89..41834e0c74 100644 --- a/src/Plugins/SimplnxCore/pipelines/ExtractPipelineToFile.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ExtractPipelineToFile.d3dpipeline @@ -1,12 +1,18 @@ { "isDisabled": false, "name": "ExtractPipelineToFile.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "input_file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d", - "output_file_path": "Data/Output/Reconstruction/SmallIN100_Final_Pipeline.d3dpipeline" + "input_file_path": { + "value": "Data/Output/Reconstruction/SmallIN100_Final.dream3d", + "version": 1 + }, + "output_file_path": { + "value": "Data/Output/Reconstruction/SmallIN100_Final_Pipeline.d3dpipeline", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -16,6 +22,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline index f06b0ff013..e7cf8faba0 100644 --- a/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline @@ -4,69 +4,111 @@ "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "input_file": "Data/Small_IN100/Slice_1.ang" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "input_file": { + "value": "Data/Small_IN100/Slice_1.ang", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadAngDataFilter", + "name": "nx::core::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false }, { "args": { - "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis_angle": [ - 0.0, - 0.0, - 1.0, - 90.0 - ] + "euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "parameters_version": 1, + "rotation_axis_angle": { + "value": [ + 0.0, + 0.0, + 1.0, + 90.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateEulerRefFrameFilter", + "name": "nx::core::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false }, { "args": { - "output_image_geometry_path": "DataContainer", - "remove_original_geometry": true, - "rotate_slice_by_slice": false, - "rotation_axis_angle": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "rotation_matrix": [ - [ + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "rotate_slice_by_slice": { + "value": false, + "version": 1 + }, + "rotation_axis_angle": { + "value": [ 0.0, + 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 0.0 + "version": 1 + }, + "rotation_matrix": { + "value": [ + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ] ], - [ - 0.0, - 0.0, - 0.0 - ] - ], - "rotation_representation_index": 0, - "input_image_geometry_path": "DataContainer" + "version": 1 + }, + "rotation_representation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateSampleRefFrameFilter", + "name": "nx::core::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -74,51 +116,95 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.9 - } - ], - "type": "collection", - "union": 0 - }, - "output_data_array_name": "Mask", - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "use_custom_false_value": false, - "use_custom_true_value": false + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "DataContainer/Cell Data/Confidence Index", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.9 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": false + "cell_euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPFColors", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeIPFColorsFilter", + "name": "nx::core::ComputeIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -126,63 +212,110 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Y Position", - "comparison": 1, - "inverted": false, - "type": "array", - "union": 0, - "value": 25.0 - } - ], - "type": "collection", - "union": 0 - }, - "output_data_array_name": "Mask Y Pos", - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "use_custom_false_value": false, - "use_custom_true_value": false + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "DataContainer/Cell Data/Y Position", + "comparison": 1, + "inverted": false, + "type": "array", + "union": 0, + "value": 25.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask Y Pos", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "array_handling_index": 0, - "included_data_array_paths": [ - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/X Position", - "DataContainer/Cell Data/Y Position", - "DataContainer/Cell Data/Mask" - ], - "input_grid_geometry_path": "DataContainer", - "mask_array_path": "DataContainer/Cell Data/Mask Y Pos", - "output_shared_vertex_list_name": "SharedVertexList", - "output_vertex_attr_matrix_name": "Vertex Data", - "output_vertex_geometry_path": "Vertex Geometry", - "use_mask": true + "array_handling_index": { + "value": 0, + "version": 1 + }, + "included_data_array_paths": { + "value": [ + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/IPFColors", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/X Position", + "DataContainer/Cell Data/Y Position", + "DataContainer/Cell Data/Mask" + ], + "version": 1 + }, + "input_grid_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask Y Pos", + "version": 1 + }, + "output_shared_vertex_list_name": { + "value": "SharedVertexList", + "version": 1 + }, + "output_vertex_attr_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "output_vertex_geometry_path": { + "value": "Vertex Geometry", + "version": 1 + }, + "parameters_version": 1, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "This filter will only create vertices where the Y Position was below a threshold set in the previous filter. The filter will move the arrays to the newly created vertext geometry", "filter": { - "name": "simplnx::ExtractVertexGeometryFilter", + "name": "nx::core::ExtractVertexGeometryFilter", "uuid": "621a71ca-124b-4471-ad1a-02f05ffba099" }, "isDisabled": false } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/SimplnxCore/pipelines/Import_CSV_File.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_CSV_File.d3dpipeline index 3c24c32fac..29d9799f3a 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_CSV_File.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_CSV_File.d3dpipeline @@ -4,8 +4,15 @@ "pipeline": [ { "args": { - "export_file_path": "Data/Output/Import_ASCII_IPF.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Import_ASCII_IPF.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -16,23 +23,39 @@ }, { "args": { - "cell_data_name": "Cell Data", - "dimensions": [ - 60, - 40, - 100 - ], - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "output_image_geometry_path": "[Image Geometry]", - "spacing": [ - 0.25, - 0.25, - 1.0 - ] + "cell_data_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 60, + 40, + 100 + ], + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "[Image Geometry]", + "version": 1 + }, + "parameters_version": 1, + "spacing": { + "value": [ + 0.25, + 0.25, + 1.0 + ], + "version": 1 + } }, "comments": "", "filter": { @@ -43,37 +66,50 @@ }, { "args": { - "created_data_group_path": "Imported Data", + "created_data_group_path": { + "value": "Imported Data", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": [ - "phi1", - "Phi", - "phi2" - ], - "Data Types": [ - 8, - 8, - 8 - ], - "Delimiters": [ - "," - ], - "Header Line": 1, - "Header Mode": 1, - "Input File Path": "Data/ASCIIData/EulersRotated.csv", - "Skipped Array Mask": [ - false, - false, - false - ], - "Start Import Row": 1, - "Tuple Dimensions": [ - 480000 - ] + "value": { + "Consecutive Delimiters": false, + "Custom Headers": [ + "phi1", + "Phi", + "phi2" + ], + "Data Types": [ + 8, + 8, + 8 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 1, + "Input File Path": "Data/ASCIIData/EulersRotated.csv", + "Skipped Array Mask": [ + false, + false, + false + ], + "Start Import Row": 1, + "Tuple Dimensions": [ + 480000 + ] + }, + "version": 1 }, - "selected_attribute_matrix_path": "[Image Geometry]/Cell Data/", - "use_existing_group": true + "selected_attribute_matrix_path": { + "value": "[Image Geometry]/Cell Data", + "version": 1 + }, + "use_existing_group": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -84,14 +120,27 @@ }, { "args": { - "input_data_array_paths": [ - "[Image Geometry]/Cell Data//phi1", - "[Image Geometry]/Cell Data//Phi", - "[Image Geometry]/Cell Data//phi2" - ], - "move_values": true, - "normalize_data": false, - "output_data_array_name": "Eulers" + "input_data_array_paths": { + "value": [ + "[Image Geometry]/Cell Data/phi1", + "[Image Geometry]/Cell Data/Phi", + "[Image Geometry]/Cell Data/phi2" + ], + "version": 1 + }, + "move_values": { + "value": true, + "version": 1 + }, + "normalize_data": { + "value": false, + "version": 1 + }, + "output_data_array_name": { + "value": "Eulers", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { @@ -102,17 +151,33 @@ }, { "args": { - "cell_ensemble_attribute_matrix_path": "[Image Geometry]/EnsembleAttributeMatrix", - "crystal_structures_array_name": "CrystalStructures", - "ensemble": [ - [ - "Cubic-High m-3m", - "Primary", - "Nickel" - ] - ], - "phase_names_array_name": "PhaseNames", - "phase_types_array_name": "PhaseTypes" + "cell_ensemble_attribute_matrix_path": { + "value": "[Image Geometry]/EnsembleAttributeMatrix", + "version": 1 + }, + "crystal_structures_array_name": { + "value": "CrystalStructures", + "version": 1 + }, + "ensemble": { + "value": [ + [ + "Cubic-High m-3m", + "Primary", + "Nickel" + ] + ], + "version": 1 + }, + "parameters_version": 1, + "phase_names_array_name": { + "value": "PhaseNames", + "version": 1 + }, + "phase_types_array_name": { + "value": "PhaseTypes", + "version": 1 + } }, "comments": "", "filter": { @@ -123,17 +188,39 @@ }, { "args": { - "component_count": 1, - "data_format": "", - "initialization_value_str": "1", - "numeric_type_index": 4, - "output_array_path": "[Image Geometry]/Cell Data//Phases", - "set_tuple_dimensions": true, - "tuple_dimensions": [ - [ - 0.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "1", + "version": 1 + }, + "numeric_type_index": { + "value": 4, + "version": 1 + }, + "output_array_path": { + "value": "[Image Geometry]/Cell Data/Phases", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { @@ -144,17 +231,39 @@ }, { "args": { - "cell_euler_angles_array_path": "[Image Geometry]/Cell Data//Eulers", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "[Image Geometry]/Cell Data//Phases", - "crystal_structures_array_path": "[Image Geometry]/EnsembleAttributeMatrix/CrystalStructures", - "mask_array_path": "", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": false + "cell_euler_angles_array_path": { + "value": "[Image Geometry]/Cell Data/Eulers", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPFColors", + "version": 1 + }, + "cell_phases_array_path": { + "value": "[Image Geometry]/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "[Image Geometry]/EnsembleAttributeMatrix/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -165,11 +274,27 @@ }, { "args": { - "file_name": "Data/Output/Import_CSV_Example/Import_ASCII_IPF.png", - "image_array_path": "[Image Geometry]/Cell Data//IPFColors", - "index_offset": 0, - "input_image_geometry_path": "[Image Geometry]", - "plane_index": 0 + "file_name": { + "value": "Data/Output/Import_CSV_Example/Import_ASCII_IPF.png", + "version": 1 + }, + "image_array_path": { + "value": "[Image Geometry]/Cell Data/IPFColors", + "version": 1 + }, + "index_offset": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "[Image Geometry]", + "version": 1 + }, + "parameters_version": 1, + "plane_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { @@ -180,4 +305,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline index ddbb0fc4f3..7d571f6be0 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline @@ -1,53 +1,108 @@ { "isDisabled": false, "name": "Import_STL_Model.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "output_triangle_geometry_path": "[Triangle Geometry]", - "scale_factor": 1.0, - "scale_output": false, - "stl_file_path": "Data/STL_Models/Cylinder.stl" + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "face_normals_name": { + "value": "Face Normals", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "[Triangle Geometry]", + "version": 1 + }, + "parameters_version": 1, + "scale_factor": { + "value": 1.0, + "version": 1 + }, + "scale_output": { + "value": false, + "version": 1 + }, + "stl_file_path": { + "value": "Data/STL_Models/Cylinder.stl", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadStlFileFilter", + "name": "nx::core::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false }, { "args": { - "triangle_areas_array_name": "Areas", - "input_triangle_geometry_path": "[Triangle Geometry]" + "input_triangle_geometry_path": { + "value": "[Triangle Geometry]", + "version": 1 + }, + "parameters_version": 1, + "triangle_areas_array_name": { + "value": "Areas", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeTriangleAreasFilter", + "name": "nx::core::ComputeTriangleAreasFilter", "uuid": "b149addd-c0c8-4010-a264-596005eaf2a5" }, "isDisabled": false }, { "args": { - "component_count": 1, - "initialization_value_str": "0", - "numeric_type_index": 8, - "output_array_path": "[Triangle Geometry]/Vertex Data/Node Type", - "tuple_dimensions": [ - [ - 1.0 - ] - ] + "component_count": { + "value": 1, + "version": 1 + }, + "data_format": { + "value": "", + "version": 1 + }, + "initialization_value_str": { + "value": "0", + "version": 1 + }, + "numeric_type_index": { + "value": 8, + "version": 1 + }, + "output_array_path": { + "value": "[Triangle Geometry]/Vertex Data/Node Type", + "version": 1 + }, + "parameters_version": 1, + "set_tuple_dimensions": { + "value": true, + "version": 1 + }, + "tuple_dimensions": { + "value": [ + [ + 1.0 + ] + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": true } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/Import_Text_Data.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_Text_Data.d3dpipeline index e9aa5be6d6..fc65efbb76 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_Text_Data.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_Text_Data.d3dpipeline @@ -1,127 +1,254 @@ { "isDisabled": false, "name": "Import Text Data Files", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_data_name": "Cell Data", - "dimensions": [ - 60, - 80, - 100 - ], - "output_image_geometry_path": "[Image Geometry]", - "origin": [ - 100.0, - 100.0, - 0.0 - ], - "spacing": [ - 1.0, - 1.0, - 1.0 - ] + "cell_data_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 60, + 80, + 100 + ], + "version": 1 + }, + "origin": { + "value": [ + 100.0, + 100.0, + 0.0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "[Image Geometry]", + "version": 1 + }, + "parameters_version": 1, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CreateImageGeometryFilter", + "name": "nx::core::CreateImageGeometryFilter", "uuid": "c4320659-1a84-461d-939e-c7c10229a504" }, "isDisabled": false }, { "args": { - "set_tuple_dimensions": false, - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/ConfidenceIndex.csv", - "number_comp": 1, - "skip_line_count": 0, - "number_tuples": [ - [ - 480000.0 - ] - ], - "output_data_array_path": "[Image Geometry]/Cell Data/Confidence Index", - "scalar_type_index": 8 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/ConfidenceIndex.csv", + "version": 1 + }, + "number_comp": { + "value": 1, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 480000.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "[Image Geometry]/Cell Data/Confidence Index", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { - "set_tuple_dimensions": false, - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/FeatureIds.csv", - "number_comp": 1, - "skip_line_count": 0, - "number_tuples": [ - [ - 480000.0 - ] - ], - "output_data_array_path": "[Image Geometry]/Cell Data/FeatureIds", - "scalar_type_index": 4 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/FeatureIds.csv", + "version": 1 + }, + "number_comp": { + "value": 1, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 480000.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "[Image Geometry]/Cell Data/FeatureIds", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 4, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { - "set_tuple_dimensions": false, - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/ImageQuality.csv", - "number_comp": 1, - "skip_line_count": 0, - "number_tuples": [ - [ - 480000.0 - ] - ], - "output_data_array_path": "[Image Geometry]/Cell Data/Image Quality", - "scalar_type_index": 8 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/ImageQuality.csv", + "version": 1 + }, + "number_comp": { + "value": 1, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 480000.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "[Image Geometry]/Cell Data/Image Quality", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { - "set_tuple_dimensions": false, - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/IPFColor.csv", - "number_comp": 3, - "skip_line_count": 0, - "number_tuples": [ - [ - 480000.0 - ] - ], - "output_data_array_path": "[Image Geometry]/Cell Data/IPFColors", - "scalar_type_index": 1 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/IPFColor.csv", + "version": 1 + }, + "number_comp": { + "value": 3, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 480000.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "[Image Geometry]/Cell Data/IPFColors", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 1, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/Remove_Triangles.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Remove_Triangles.d3dpipeline index e22f445da2..c3ce342930 100644 --- a/src/Plugins/SimplnxCore/pipelines/Remove_Triangles.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Remove_Triangles.d3dpipeline @@ -4,13 +4,35 @@ "pipeline": [ { "args": { - "face_attribute_matrix_name": "Face Data", - "face_normals_name": "Face Normals", - "scale_factor": 1.0, - "scale_output": false, - "stl_file_path": "Data/STL_Models/Example_Triangle_Geometry.stl", - "output_triangle_geometry_path": "TriangleDataContainer", - "vertex_attribute_matrix_name": "Vertex Data" + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "face_normals_name": { + "value": "Face Normals", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1, + "scale_factor": { + "value": 1.0, + "version": 1 + }, + "scale_output": { + "value": false, + "version": 1 + }, + "stl_file_path": { + "value": "Data/STL_Models/Example_Triangle_Geometry.stl", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { @@ -21,10 +43,23 @@ }, { "args": { - "created_region_ids_path": "TriangleDataContainer/Face Data/Region Ids", - "num_triangles_name": "NumTriangles", - "triangle_attribute_matrix_name": "CAD Part Data", - "input_triangle_geometry_path": "TriangleDataContainer" + "created_region_ids_path": { + "value": "TriangleDataContainer/Face Data/Region Ids", + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "num_triangles_name": { + "value": "NumTriangles", + "version": 1 + }, + "parameters_version": 1, + "triangle_attribute_matrix_name": { + "value": "CAD Part Data", + "version": 1 + } }, "comments": "", "filter": { @@ -36,30 +71,52 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "TriangleDataContainer/Face Data/Region Ids", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 9.0 - } - ], - "type": "collection", - "union": 0 - }, - "output_data_array_name": "Mask", - "created_mask_type": 1, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "use_custom_false_value": false, - "use_custom_true_value": false + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "TriangleDataContainer/Face Data/Region Ids", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 9.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 1, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "nx::core::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -67,39 +124,95 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "TriangleDataContainer/Face Data/Region Ids", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 9.0 - } - ], - "type": "collection", - "union": 0 - }, - "output_data_array_name": "Mask2", - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "use_custom_false_value": false, - "use_custom_true_value": false + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "TriangleDataContainer/Face Data/Region Ids", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 9.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask2", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "nx::core::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "input_triangle_geometry_path": "TriangleDataContainer", - "mask_array_path": "TriangleDataContainer/Face Data/Mask2", - "output_triangle_geometry_path": "Part 10" + "input_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "mask_array_path": { + "value": "TriangleDataContainer/Face Data/Mask2", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "Part 10", + "version": 1 + }, + "parameters_version": 1, + "triangle_data_handling_index": { + "value": 0, + "version": 1 + }, + "triangle_data_selected_array_paths": { + "value": [], + "version": 1 + }, + "triangle_data_selected_attribute_matrix_path": { + "value": "", + "version": 1 + }, + "vertex_data_handling_index": { + "value": 0, + "version": 1 + }, + "vertex_data_selected_array_paths": { + "value": [], + "version": 1 + }, + "vertex_data_selected_attribute_matrix_path": { + "value": "", + "version": 1 + } }, "comments": "", "filter": { @@ -110,4 +223,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline index c9ebd85604..da018b64b3 100644 --- a/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline @@ -1,31 +1,30 @@ { "isDisabled": false, "name": "ReplaceElementAttributesWithNeighbor.d3dpipeline", - "pinnedParams": [ - { - "filterIndex": 5, - "filterUuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2", - "paramUuid": "17309744-c4e8-4d1e-807e-e7012387f1ec", - "paramName": "min_voxel" - }, - { - "filterIndex": 5, - "filterUuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2", - "paramUuid": "17309744-c4e8-4d1e-807e-e7012387f1ec", - "paramName": "max_voxel" - } - ], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "input_file": "Data/Small_IN100/Slice_1.ang" + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "cell_ensemble_attribute_matrix_name": { + "value": "Cell Ensemble Data", + "version": 1 + }, + "input_file": { + "value": "Data/Small_IN100/Slice_1.ang", + "version": 1 + }, + "output_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReadAngDataFilter", + "name": "nx::core::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -33,190 +32,367 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - }, - { - "array_path": "DataContainer/Cell Data/Image Quality", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 120.0 - } - ], - "type": "collection", - "union": 0 + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "DataContainer/Cell Data/Confidence Index", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.1 + }, + { + "array_path": "DataContainer/Cell Data/Image Quality", + "comparison": 0, + "inverted": false, + "type": "array", + "union": 0, + "value": 120.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 }, - "output_data_array_name": "Mask" + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "output_image_geometry_path": "", - "remove_original_geometry": true, - "rotate_slice_by_slice": false, - "rotation_axis_angle": [ - 0.0, - 1.0, - 0.0, - 180.0 - ], - "rotation_matrix": [ - [ + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "output_image_geometry_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "rotate_slice_by_slice": { + "value": false, + "version": 1 + }, + "rotation_axis_angle": { + "value": [ 0.0, + 1.0, 0.0, - 0.0 + 180.0 ], - [ - 0.0, - 0.0, - 0.0 + "version": 1 + }, + "rotation_matrix": { + "value": [ + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ] ], - [ - 0.0, - 0.0, - 0.0 - ] - ], - "rotation_representation_index": 0, - "input_image_geometry_path": "DataContainer" + "version": 1 + }, + "rotation_representation_index": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateSampleRefFrameFilter", + "name": "nx::core::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false }, { "args": { - "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis_angle": [ - 0.0, - 0.0, - 1.0, - 90.0 - ] + "euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "parameters_version": 1, + "rotation_axis_angle": { + "value": [ + 0.0, + 0.0, + 1.0, + 90.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::RotateEulerRefFrameFilter", + "name": "nx::core::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false }, { "args": { - "change_origin": true, - "change_spacing": true, - "input_image_geometry_path": "DataContainer", - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "spacing": [ - 1.0, - 1.0, - 1.0 - ] + "center_origin": { + "value": false, + "version": 1 + }, + "change_origin": { + "value": true, + "version": 1 + }, + "change_spacing": { + "value": true, + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "parameters_version": 1, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::SetImageGeomOriginScalingFilter", + "name": "nx::core::SetImageGeomOriginScalingFilter", "uuid": "057bc7fd-c84a-4902-9397-87e51b1b1fe0" }, "isDisabled": false }, { "args": { - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "output_image_geometry_path": "", - "feature_ids_path": "", - "max_voxel": [ - 160, - 175, - 0 - ], - "min_voxel": [ - 25, - 25, - 0 - ], - "remove_original_geometry": true, - "renumber_features": false, - "input_image_geometry_path": "DataContainer", - "use_physical_bounds": false + "cell_feature_attribute_matrix_path": { + "value": "Cell Feature Data", + "version": 1 + }, + "crop_x_dim": { + "value": true, + "version": 1 + }, + "crop_y_dim": { + "value": true, + "version": 1 + }, + "crop_z_dim": { + "value": true, + "version": 1 + }, + "feature_ids_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "max_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "max_voxel": { + "value": [ + 160, + 175, + 0 + ], + "version": 1 + }, + "min_coord": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "min_voxel": { + "value": [ + 25, + 25, + 0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": true, + "version": 1 + }, + "renumber_features": { + "value": false, + "version": 1 + }, + "use_physical_bounds": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CropImageGeometryFilter", + "name": "nx::core::CropImageGeometryFilter", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false }, { "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true + "cell_euler_angles_array_path": { + "value": "DataContainer/Cell Data/EulerAngles", + "version": 1 + }, + "cell_ipf_colors_array_name": { + "value": "IPFColors", + "version": 1 + }, + "cell_phases_array_path": { + "value": "DataContainer/Cell Data/Phases", + "version": 1 + }, + "crystal_structures_array_path": { + "value": "DataContainer/Cell Ensemble Data/CrystalStructures", + "version": 1 + }, + "mask_array_path": { + "value": "DataContainer/Cell Data/Mask", + "version": 1 + }, + "parameters_version": 1, + "reference_dir": { + "value": [ + 0.0, + 0.0, + 1.0 + ], + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeIPFColorsFilter", + "name": "nx::core::ComputeIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false }, { "args": { - "comparison_data_path": "DataContainer/Cell Data/Confidence Index", - "loop": true, - "min_confidence": 0.10000000149011612, - "comparison_index": 0, - "input_image_geometry_path": "DataContainer" + "comparison_data_path": { + "value": "DataContainer/Cell Data/Confidence Index", + "version": 1 + }, + "comparison_index": { + "value": 0, + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "loop": { + "value": true, + "version": 1 + }, + "min_confidence": { + "value": 0.10000000149011612, + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::ReplaceElementAttributesWithNeighborValuesFilter", + "name": "nx::core::ReplaceElementAttributesWithNeighborValuesFilter", "uuid": "65128c53-d3be-4a69-a559-32a48d603884" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/Examples/ReplaceElementAttributesWithNeighbor.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/Examples/ReplaceElementAttributesWithNeighbor.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline index 5ca1401b1a..1e2281d60e 100644 --- a/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline @@ -1,152 +1,300 @@ { "isDisabled": false, "name": "Untitled.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Cell Data", - "image_data_array_name": "ImageData", - "output_image_geometry_path": "Porosity_Image", - "image_transform_index": 0, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "change_image_data_type": { + "value": false, + "version": 1 + }, + "color_weights": { + "value": [ + 0.21250000596046448, + 0.715399980545044, + 0.07209999859333038 + ], + "version": 1 + }, + "convert_to_gray_scale": { + "value": false, + "version": 1 + }, + "image_data_array_name": { + "value": "ImageData", + "version": 1 + }, + "image_data_type_index": { + "value": 0, + "version": 1 + }, + "image_transform_index": { + "value": 0, + "version": 1 + }, "input_file_list_object": { - "end_index": 174, - "file_extension": ".tif", - "file_prefix": "slice_", - "file_suffix": "", - "increment_index": 1, - "input_path": "Data/Porosity_Image", - "ordering": 0, - "padding_digits": 2, - "start_index": 11 - }, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "spacing": [ - 1.0, - 1.0, - 1.0 - ] + "value": { + "end_index": 174, + "file_extension": ".tif", + "file_prefix": "slice_", + "file_suffix": "", + "increment_index": 1, + "input_path": "Data/Porosity_Image", + "ordering": 0, + "padding_digits": 2, + "start_index": 11 + }, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "Porosity_Image", + "version": 1 + }, + "parameters_version": 1, + "scale_images": { + "value": false, + "version": 1 + }, + "scaling": { + "value": 1.0, + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ITKImportImageStack", + "name": "nx::core::ITKImportImageStackFilter", "uuid": "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb" }, "isDisabled": false }, { "args": { - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "exact_dimensions": [ - 100, - 500, - 20 - ], - "feature_ids_path": "", - "new_data_container_path": "Porosity_Image_Resampled_Spacing", - "remove_original_geometry": false, - "renumber_features": false, - "resampling_mode_index": 0, - "scaling": [ - 120.4000015258789, - 50.7400016784668, - 68.12000274658203 - ], - "input_image_geometry_path": "Porosity_Image", - "spacing": [ - 2.0, - 2.0, - 2.0 - ] + "cell_feature_attribute_matrix_path": { + "value": "Cell Feature Data", + "version": 1 + }, + "exact_dimensions": { + "value": [ + 100, + 500, + 20 + ], + "version": 1 + }, + "feature_ids_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Porosity_Image", + "version": 1 + }, + "new_data_container_path": { + "value": "Porosity_Image_Resampled_Spacing", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": false, + "version": 1 + }, + "renumber_features": { + "value": false, + "version": 1 + }, + "resampling_mode_index": { + "value": 0, + "version": 1 + }, + "scaling": { + "value": [ + 120.4000015258789, + 50.7400016784668, + 68.12000274658203 + ], + "version": 1 + }, + "spacing": { + "value": [ + 2.0, + 2.0, + 2.0 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ResampleImageGeomFilter", + "name": "nx::core::ResampleImageGeomFilter", "uuid": "9783ea2c-4cf7-46de-ab21-b40d91a48c5b" }, "isDisabled": false }, { "args": { - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "exact_dimensions": [ - 100, - 500, - 20 - ], - "feature_ids_path": "", - "new_data_container_path": "Porosity_Image_Resampled_Scaled", - "remove_original_geometry": false, - "renumber_features": false, - "resampling_mode_index": 1, - "scaling": [ - 50.0, - 50.0, - 50.0 - ], - "input_image_geometry_path": "Porosity_Image", - "spacing": [ - 0.25, - 0.699999988079071, - 2.299999952316284 - ] + "cell_feature_attribute_matrix_path": { + "value": "Cell Feature Data", + "version": 1 + }, + "exact_dimensions": { + "value": [ + 100, + 500, + 20 + ], + "version": 1 + }, + "feature_ids_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Porosity_Image", + "version": 1 + }, + "new_data_container_path": { + "value": "Porosity_Image_Resampled_Scaled", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": false, + "version": 1 + }, + "renumber_features": { + "value": false, + "version": 1 + }, + "resampling_mode_index": { + "value": 1, + "version": 1 + }, + "scaling": { + "value": [ + 50.0, + 50.0, + 50.0 + ], + "version": 1 + }, + "spacing": { + "value": [ + 0.25, + 0.699999988079071, + 2.299999952316284 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ResampleImageGeomFilter", + "name": "nx::core::ResampleImageGeomFilter", "uuid": "9783ea2c-4cf7-46de-ab21-b40d91a48c5b" }, "isDisabled": false }, { "args": { - "cell_feature_attribute_matrix_path": "Cell Feature Data", - "exact_dimensions": [ - 262, - 195, - 82 - ], - "feature_ids_path": "", - "new_data_container_path": "Porosity_Image_Resampled_Exact_Dims", - "remove_original_geometry": false, - "renumber_features": false, - "resampling_mode_index": 2, - "scaling": [ - 120.4000015258789, - 50.7400016784668, - 68.12000274658203 - ], - "input_image_geometry_path": "Porosity_Image", - "spacing": [ - 0.25, - 0.699999988079071, - 2.299999952316284 - ] + "cell_feature_attribute_matrix_path": { + "value": "Cell Feature Data", + "version": 1 + }, + "exact_dimensions": { + "value": [ + 262, + 195, + 82 + ], + "version": 1 + }, + "feature_ids_path": { + "value": "", + "version": 1 + }, + "input_image_geometry_path": { + "value": "Porosity_Image", + "version": 1 + }, + "new_data_container_path": { + "value": "Porosity_Image_Resampled_Exact_Dims", + "version": 1 + }, + "parameters_version": 1, + "remove_original_geometry": { + "value": false, + "version": 1 + }, + "renumber_features": { + "value": false, + "version": 1 + }, + "resampling_mode_index": { + "value": 2, + "version": 1 + }, + "scaling": { + "value": [ + 120.4000015258789, + 50.7400016784668, + 68.12000274658203 + ], + "version": 1 + }, + "spacing": { + "value": [ + 0.25, + 0.699999988079071, + 2.299999952316284 + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ResampleImageGeomFilter", + "name": "nx::core::ResampleImageGeomFilter", "uuid": "9783ea2c-4cf7-46de-ab21-b40d91a48c5b" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/ResamplePorosityImage.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/ResamplePorosityImage.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline index f37ebb54be..2bb943150e 100644 --- a/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline @@ -5,260 +5,546 @@ "pipeline": [ { "args": { - "created_data_group_path": "Bounds", + "created_data_group_path": { + "value": "Bounds", + "version": 1 + }, + "parameters_version": 1, "read_csv_data_object": { - "Consecutive Delimiters": false, - "Custom Headers": null, - "Data Types": [ - 8, - 8, - 8 + "value": { + "Consecutive Delimiters": false, + "Custom Headers": null, + "Data Types": [ + 8, + 8, + 8 + ], + "Delimiters": [ + "," + ], + "Header Line": 1, + "Header Mode": 0, + "Input File Path": "Data/ASCIIData/RectilinearGrid.csv", + "Skipped Array Mask": [ + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 14 + ] + }, + "version": 1 + }, + "selected_attribute_matrix_path": { + "value": "", + "version": 1 + }, + "use_existing_group": { + "value": false, + "version": 1 + } + }, + "comments": "", + "filter": { + "name": "nx::core::ReadCSVFileFilter", + "uuid": "373be1f8-31cf-49f6-aa5d-e356f4f3f261" + }, + "isDisabled": false + }, + { + "args": { + "array_handling_index": { + "value": 1, + "version": 1 + }, + "cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "dimensions": { + "value": [ + 20, + 60, + 200 ], - "Delimiters": [ - "," + "version": 1 + }, + "edge_attribute_matrix_name": { + "value": "Edge Data", + "version": 1 + }, + "edge_list_path": { + "value": "", + "version": 1 + }, + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "geometry_type_index": { + "value": 1, + "version": 1 + }, + "hexahedral_list_path": { + "value": "", + "version": 1 + }, + "length_unit_index": { + "value": 7, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 ], - "Header Line": 1, - "Header Mode": 0, - "Input File Path": "Data/ASCIIData/RectilinearGrid.csv", - "Skipped Array Mask": [ - false, - false, - false + "version": 1 + }, + "output_geometry_path": { + "value": "RectGridGeometry", + "version": 1 + }, + "parameters_version": 1, + "quadrilateral_list_path": { + "value": "", + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 ], - "Start Import Row": 2, - "Tuple Dimensions": [ - 14 - ] + "version": 1 + }, + "tetrahedral_list_path": { + "value": "", + "version": 1 }, - "created_data_group_path": "", - "use_existing_group": false + "triangle_list_path": { + "value": "", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + }, + "vertex_list_path": { + "value": "", + "version": 1 + }, + "warnings_as_errors": { + "value": false, + "version": 1 + }, + "x_bounds_path": { + "value": "Bounds/x", + "version": 1 + }, + "y_bounds_path": { + "value": "Bounds/y", + "version": 1 + }, + "z_bounds_path": { + "value": "Bounds/z", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadCSVFileFilter", - "uuid": "373be1f8-31cf-49f6-aa5d-e356f4f3f261" + "name": "nx::core::CreateGeometryFilter", + "uuid": "24768170-5b90-4a9d-82ac-9aeecd9f892e" }, "isDisabled": false }, { "args": { - "array_handling_index": 1, - "cell_attribute_matrix_name": "Cell Data", - "dimensions": [ - 20, - 60, - 200 - ], - "edge_attribute_matrix_name": "Edge Data", - "edge_list_path": "", - "face_attribute_matrix_name": "Face Data", - "geometry_type_index": "RectGridGeometry", - "geometry_type_index": 1, - "hexahedral_list_path": "", - "length_unit_index": 7, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "quadrilateral_list_path": "", - "spacing": [ - 1.0, - 1.0, - 1.0 - ], - "tetrahedral_list_path": "", - "triangle_list_path": "", - "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_path": "", - "warnings_as_errors": false, - "x_bounds_path": "Bounds/x", - "y_bounds_path": "Bounds/y", - "z_bounds_path": "Bounds/z" + "parameters_version": 1, + "removed_data_path": { + "value": [ + "Bounds" + ], + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::CreateGeometryFilter", - "uuid": "24768170-5b90-4a9d-82ac-9aeecd9f892e" + "name": "nx::core::DeleteDataFilter", + "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" }, "isDisabled": false }, { "args": { - "set_tuple_dimensions": false, - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/ConfidenceIndex.csv", - "number_tuples": 1, - "skip_line_count": 0, - "n_tuples": [ - [ - 0.0 - ] - ], - "output_array_path": "RectGridGeometry/CellData/ConfidenceIndex", - "scalar_type_index": 8 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/ConfidenceIndex.csv", + "version": 1 + }, + "number_comp": { + "value": 1, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "RectGridGeometry/Cell Data/ConfidenceIndex", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { - "set_tuple_dimensions": false, - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/ImageQuality.csv", - "number_tuples": 1, - "skip_line_count": 0, - "n_tuples": [ - [ - 0.0 - ] - ], - "output_array_path": "RectGridGeometry/CellData/ImageQuality", - "scalar_type_index": 8 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/ImageQuality.csv", + "version": 1 + }, + "number_comp": { + "value": 1, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "RectGridGeometry/Cell Data/ImageQuality", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { - "set_tuple_dimensions": false, - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/SEM Signal.csv", - "number_tuples": 1, - "skip_line_count": 0, - "n_tuples": [ - [ - 0.0 - ] - ], - "output_array_path": "RectGridGeometry/CellData/SEM Signal", - "scalar_type_index": 8 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/SEM Signal.csv", + "version": 1 + }, + "number_comp": { + "value": 1, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "RectGridGeometry/Cell Data/SEM Signal", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { - "set_tuple_dimensions": false, - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/Fit.csv", - "number_tuples": 1, - "skip_line_count": 0, - "n_tuples": [ - [ - 0.0 - ] - ], - "output_array_path": "RectGridGeometry/CellData/Fit", - "scalar_type_index": 8 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/Fit.csv", + "version": 1 + }, + "number_comp": { + "value": 1, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "RectGridGeometry/Cell Data/Fit", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { - "set_tuple_dimensions": false, - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/EulerAngles.csv", - "number_tuples": 3, - "skip_line_count": 0, - "n_tuples": [ - [ - 0.0 - ] - ], - "output_array_path": "RectGridGeometry/CellData/EulerAngles", - "scalar_type_index": 8 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/EulerAngles.csv", + "version": 1 + }, + "number_comp": { + "value": 1, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "RectGridGeometry/Cell Data/EulerAngles", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 8, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { - "set_tuple_dimensions": false, - "data_format": "", - "delimiter_index": 0, - "input_file": "Data/ASCIIData/Phases.csv", - "number_tuples": 1, - "skip_line_count": 0, - "n_tuples": [ - [ - 0.0 - ] - ], - "output_array_path": "RectGridGeometry/CellData/Phases", - "scalar_type_index": 4 + "data_format": { + "value": "", + "version": 1 + }, + "delimiter_index": { + "value": 0, + "version": 1 + }, + "input_file": { + "value": "Data/ASCIIData/Phases.csv", + "version": 1 + }, + "number_comp": { + "value": 1, + "version": 1 + }, + "number_tuples": { + "value": [ + [ + 0.0 + ] + ], + "version": 1 + }, + "output_data_array_path": { + "value": "RectGridGeometry/Cell Data/Phases", + "version": 1 + }, + "parameters_version": 1, + "scalar_type_index": { + "value": 4, + "version": 1 + }, + "set_tuple_dimensions": { + "value": false, + "version": 1 + }, + "skip_line_count": { + "value": 0, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { - "dimensions": [ - 20, - 20, - 20 - ], - "image_geom_cell_attribute_matrix_name": "Cell Data", - "input_image_geometry_path": "Image Geometry", - "rectilinear_grid_path": "RectGridGeometry", - "input_data_array_paths": [ - "RectGridGeometry/CellData/ConfidenceIndex", - "RectGridGeometry/CellData/EulerAngles", - "RectGridGeometry/CellData/Fit", - "RectGridGeometry/CellData/ImageQuality", - "RectGridGeometry/CellData/Phases", - "RectGridGeometry/CellData/SEM Signal" - ] + "dimensions": { + "value": [ + 20, + 20, + 20 + ], + "version": 1 + }, + "image_geom_cell_attribute_matrix_name": { + "value": "Cell Data", + "version": 1 + }, + "input_data_array_paths": { + "value": [ + "RectGridGeometry/Cell Data/ConfidenceIndex", + "RectGridGeometry/Cell Data/EulerAngles", + "RectGridGeometry/Cell Data/Fit", + "RectGridGeometry/Cell Data/ImageQuality", + "RectGridGeometry/Cell Data/Phases", + "RectGridGeometry/Cell Data/SEM Signal" + ], + "version": 1 + }, + "input_image_geometry_path": { + "value": "Image Geometry", + "version": 1 + }, + "parameters_version": 1, + "rectilinear_grid_path": { + "value": "RectGridGeometry", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ResampleRectGridToImageGeomFilter", + "name": "nx::core::ResampleRectGridToImageGeomFilter", "uuid": "28ed3258-41b2-45a0-8f37-6574264650f9" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Examples/ResampleRectGridToImageGeom.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Examples/ResampleRectGridToImageGeom.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "version": 1 -} \ No newline at end of file + "version": 1, + "workflowParams": [] +} diff --git a/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline index 51cc5aa4df..928f32cf90 100644 --- a/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline @@ -1,39 +1,88 @@ { "isDisabled": false, "name": "SurfaceNets_Demo.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "cell_attribute_matrix_name": "Optical Data", - "image_data_array_name": "ImageData", - "output_image_geometry_path": "RoboMet.3D Image Stack", - "image_transform_index": 0, + "cell_attribute_matrix_name": { + "value": "Optical Data", + "version": 1 + }, + "change_image_data_type": { + "value": false, + "version": 1 + }, + "color_weights": { + "value": [ + 0.21250000596046448, + 0.715399980545044, + 0.07209999859333038 + ], + "version": 1 + }, + "convert_to_gray_scale": { + "value": false, + "version": 1 + }, + "image_data_array_name": { + "value": "ImageData", + "version": 1 + }, + "image_data_type_index": { + "value": 0, + "version": 1 + }, + "image_transform_index": { + "value": 0, + "version": 1 + }, "input_file_list_object": { - "end_index": 174, - "file_extension": ".tif", - "file_prefix": "slice_", - "file_suffix": "", - "increment_index": 1, - "input_path": "Data/Porosity_Image", - "ordering": 0, - "padding_digits": 2, - "start_index": 11 - }, - "origin": [ - 0.0, - 0.0, - 0.0 - ], - "spacing": [ - 1.0, - 1.0, - 1.0 - ] + "value": { + "end_index": 174, + "file_extension": ".tif", + "file_prefix": "slice_", + "file_suffix": "", + "increment_index": 1, + "input_path": "Data/Porosity_Image", + "ordering": 0, + "padding_digits": 2, + "start_index": 11 + }, + "version": 1 + }, + "origin": { + "value": [ + 0.0, + 0.0, + 0.0 + ], + "version": 1 + }, + "output_image_geometry_path": { + "value": "RoboMet.3D Image Stack", + "version": 1 + }, + "parameters_version": 1, + "scale_images": { + "value": false, + "version": 1 + }, + "scaling": { + "value": 1.0, + "version": 1 + }, + "spacing": { + "value": [ + 1.0, + 1.0, + 1.0 + ], + "version": 1 + } }, "comments": "This pipeline shows how to import a stack of binarized images, segment them and perform a surfacemeshing on those pores using the 'SurfaceNets' Algorithm.\n\nIf you want to visualize the pores you will need to threshold out (with a visualization program) those triangle faces that have a FaceLael > 0 (for the 2nd component of the FaceLabels) array.", "filter": { - "name": "simplnx::ITKImportImageStack", + "name": "nx::core::ITKImportImageStackFilter", "uuid": "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb" }, "isDisabled": false @@ -41,89 +90,185 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "RoboMet.3D Image Stack/Optical Data/ImageData", - "comparison": 2, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.0 - } - ], - "type": "collection", - "union": 0 - }, - "output_data_array_name": "Mask", - "created_mask_type": 10, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "use_custom_false_value": false, - "use_custom_true_value": false + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "RoboMet.3D Image Stack/Optical Data/ImageData", + "comparison": 2, + "inverted": false, + "type": "array", + "union": 0, + "value": 0.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 10, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::MultiThresholdObjects", + "name": "nx::core::MultiThresholdObjectsFilter", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false }, { "args": { - "active_array_name": "Active", - "cell_feature_group_name": "Pore Data", - "feature_ids_name": "FeatureIds", - "input_image_geometry_path": "RoboMet.3D Image Stack", - "input_array_path": "RoboMet.3D Image Stack/Optical Data/ImageData", - "mask_path": "RoboMet.3D Image Stack/Optical Data/Mask", - "randomize_features": true, - "scalar_tolerance": 0, - "use_mask": true + "active_array_name": { + "value": "Active", + "version": 1 + }, + "cell_feature_group_name": { + "value": "Pore Data", + "version": 1 + }, + "feature_ids_name": { + "value": "FeatureIds", + "version": 1 + }, + "input_array_path": { + "value": "RoboMet.3D Image Stack/Optical Data/ImageData", + "version": 1 + }, + "input_image_geometry_path": { + "value": "RoboMet.3D Image Stack", + "version": 1 + }, + "mask_path": { + "value": "RoboMet.3D Image Stack/Optical Data/Mask", + "version": 1 + }, + "parameters_version": 1, + "randomize_features": { + "value": true, + "version": 1 + }, + "scalar_tolerance": { + "value": 0, + "version": 1 + }, + "use_mask": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ScalarSegmentFeaturesFilter", + "name": "nx::core::ScalarSegmentFeaturesFilter", "uuid": "e067cd97-9bbf-4c92-89a6-3cb4fdb76c93" }, "isDisabled": false }, { "args": { - "apply_smoothing": true, - "face_data_group_name": "Face Data", - "face_feature_attribute_matrix_name": "Face Feature Data", - "face_labels_array_name": "FaceLabels", - "feature_ids_path": "RoboMet.3D Image Stack/Optical Data/FeatureIds", - "input_grid_geometry_path": "RoboMet.3D Image Stack", - "max_distance_from_voxel": 1.0, - "node_types_array_name": "NodeTypes", - "relaxation_factor": 0.5, - "input_data_array_paths": [], - "smoothing_iterations": 20, - "output_triangle_geometry_path": "TriangleDataContainer", - "vertex_data_group_name": "Vertex Data" + "apply_smoothing": { + "value": true, + "version": 1 + }, + "face_data_group_name": { + "value": "Face Data", + "version": 1 + }, + "face_feature_attribute_matrix_name": { + "value": "Face Feature Data", + "version": 1 + }, + "face_labels_array_name": { + "value": "FaceLabels", + "version": 1 + }, + "feature_ids_path": { + "value": "RoboMet.3D Image Stack/Optical Data/FeatureIds", + "version": 1 + }, + "input_data_array_paths": { + "value": [], + "version": 1 + }, + "input_grid_geometry_path": { + "value": "RoboMet.3D Image Stack", + "version": 1 + }, + "max_distance_from_voxel": { + "value": 1.0, + "version": 1 + }, + "node_types_array_name": { + "value": "NodeTypes", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "TriangleDataContainer", + "version": 1 + }, + "parameters_version": 1, + "relaxation_factor": { + "value": 0.5, + "version": 1 + }, + "smoothing_iterations": { + "value": 20, + "version": 1 + }, + "vertex_data_group_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::SurfaceNetsFilter", + "name": "nx::core::SurfaceNetsFilter", "uuid": "13ddf0bd-af49-4e0f-95fb-3267952fd6e5" }, "isDisabled": false }, { "args": { - "export_file_path": "Data/Output/SurfaceMesh/SurfaceNets_Demo.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/SurfaceMesh/SurfaceNets_Demo.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline index 2592862e08..bea8602f45 100644 --- a/src/Plugins/SimplnxCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline @@ -1,70 +1,122 @@ { "isDisabled": false, "name": "Triangle_Areas_Demo.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "output_triangle_geometry_path": "[Triangle Geometry]", - "scale_factor": 1.0, - "scale_output": false, - "stl_file_path": "Data/STL_Models/ASTMD638_specimen.stl" + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "face_normals_name": { + "value": "Face Normals", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "[Triangle Geometry]", + "version": 1 + }, + "parameters_version": 1, + "scale_factor": { + "value": 1.0, + "version": 1 + }, + "scale_output": { + "value": false, + "version": 1 + }, + "stl_file_path": { + "value": "Data/STL_Models/ASTMD638_specimen.stl", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ReadStlFileFilter", + "name": "nx::core::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false }, { "args": { - "triangle_areas_array_name": "Face Areas", - "input_triangle_geometry_path": "[Triangle Geometry]" + "input_triangle_geometry_path": { + "value": "[Triangle Geometry]", + "version": 1 + }, + "parameters_version": 1, + "triangle_areas_array_name": { + "value": "Face Areas", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::ComputeTriangleAreasFilter", + "name": "nx::core::ComputeTriangleAreasFilter", "uuid": "b149addd-c0c8-4010-a264-596005eaf2a5" }, "isDisabled": false }, { "args": { - "output_normals_array_name": "Face Normals (Calculated)", - "input_triangle_geometry_path": "[Triangle Geometry]" + "input_triangle_geometry_path": { + "value": "[Triangle Geometry]", + "version": 1 + }, + "output_normals_array_name": { + "value": "Face Normals (Calculated)", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::TriangleNormalFilter", + "name": "nx::core::TriangleNormalFilter", "uuid": "8133d419-1919-4dbf-a5bf-1c97282ba63f" }, "isDisabled": false }, { "args": { - "surface_mesh_triangle_dihedral_angles_array_name": "Dihedral Angles", - "input_triangle_geometry_path": "[Triangle Geometry]" + "input_triangle_geometry_path": { + "value": "[Triangle Geometry]", + "version": 1 + }, + "parameters_version": 1, + "surface_mesh_triangle_dihedral_angles_array_name": { + "value": "Dihedral Angles", + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::TriangleDihedralAngleFilter", + "name": "nx::core::TriangleDihedralAngleFilter", "uuid": "dd42c521-4ae5-485d-ad35-d1276547d2f1" }, "isDisabled": false }, { "args": { - "centroids_array_name": "Centroids", - "input_triangle_geometry_path": "[Triangle Geometry]" + "centroids_array_name": { + "value": "Centroids", + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "[Triangle Geometry]", + "version": 1 + }, + "parameters_version": 1 }, "comments": "", "filter": { - "name": "simplnx::TriangleCentroidFilter", + "name": "nx::core::TriangleCentroidFilter", "uuid": "5d7156ae-3e0a-4db0-a792-552f492e8911" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline index a7f277b5a9..31a6824379 100644 --- a/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline @@ -1,504 +1,97 @@ { "isDisabled": false, "name": "VtkRectilinearGridWriter.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { "import_data_object": { - "data_paths": [ - "DataContainer", - "DataContainer/Cell Data", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/X Position", - "DataContainer/Cell Data/Y Position", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Ensemble Data", - "DataContainer/Cell Ensemble Data/CrystalStructures", - "DataContainer/Cell Ensemble Data/LatticeConstants", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Feature Data", - "DataContainer/Cell Feature Data/Active", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Feature Data/Phases", - "DataContainer/Cell Feature Data/AvgQuats", - "DataContainer/Cell Feature Data/AvgEulerAngles", - - "DataContainer/NewGrain Data", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Feature Data/ParentIds", - "DataContainer/NewGrain Data/Active", - "DataContainer/Cell Feature Data/Volumes", - "DataContainer/Cell Feature Data/EquivalentDiameters", - "DataContainer/Cell Feature Data/NumElements", - "DataContainer/Cell Feature Data/NumNeighbors", - "DataContainer/Cell Data/IPFColors" - ], - "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" + "value": { + "data_paths": [ + "DataContainer", + "DataContainer/Cell Data", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/X Position", + "DataContainer/Cell Data/Y Position", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Ensemble Data", + "DataContainer/Cell Ensemble Data/CrystalStructures", + "DataContainer/Cell Ensemble Data/LatticeConstants", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Feature Data", + "DataContainer/Cell Feature Data/Active", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/Cell Feature Data/Phases", + "DataContainer/Cell Feature Data/AvgQuats", + "DataContainer/Cell Feature Data/AvgEulerAngles", + "DataContainer/NewGrain Data", + "DataContainer/Cell Data/ParentIds", + "DataContainer/Cell Feature Data/ParentIds", + "DataContainer/NewGrain Data/Active", + "DataContainer/Cell Feature Data/Volumes", + "DataContainer/Cell Feature Data/EquivalentDiameters", + "DataContainer/Cell Feature Data/NumElements", + "DataContainer/Cell Feature Data/NumNeighbors", + "DataContainer/Cell Data/IPFColors" + ], + "file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d" + }, + "version": 1 }, - "Imported Pipeline": { - "isDisabled": false, - "name": "(08) Small IN100 Full Reconstruction", - "pipeline": [ - { - "args": { - "cell_attribute_matrix_name": "Cell Data", - "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "output_image_geometry_path": "DataContainer", - "read_h5_ebsd_object": { - "end_slice": 117, - "euler_representation": 0, - "hdf5_data_paths": [ - "Confidence Index", - "EulerAngles", - "Fit", - "Image Quality", - "Phases", - "SEM Signal", - "X Position", - "Y Position" - ], - "input_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", - "start_slice": 1, - "use_recommended_transform": true - } - }, - "comments": "", - "filter": { - "name": "simplnx::ReadH5EbsdFilter", - "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" - }, - "isDisabled": false - }, - { - "args": { - "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "DataContainer/Cell Data/Image Quality", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 120.0 - }, - { - "array_path": "DataContainer/Cell Data/Confidence Index", - "comparison": 0, - "inverted": false, - "type": "array", - "union": 0, - "value": 0.1 - } - ], - "type": "collection", - "union": 0 - }, - "output_data_array_name": "Mask" - }, - "comments": "", - "filter": { - "name": "simplnx::MultiThresholdObjects", - "uuid": "4246245e-1011-4add-8436-0af6bed19228" - }, - "isDisabled": false - }, - { - "args": { - "input_orientation_array_path": "DataContainer/Cell Data/EulerAngles", - "input_representation_index": 0, - "output_orientation_array_name": "Quats", - "output_representation_index": 2 - }, - "comments": "", - "filter": { - "name": "simplnx::ConvertOrientations", - "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Misorientation_Shifts.txt", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "input_image_geometry_path": "DataContainer", - "use_mask": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "simplnx::AlignSectionsMisorientationFilter", - "uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced" - }, - "isDisabled": false - }, - { - "args": { - "fill_holes": false, - "mask_array_path": "DataContainer/Cell Data/Mask", - "image_geometry": "DataContainer" - }, - "comments": "", - "filter": { - "name": "simplnx::IdentifySampleFilter", - "uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273" - }, - "isDisabled": false - }, - { - "args": { - "alignment_shift_file_name": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_slice": 0, - "selected_cell_data_path": "DataContainer/Cell Data", - "input_image_geometry_path": "DataContainer", - "use_reference_slice": true, - "write_alignment_shifts": false - }, - "comments": "", - "filter": { - "name": "simplnx::AlignSectionsFeatureCentroidFilter", - "uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "input_image_geometry_path": "DataContainer", - "misorientation_tolerance": 5.0, - "number_of_neighbors": 4, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "simplnx::BadDataNeighborOrientationCheckFilter", - "uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "correlation_array_path": "DataContainer/Cell Data/Confidence Index", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "ignored_data_array_paths": [], - "input_image_geometry_path": "DataContainer", - "level": 2, - "min_confidence": 0.20000000298023224, - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats" - }, - "comments": "", - "filter": { - "name": "simplnx::NeighborOrientationCorrelationFilter", - "uuid": "4625c192-7e46-4333-a294-67a2eb64cb37" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "cell_feature_attribute_matrix_name": "Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_array_name": "FeatureIds", - "mask_array_path": "DataContainer/Cell Data/Mask", - "input_image_geometry_path": "DataContainer", - "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/Cell Data/Quats", - "randomize_features": true, - "use_mask": true - }, - "comments": "", - "filter": { - "name": "simplnx::EBSDSegmentFeaturesFilter", - "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" - }, - "isDisabled": false - }, - { - "args": { - "cell_features_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_array_name": "Phases" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeFeaturePhasesFilter", - "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" - }, - "isDisabled": false - }, - { - "args": { - "avg_euler_angles_array_name": "AvgEulerAngles", - "avg_quats_array_name": "AvgQuats", - "cell_feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "cell_feature_ids_array_path": "DataContainer/Cell Data/FeatureIds", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "cell_quats_array_path": "DataContainer/Cell Data/Quats", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeAvgOrientationsFilter", - "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList2", - "number_of_neighbors_name": "NumNeighbors2", - "shared_surface_area_list_name": "SharedSurfaceAreaList2", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "simplnx::FindNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "active_array_name": "Active", - "angle_tolerance": 2.0, - "avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats", - "axis_tolerance": 3.0, - "cell_parent_ids_array_name": "ParentIds", - "contiguous_neighbor_list_array_path": "DataContainer/Cell Feature Data/NeighborList2", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_parent_ids_array_name": "ParentIds", - "feature_phases_array_path": "DataContainer/Cell Feature Data/Phases", - "created_feature_attribute_matrix_name": "NewGrain Data", - "non_contiguous_neighbor_list_array_path": "", - "use_non_contiguous_neighbors": false - }, - "comments": "", - "filter": { - "name": "simplnx::MergeTwinsFilter", - "uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9" - }, - "isDisabled": false - }, - { - "args": { - "equivalent_diameters_name": "EquivalentDiameters", - "feature_attribute_matrix_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "num_elements_name": "NumElements", - "save_element_sizes": false, - "volumes_name": "Volumes" - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeFeatureSizesFilter", - "uuid": "c666ee17-ca58-4969-80d0-819986c72485" - }, - "isDisabled": false - }, - { - "args": { - "apply_single_phase": false, - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "", - "input_image_geometry_path": "DataContainer", - "min_allowed_features_size": 16, - "num_cells_path": "DataContainer/Cell Feature Data/NumElements", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "simplnx::RequireMinimumSizeFeaturesFilter", - "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" - }, - "isDisabled": false - }, - { - "args": { - "boundary_cells_name": "BoundaryCells", - "cell_feature_array_path": "DataContainer/Cell Feature Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "input_image_geometry_path": "DataContainer", - "neighbor_list_name": "NeighborList", - "number_of_neighbors_name": "NumNeighbors", - "shared_surface_area_list_name": "SharedSurfaceAreaList", - "store_boundary_cells": false, - "store_surface_features": false, - "surface_features_name": "SurfaceFeatures" - }, - "comments": "", - "filter": { - "name": "simplnx::FindNeighborsFilter", - "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" - }, - "isDisabled": false - }, - { - "args": { - "apply_to_single_phase": false, - "cell_attribute_matrix_path": "DataContainer/Cell Data", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "feature_phases_path": "Data Container/Feature Data/Phases", - "ignored_voxel_arrays": [], - "image_geom": "DataContainer", - "min_num_neighbors": 2, - "num_neighbors_path": "DataContainer/Cell Feature Data/NumNeighbors", - "phase_number": 0 - }, - "comments": "", - "filter": { - "name": "simplnx::RequireMinNumNeighborsFilter", - "uuid": "4ab5153f-6014-4e6d-bbd6-194068620389" - }, - "isDisabled": false - }, - { - "args": { - "cell_phases_array_path": "Phases", - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "min_allowed_defect_size": 1000, - "input_image_geometry_path": "DataContainer", - "store_as_new_phase": false - }, - "comments": "", - "filter": { - "name": "simplnx::FillBadDataFilter", - "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "num_iterations": 2, - "operation_index": 0, - "input_image_geometry_path": "DataContainer", - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "simplnx::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "feature_ids_path": "DataContainer/Cell Data/FeatureIds", - "ignored_data_array_paths": [], - "num_iterations": 2, - "operation_index": 1, - "input_image_geometry_path": "DataContainer", - "x_dir_on": true, - "y_dir_on": true, - "z_dir_on": true - }, - "comments": "", - "filter": { - "name": "simplnx::ErodeDilateBadDataFilter", - "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" - }, - "isDisabled": false - }, - { - "args": { - "cell_euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "DataContainer/Cell Data/Phases", - "crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures", - "mask_array_path": "DataContainer/Cell Data/Mask", - "reference_dir": [ - 0.0, - 0.0, - 1.0 - ], - "use_mask": true - }, - "comments": "", - "filter": { - "name": "simplnx::ComputeIPFColorsFilter", - "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" - }, - "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Reconstruction/SmallIN100_Final.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "simplnx::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": false - } - ] - } + "parameters_version": 1 }, "comments": "The input for this pipeline requires the output from the (08) Small IN100 Full Reconstruction bookmarked pipeline.", "filter": { - "name": "simplnx::ReadDREAM3DFilter", + "name": "nx::core::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false }, { "args": { - "input_image_geometry_path": "DataContainer", - "output_file": "Data/Output/Examples/SmallIN100_Final.vtk", - "input_data_array_paths": [ - "DataContainer/Cell Data/Confidence Index", - "DataContainer/Cell Data/EulerAngles", - "DataContainer/Cell Data/FeatureIds", - "DataContainer/Cell Data/Fit", - "DataContainer/Cell Data/IPFColors", - "DataContainer/Cell Data/Image Quality", - "DataContainer/Cell Data/Mask", - "DataContainer/Cell Data/ParentIds", - "DataContainer/Cell Data/Phases", - "DataContainer/Cell Data/Quats", - "DataContainer/Cell Data/SEM Signal", - "DataContainer/Cell Data/X Position", - "DataContainer/Cell Data/Y Position" - ], - "write_binary_file": false + "input_data_array_paths": { + "value": [ + "DataContainer/Cell Data/Confidence Index", + "DataContainer/Cell Data/EulerAngles", + "DataContainer/Cell Data/FeatureIds", + "DataContainer/Cell Data/Fit", + "DataContainer/Cell Data/IPFColors", + "DataContainer/Cell Data/Image Quality", + "DataContainer/Cell Data/Mask", + "DataContainer/Cell Data/ParentIds", + "DataContainer/Cell Data/Phases", + "DataContainer/Cell Data/Quats", + "DataContainer/Cell Data/SEM Signal", + "DataContainer/Cell Data/X Position", + "DataContainer/Cell Data/Y Position" + ], + "version": 1 + }, + "input_image_geometry_path": { + "value": "DataContainer", + "version": 1 + }, + "output_file": { + "value": "Data/Output/Examples/SmallIN100_Final.vtk", + "version": 1 + }, + "parameters_version": 1, + "write_binary_file": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { - "name": "simplnx::WriteVtkRectilinearGridFilter", + "name": "nx::core::WriteVtkRectilinearGridFilter", "uuid": "58a4d758-c5ff-43d3-a394-1508ad00a0d2" }, "isDisabled": false } ], - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/pipelines/remove_flagged_triangles_example.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/remove_flagged_triangles_example.d3dpipeline index 532ad120d2..a35f81350e 100644 --- a/src/Plugins/SimplnxCore/pipelines/remove_flagged_triangles_example.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/remove_flagged_triangles_example.d3dpipeline @@ -1,17 +1,38 @@ { "isDisabled": false, "name": "remove_flagged_triangles_example.d3dpipeline", - "pinnedParams": [], "pipeline": [ { "args": { - "face_attribute_matrix_name": "Face Data", - "face_normals_name": "Face Normals", - "output_triangle_geometry_path": "TriangleGeometry", - "scale_factor": 1.0, - "scale_output": false, - "stl_file_path": "Data/STL_Models/Example_Triangle_Geometry.stl", - "vertex_attribute_matrix_name": "Vertex Data" + "face_attribute_matrix_name": { + "value": "Face Data", + "version": 1 + }, + "face_normals_name": { + "value": "Face Normals", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "TriangleGeometry", + "version": 1 + }, + "parameters_version": 1, + "scale_factor": { + "value": 1.0, + "version": 1 + }, + "scale_output": { + "value": false, + "version": 1 + }, + "stl_file_path": { + "value": "Data/STL_Models/Example_Triangle_Geometry.stl", + "version": 1 + }, + "vertex_attribute_matrix_name": { + "value": "Vertex Data", + "version": 1 + } }, "comments": "", "filter": { @@ -22,10 +43,23 @@ }, { "args": { - "created_region_ids_path": "TriangleGeometry/Face Data/Region Ids", - "input_triangle_geometry_path": "TriangleGeometry", - "num_triangles_name": "NumTriangles", - "triangle_attribute_matrix_name": "Cell Feature AM" + "created_region_ids_path": { + "value": "TriangleGeometry/Face Data/Region Ids", + "version": 1 + }, + "input_triangle_geometry_path": { + "value": "TriangleGeometry", + "version": 1 + }, + "num_triangles_name": { + "value": "NumTriangles", + "version": 1 + }, + "parameters_version": 1, + "triangle_attribute_matrix_name": { + "value": "Cell Feature AM", + "version": 1 + } }, "comments": "", "filter": { @@ -37,26 +71,48 @@ { "args": { "array_thresholds_object": { - "inverted": false, - "thresholds": [ - { - "array_path": "TriangleGeometry/Face Data/Region Ids", - "comparison": 1, - "inverted": false, - "type": "array", - "union": 0, - "value": 3.0 - } - ], - "type": "collection", - "union": 0 - }, - "created_mask_type": 1, - "custom_false_value": 0.0, - "custom_true_value": 1.0, - "output_data_array_name": "Mask", - "use_custom_false_value": false, - "use_custom_true_value": false + "value": { + "inverted": false, + "thresholds": [ + { + "array_path": "TriangleGeometry/Face Data/Region Ids", + "comparison": 1, + "inverted": false, + "type": "array", + "union": 0, + "value": 3.0 + } + ], + "type": "collection", + "union": 0 + }, + "version": 1 + }, + "created_mask_type": { + "value": 1, + "version": 1 + }, + "custom_false_value": { + "value": 0.0, + "version": 1 + }, + "custom_true_value": { + "value": 1.0, + "version": 1 + }, + "output_data_array_name": { + "value": "Mask", + "version": 1 + }, + "parameters_version": 1, + "use_custom_false_value": { + "value": false, + "version": 1 + }, + "use_custom_true_value": { + "value": false, + "version": 1 + } }, "comments": "", "filter": { @@ -67,19 +123,47 @@ }, { "args": { - "input_triangle_geometry_path": "TriangleGeometry", - "mask_array_path": "TriangleGeometry/Face Data/Mask", - "output_triangle_geometry_path": "ExemplarReducedGeometry", - "triangle_data_handling_index": 0, - "triangle_data_selected_array_paths": [ - "TriangleGeometry/Face Data/Face Normals", - "TriangleGeometry/Face Data/Mask", - "TriangleGeometry/Face Data/Region Ids" - ], - "triangle_data_selected_attribute_matrix_path": "", - "vertex_data_handling_index": 0, - "vertex_data_selected_array_paths": [], - "vertex_data_selected_attribute_matrix_path": "" + "input_triangle_geometry_path": { + "value": "TriangleGeometry", + "version": 1 + }, + "mask_array_path": { + "value": "TriangleGeometry/Face Data/Mask", + "version": 1 + }, + "output_triangle_geometry_path": { + "value": "ExemplarReducedGeometry", + "version": 1 + }, + "parameters_version": 1, + "triangle_data_handling_index": { + "value": 0, + "version": 1 + }, + "triangle_data_selected_array_paths": { + "value": [ + "TriangleGeometry/Face Data/Face Normals", + "TriangleGeometry/Face Data/Mask", + "TriangleGeometry/Face Data/Region Ids" + ], + "version": 1 + }, + "triangle_data_selected_attribute_matrix_path": { + "value": "", + "version": 1 + }, + "vertex_data_handling_index": { + "value": 0, + "version": 1 + }, + "vertex_data_selected_array_paths": { + "value": [], + "version": 1 + }, + "vertex_data_selected_attribute_matrix_path": { + "value": "", + "version": 1 + } }, "comments": "", "filter": { @@ -90,8 +174,15 @@ }, { "args": { - "export_file_path": "Data/Output/remove_flagged_elements_data/remove_flagged_triangles_data.dream3d", - "write_xdmf_file": true + "export_file_path": { + "value": "Data/Output/remove_flagged_elements_data/remove_flagged_triangles_data.dream3d", + "version": 1 + }, + "parameters_version": 1, + "write_xdmf_file": { + "value": true, + "version": 1 + } }, "comments": "", "filter": { @@ -101,6 +192,5 @@ "isDisabled": false } ], - "version": 1, - "workflowParams": [] + "version": 1 } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.cpp index 0a87ac7967..5071636293 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.cpp @@ -83,6 +83,12 @@ Parameters AddBadDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType AddBadDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer AddBadDataFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.hpp index 7d7f4ac237..ac0bac16d9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.hpp @@ -77,6 +77,14 @@ class SIMPLNXCORE_EXPORT AddBadDataFilter : 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/SimplnxCore/src/SimplnxCore/Filters/AlignGeometriesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometriesFilter.cpp index 572417cd73..720a69e3c2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometriesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometriesFilter.cpp @@ -413,6 +413,12 @@ Parameters AlignGeometriesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType AlignGeometriesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer AlignGeometriesFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometriesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometriesFilter.hpp index 89b7049be8..8c64ee32c0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometriesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometriesFilter.hpp @@ -68,6 +68,14 @@ class SIMPLNXCORE_EXPORT AlignGeometriesFilter : 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 * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp index a651e83992..8a72f10c79 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp @@ -91,6 +91,12 @@ Parameters AlignSectionsFeatureCentroidFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType AlignSectionsFeatureCentroidFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer AlignSectionsFeatureCentroidFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp index d11c4ec7e9..cac12816ed 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp @@ -76,6 +76,14 @@ class SIMPLNXCORE_EXPORT AlignSectionsFeatureCentroidFilter : 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/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp index feffaa798d..a9700c3079 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp @@ -66,6 +66,12 @@ Parameters AlignSectionsListFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType AlignSectionsListFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer AlignSectionsListFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp index 90d45a261a..b63b884e7c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp @@ -71,6 +71,14 @@ class SIMPLNXCORE_EXPORT AlignSectionsListFilter : 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/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryFilter.cpp index 3ef6aa1a76..d6a649d993 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryFilter.cpp @@ -77,6 +77,12 @@ Parameters AppendImageGeometryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType AppendImageGeometryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer AppendImageGeometryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryFilter.hpp index 678ce1580b..cf440de857 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryFilter.hpp @@ -75,6 +75,14 @@ class SIMPLNXCORE_EXPORT AppendImageGeometryFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp index d7415e194a..71b7e40437 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp @@ -128,6 +128,12 @@ Parameters ApplyTransformationToGeometryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ApplyTransformationToGeometryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ApplyTransformationToGeometryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp index 60242633b3..4248a9ca36 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp @@ -78,6 +78,14 @@ class SIMPLNXCORE_EXPORT ApplyTransformationToGeometryFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.cpp index b953454cd7..37a2f8853b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.cpp @@ -74,6 +74,12 @@ Parameters ApproximatePointCloudHullFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ApproximatePointCloudHullFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ApproximatePointCloudHullFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.hpp index 2e50a86795..326d28ad6d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT ApproximatePointCloudHullFilter : 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 UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.cpp index 76657c0dd2..615b3425aa 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.cpp @@ -62,6 +62,12 @@ Parameters ArrayCalculatorFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ArrayCalculatorFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ArrayCalculatorFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp index 9381dc71e3..9024ad1a0c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp @@ -71,6 +71,14 @@ class SIMPLNXCORE_EXPORT ArrayCalculatorFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentationFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentationFilter.cpp index 44cb508eeb..55745b5b16 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentationFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentationFilter.cpp @@ -99,6 +99,12 @@ Parameters ChangeAngleRepresentationFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ChangeAngleRepresentationFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ChangeAngleRepresentationFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentationFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentationFilter.hpp index 78949390a2..898537a85d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentationFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentationFilter.hpp @@ -70,6 +70,14 @@ class SIMPLNXCORE_EXPORT ChangeAngleRepresentationFilter : 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/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.cpp index ba950d298c..f1ef695e94 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.cpp @@ -73,6 +73,12 @@ Parameters CombineAttributeArraysFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CombineAttributeArraysFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CombineAttributeArraysFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.hpp index 921b0039a5..f340b195f3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT CombineAttributeArraysFilter : 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/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp index a1acfa1282..fba56bf632 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp @@ -95,6 +95,12 @@ Parameters CombineStlFilesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CombineStlFilesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CombineStlFilesFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.hpp index f75965f07b..b9ae6f5608 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.hpp @@ -80,6 +80,14 @@ class SIMPLNXCORE_EXPORT CombineStlFilesFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayHistogramFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayHistogramFilter.cpp index ccb2ce08d3..fe24bb3043 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayHistogramFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayHistogramFilter.cpp @@ -86,6 +86,12 @@ Parameters ComputeArrayHistogramFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeArrayHistogramFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeArrayHistogramFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayHistogramFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayHistogramFilter.hpp index 36d33c604a..3e65e8ecac 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayHistogramFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayHistogramFilter.hpp @@ -78,6 +78,14 @@ class SIMPLNXCORE_EXPORT ComputeArrayHistogramFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayStatisticsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayStatisticsFilter.cpp index f6df1dd093..1dc089c4b3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayStatisticsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayStatisticsFilter.cpp @@ -290,6 +290,12 @@ Parameters ComputeArrayStatisticsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeArrayStatisticsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeArrayStatisticsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayStatisticsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayStatisticsFilter.hpp index ede8ca2280..6af7f05afc 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayStatisticsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeArrayStatisticsFilter.hpp @@ -106,6 +106,14 @@ class SIMPLNXCORE_EXPORT ComputeArrayStatisticsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeBiasedFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBiasedFeaturesFilter.cpp index 8c79e6da4f..4487c8f42c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBiasedFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBiasedFeaturesFilter.cpp @@ -73,6 +73,12 @@ Parameters ComputeBiasedFeaturesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeBiasedFeaturesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeBiasedFeaturesFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBiasedFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBiasedFeaturesFilter.hpp index 9a4af338d4..4c44d681a1 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBiasedFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBiasedFeaturesFilter.hpp @@ -74,6 +74,14 @@ class SIMPLNXCORE_EXPORT ComputeBiasedFeaturesFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryCellsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryCellsFilter.cpp index 844305b4e6..069fe112ae 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryCellsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryCellsFilter.cpp @@ -71,6 +71,12 @@ Parameters ComputeBoundaryCellsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeBoundaryCellsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeBoundaryCellsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryCellsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryCellsFilter.hpp index 60fed62603..9720562a75 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryCellsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryCellsFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT ComputeBoundaryCellsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryElementFractionsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryElementFractionsFilter.cpp index a0b48b7be2..e29714f3cd 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryElementFractionsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryElementFractionsFilter.cpp @@ -70,6 +70,12 @@ Parameters ComputeBoundaryElementFractionsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeBoundaryElementFractionsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeBoundaryElementFractionsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryElementFractionsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryElementFractionsFilter.hpp index 95243b5a07..fce2d9cc20 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryElementFractionsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeBoundaryElementFractionsFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT ComputeBoundaryElementFractionsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp index 4d6c771b9c..f348344b63 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp @@ -147,6 +147,12 @@ Parameters ComputeDifferencesMapFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeDifferencesMapFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeDifferencesMapFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.hpp index 00f3ca38f9..64720a4ea6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT ComputeDifferencesMapFilter : 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 Creates a copy of the filter. * @return IFilter::UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeEuclideanDistMapFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeEuclideanDistMapFilter.cpp index bc0f1f0bd7..6f9ca387b4 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeEuclideanDistMapFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeEuclideanDistMapFilter.cpp @@ -92,6 +92,12 @@ Parameters ComputeEuclideanDistMapFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeEuclideanDistMapFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeEuclideanDistMapFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeEuclideanDistMapFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeEuclideanDistMapFilter.hpp index 3da9947c78..33b6abe300 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeEuclideanDistMapFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeEuclideanDistMapFilter.hpp @@ -80,6 +80,14 @@ class SIMPLNXCORE_EXPORT ComputeEuclideanDistMapFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureCentroidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureCentroidsFilter.cpp index 796dad1e86..3c208ba7b2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureCentroidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureCentroidsFilter.cpp @@ -69,6 +69,12 @@ Parameters ComputeFeatureCentroidsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFeatureCentroidsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeFeatureCentroidsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureCentroidsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureCentroidsFilter.hpp index 26bdce48bf..4d7c1a1c61 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureCentroidsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureCentroidsFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT ComputeFeatureCentroidsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureClusteringFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureClusteringFilter.cpp index 4d90e3aecb..1b28d1efb3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureClusteringFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureClusteringFilter.cpp @@ -94,6 +94,12 @@ Parameters ComputeFeatureClusteringFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFeatureClusteringFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeFeatureClusteringFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureClusteringFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureClusteringFilter.hpp index b82f5718fa..bee0441b52 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureClusteringFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureClusteringFilter.hpp @@ -82,6 +82,14 @@ class SIMPLNXCORE_EXPORT ComputeFeatureClusteringFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureNeighborsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureNeighborsFilter.cpp index 09d50f9b9d..260fd2fe59 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureNeighborsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureNeighborsFilter.cpp @@ -89,6 +89,12 @@ Parameters ComputeFeatureNeighborsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFeatureNeighborsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeFeatureNeighborsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureNeighborsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureNeighborsFilter.hpp index 0c4087f8fa..8713567539 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureNeighborsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureNeighborsFilter.hpp @@ -69,6 +69,14 @@ class SIMPLNXCORE_EXPORT ComputeFeatureNeighborsFilter : 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 the default tags for this filter. * @return diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesBinaryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesBinaryFilter.cpp index 8a67d44898..472a527cdb 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesBinaryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesBinaryFilter.cpp @@ -69,6 +69,12 @@ Parameters ComputeFeaturePhasesBinaryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFeaturePhasesBinaryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeFeaturePhasesBinaryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesBinaryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesBinaryFilter.hpp index 2f2c6b3899..e031d7b5a7 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesBinaryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesBinaryFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT ComputeFeaturePhasesBinaryFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesFilter.cpp index f09b620bf8..20eabc4669 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesFilter.cpp @@ -68,6 +68,12 @@ Parameters ComputeFeaturePhasesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFeaturePhasesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeFeaturePhasesFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesFilter.hpp index 29d5bab7d5..6bd3e81e02 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeaturePhasesFilter.hpp @@ -76,6 +76,14 @@ class SIMPLNXCORE_EXPORT ComputeFeaturePhasesFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp index cb6db9f3a2..f9b3b0b886 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp @@ -63,6 +63,12 @@ Parameters ComputeFeatureRectFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFeatureRectFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeFeatureRectFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.hpp index d58125a304..4e5337ce9b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT ComputeFeatureRectFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureSizesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureSizesFilter.cpp index 710def841f..009ca7689d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureSizesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureSizesFilter.cpp @@ -78,6 +78,12 @@ Parameters ComputeFeatureSizesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeFeatureSizesFilter::parametersVersion() const +{ + return 1; +} + IFilter::UniquePointer ComputeFeatureSizesFilter::clone() const { return std::make_unique(); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureSizesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureSizesFilter.hpp index 2d2c2c46e5..6c5948de31 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureSizesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureSizesFilter.hpp @@ -77,6 +77,14 @@ class SIMPLNXCORE_EXPORT ComputeFeatureSizesFilter : 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 Creates and returns a copy of the filter. * @return IFilter::UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMeansFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMeansFilter.cpp index 0c3dbedc97..e06611fb24 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMeansFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMeansFilter.cpp @@ -101,6 +101,12 @@ Parameters ComputeKMeansFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeKMeansFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeKMeansFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMeansFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMeansFilter.hpp index 8187475c9c..e20172b679 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMeansFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMeansFilter.hpp @@ -79,6 +79,14 @@ class SIMPLNXCORE_EXPORT ComputeKMeansFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeKMedoidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMedoidsFilter.cpp index 9ab9d0367e..75198710a8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMedoidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMedoidsFilter.cpp @@ -97,6 +97,12 @@ Parameters ComputeKMedoidsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeKMedoidsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeKMedoidsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMedoidsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMedoidsFilter.hpp index d4be3b8459..8dfcb013c0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMedoidsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeKMedoidsFilter.hpp @@ -79,6 +79,14 @@ class SIMPLNXCORE_EXPORT ComputeKMedoidsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeLargestCrossSectionsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeLargestCrossSectionsFilter.cpp index 6bcf1d407c..e116449931 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeLargestCrossSectionsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeLargestCrossSectionsFilter.cpp @@ -71,6 +71,12 @@ Parameters ComputeLargestCrossSectionsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeLargestCrossSectionsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeLargestCrossSectionsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeLargestCrossSectionsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeLargestCrossSectionsFilter.hpp index cc5a383a32..783276ed75 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeLargestCrossSectionsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeLargestCrossSectionsFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT ComputeLargestCrossSectionsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp index aa63d1dadd..2f1aa7992c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp @@ -75,6 +75,12 @@ Parameters ComputeMomentInvariants2DFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeMomentInvariants2DFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeMomentInvariants2DFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp index d106483146..4e1a460375 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp @@ -78,6 +78,14 @@ class SIMPLNXCORE_EXPORT ComputeMomentInvariants2DFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborListStatisticsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborListStatisticsFilter.cpp index c9f5c6f581..67ca3ab552 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborListStatisticsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborListStatisticsFilter.cpp @@ -281,6 +281,12 @@ Parameters ComputeNeighborListStatisticsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeNeighborListStatisticsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeNeighborListStatisticsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborListStatisticsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborListStatisticsFilter.hpp index 0e3eb20aff..d6f99ca6da 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborListStatisticsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborListStatisticsFilter.hpp @@ -84,6 +84,14 @@ class SIMPLNXCORE_EXPORT ComputeNeighborListStatisticsFilter : 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 Creates a copy of the filter. * @return IFilter::UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborhoodsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborhoodsFilter.cpp index 0224ffb311..0829316a3e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborhoodsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborhoodsFilter.cpp @@ -82,6 +82,12 @@ Parameters ComputeNeighborhoodsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeNeighborhoodsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeNeighborhoodsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborhoodsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborhoodsFilter.hpp index fee954e152..2eaaa3aa24 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborhoodsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborhoodsFilter.hpp @@ -76,6 +76,14 @@ class SIMPLNXCORE_EXPORT ComputeNeighborhoodsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeNumFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNumFeaturesFilter.cpp index 23e0447216..7471a81f44 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNumFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNumFeaturesFilter.cpp @@ -66,6 +66,12 @@ Parameters ComputeNumFeaturesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeNumFeaturesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeNumFeaturesFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNumFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNumFeaturesFilter.hpp index 1fa0fc849e..0eb372fd5d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNumFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNumFeaturesFilter.hpp @@ -71,6 +71,14 @@ class SIMPLNXCORE_EXPORT ComputeNumFeaturesFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceAreaToVolumeFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceAreaToVolumeFilter.cpp index ff8fc59923..a6ebd75b9a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceAreaToVolumeFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceAreaToVolumeFilter.cpp @@ -76,6 +76,12 @@ Parameters ComputeSurfaceAreaToVolumeFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeSurfaceAreaToVolumeFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeSurfaceAreaToVolumeFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceAreaToVolumeFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceAreaToVolumeFilter.hpp index 52f51eda5a..f50ddc987c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceAreaToVolumeFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceAreaToVolumeFilter.hpp @@ -75,6 +75,14 @@ class SIMPLNXCORE_EXPORT ComputeSurfaceAreaToVolumeFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.cpp index c92cc89a94..6d0f5d18c6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.cpp @@ -249,6 +249,12 @@ Parameters ComputeSurfaceFeaturesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeSurfaceFeaturesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeSurfaceFeaturesFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.hpp index 096cdb9b32..b65c9048cc 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.hpp @@ -88,6 +88,14 @@ class SIMPLNXCORE_EXPORT ComputeSurfaceFeaturesFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleAreasFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleAreasFilter.cpp index d57d6020dc..e2c962c486 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleAreasFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleAreasFilter.cpp @@ -115,6 +115,12 @@ Parameters ComputeTriangleAreasFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeTriangleAreasFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeTriangleAreasFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleAreasFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleAreasFilter.hpp index 93ea0a02b2..3379e9ac2d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleAreasFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleAreasFilter.hpp @@ -70,6 +70,14 @@ class SIMPLNXCORE_EXPORT ComputeTriangleAreasFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomCentroidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomCentroidsFilter.cpp index 830514a616..b63e0acd74 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomCentroidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomCentroidsFilter.cpp @@ -64,6 +64,12 @@ Parameters ComputeTriangleGeomCentroidsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeTriangleGeomCentroidsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeTriangleGeomCentroidsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomCentroidsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomCentroidsFilter.hpp index 6d68e2df76..6be40710b6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomCentroidsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomCentroidsFilter.hpp @@ -65,6 +65,14 @@ class SIMPLNXCORE_EXPORT ComputeTriangleGeomCentroidsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomSizesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomSizesFilter.cpp index 06b7b174c5..3f3afd5341 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomSizesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomSizesFilter.cpp @@ -65,6 +65,12 @@ Parameters ComputeTriangleGeomSizesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeTriangleGeomSizesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeTriangleGeomSizesFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomSizesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomSizesFilter.hpp index 79c1002d9f..aecb7a3594 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomSizesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomSizesFilter.hpp @@ -65,6 +65,14 @@ class SIMPLNXCORE_EXPORT ComputeTriangleGeomSizesFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeVectorColorsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVectorColorsFilter.cpp index c01685ada8..c30097e1e2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVectorColorsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVectorColorsFilter.cpp @@ -76,6 +76,12 @@ Parameters ComputeVectorColorsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeVectorColorsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeVectorColorsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVectorColorsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVectorColorsFilter.hpp index 73754ea608..7d75c3b5d0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVectorColorsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVectorColorsFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT ComputeVectorColorsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeVertexToTriangleDistancesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVertexToTriangleDistancesFilter.cpp index c821753689..df5db90c9d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVertexToTriangleDistancesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVertexToTriangleDistancesFilter.cpp @@ -74,6 +74,12 @@ Parameters ComputeVertexToTriangleDistancesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeVertexToTriangleDistancesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeVertexToTriangleDistancesFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVertexToTriangleDistancesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVertexToTriangleDistancesFilter.hpp index 691cb47fcc..d505ab2598 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVertexToTriangleDistancesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVertexToTriangleDistancesFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT ComputeVertexToTriangleDistancesFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ComputeVolumeFractionsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVolumeFractionsFilter.cpp index 4c73930fd7..39cccce8f5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVolumeFractionsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVolumeFractionsFilter.cpp @@ -66,6 +66,12 @@ Parameters ComputeVolumeFractionsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ComputeVolumeFractionsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ComputeVolumeFractionsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVolumeFractionsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVolumeFractionsFilter.hpp index 46d577f790..b041dae81e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVolumeFractionsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVolumeFractionsFilter.hpp @@ -71,6 +71,14 @@ class SIMPLNXCORE_EXPORT ComputeVolumeFractionsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ConcatenateDataArraysFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConcatenateDataArraysFilter.cpp index 5182404f05..caec70fb54 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConcatenateDataArraysFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConcatenateDataArraysFilter.cpp @@ -62,6 +62,12 @@ Parameters ConcatenateDataArraysFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ConcatenateDataArraysFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ConcatenateDataArraysFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConcatenateDataArraysFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConcatenateDataArraysFilter.hpp index 604c373bea..94288c311b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConcatenateDataArraysFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConcatenateDataArraysFilter.hpp @@ -59,6 +59,14 @@ class SIMPLNXCORE_EXPORT ConcatenateDataArraysFilter : 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 Creates and returns a copy of the filter. * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.cpp index b32b95b865..73ad1d2df2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.cpp @@ -107,6 +107,12 @@ Parameters ConditionalSetValueFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ConditionalSetValueFilter::parametersVersion() const +{ + return 1; +} + IFilter::UniquePointer ConditionalSetValueFilter::clone() const { return std::make_unique(); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.hpp index 62bb944e55..2c29069997 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.hpp @@ -74,6 +74,14 @@ class SIMPLNXCORE_EXPORT ConditionalSetValueFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp index f4a865c18e..ee75f9475d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp @@ -74,6 +74,12 @@ Parameters ConvertColorToGrayScaleFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ConvertColorToGrayScaleFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ConvertColorToGrayScaleFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp index 479c14ce5c..de47c8a067 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT ConvertColorToGrayScaleFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp index 3de8c55af1..9f8fe379ae 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp @@ -65,6 +65,12 @@ Parameters ConvertDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ConvertDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ConvertDataFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp index ef8b8ac3ce..caca2218e3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT ConvertDataFilter : 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/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.cpp index 6d1735bcc2..f972757ef2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.cpp @@ -65,6 +65,12 @@ Parameters CopyDataObjectFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CopyDataObjectFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CopyDataObjectFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.hpp index aa13d36193..7285256be7 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.hpp @@ -69,6 +69,14 @@ class SIMPLNXCORE_EXPORT CopyDataObjectFilter : 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 * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.cpp index 6be6e22ccb..55b91d3a13 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.cpp @@ -113,6 +113,12 @@ Parameters CopyFeatureArrayToElementArrayFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CopyFeatureArrayToElementArrayFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CopyFeatureArrayToElementArrayFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.hpp index 92533c65e0..8ab4bd6b93 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.hpp @@ -74,6 +74,14 @@ class SIMPLNXCORE_EXPORT CopyFeatureArrayToElementArrayFilter : 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/SimplnxCore/src/SimplnxCore/Filters/CreateAMScanPathsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAMScanPathsFilter.cpp index 7d00a68374..aba082b6b4 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAMScanPathsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAMScanPathsFilter.cpp @@ -79,6 +79,12 @@ Parameters CreateAMScanPathsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CreateAMScanPathsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CreateAMScanPathsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAMScanPathsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAMScanPathsFilter.hpp index 91718f2b42..7b21175c45 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAMScanPathsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAMScanPathsFilter.hpp @@ -81,6 +81,14 @@ class SIMPLNXCORE_EXPORT CreateAMScanPathsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.cpp index ed58927e8b..5ce2f3b2a2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.cpp @@ -50,6 +50,12 @@ Parameters CreateAttributeMatrixFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CreateAttributeMatrixFilter::parametersVersion() const +{ + return 1; +} + IFilter::UniquePointer CreateAttributeMatrixFilter::clone() const { return std::make_unique(); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.hpp index 41e90ab924..29dba1e199 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.hpp @@ -69,6 +69,14 @@ class SIMPLNXCORE_EXPORT CreateAttributeMatrixFilter : 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/SimplnxCore/src/SimplnxCore/Filters/CreateColorMapFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateColorMapFilter.cpp index 9b464ee65e..58393ad071 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateColorMapFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateColorMapFilter.cpp @@ -88,6 +88,12 @@ Parameters CreateColorMapFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CreateColorMapFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CreateColorMapFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateColorMapFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateColorMapFilter.hpp index 6bb2b71b3e..a8170ca94d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateColorMapFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateColorMapFilter.hpp @@ -76,6 +76,14 @@ class SIMPLNXCORE_EXPORT CreateColorMapFilter : 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/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayAdvancedFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayAdvancedFilter.cpp index 7902b0ec74..6fac32e9e0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayAdvancedFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayAdvancedFilter.cpp @@ -155,6 +155,12 @@ Parameters CreateDataArrayAdvancedFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CreateDataArrayAdvancedFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CreateDataArrayAdvancedFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayAdvancedFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayAdvancedFilter.hpp index 87e1728f0a..c18f6249af 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayAdvancedFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayAdvancedFilter.hpp @@ -82,6 +82,14 @@ class SIMPLNXCORE_EXPORT CreateDataArrayAdvancedFilter : 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 Creates and returns a copy of the filter. * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp index 834668b774..b1f725b9a1 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp @@ -100,6 +100,12 @@ Parameters CreateDataArrayFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CreateDataArrayFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CreateDataArrayFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.hpp index e3e38e9856..2902b9ee14 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT CreateDataArrayFilter : 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 Creates and returns a copy of the filter. * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroupFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroupFilter.cpp index 20c53cc07e..1f528b0513 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroupFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroupFilter.cpp @@ -43,6 +43,12 @@ Parameters CreateDataGroupFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CreateDataGroupFilter::parametersVersion() const +{ + return 1; +} + IFilter::UniquePointer CreateDataGroupFilter::clone() const { return std::make_unique(); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroupFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroupFilter.hpp index 589601a364..c17bdadf77 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroupFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroupFilter.hpp @@ -68,6 +68,14 @@ class SIMPLNXCORE_EXPORT CreateDataGroupFilter : 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/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp index f3a36fdaf0..64ad228ee4 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp @@ -124,6 +124,12 @@ Parameters CreateFeatureArrayFromElementArrayFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CreateFeatureArrayFromElementArrayFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CreateFeatureArrayFromElementArrayFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.hpp index 05eff86683..d8b1fd054a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT CreateFeatureArrayFromElementArrayFilter : public IFilt */ 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/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp index 21e6827583..5107c1ea79 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp @@ -200,6 +200,12 @@ Parameters CreateGeometryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CreateGeometryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CreateGeometryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp index f6a206742a..69e23fe357 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp @@ -106,6 +106,14 @@ class SIMPLNXCORE_EXPORT CreateGeometryFilter : 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/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometryFilter.cpp index c7cab674e6..2737def3f7 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometryFilter.cpp @@ -69,6 +69,12 @@ Parameters CreateImageGeometryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CreateImageGeometryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CreateImageGeometryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometryFilter.hpp index ba4f31ea5a..b540c81b01 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometryFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT CreateImageGeometryFilter : 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/SimplnxCore/src/SimplnxCore/Filters/CreatePythonSkeletonFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreatePythonSkeletonFilter.cpp index 37d37052f7..45cc9efeb3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreatePythonSkeletonFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreatePythonSkeletonFilter.cpp @@ -72,6 +72,12 @@ Parameters CreatePythonSkeletonFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CreatePythonSkeletonFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CreatePythonSkeletonFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreatePythonSkeletonFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreatePythonSkeletonFilter.hpp index 912bff82f3..7ffeb6fc1b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreatePythonSkeletonFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreatePythonSkeletonFilter.hpp @@ -74,6 +74,14 @@ class SIMPLNXCORE_EXPORT CreatePythonSkeletonFilter : 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/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.cpp index ff04c49df0..82412f3ad9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.cpp @@ -224,6 +224,12 @@ Parameters CropImageGeometryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CropImageGeometryFilter::parametersVersion() const +{ + return 1; +} + IFilter::UniquePointer CropImageGeometryFilter::clone() const { return std::make_unique(); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.hpp index 063839131e..babee8ef3c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.hpp @@ -80,6 +80,14 @@ class SIMPLNXCORE_EXPORT CropImageGeometryFilter : 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 * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.cpp index f381580667..df29d6c2bf 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.cpp @@ -87,6 +87,12 @@ Parameters CropVertexGeometryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType CropVertexGeometryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer CropVertexGeometryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.hpp index 716adb6a2a..9a733d39b7 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.hpp @@ -71,6 +71,14 @@ class SIMPLNXCORE_EXPORT CropVertexGeometryFilter : 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 * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DBSCANFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DBSCANFilter.cpp index 54442e8551..31bac09811 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DBSCANFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DBSCANFilter.cpp @@ -107,6 +107,12 @@ Parameters DBSCANFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType DBSCANFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer DBSCANFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DBSCANFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DBSCANFilter.hpp index babeaf813c..cbc0fec38c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DBSCANFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DBSCANFilter.hpp @@ -87,6 +87,14 @@ class SIMPLNXCORE_EXPORT DBSCANFilter : 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/SimplnxCore/src/SimplnxCore/Filters/DeleteDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteDataFilter.cpp index e89bc91577..a47e16ed08 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteDataFilter.cpp @@ -63,6 +63,12 @@ Parameters DeleteDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType DeleteDataFilter::parametersVersion() const +{ + return 1; +} + IFilter::UniquePointer DeleteDataFilter::clone() const { return std::make_unique(); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteDataFilter.hpp index 75b312f24f..635d16045d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteDataFilter.hpp @@ -76,6 +76,14 @@ class SIMPLNXCORE_EXPORT DeleteDataFilter : 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 * @return diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp index 09a7f687a1..d50a1c7b1c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp @@ -78,6 +78,12 @@ Parameters ErodeDilateBadDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ErodeDilateBadDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ErodeDilateBadDataFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp index cb88344905..a2dd49ffa7 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp @@ -78,6 +78,14 @@ class SIMPLNXCORE_EXPORT ErodeDilateBadDataFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp index e921c7378e..82c6fd4366 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp @@ -69,6 +69,12 @@ Parameters ErodeDilateCoordinationNumberFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ErodeDilateCoordinationNumberFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ErodeDilateCoordinationNumberFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp index 9e27737dd3..4efce48328 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT ErodeDilateCoordinationNumberFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp index dd5f34f512..1f60cd6782 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp @@ -68,6 +68,12 @@ Parameters ErodeDilateMaskFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ErodeDilateMaskFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ErodeDilateMaskFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp index 242dba76f8..b1c2863b04 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp @@ -77,6 +77,14 @@ class SIMPLNXCORE_EXPORT ErodeDilateMaskFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.cpp index dd46486632..9ab71e409d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.cpp @@ -62,6 +62,12 @@ Parameters ExecuteProcessFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ExecuteProcessFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ExecuteProcessFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.hpp index df55d8eb78..4063b5c344 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT ExecuteProcessFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp index 04ba703de7..eed43d7bb8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp @@ -72,6 +72,12 @@ Parameters ExtractComponentAsArrayFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ExtractComponentAsArrayFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ExtractComponentAsArrayFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp index 86d9050a83..58040d5065 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp @@ -74,6 +74,14 @@ class SIMPLNXCORE_EXPORT ExtractComponentAsArrayFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.cpp index 69b4c1e564..21140a7aaf 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.cpp @@ -151,6 +151,12 @@ Parameters ExtractInternalSurfacesFromTriangleGeometryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ExtractInternalSurfacesFromTriangleGeometryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ExtractInternalSurfacesFromTriangleGeometryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.hpp index f3ab0696b4..7dfc8f37e9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT ExtractInternalSurfacesFromTriangleGeometryFilter : 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 Creates and returns a copy of the filter. * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractPipelineToFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractPipelineToFileFilter.cpp index b90de5057a..4175394628 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractPipelineToFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractPipelineToFileFilter.cpp @@ -60,6 +60,12 @@ Parameters ExtractPipelineToFileFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ExtractPipelineToFileFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ExtractPipelineToFileFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractPipelineToFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractPipelineToFileFilter.hpp index 9a5723ecf6..f1d21c572e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractPipelineToFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractPipelineToFileFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT ExtractPipelineToFileFilter : 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 as a std::unique_ptr. * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.cpp index 09238f6d1d..d7b1e3f38b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.cpp @@ -92,6 +92,12 @@ Parameters ExtractVertexGeometryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ExtractVertexGeometryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ExtractVertexGeometryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp index 2ba9fea4b7..afff80ab8d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp @@ -71,6 +71,14 @@ class SIMPLNXCORE_EXPORT ExtractVertexGeometryFilter : 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/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp index fb750c041b..ae01828301 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp @@ -105,6 +105,12 @@ Parameters FeatureFaceCurvatureFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType FeatureFaceCurvatureFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer FeatureFaceCurvatureFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp index 816c53e794..fddf58bce6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp @@ -81,6 +81,14 @@ class SIMPLNXCORE_EXPORT FeatureFaceCurvatureFilter : 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/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp index ea4d95462d..d0d77120cf 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp @@ -75,6 +75,12 @@ Parameters FillBadDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType FillBadDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer FillBadDataFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.hpp index ea77eeeaab..9b3698ffec 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.hpp @@ -76,6 +76,14 @@ class SIMPLNXCORE_EXPORT FillBadDataFilter : 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/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp index 178343e095..50fa76acfb 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp @@ -72,6 +72,12 @@ Parameters FlyingEdges3DFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType FlyingEdges3DFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer FlyingEdges3DFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.hpp index 7be7b96008..b4e0c60ddd 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.hpp @@ -65,6 +65,14 @@ class SIMPLNXCORE_EXPORT FlyingEdges3DFilter : 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/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.cpp index ef2d359882..334aa0e339 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.cpp @@ -265,6 +265,12 @@ Parameters IdentifySampleFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType IdentifySampleFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer IdentifySampleFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.hpp index 37ae6e2e7c..2511ad5a83 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.hpp @@ -68,6 +68,14 @@ class SIMPLNXCORE_EXPORT IdentifySampleFilter : 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 * @return diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.cpp index 13cbf34128..d6fb7142e7 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.cpp @@ -116,6 +116,12 @@ Parameters InitializeDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType InitializeDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer InitializeDataFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.hpp index 9d7c24026f..7edd7df728 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.hpp @@ -70,6 +70,14 @@ class SIMPLNXCORE_EXPORT InitializeDataFilter : 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 * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.cpp index 3fefc9b47a..0c17563a3c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.cpp @@ -217,6 +217,12 @@ Parameters InitializeImageGeomCellDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType InitializeImageGeomCellDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer InitializeImageGeomCellDataFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.hpp index ddd71617b0..d3c5304802 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.hpp @@ -82,6 +82,14 @@ class SIMPLNXCORE_EXPORT InitializeImageGeomCellDataFilter : 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 * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp index a073364b9d..1689788a31 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp @@ -216,6 +216,12 @@ Parameters InterpolatePointCloudToRegularGridFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType InterpolatePointCloudToRegularGridFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer InterpolatePointCloudToRegularGridFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp index 320f7cace1..74bad5523c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp @@ -84,6 +84,14 @@ class SIMPLNXCORE_EXPORT InterpolatePointCloudToRegularGridFilter : public IFilt */ 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 Creates a copy of the filter. * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp index 12f6e160e4..45c26b20b3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp @@ -114,6 +114,12 @@ Parameters IterativeClosestPointFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType IterativeClosestPointFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer IterativeClosestPointFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.hpp index 7e2b8e1a3c..d1624d2b5a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.hpp @@ -70,6 +70,14 @@ class SIMPLNXCORE_EXPORT IterativeClosestPointFilter : 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 * @return diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.cpp index c04a4bfefb..794117c4d1 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.cpp @@ -69,6 +69,12 @@ Parameters LabelTriangleGeometryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType LabelTriangleGeometryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer LabelTriangleGeometryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.hpp index 9f17ec4aec..ff7a961b24 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT LabelTriangleGeometryFilter : 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/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.cpp index 5c08f5e698..c935c78c5d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.cpp @@ -80,6 +80,12 @@ Parameters LaplacianSmoothingFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType LaplacianSmoothingFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer LaplacianSmoothingFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.hpp index aa0bb6b93c..b2c2424208 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.hpp @@ -80,6 +80,14 @@ class SIMPLNXCORE_EXPORT LaplacianSmoothingFilter : 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/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp index 68acb6c186..4530b0b64c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp @@ -256,6 +256,12 @@ Parameters MapPointCloudToRegularGridFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType MapPointCloudToRegularGridFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer MapPointCloudToRegularGridFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp index 5a2518269e..5fffaffb55 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp @@ -78,6 +78,14 @@ class SIMPLNXCORE_EXPORT MapPointCloudToRegularGridFilter : 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 * @return diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveDataFilter.cpp index e6ba838a17..32e5db621a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveDataFilter.cpp @@ -52,6 +52,12 @@ Parameters MoveDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType MoveDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer MoveDataFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveDataFilter.hpp index b57845d7ec..8630d314e7 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveDataFilter.hpp @@ -67,6 +67,14 @@ class SIMPLNXCORE_EXPORT MoveDataFilter : 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 * @return IFilter::UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.cpp index ce74c547c2..a42f2b066f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.cpp @@ -373,6 +373,12 @@ Parameters MultiThresholdObjectsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType MultiThresholdObjectsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer MultiThresholdObjectsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.hpp index b792446146..d07a49390a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.hpp @@ -82,6 +82,14 @@ class SIMPLNXCORE_EXPORT MultiThresholdObjectsFilter : 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 * @return IFilter::UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp index 5ff6e776cb..cfc60c5cae 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp @@ -78,6 +78,12 @@ Parameters NearestPointFuseRegularGridsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType NearestPointFuseRegularGridsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer NearestPointFuseRegularGridsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp index ea483b9972..062401a713 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp @@ -74,6 +74,14 @@ class SIMPLNXCORE_EXPORT NearestPointFuseRegularGridsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.cpp index 55cef9b3ba..70e30a417f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.cpp @@ -323,6 +323,12 @@ Parameters PartitionGeometryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType PartitionGeometryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer PartitionGeometryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp index bbc7ffdf0f..3218e5faf8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp @@ -107,6 +107,14 @@ class SIMPLNXCORE_EXPORT PartitionGeometryFilter : 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/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp index 30fba7b37a..44a800878a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp @@ -95,6 +95,12 @@ Parameters PointSampleTriangleGeometryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType PointSampleTriangleGeometryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer PointSampleTriangleGeometryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp index 985213151c..128e3bc08a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp @@ -82,6 +82,14 @@ class SIMPLNXCORE_EXPORT PointSampleTriangleGeometryFilter : 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/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp index ed3351de6e..1bbdf5aacf 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp @@ -92,6 +92,12 @@ Parameters QuickSurfaceMeshFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType QuickSurfaceMeshFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer QuickSurfaceMeshFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp index 85fe52e6fb..e492b04d8d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp @@ -83,6 +83,14 @@ class SIMPLNXCORE_EXPORT QuickSurfaceMeshFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.cpp index 23ede1b515..be559091fc 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.cpp @@ -390,6 +390,12 @@ Parameters ReadBinaryCTNorthstarFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadBinaryCTNorthstarFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadBinaryCTNorthstarFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp index 1f44f7db78..c1f376ff3f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp @@ -92,6 +92,14 @@ class SIMPLNXCORE_EXPORT ReadBinaryCTNorthstarFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp index 06f65f1ed5..46ecb0f9cc 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp @@ -440,6 +440,12 @@ Parameters ReadCSVFileFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadCSVFileFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadCSVFileFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp index 3278f89102..73fb2efac1 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp @@ -82,6 +82,14 @@ class SIMPLNXCORE_EXPORT ReadCSVFileFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.cpp index 4c7c61ebd9..8118362309 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.cpp @@ -57,6 +57,12 @@ Parameters ReadDREAM3DFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadDREAM3DFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadDREAM3DFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.hpp index aafd882b65..7c92ccf534 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT ReadDREAM3DFilter : 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 as a std::unique_ptr. * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.cpp index 8d4a5ef0c9..dc20f7af7d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.cpp @@ -84,6 +84,12 @@ Parameters ReadDeformKeyFileV12Filter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadDeformKeyFileV12Filter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadDeformKeyFileV12Filter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp index 213b7771b1..c1aee70f58 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp @@ -77,6 +77,14 @@ class SIMPLNXCORE_EXPORT ReadDeformKeyFileV12Filter : 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/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5DatasetFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5DatasetFilter.cpp index 8ac7eae86c..606f636a25 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5DatasetFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5DatasetFilter.cpp @@ -88,6 +88,12 @@ Parameters ReadHDF5DatasetFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadHDF5DatasetFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadHDF5DatasetFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5DatasetFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5DatasetFilter.hpp index 7936933af4..9a4d7a6fd6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5DatasetFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5DatasetFilter.hpp @@ -71,6 +71,14 @@ class SIMPLNXCORE_EXPORT ReadHDF5DatasetFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.cpp index 12c7059c87..ba15bc14a8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.cpp @@ -82,6 +82,12 @@ Parameters ReadRawBinaryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadRawBinaryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadRawBinaryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp index 13abd01b5f..eb1720adc3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp @@ -80,6 +80,14 @@ class SIMPLNXCORE_EXPORT ReadRawBinaryFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp index 48bb7aa1dc..69c1b6186e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp @@ -82,6 +82,12 @@ Parameters ReadStlFileFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadStlFileFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadStlFileFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp index 5accce4b99..6f08d46667 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp @@ -79,6 +79,14 @@ class SIMPLNXCORE_EXPORT ReadStlFileFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp index 5c5f0be9e3..3af7407ca0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp @@ -95,6 +95,12 @@ Parameters ReadTextDataArrayFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadTextDataArrayFilter::parametersVersion() const +{ + return 1; +} + IFilter::UniquePointer ReadTextDataArrayFilter::clone() const { return std::make_unique(); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp index 08cc2d8870..ea519b1be9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT ReadTextDataArrayFilter : 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 * @return diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp index 5af7f0b619..62942acd1f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp @@ -402,6 +402,12 @@ Parameters ReadVolumeGraphicsFileFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadVolumeGraphicsFileFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadVolumeGraphicsFileFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp index eb7a94e66d..01b496d988 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp @@ -85,6 +85,14 @@ class SIMPLNXCORE_EXPORT ReadVolumeGraphicsFileFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.cpp index afc3721a4c..5ee0ca5f99 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.cpp @@ -94,6 +94,12 @@ Parameters ReadVtkStructuredPointsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReadVtkStructuredPointsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReadVtkStructuredPointsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.hpp index 4299c342ac..494d9a5492 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.hpp @@ -75,6 +75,14 @@ class SIMPLNXCORE_EXPORT ReadVtkStructuredPointsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp index 1578875d8c..82f0f5fc4d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp @@ -82,6 +82,12 @@ Parameters RegularGridSampleSurfaceMeshFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType RegularGridSampleSurfaceMeshFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer RegularGridSampleSurfaceMeshFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp index 43a9d69015..09a4f8624d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp @@ -77,6 +77,14 @@ class SIMPLNXCORE_EXPORT RegularGridSampleSurfaceMeshFilter : 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/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedEdgesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedEdgesFilter.cpp index 13f88575ab..dcaa3b0c56 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedEdgesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedEdgesFilter.cpp @@ -90,6 +90,12 @@ Parameters RemoveFlaggedEdgesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType RemoveFlaggedEdgesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer RemoveFlaggedEdgesFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedEdgesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedEdgesFilter.hpp index 10ad2b3322..7fd8d62017 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedEdgesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedEdgesFilter.hpp @@ -79,6 +79,14 @@ class SIMPLNXCORE_EXPORT RemoveFlaggedEdgesFilter : 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/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp index 4e68f158a2..82d62b41e9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp @@ -99,6 +99,12 @@ Parameters RemoveFlaggedFeaturesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType RemoveFlaggedFeaturesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer RemoveFlaggedFeaturesFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp index 8613513038..ce9c0ef461 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp @@ -75,6 +75,14 @@ class SIMPLNXCORE_EXPORT RemoveFlaggedFeaturesFilter : 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/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.cpp index 8f2491e52a..7b930a9166 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.cpp @@ -89,6 +89,12 @@ Parameters RemoveFlaggedTrianglesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType RemoveFlaggedTrianglesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer RemoveFlaggedTrianglesFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.hpp index 43403a06a8..70b72e3929 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.hpp @@ -79,6 +79,14 @@ class SIMPLNXCORE_EXPORT RemoveFlaggedTrianglesFilter : 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/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.cpp index 5249a4995b..f2ea3472e3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.cpp @@ -102,6 +102,12 @@ Parameters RemoveFlaggedVerticesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType RemoveFlaggedVerticesFilter::parametersVersion() const +{ + return 1; +} + IFilter::UniquePointer RemoveFlaggedVerticesFilter::clone() const { return std::make_unique(); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.hpp index 27fb72baf5..960d83da14 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.hpp @@ -71,6 +71,14 @@ class SIMPLNXCORE_EXPORT RemoveFlaggedVerticesFilter : 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 UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObjectFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObjectFilter.cpp index 36af5682ec..cdb0ee2d32 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObjectFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObjectFilter.cpp @@ -67,6 +67,12 @@ Parameters RenameDataObjectFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType RenameDataObjectFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer RenameDataObjectFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObjectFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObjectFilter.hpp index 5dae8d2d44..cefb805ddb 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObjectFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObjectFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT RenameDataObjectFilter : 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 * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp index d8bf231893..e506fa75ed 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp @@ -67,6 +67,12 @@ Parameters ReplaceElementAttributesWithNeighborValuesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReplaceElementAttributesWithNeighborValuesFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReplaceElementAttributesWithNeighborValuesFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp index d1c9c782c1..e6364717b1 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp @@ -74,6 +74,14 @@ class SIMPLNXCORE_EXPORT ReplaceElementAttributesWithNeighborValuesFilter : publ */ 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/SimplnxCore/src/SimplnxCore/Filters/RequireMinNumNeighborsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinNumNeighborsFilter.cpp index 1db38f1605..f12766d8de 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinNumNeighborsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinNumNeighborsFilter.cpp @@ -361,6 +361,12 @@ Parameters RequireMinNumNeighborsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType RequireMinNumNeighborsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer RequireMinNumNeighborsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinNumNeighborsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinNumNeighborsFilter.hpp index b690b88677..505bcbf4cf 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinNumNeighborsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinNumNeighborsFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT RequireMinNumNeighborsFilter : 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 * @return IFilter::UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinimumSizeFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinimumSizeFeaturesFilter.cpp index 8032b0be9e..d5972d9334 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinimumSizeFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinimumSizeFeaturesFilter.cpp @@ -299,6 +299,12 @@ Parameters RequireMinimumSizeFeaturesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType RequireMinimumSizeFeaturesFilter::parametersVersion() const +{ + return 1; +} + IFilter::UniquePointer RequireMinimumSizeFeaturesFilter::clone() const { return std::make_unique(); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinimumSizeFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinimumSizeFeaturesFilter.hpp index 6d64a50448..f182d2832b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinimumSizeFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RequireMinimumSizeFeaturesFilter.hpp @@ -75,6 +75,14 @@ class SIMPLNXCORE_EXPORT RequireMinimumSizeFeaturesFilter : 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 * @return diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp index 0e45c23637..2bddf945b1 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp @@ -122,6 +122,12 @@ Parameters ResampleImageGeomFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ResampleImageGeomFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ResampleImageGeomFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp index 97a576cae7..41975527bb 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp @@ -78,6 +78,14 @@ class SIMPLNXCORE_EXPORT ResampleImageGeomFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp index 17415bf838..e9fa66368d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp @@ -73,6 +73,12 @@ Parameters ResampleRectGridToImageGeomFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ResampleRectGridToImageGeomFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ResampleRectGridToImageGeomFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp index 27ca6b6d4e..17414a384f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT ResampleRectGridToImageGeomFilter : 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/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.cpp index aac65bbe98..0090d3a549 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.cpp @@ -96,6 +96,12 @@ Parameters ReverseTriangleWindingFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ReverseTriangleWindingFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ReverseTriangleWindingFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp index 38983695cc..8805055d45 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp @@ -70,6 +70,14 @@ class SIMPLNXCORE_EXPORT ReverseTriangleWindingFilter : 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/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.cpp index 99227fa5f2..29bc90cd37 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.cpp @@ -92,6 +92,12 @@ Parameters RobustAutomaticThresholdFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType RobustAutomaticThresholdFilter::parametersVersion() const +{ + return 1; +} + IFilter::UniquePointer RobustAutomaticThresholdFilter::clone() const { return std::make_unique(); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.hpp index 203d25584b..54729b6967 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.hpp @@ -66,6 +66,14 @@ class SIMPLNXCORE_EXPORT RobustAutomaticThresholdFilter : 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 Creates and returns a copy of the filter. * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp index 0c90662acf..6a2b015a40 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp @@ -346,6 +346,12 @@ Parameters RotateSampleRefFrameFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType RotateSampleRefFrameFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer RotateSampleRefFrameFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp index c185b3ea8f..5fcd9e922c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp @@ -82,6 +82,14 @@ class SIMPLNXCORE_EXPORT RotateSampleRefFrameFilter : 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 * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp index 8c8728eded..42b74ac46f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp @@ -88,6 +88,12 @@ Parameters ScalarSegmentFeaturesFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ScalarSegmentFeaturesFilter::parametersVersion() const +{ + return 1; +} + IFilter::UniquePointer ScalarSegmentFeaturesFilter::clone() const { return std::make_unique(); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp index c953fa0b2b..2e1e64b12b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp @@ -81,6 +81,14 @@ class SIMPLNXCORE_EXPORT ScalarSegmentFeaturesFilter : 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 Creates a copy of the filter. * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp index bfd7af429e..855b3681eb 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp @@ -68,6 +68,12 @@ Parameters SetImageGeomOriginScalingFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType SetImageGeomOriginScalingFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer SetImageGeomOriginScalingFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp index cca360628f..74492d7e96 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp @@ -75,6 +75,14 @@ class SIMPLNXCORE_EXPORT SetImageGeomOriginScalingFilter : 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 * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.cpp index bb4ed9f865..cffc1e2e0f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.cpp @@ -72,6 +72,12 @@ Parameters SharedFeatureFaceFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType SharedFeatureFaceFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer SharedFeatureFaceFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.hpp index 58dfc62755..b3ebdddce0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.hpp @@ -68,6 +68,14 @@ class SIMPLNXCORE_EXPORT SharedFeatureFaceFilter : 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/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.cpp index a0b143c0e6..529b2a019d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.cpp @@ -84,6 +84,12 @@ Parameters SilhouetteFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType SilhouetteFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer SilhouetteFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp index 4c356383f1..711d42d79f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp @@ -74,6 +74,14 @@ class SIMPLNXCORE_EXPORT SilhouetteFilter : 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/SimplnxCore/src/SimplnxCore/Filters/SliceTriangleGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SliceTriangleGeometryFilter.cpp index 7b1e7b2d18..e5ee1979ff 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SliceTriangleGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SliceTriangleGeometryFilter.cpp @@ -93,6 +93,12 @@ Parameters SliceTriangleGeometryFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType SliceTriangleGeometryFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer SliceTriangleGeometryFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SliceTriangleGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SliceTriangleGeometryFilter.hpp index 54014b90bf..4ea16a3587 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SliceTriangleGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SliceTriangleGeometryFilter.hpp @@ -83,6 +83,14 @@ class SIMPLNXCORE_EXPORT SliceTriangleGeometryFilter : 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/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp index 3058359dbd..5b160f6b0e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp @@ -68,6 +68,12 @@ Parameters SplitAttributeArrayFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType SplitAttributeArrayFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer SplitAttributeArrayFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.hpp index ad1de970e3..e56c3c4773 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT SplitAttributeArrayFilter : 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/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp index 627ae9d82f..607f5c0171 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp @@ -99,6 +99,12 @@ Parameters SurfaceNetsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType SurfaceNetsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer SurfaceNetsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.hpp index cee31f856b..93be4a5ffe 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.hpp @@ -78,6 +78,14 @@ class SIMPLNXCORE_EXPORT SurfaceNetsFilter : 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/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.cpp index d77cc8ff3d..dcddd788d6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.cpp @@ -64,6 +64,12 @@ Parameters TriangleCentroidFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType TriangleCentroidFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer TriangleCentroidFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.hpp index 85ab46ab1b..f6d179b7dc 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.hpp @@ -70,6 +70,14 @@ class SIMPLNXCORE_EXPORT TriangleCentroidFilter : 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/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.cpp index d5b34e9e60..d4fc73765d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.cpp @@ -147,6 +147,12 @@ Parameters TriangleDihedralAngleFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType TriangleDihedralAngleFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer TriangleDihedralAngleFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp index d673012dc4..42cf5badb9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp @@ -70,6 +70,14 @@ class SIMPLNXCORE_EXPORT TriangleDihedralAngleFilter : 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/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp index 8be3ab8573..336bd8f20f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp @@ -118,6 +118,12 @@ Parameters TriangleNormalFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType TriangleNormalFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer TriangleNormalFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp index e66ee12ae1..0550c92f86 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp @@ -70,6 +70,14 @@ class SIMPLNXCORE_EXPORT TriangleNormalFilter : 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/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp index b557d50f55..f17329f1c4 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp @@ -93,6 +93,12 @@ Parameters UncertainRegularGridSampleSurfaceMeshFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType UncertainRegularGridSampleSurfaceMeshFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer UncertainRegularGridSampleSurfaceMeshFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp index 9b2db90273..03992c6372 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp @@ -80,6 +80,14 @@ class SIMPLNXCORE_EXPORT UncertainRegularGridSampleSurfaceMeshFilter : public IF */ 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/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.cpp index cc0172b76a..9df90c1e34 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.cpp @@ -93,6 +93,12 @@ Parameters WriteASCIIDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteASCIIDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteASCIIDataFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp index dc59191a81..8000cc5d1e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp @@ -90,6 +90,14 @@ class SIMPLNXCORE_EXPORT WriteASCIIDataFilter : 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/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.cpp index 8a3cee8c30..89926c8567 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.cpp @@ -70,6 +70,12 @@ Parameters WriteAbaqusHexahedronFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteAbaqusHexahedronFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteAbaqusHexahedronFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp index 042dbeb33f..adb3634fde 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp @@ -74,6 +74,14 @@ class SIMPLNXCORE_EXPORT WriteAbaqusHexahedronFilter : 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/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp index a31387cbd9..4920cb021b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp @@ -69,6 +69,12 @@ Parameters WriteAvizoRectilinearCoordinateFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteAvizoRectilinearCoordinateFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteAvizoRectilinearCoordinateFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp index 815f187408..5494b24bf5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT WriteAvizoRectilinearCoordinateFilter : 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/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.cpp index a8932352dd..fee7a76ece 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.cpp @@ -69,6 +69,12 @@ Parameters WriteAvizoUniformCoordinateFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteAvizoUniformCoordinateFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteAvizoUniformCoordinateFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp index 7abf09d823..c90bd10736 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT WriteAvizoUniformCoordinateFilter : 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/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.cpp index 28c9a5c679..d8d04366d8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.cpp @@ -86,6 +86,12 @@ Parameters WriteBinaryDataFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteBinaryDataFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteBinaryDataFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp index bd3af7e440..c2703db0b5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT WriteBinaryDataFilter : 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/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.cpp index f52da2c126..d03d95430b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.cpp @@ -62,6 +62,12 @@ Parameters WriteDREAM3DFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteDREAM3DFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteDREAM3DFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.hpp index 24270398a5..57324811ab 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT WriteDREAM3DFilter : 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 as a std::unique_ptr. * @return UniquePointer diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp index 3353cd2dc7..bbd30c9779 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp @@ -71,6 +71,12 @@ Parameters WriteFeatureDataCSVFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteFeatureDataCSVFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteFeatureDataCSVFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp index b6c09c853f..dde52da91b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp @@ -82,6 +82,14 @@ class SIMPLNXCORE_EXPORT WriteFeatureDataCSVFilter : 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/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.cpp index 470334e848..d85c51ae03 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.cpp @@ -72,6 +72,12 @@ Parameters WriteLosAlamosFFTFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteLosAlamosFFTFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteLosAlamosFFTFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp index ef15297522..5da7c553af 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp @@ -73,6 +73,14 @@ class SIMPLNXCORE_EXPORT WriteLosAlamosFFTFilter : 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/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.cpp index 31196344be..4b9945c0bb 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.cpp @@ -99,6 +99,12 @@ Parameters WriteStlFileFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteStlFileFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteStlFileFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp index d2c9290fe4..be0c3bbc90 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp @@ -76,6 +76,14 @@ class SIMPLNXCORE_EXPORT WriteStlFileFilter : 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/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.cpp index ee338d8f28..b599585c72 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.cpp @@ -66,6 +66,12 @@ Parameters WriteVtkRectilinearGridFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteVtkRectilinearGridFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteVtkRectilinearGridFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp index ff82ab949f..b525062269 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT WriteVtkRectilinearGridFilter : 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/SimplnxCore/src/SimplnxCore/Filters/WriteVtkStructuredPointsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkStructuredPointsFilter.cpp index 6b4d371d1c..98f2128075 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkStructuredPointsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkStructuredPointsFilter.cpp @@ -65,6 +65,12 @@ Parameters WriteVtkStructuredPointsFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType WriteVtkStructuredPointsFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer WriteVtkStructuredPointsFilter::clone() const { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkStructuredPointsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkStructuredPointsFilter.hpp index f1ea6feecd..a55a2e6e57 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkStructuredPointsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkStructuredPointsFilter.hpp @@ -72,6 +72,14 @@ class SIMPLNXCORE_EXPORT WriteVtkStructuredPointsFilter : 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/SimplnxCore/src/SimplnxCore/utils/PythonFilterTemplate.py b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/PythonFilterTemplate.py index aa9a5d1844..fc34dac232 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/utils/PythonFilterTemplate.py +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/PythonFilterTemplate.py @@ -75,6 +75,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the array sizes are actually known at preflight time. Some filters will not be able to report output diff --git a/src/Plugins/SimplnxCore/test/PipelineTest.cpp b/src/Plugins/SimplnxCore/test/PipelineTest.cpp index 50d0abea89..5f96026e78 100644 --- a/src/Plugins/SimplnxCore/test/PipelineTest.cpp +++ b/src/Plugins/SimplnxCore/test/PipelineTest.cpp @@ -80,6 +80,11 @@ class DeferredActionTestFilter : public IFilter return {}; } + VersionType parametersVersion() const override + { + return 1; + } + UniquePointer clone() const override { return std::make_unique(); diff --git a/src/Plugins/SimplnxCore/wrapping/python/simplnxpy.cpp b/src/Plugins/SimplnxCore/wrapping/python/simplnxpy.cpp index 6821e4a83b..65ec0eb33d 100644 --- a/src/Plugins/SimplnxCore/wrapping/python/simplnxpy.cpp +++ b/src/Plugins/SimplnxCore/wrapping/python/simplnxpy.cpp @@ -569,6 +569,7 @@ PYBIND11_MODULE(simplnx, mod) parameter.def_property_readonly("human_name", &IParameter::humanName); parameter.def_property_readonly("help_text", &IParameter::helpText); parameter.def_property_readonly("type", &IParameter::type); + parameter.def_property_readonly("version", &IParameter::getVersion); py::class_ parameters(mod, "Parameters"); @@ -1374,6 +1375,7 @@ PYBIND11_MODULE(simplnx, mod) filter.def("name", &IFilter::name); filter.def("uuid", &IFilter::uuid); filter.def("human_name", &IFilter::humanName); + filter.def("parameters_version", &IFilter::parametersVersion); filter.def("preflight2", [internals](const IFilter& self, DataStructure& dataStructure, const py::kwargs& kwargs) { Arguments convertedArgs = ConvertDictToArgs(*internals, self.parameters(), kwargs); py::gil_scoped_release releaseGIL{}; diff --git a/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExampleFilter.cpp b/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExampleFilter.cpp index 6d902ed9c5..172288059c 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExampleFilter.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExampleFilter.cpp @@ -87,6 +87,12 @@ Parameters DynamicTableExampleFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType DynamicTableExampleFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer DynamicTableExampleFilter::clone() const { diff --git a/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExampleFilter.hpp b/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExampleFilter.hpp index 30fedfc5b9..db6df628fb 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExampleFilter.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExampleFilter.hpp @@ -55,6 +55,14 @@ class TESTONE_EXPORT DynamicTableExampleFilter : 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 * @return diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.cpp b/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.cpp index 006a57bb64..6f77ccea27 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.cpp @@ -78,6 +78,12 @@ nx::core::Parameters ErrorWarningFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ErrorWarningFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ErrorWarningFilter::clone() const { diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.hpp b/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.hpp index 43124918b8..347ea70941 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.hpp @@ -66,6 +66,14 @@ class TESTONE_EXPORT ErrorWarningFilter : public nx::core::IFilter */ nx::core::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 unique_pointer to a copy of the filter. * @return nx::core::IFilter::UniquePointer diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1Filter.cpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1Filter.cpp index 822687d3f0..4e0080e61e 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1Filter.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1Filter.cpp @@ -112,6 +112,12 @@ Parameters ExampleFilter1Filter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ExampleFilter1Filter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ExampleFilter1Filter::clone() const { diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1Filter.hpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1Filter.hpp index 13c5f914a2..cd289a3214 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1Filter.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1Filter.hpp @@ -61,6 +61,14 @@ class TESTONE_EXPORT ExampleFilter1Filter : 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 * @return diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2Filter.cpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2Filter.cpp index b49aeaf420..9bfcfdabef 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2Filter.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2Filter.cpp @@ -110,6 +110,12 @@ Parameters ExampleFilter2Filter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType ExampleFilter2Filter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ IFilter::UniquePointer ExampleFilter2Filter::clone() const { diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2Filter.hpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2Filter.hpp index 5929375b08..3178455cf9 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2Filter.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2Filter.hpp @@ -55,6 +55,14 @@ class TESTONE_EXPORT ExampleFilter2Filter : 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 * @return diff --git a/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.cpp b/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.cpp index 46064cf2a1..d0396dcc6c 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.cpp @@ -59,6 +59,12 @@ nx::core::Parameters TestFilter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType TestFilter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ nx::core::IFilter::UniquePointer TestFilter::clone() const { diff --git a/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.hpp b/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.hpp index 9e65a2fb8f..5ad84fbf33 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.hpp @@ -49,6 +49,14 @@ class TESTONE_EXPORT TestFilter : public nx::core::IFilter */ nx::core::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 unique_pointer to a copy of the filter. * @return nx::core::IFilter::UniquePointer diff --git a/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp b/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp index 8440425dec..deadc2dd93 100644 --- a/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp +++ b/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp @@ -58,6 +58,12 @@ nx::core::Parameters Test2Filter::parameters() const return params; } +//------------------------------------------------------------------------------ +IFilter::VersionType Test2Filter::parametersVersion() const +{ + return 1; +} + //------------------------------------------------------------------------------ nx::core::IFilter::UniquePointer Test2Filter::clone() const { diff --git a/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.hpp b/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.hpp index 214c43cd5c..800f3c12e6 100644 --- a/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.hpp +++ b/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.hpp @@ -48,6 +48,14 @@ class TESTTWO_EXPORT Test2Filter : public nx::core::IFilter */ nx::core::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 unique_pointer to a copy of the filter. * @return nx::core::IFilter::UniquePointer diff --git a/src/simplnx/Filter/IFilter.cpp b/src/simplnx/Filter/IFilter.cpp index 5bb4fddf88..f6b67a535a 100644 --- a/src/simplnx/Filter/IFilter.cpp +++ b/src/simplnx/Filter/IFilter.cpp @@ -248,6 +248,7 @@ IFilter::ExecuteResult IFilter::execute(DataStructure& dataStructure, const Argu nlohmann::json IFilter::toJson(const Arguments& args) const { nlohmann::json json; + json["parameters_version"] = parametersVersion(); Parameters params = parameters(); for(const auto& [name, param] : params) { diff --git a/src/simplnx/Filter/IFilter.hpp b/src/simplnx/Filter/IFilter.hpp index c6873e70cd..f05fd59f77 100644 --- a/src/simplnx/Filter/IFilter.hpp +++ b/src/simplnx/Filter/IFilter.hpp @@ -29,6 +29,7 @@ class SIMPLNX_EXPORT IFilter { public: using UniquePointer = std::unique_ptr; + using VersionType = uint64; struct Message { @@ -143,6 +144,14 @@ class SIMPLNX_EXPORT IFilter */ virtual Parameters parameters() const = 0; + /** + * @brief Returns parameters version integer. + * Initial version should always be 1. + * Should be incremented everytime the parameters change. + * @return VersionType + */ + virtual VersionType parametersVersion() const = 0; + /** * @brief Returns a copy of the filter. * @return UniquePointer diff --git a/src/simplnx/Filter/IParameter.cpp b/src/simplnx/Filter/IParameter.cpp index f09a23e6d9..2c5431b5db 100644 --- a/src/simplnx/Filter/IParameter.cpp +++ b/src/simplnx/Filter/IParameter.cpp @@ -1,9 +1,66 @@ #include "IParameter.hpp" +#include "simplnx/Common/StringLiteral.hpp" + +#include + namespace nx::core { +namespace +{ +constexpr StringLiteral k_ValueKey = "value"; +constexpr StringLiteral k_VersionKey = "version"; +} // namespace + std::any IParameter::construct(const Arguments& args) const { return args.at(name()); } + +nlohmann::json IParameter::toJson(const std::any& value) const +{ + nlohmann::json json; + + json[k_ValueKey] = toJsonImpl(value); + json[k_VersionKey] = getVersion(); + + return json; +} + +Result IParameter::fromJson(const nlohmann::json& json) const +{ + std::vector warnings; + VersionType version = 1; + if(json.contains(k_VersionKey)) + { + nlohmann::json versionJson = json[k_VersionKey]; + if(!versionJson.is_number_unsigned()) + { + return MakeErrorResult(-2, fmt::format("{}: Parameter key '{}' is not an unsigned integer", name(), k_VersionKey)); + } + + version = versionJson.get(); + } + else + { + warnings.push_back(Warning{-1, fmt::format("{}: Parameter key '{}' does not exist. Assuming version={}", name(), k_VersionKey, version)}); + } + + nlohmann::json valueJson; + if(json.contains(k_ValueKey)) + { + valueJson = json[k_ValueKey]; + } + else + { + warnings.push_back(Warning{-2, fmt::format("{}: Parameter key '{}' does not exist. Assuming json is the current json object", name(), k_ValueKey, version)}); + valueJson = json; + } + + Result result = fromJsonImpl(valueJson, version); + + result.warnings().insert(result.warnings().begin(), warnings.cbegin(), warnings.cend()); + + return result; +} } // namespace nx::core diff --git a/src/simplnx/Filter/IParameter.hpp b/src/simplnx/Filter/IParameter.hpp index 4ff317ba9e..30290a96e3 100644 --- a/src/simplnx/Filter/IParameter.hpp +++ b/src/simplnx/Filter/IParameter.hpp @@ -53,6 +53,7 @@ class SIMPLNX_EXPORT IParameter public: using AcceptedTypes = std::vector; using UniquePointer = std::unique_ptr; + using VersionType = uint64; enum class Type : uint8 { @@ -110,19 +111,27 @@ class SIMPLNX_EXPORT IParameter */ virtual AcceptedTypes acceptedTypes() const = 0; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + virtual VersionType getVersion() const = 0; + /** * @brief Converts the given value to JSON. * Throws if value is not an accepted type. * @param value */ - virtual nlohmann::json toJson(const std::any& value) const = 0; + nlohmann::json toJson(const std::any& value) const; /** * @brief Converts the given JSON to a std::any containing the appropriate input type. * Returns any warnings/errors. * @return */ - virtual Result fromJson(const nlohmann::json& json) const = 0; + Result fromJson(const nlohmann::json& json) const; /** * @brief Creates a copy of the parameter. @@ -140,6 +149,20 @@ class SIMPLNX_EXPORT IParameter protected: IParameter() = default; + + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + */ + virtual nlohmann::json toJsonImpl(const std::any& value) const = 0; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return + */ + virtual Result fromJsonImpl(const nlohmann::json& json, uint64 version) const = 0; }; using AnyParameter = AnyCloneable; diff --git a/src/simplnx/Parameters/ArrayCreationParameter.cpp b/src/simplnx/Parameters/ArrayCreationParameter.cpp index b4e088ca2c..25c57717e0 100644 --- a/src/simplnx/Parameters/ArrayCreationParameter.cpp +++ b/src/simplnx/Parameters/ArrayCreationParameter.cpp @@ -24,14 +24,20 @@ IParameter::AcceptedTypes ArrayCreationParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json ArrayCreationParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType ArrayCreationParameter::getVersion() const +{ + return 1; +} + +nlohmann::json ArrayCreationParameter::toJsonImpl(const std::any& value) const { const auto& path = GetAnyRef(value); nlohmann::json json = path.toString(); return json; } -Result ArrayCreationParameter::fromJson(const nlohmann::json& json) const +Result ArrayCreationParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'ArrayCreationParameter' JSON Error: "; diff --git a/src/simplnx/Parameters/ArrayCreationParameter.hpp b/src/simplnx/Parameters/ArrayCreationParameter.hpp index 082a804866..436e12c687 100644 --- a/src/simplnx/Parameters/ArrayCreationParameter.hpp +++ b/src/simplnx/Parameters/ArrayCreationParameter.hpp @@ -35,29 +35,25 @@ class SIMPLNX_EXPORT ArrayCreationParameter : public MutableDataParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + UniquePointer clone() const override; /** * @brief * @return */ - UniquePointer clone() const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - std::any defaultValue() const override; + VersionType getVersion() const override; /** * @brief @@ -87,6 +83,19 @@ class SIMPLNX_EXPORT ArrayCreationParameter : public MutableDataParameter */ Result resolve(DataStructure& dataStructure, const std::any& value) const override; +protected: + /** + * @brief + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; }; diff --git a/src/simplnx/Parameters/ArraySelectionParameter.cpp b/src/simplnx/Parameters/ArraySelectionParameter.cpp index f3cce19e0c..b1d5344a80 100644 --- a/src/simplnx/Parameters/ArraySelectionParameter.cpp +++ b/src/simplnx/Parameters/ArraySelectionParameter.cpp @@ -54,14 +54,20 @@ IParameter::AcceptedTypes ArraySelectionParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json ArraySelectionParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType ArraySelectionParameter::getVersion() const +{ + return 1; +} + +nlohmann::json ArraySelectionParameter::toJsonImpl(const std::any& value) const { const auto& path = GetAnyRef(value); nlohmann::json json = path.toString(); return json; } -Result ArraySelectionParameter::fromJson(const nlohmann::json& json) const +Result ArraySelectionParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'ArraySelectionParameter' JSON Error: "; if(!json.is_string()) diff --git a/src/simplnx/Parameters/ArraySelectionParameter.hpp b/src/simplnx/Parameters/ArraySelectionParameter.hpp index e9dcb02533..9bc880ba75 100644 --- a/src/simplnx/Parameters/ArraySelectionParameter.hpp +++ b/src/simplnx/Parameters/ArraySelectionParameter.hpp @@ -51,20 +51,6 @@ class SIMPLNX_EXPORT ArraySelectionParameter : public MutableDataParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Converts the given value to JSON. - * Throws if value is not an accepted type. - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Converts the given JSON to a std::any containing the appropriate input type. - * Returns any warnings/errors. - * @return - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates a copy of the parameter. * @return @@ -77,6 +63,14 @@ class SIMPLNX_EXPORT ArraySelectionParameter : public MutableDataParameter */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief * @return @@ -138,6 +132,21 @@ class SIMPLNX_EXPORT ArraySelectionParameter : public MutableDataParameter */ Result resolve(DataStructure& dataStructure, const std::any& value) const override; +protected: + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; AllowedTypes m_AllowedTypes = {}; diff --git a/src/simplnx/Parameters/ArrayThresholdsParameter.cpp b/src/simplnx/Parameters/ArrayThresholdsParameter.cpp index 5eb75b19be..b6e78d33ec 100644 --- a/src/simplnx/Parameters/ArrayThresholdsParameter.cpp +++ b/src/simplnx/Parameters/ArrayThresholdsParameter.cpp @@ -27,14 +27,20 @@ IParameter::AcceptedTypes ArrayThresholdsParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json ArrayThresholdsParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType ArrayThresholdsParameter::getVersion() const +{ + return 1; +} + +nlohmann::json ArrayThresholdsParameter::toJsonImpl(const std::any& value) const { const auto& thresholds = GetAnyRef(value); nlohmann::json json = thresholds.toJson(); return json; } -Result ArrayThresholdsParameter::fromJson(const nlohmann::json& json) const +Result ArrayThresholdsParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'ArrayThresholdsParameter' JSON Error: "; auto thresholds = ArrayThresholdSet::FromJson(json); diff --git a/src/simplnx/Parameters/ArrayThresholdsParameter.hpp b/src/simplnx/Parameters/ArrayThresholdsParameter.hpp index 3bd86dc9de..1d60ce8add 100644 --- a/src/simplnx/Parameters/ArrayThresholdsParameter.hpp +++ b/src/simplnx/Parameters/ArrayThresholdsParameter.hpp @@ -38,19 +38,6 @@ class SIMPLNX_EXPORT ArrayThresholdsParameter : public MutableDataParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief - * @param value - * @return nlohmann::json - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief - * @return Result - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief * @return UniquePointer @@ -63,6 +50,14 @@ class SIMPLNX_EXPORT ArrayThresholdsParameter : public MutableDataParameter */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief * @return ValueType @@ -98,6 +93,19 @@ class SIMPLNX_EXPORT ArrayThresholdsParameter : public MutableDataParameter Result resolve(DataStructure& dataStructure, const std::any& value) const override; protected: + /** + * @brief + * @param value + * @return nlohmann::json + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief + * @return Result + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + /** * @brief * @param dataStructure diff --git a/src/simplnx/Parameters/AttributeMatrixSelectionParameter.cpp b/src/simplnx/Parameters/AttributeMatrixSelectionParameter.cpp index f135519b55..0d76426bc2 100644 --- a/src/simplnx/Parameters/AttributeMatrixSelectionParameter.cpp +++ b/src/simplnx/Parameters/AttributeMatrixSelectionParameter.cpp @@ -25,14 +25,20 @@ IParameter::AcceptedTypes AttributeMatrixSelectionParameter::acceptedTypes() con return {typeid(ValueType)}; } -nlohmann::json AttributeMatrixSelectionParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType AttributeMatrixSelectionParameter::getVersion() const +{ + return 1; +} + +nlohmann::json AttributeMatrixSelectionParameter::toJsonImpl(const std::any& value) const { const auto& path = GetAnyRef(value); nlohmann::json json = path.toString(); return json; } -Result AttributeMatrixSelectionParameter::fromJson(const nlohmann::json& json) const +Result AttributeMatrixSelectionParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'AttributeMatrixSelectionParameter' JSON Error: "; diff --git a/src/simplnx/Parameters/AttributeMatrixSelectionParameter.hpp b/src/simplnx/Parameters/AttributeMatrixSelectionParameter.hpp index c1ef2d337f..26f23f81e2 100644 --- a/src/simplnx/Parameters/AttributeMatrixSelectionParameter.hpp +++ b/src/simplnx/Parameters/AttributeMatrixSelectionParameter.hpp @@ -39,20 +39,6 @@ class SIMPLNX_EXPORT AttributeMatrixSelectionParameter : public MutableDataParam */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Converts the given value to JSON. - * Throws if value is not an accepted type. - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Converts the given JSON to a std::any containing the appropriate input type. - * Returns any warnings/errors. - * @return - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates a copy of the parameter. * @return @@ -65,6 +51,14 @@ class SIMPLNX_EXPORT AttributeMatrixSelectionParameter : public MutableDataParam */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief Returns the user defined default path. * @return @@ -96,6 +90,21 @@ class SIMPLNX_EXPORT AttributeMatrixSelectionParameter : public MutableDataParam */ Result resolve(DataStructure& dataStructure, const std::any& value) const override; +protected: + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; }; diff --git a/src/simplnx/Parameters/BoolParameter.cpp b/src/simplnx/Parameters/BoolParameter.cpp index 2eba28002b..b6e597a88e 100644 --- a/src/simplnx/Parameters/BoolParameter.cpp +++ b/src/simplnx/Parameters/BoolParameter.cpp @@ -21,14 +21,20 @@ IParameter::AcceptedTypes BoolParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json BoolParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType BoolParameter::getVersion() const +{ + return 1; +} + +nlohmann::json BoolParameter::toJsonImpl(const std::any& value) const { auto boolValue = std::any_cast(value); nlohmann::json json = boolValue; return json; } -Result BoolParameter::fromJson(const nlohmann::json& json) const +Result BoolParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'BoolParameter' JSON Error: "; if(!json.is_boolean()) diff --git a/src/simplnx/Parameters/BoolParameter.hpp b/src/simplnx/Parameters/BoolParameter.hpp index b48ba9f0c3..875b4c66fd 100644 --- a/src/simplnx/Parameters/BoolParameter.hpp +++ b/src/simplnx/Parameters/BoolParameter.hpp @@ -33,29 +33,25 @@ class SIMPLNX_EXPORT BoolParameter : public ValueParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + UniquePointer clone() const override; /** * @brief * @return */ - UniquePointer clone() const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - std::any defaultValue() const override; + VersionType getVersion() const override; /** * @brief @@ -78,6 +74,19 @@ class SIMPLNX_EXPORT BoolParameter : public ValueParameter */ bool checkActive(const std::any& parameterValue, const std::any& associatedValue) const; +protected: + /** + * @brief + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; }; diff --git a/src/simplnx/Parameters/CalculatorParameter.cpp b/src/simplnx/Parameters/CalculatorParameter.cpp index e2ae2df324..085f240176 100644 --- a/src/simplnx/Parameters/CalculatorParameter.cpp +++ b/src/simplnx/Parameters/CalculatorParameter.cpp @@ -35,7 +35,13 @@ IParameter::AcceptedTypes CalculatorParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json CalculatorParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType CalculatorParameter::getVersion() const +{ + return 1; +} + +nlohmann::json CalculatorParameter::toJsonImpl(const std::any& value) const { const auto& structValue = GetAnyRef(value); nlohmann::json json; @@ -45,7 +51,7 @@ nlohmann::json CalculatorParameter::toJson(const std::any& value) const return json; } -Result CalculatorParameter::fromJson(const nlohmann::json& json) const +Result CalculatorParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'CalculatorParameter' JSON Error: "; if(!json.is_object()) diff --git a/src/simplnx/Parameters/CalculatorParameter.hpp b/src/simplnx/Parameters/CalculatorParameter.hpp index 91425e59b5..129a6b4eb7 100644 --- a/src/simplnx/Parameters/CalculatorParameter.hpp +++ b/src/simplnx/Parameters/CalculatorParameter.hpp @@ -47,29 +47,25 @@ class SIMPLNX_EXPORT CalculatorParameter : public MutableDataParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + UniquePointer clone() const override; /** * @brief * @return */ - UniquePointer clone() const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - std::any defaultValue() const override; + VersionType getVersion() const override; /** * @brief @@ -93,6 +89,19 @@ class SIMPLNX_EXPORT CalculatorParameter : public MutableDataParameter */ Result resolve(DataStructure& dataStructure, const std::any& value) const override; +protected: + /** + * @brief + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; }; diff --git a/src/simplnx/Parameters/ChoicesParameter.cpp b/src/simplnx/Parameters/ChoicesParameter.cpp index cc1f5a1e4a..70652e8b6d 100644 --- a/src/simplnx/Parameters/ChoicesParameter.cpp +++ b/src/simplnx/Parameters/ChoicesParameter.cpp @@ -39,14 +39,20 @@ IParameter::AcceptedTypes ChoicesParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json ChoicesParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType ChoicesParameter::getVersion() const +{ + return 1; +} + +nlohmann::json ChoicesParameter::toJsonImpl(const std::any& value) const { auto index = std::any_cast(value); nlohmann::json json = index; return json; } -Result ChoicesParameter::fromJson(const nlohmann::json& json) const +Result ChoicesParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'ChoicesParameter' JSON Error: "; if(!json.is_number()) diff --git a/src/simplnx/Parameters/ChoicesParameter.hpp b/src/simplnx/Parameters/ChoicesParameter.hpp index afccd4cd16..7efa67d71d 100644 --- a/src/simplnx/Parameters/ChoicesParameter.hpp +++ b/src/simplnx/Parameters/ChoicesParameter.hpp @@ -37,29 +37,25 @@ class SIMPLNX_EXPORT ChoicesParameter : public ValueParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + UniquePointer clone() const override; /** * @brief * @return */ - UniquePointer clone() const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - std::any defaultValue() const override; + VersionType getVersion() const override; /** * @brief @@ -95,6 +91,19 @@ class SIMPLNX_EXPORT ChoicesParameter : public ValueParameter */ bool checkActive(const std::any& parameterValue, const std::any& associatedValue) const; +protected: + /** + * @brief + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; Choices m_Choices = {}; diff --git a/src/simplnx/Parameters/CreateColorMapParameter.cpp b/src/simplnx/Parameters/CreateColorMapParameter.cpp index f8ab90768a..0e79538564 100644 --- a/src/simplnx/Parameters/CreateColorMapParameter.cpp +++ b/src/simplnx/Parameters/CreateColorMapParameter.cpp @@ -24,14 +24,20 @@ IParameter::AcceptedTypes CreateColorMapParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json CreateColorMapParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType CreateColorMapParameter::getVersion() const +{ + return 1; +} + +nlohmann::json CreateColorMapParameter::toJsonImpl(const std::any& value) const { const auto& nameStr = GetAnyRef(value); nlohmann::json json = nameStr; return json; } -Result CreateColorMapParameter::fromJson(const nlohmann::json& json) const +Result CreateColorMapParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'CreateColorMapParameter' JSON Error: "; if(!json.empty() && !json.is_string()) diff --git a/src/simplnx/Parameters/CreateColorMapParameter.hpp b/src/simplnx/Parameters/CreateColorMapParameter.hpp index cb6c3f8951..1f700a1737 100644 --- a/src/simplnx/Parameters/CreateColorMapParameter.hpp +++ b/src/simplnx/Parameters/CreateColorMapParameter.hpp @@ -43,40 +43,49 @@ class SIMPLNX_EXPORT CreateColorMapParameter : public ValueParameter /** * @brief - * @param value + * @return */ - nlohmann::json toJson(const std::any& value) const override; + UniquePointer clone() const override; /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - UniquePointer clone() const override; + VersionType getVersion() const override; /** * @brief * @return */ - std::any defaultValue() const override; + ValueType defaultJson() const; /** * @brief + * @param value * @return */ - ValueType defaultJson() const; + Result<> validate(const std::any& value) const override; +protected: /** * @brief * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief * @return */ - Result<> validate(const std::any& value) const override; + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; private: ValueType m_DefaultValue = {}; diff --git a/src/simplnx/Parameters/DataGroupCreationParameter.cpp b/src/simplnx/Parameters/DataGroupCreationParameter.cpp index a9d065d83a..53b960b7a8 100644 --- a/src/simplnx/Parameters/DataGroupCreationParameter.cpp +++ b/src/simplnx/Parameters/DataGroupCreationParameter.cpp @@ -24,14 +24,20 @@ IParameter::AcceptedTypes DataGroupCreationParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json DataGroupCreationParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType DataGroupCreationParameter::getVersion() const +{ + return 1; +} + +nlohmann::json DataGroupCreationParameter::toJsonImpl(const std::any& value) const { const auto& path = GetAnyRef(value); nlohmann::json json = path.toString(); return json; } -Result DataGroupCreationParameter::fromJson(const nlohmann::json& json) const +Result DataGroupCreationParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'DataGroupCreationParameter' JSON Error: "; diff --git a/src/simplnx/Parameters/DataGroupCreationParameter.hpp b/src/simplnx/Parameters/DataGroupCreationParameter.hpp index 4848773d7e..06d94cc7fd 100644 --- a/src/simplnx/Parameters/DataGroupCreationParameter.hpp +++ b/src/simplnx/Parameters/DataGroupCreationParameter.hpp @@ -36,20 +36,6 @@ class SIMPLNX_EXPORT DataGroupCreationParameter : public MutableDataParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Converts the given value to JSON. - * Throws if value is not an accepted type. - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Converts the given JSON to a std::any containing the appropriate input type. - * Returns any warnings/errors. - * @return - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates a copy of the parameter. * @return @@ -62,6 +48,14 @@ class SIMPLNX_EXPORT DataGroupCreationParameter : public MutableDataParameter */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief Returns the user defined default path. * @return @@ -93,6 +87,21 @@ class SIMPLNX_EXPORT DataGroupCreationParameter : public MutableDataParameter */ Result resolve(DataStructure& dataStructure, const std::any& value) const override; +protected: + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; }; diff --git a/src/simplnx/Parameters/DataGroupSelectionParameter.cpp b/src/simplnx/Parameters/DataGroupSelectionParameter.cpp index ef00c457c5..87a4ff2e29 100644 --- a/src/simplnx/Parameters/DataGroupSelectionParameter.cpp +++ b/src/simplnx/Parameters/DataGroupSelectionParameter.cpp @@ -28,14 +28,20 @@ IParameter::AcceptedTypes DataGroupSelectionParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json DataGroupSelectionParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType DataGroupSelectionParameter::getVersion() const +{ + return 1; +} + +nlohmann::json DataGroupSelectionParameter::toJsonImpl(const std::any& value) const { const auto& path = GetAnyRef(value); nlohmann::json json = path.toString(); return json; } -Result DataGroupSelectionParameter::fromJson(const nlohmann::json& json) const +Result DataGroupSelectionParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'DataGroupSelectionParameter' JSON Error: "; diff --git a/src/simplnx/Parameters/DataGroupSelectionParameter.hpp b/src/simplnx/Parameters/DataGroupSelectionParameter.hpp index 27dcfa6dec..06a2877df0 100644 --- a/src/simplnx/Parameters/DataGroupSelectionParameter.hpp +++ b/src/simplnx/Parameters/DataGroupSelectionParameter.hpp @@ -40,20 +40,6 @@ class SIMPLNX_EXPORT DataGroupSelectionParameter : public MutableDataParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Converts the given value to JSON. - * Throws if value is not an accepted type. - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Converts the given JSON to a std::any containing the appropriate input type. - * Returns any warnings/errors. - * @return - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates a copy of the parameter. * @return @@ -66,6 +52,14 @@ class SIMPLNX_EXPORT DataGroupSelectionParameter : public MutableDataParameter */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief Returns the user defined default path. * @return @@ -103,6 +97,21 @@ class SIMPLNX_EXPORT DataGroupSelectionParameter : public MutableDataParameter */ Result resolve(DataStructure& dataStructure, const std::any& value) const override; +protected: + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; AllowedTypes m_AllowedTypes = {}; diff --git a/src/simplnx/Parameters/DataObjectNameParameter.cpp b/src/simplnx/Parameters/DataObjectNameParameter.cpp index 36aeeb936f..69aa0529c6 100644 --- a/src/simplnx/Parameters/DataObjectNameParameter.cpp +++ b/src/simplnx/Parameters/DataObjectNameParameter.cpp @@ -25,14 +25,20 @@ IParameter::AcceptedTypes DataObjectNameParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json DataObjectNameParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType DataObjectNameParameter::getVersion() const +{ + return 1; +} + +nlohmann::json DataObjectNameParameter::toJsonImpl(const std::any& value) const { const auto& stringValue = GetAnyRef(value); nlohmann::json json = stringValue; return json; } -Result DataObjectNameParameter::fromJson(const nlohmann::json& json) const +Result DataObjectNameParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'DataObjectNameParameter' JSON Error: "; if(!json.is_string()) diff --git a/src/simplnx/Parameters/DataObjectNameParameter.hpp b/src/simplnx/Parameters/DataObjectNameParameter.hpp index 21f27a6775..5ae5c1bc6e 100644 --- a/src/simplnx/Parameters/DataObjectNameParameter.hpp +++ b/src/simplnx/Parameters/DataObjectNameParameter.hpp @@ -37,47 +37,56 @@ class SIMPLNX_EXPORT DataObjectNameParameter : public ValueParameter /** * @brief - * @param value + * @return */ - nlohmann::json toJson(const std::any& value) const override; + UniquePointer clone() const override; /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - UniquePointer clone() const override; + VersionType getVersion() const override; /** * @brief * @return */ - std::any defaultValue() const override; + ValueType defaultName() const; /** * @brief + * @param value * @return */ - ValueType defaultName() const; + Result<> validate(const std::any& value) const override; /** * @brief * @param value * @return */ - Result<> validate(const std::any& value) const override; + Result<> validateName(const std::string& value) const; +protected: /** * @brief * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief * @return */ - Result<> validateName(const std::string& value) const; + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; private: ValueType m_DefaultValue = {}; diff --git a/src/simplnx/Parameters/DataPathSelectionParameter.cpp b/src/simplnx/Parameters/DataPathSelectionParameter.cpp index 9e2ff3f0e6..eceb721aac 100644 --- a/src/simplnx/Parameters/DataPathSelectionParameter.cpp +++ b/src/simplnx/Parameters/DataPathSelectionParameter.cpp @@ -23,14 +23,20 @@ IParameter::AcceptedTypes DataPathSelectionParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json DataPathSelectionParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType DataPathSelectionParameter::getVersion() const +{ + return 1; +} + +nlohmann::json DataPathSelectionParameter::toJsonImpl(const std::any& value) const { const auto& path = GetAnyRef(value); nlohmann::json json = path.toString(); return json; } -Result DataPathSelectionParameter::fromJson(const nlohmann::json& json) const +Result DataPathSelectionParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix("FilterParameter 'DataPathSelectionParameter' JSON Error: "); if(!json.is_string()) diff --git a/src/simplnx/Parameters/DataPathSelectionParameter.hpp b/src/simplnx/Parameters/DataPathSelectionParameter.hpp index 6fca79c2b5..ac60745a47 100644 --- a/src/simplnx/Parameters/DataPathSelectionParameter.hpp +++ b/src/simplnx/Parameters/DataPathSelectionParameter.hpp @@ -36,20 +36,6 @@ class SIMPLNX_EXPORT DataPathSelectionParameter : public MutableDataParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Converts the given value to JSON. - * Throws if value is not an accepted type. - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Converts the given JSON to a std::any containing the appropriate input type. - * Returns any warnings/errors. - * @return - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates a copy of the parameter. * @return @@ -62,6 +48,14 @@ class SIMPLNX_EXPORT DataPathSelectionParameter : public MutableDataParameter */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief Returns the user defined default path. * @return @@ -93,6 +87,21 @@ class SIMPLNX_EXPORT DataPathSelectionParameter : public MutableDataParameter */ Result resolve(DataStructure& dataStructure, const std::any& value) const override; +protected: + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; }; diff --git a/src/simplnx/Parameters/DataStoreFormatParameter.cpp b/src/simplnx/Parameters/DataStoreFormatParameter.cpp index 8c66d17244..a423d1f190 100644 --- a/src/simplnx/Parameters/DataStoreFormatParameter.cpp +++ b/src/simplnx/Parameters/DataStoreFormatParameter.cpp @@ -29,12 +29,18 @@ IParameter::AcceptedTypes DataStoreFormatParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json DataStoreFormatParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType DataStoreFormatParameter::getVersion() const +{ + return 1; +} + +nlohmann::json DataStoreFormatParameter::toJsonImpl(const std::any& value) const { return GetAnyRef(value); } -Result DataStoreFormatParameter::fromJson(const nlohmann::json& json) const +Result DataStoreFormatParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { if(!json.is_string()) { diff --git a/src/simplnx/Parameters/DataStoreFormatParameter.hpp b/src/simplnx/Parameters/DataStoreFormatParameter.hpp index 40b7d86bb2..0f172f82e5 100644 --- a/src/simplnx/Parameters/DataStoreFormatParameter.hpp +++ b/src/simplnx/Parameters/DataStoreFormatParameter.hpp @@ -37,29 +37,25 @@ class SIMPLNX_EXPORT DataStoreFormatParameter : public ValueParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + UniquePointer clone() const override; /** * @brief * @return */ - UniquePointer clone() const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - std::any defaultValue() const override; + VersionType getVersion() const override; /** * @brief @@ -80,6 +76,19 @@ class SIMPLNX_EXPORT DataStoreFormatParameter : public ValueParameter */ Result<> validate(const std::any& value) const override; +protected: + /** + * @brief + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; }; diff --git a/src/simplnx/Parameters/DataTypeParameter.cpp b/src/simplnx/Parameters/DataTypeParameter.cpp index c492e688b3..afd7b98611 100644 --- a/src/simplnx/Parameters/DataTypeParameter.cpp +++ b/src/simplnx/Parameters/DataTypeParameter.cpp @@ -76,14 +76,20 @@ IParameter::AcceptedTypes DataTypeParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json DataTypeParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType DataTypeParameter::getVersion() const +{ + return 1; +} + +nlohmann::json DataTypeParameter::toJsonImpl(const std::any& value) const { auto enumValue = std::any_cast(value); nlohmann::json json = enumValue; return json; } -Result DataTypeParameter::fromJson(const nlohmann::json& json) const +Result DataTypeParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'DataTypeParameter' JSON Error: "; if(!json.is_number()) diff --git a/src/simplnx/Parameters/DataTypeParameter.hpp b/src/simplnx/Parameters/DataTypeParameter.hpp index 87af59294b..0a418a87fd 100644 --- a/src/simplnx/Parameters/DataTypeParameter.hpp +++ b/src/simplnx/Parameters/DataTypeParameter.hpp @@ -36,40 +36,49 @@ class SIMPLNX_EXPORT DataTypeParameter : public ValueParameter /** * @brief - * @param value + * @return */ - nlohmann::json toJson(const std::any& value) const override; + UniquePointer clone() const override; /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - UniquePointer clone() const override; + VersionType getVersion() const override; /** * @brief * @return */ - std::any defaultValue() const override; + ValueType defaultDataType() const; /** * @brief + * @param value * @return */ - ValueType defaultDataType() const; + Result<> validate(const std::any& value) const override; +protected: /** * @brief * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief * @return */ - Result<> validate(const std::any& value) const override; + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; private: ValueType m_DefaultValue = {}; diff --git a/src/simplnx/Parameters/Dream3dImportParameter.cpp b/src/simplnx/Parameters/Dream3dImportParameter.cpp index 1ba4ef98f6..ae604b3784 100644 --- a/src/simplnx/Parameters/Dream3dImportParameter.cpp +++ b/src/simplnx/Parameters/Dream3dImportParameter.cpp @@ -38,8 +38,14 @@ IParameter::AcceptedTypes Dream3dImportParameter::acceptedTypes() const return {typeid(ValueType)}; } +//------------------------------------------------------------------------------ +IParameter::VersionType Dream3dImportParameter::getVersion() const +{ + return 1; +} + //----------------------------------------------------------------------------- -nlohmann::json Dream3dImportParameter::toJson(const std::any& value) const +nlohmann::json Dream3dImportParameter::toJsonImpl(const std::any& value) const { const auto& importData = GetAnyRef(value); nlohmann::json json; @@ -65,7 +71,7 @@ nlohmann::json Dream3dImportParameter::toJson(const std::any& value) const } //----------------------------------------------------------------------------- -Result Dream3dImportParameter::fromJson(const nlohmann::json& json) const +Result Dream3dImportParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'Dream3dImportParameter' JSON Error: "; if(!json.is_object()) diff --git a/src/simplnx/Parameters/Dream3dImportParameter.hpp b/src/simplnx/Parameters/Dream3dImportParameter.hpp index b044c8c581..745dbef937 100644 --- a/src/simplnx/Parameters/Dream3dImportParameter.hpp +++ b/src/simplnx/Parameters/Dream3dImportParameter.hpp @@ -58,18 +58,6 @@ class SIMPLNX_EXPORT Dream3dImportParameter : public ValueParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Writes the provided value to JSON. - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Reads and returns the parameter's values from JSON. - * @return Result - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates and returns a copy of the parameter. * @return UniquePointer @@ -82,6 +70,14 @@ class SIMPLNX_EXPORT Dream3dImportParameter : public ValueParameter */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief * @param value @@ -96,6 +92,19 @@ class SIMPLNX_EXPORT Dream3dImportParameter : public ValueParameter */ Result<> validatePath(const ValueType& importData) const; +protected: + /** + * @brief Writes the provided value to JSON. + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Reads and returns the parameter's values from JSON. + * @return Result + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue; }; diff --git a/src/simplnx/Parameters/DynamicTableParameter.cpp b/src/simplnx/Parameters/DynamicTableParameter.cpp index b9843af77d..c04246992d 100644 --- a/src/simplnx/Parameters/DynamicTableParameter.cpp +++ b/src/simplnx/Parameters/DynamicTableParameter.cpp @@ -40,13 +40,19 @@ IParameter::AcceptedTypes DynamicTableParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json DynamicTableParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType DynamicTableParameter::getVersion() const +{ + return 1; +} + +nlohmann::json DynamicTableParameter::toJsonImpl(const std::any& value) const { const auto& table = GetAnyRef(value); return DynamicTableInfo::WriteData(table); } -Result DynamicTableParameter::fromJson(const nlohmann::json& json) const +Result DynamicTableParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { return {ConvertResultTo(DynamicTableInfo::ReadData(json))}; } diff --git a/src/simplnx/Parameters/DynamicTableParameter.hpp b/src/simplnx/Parameters/DynamicTableParameter.hpp index 994b3cb137..963a0731d8 100644 --- a/src/simplnx/Parameters/DynamicTableParameter.hpp +++ b/src/simplnx/Parameters/DynamicTableParameter.hpp @@ -41,21 +41,6 @@ class SIMPLNX_EXPORT DynamicTableParameter : public ValueParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Converts the given value to JSON. - * Throws if value is not an accepted type. - * @param value - * @return nlohmann::json - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Converts the given JSON to a std::any containing the appropriate input type. - * Returns any warnings/errors. - * @return Result - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates a copy of the parameter. * @return UniquePointer @@ -68,6 +53,14 @@ class SIMPLNX_EXPORT DynamicTableParameter : public ValueParameter */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief Returns the user defined default table. * @return ValueType @@ -87,6 +80,22 @@ class SIMPLNX_EXPORT DynamicTableParameter : public ValueParameter */ Result<> validate(const std::any& value) const override; +protected: + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + * @return nlohmann::json + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return Result + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; DynamicTableInfo m_TableInfo; diff --git a/src/simplnx/Parameters/EnsembleInfoParameter.cpp b/src/simplnx/Parameters/EnsembleInfoParameter.cpp index f304877c97..94818a802a 100644 --- a/src/simplnx/Parameters/EnsembleInfoParameter.cpp +++ b/src/simplnx/Parameters/EnsembleInfoParameter.cpp @@ -42,8 +42,14 @@ IParameter::AcceptedTypes EnsembleInfoParameter::acceptedTypes() const return {typeid(ValueType)}; } +//------------------------------------------------------------------------------ +IParameter::VersionType EnsembleInfoParameter::getVersion() const +{ + return 1; +} + //----------------------------------------------------------------------------- -nlohmann::json EnsembleInfoParameter::toJson(const std::any& value) const +nlohmann::json EnsembleInfoParameter::toJsonImpl(const std::any& value) const { const auto& table = GetAnyRef(value); nlohmann::json rows; @@ -60,7 +66,7 @@ nlohmann::json EnsembleInfoParameter::toJson(const std::any& value) const } //----------------------------------------------------------------------------- -Result EnsembleInfoParameter::fromJson(const nlohmann::json& json) const +Result EnsembleInfoParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'EnsembleInfoParameter' Error: "; diff --git a/src/simplnx/Parameters/EnsembleInfoParameter.hpp b/src/simplnx/Parameters/EnsembleInfoParameter.hpp index 4f197db346..2edf415e8b 100644 --- a/src/simplnx/Parameters/EnsembleInfoParameter.hpp +++ b/src/simplnx/Parameters/EnsembleInfoParameter.hpp @@ -53,34 +53,43 @@ class SIMPLNX_EXPORT EnsembleInfoParameter : public ValueParameter /** * @brief - * @param value + * @return */ - nlohmann::json toJson(const std::any& value) const override; + UniquePointer clone() const override; /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - UniquePointer clone() const override; + VersionType getVersion() const override; /** * @brief + * @param value * @return */ - std::any defaultValue() const override; + Result<> validate(const std::any& value) const override; +protected: /** * @brief * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief * @return */ - Result<> validate(const std::any& value) const override; + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; private: ValueType m_DefaultValue = {}; diff --git a/src/simplnx/Parameters/FileSystemPathParameter.cpp b/src/simplnx/Parameters/FileSystemPathParameter.cpp index b438c26ca8..09ad42c3cd 100644 --- a/src/simplnx/Parameters/FileSystemPathParameter.cpp +++ b/src/simplnx/Parameters/FileSystemPathParameter.cpp @@ -129,6 +129,12 @@ IParameter::AcceptedTypes FileSystemPathParameter::acceptedTypes() const return {typeid(ValueType)}; } +//------------------------------------------------------------------------------ +IParameter::VersionType FileSystemPathParameter::getVersion() const +{ + return 1; +} + //----------------------------------------------------------------------------- bool FileSystemPathParameter::acceptAllExtensions() const { @@ -136,7 +142,7 @@ bool FileSystemPathParameter::acceptAllExtensions() const } //----------------------------------------------------------------------------- -nlohmann::json FileSystemPathParameter::toJson(const std::any& value) const +nlohmann::json FileSystemPathParameter::toJsonImpl(const std::any& value) const { const auto& path = GetAnyRef(value); nlohmann::json json = path.string(); @@ -144,7 +150,7 @@ nlohmann::json FileSystemPathParameter::toJson(const std::any& value) const } //----------------------------------------------------------------------------- -Result FileSystemPathParameter::fromJson(const nlohmann::json& json) const +Result FileSystemPathParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'FileSystemPathParameter' JSON Error: "; diff --git a/src/simplnx/Parameters/FileSystemPathParameter.hpp b/src/simplnx/Parameters/FileSystemPathParameter.hpp index 0bd33aa994..bd0f89b958 100644 --- a/src/simplnx/Parameters/FileSystemPathParameter.hpp +++ b/src/simplnx/Parameters/FileSystemPathParameter.hpp @@ -70,29 +70,25 @@ class SIMPLNX_EXPORT FileSystemPathParameter : public ValueParameter */ bool acceptAllExtensions() const; - /** - * @brief - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + UniquePointer clone() const override; /** * @brief * @return */ - UniquePointer clone() const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - std::any defaultValue() const override; + VersionType getVersion() const override; /** * @brief @@ -126,6 +122,19 @@ class SIMPLNX_EXPORT FileSystemPathParameter : public ValueParameter */ Result<> validatePath(const ValueType& path) const; +protected: + /** + * @brief + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue; PathType m_PathType; diff --git a/src/simplnx/Parameters/GeneratedFileListParameter.cpp b/src/simplnx/Parameters/GeneratedFileListParameter.cpp index 4c2ba290d7..faf40061f3 100644 --- a/src/simplnx/Parameters/GeneratedFileListParameter.cpp +++ b/src/simplnx/Parameters/GeneratedFileListParameter.cpp @@ -48,8 +48,14 @@ IParameter::AcceptedTypes GeneratedFileListParameter::acceptedTypes() const return {typeid(ValueType)}; } +//------------------------------------------------------------------------------ +IParameter::VersionType GeneratedFileListParameter::getVersion() const +{ + return 1; +} + //----------------------------------------------------------------------------- -nlohmann::json GeneratedFileListParameter::toJson(const std::any& value) const +nlohmann::json GeneratedFileListParameter::toJsonImpl(const std::any& value) const { const auto& data = GetAnyRef(value); nlohmann::json json; @@ -66,7 +72,7 @@ nlohmann::json GeneratedFileListParameter::toJson(const std::any& value) const } //----------------------------------------------------------------------------- -Result GeneratedFileListParameter::fromJson(const nlohmann::json& json) const +Result GeneratedFileListParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'GeneratedFileListParameter' Error: "; diff --git a/src/simplnx/Parameters/GeneratedFileListParameter.hpp b/src/simplnx/Parameters/GeneratedFileListParameter.hpp index 96f3433dc9..af3871295e 100644 --- a/src/simplnx/Parameters/GeneratedFileListParameter.hpp +++ b/src/simplnx/Parameters/GeneratedFileListParameter.hpp @@ -65,34 +65,43 @@ class SIMPLNX_EXPORT GeneratedFileListParameter : public ValueParameter /** * @brief - * @param value + * @return */ - nlohmann::json toJson(const std::any& value) const override; + UniquePointer clone() const override; /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - UniquePointer clone() const override; + VersionType getVersion() const override; /** * @brief + * @param value * @return */ - std::any defaultValue() const override; + Result<> validate(const std::any& value) const override; +protected: /** * @brief * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief * @return */ - Result<> validate(const std::any& value) const override; + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; private: ValueType m_DefaultValue = {}; diff --git a/src/simplnx/Parameters/GeometrySelectionParameter.cpp b/src/simplnx/Parameters/GeometrySelectionParameter.cpp index 9cfe6c9965..aa9f843cf1 100644 --- a/src/simplnx/Parameters/GeometrySelectionParameter.cpp +++ b/src/simplnx/Parameters/GeometrySelectionParameter.cpp @@ -29,14 +29,20 @@ IParameter::AcceptedTypes GeometrySelectionParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json GeometrySelectionParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType GeometrySelectionParameter::getVersion() const +{ + return 1; +} + +nlohmann::json GeometrySelectionParameter::toJsonImpl(const std::any& value) const { const auto& path = GetAnyRef(value); nlohmann::json json = path.toString(); return json; } -Result GeometrySelectionParameter::fromJson(const nlohmann::json& json) const +Result GeometrySelectionParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'GeometrySelectionParameter' JSON Error: "; if(!json.is_string()) diff --git a/src/simplnx/Parameters/GeometrySelectionParameter.hpp b/src/simplnx/Parameters/GeometrySelectionParameter.hpp index e18d09226c..4690691f2d 100644 --- a/src/simplnx/Parameters/GeometrySelectionParameter.hpp +++ b/src/simplnx/Parameters/GeometrySelectionParameter.hpp @@ -43,20 +43,6 @@ class SIMPLNX_EXPORT GeometrySelectionParameter : public MutableDataParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Converts the given value to JSON. - * Throws if value is not an accepted type. - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Converts the given JSON to a std::any containing the appropriate input type. - * Returns any warnings/errors. - * @return - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates a copy of the parameter. * @return @@ -69,6 +55,14 @@ class SIMPLNX_EXPORT GeometrySelectionParameter : public MutableDataParameter */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief Returns the default path. * @return @@ -106,6 +100,21 @@ class SIMPLNX_EXPORT GeometrySelectionParameter : public MutableDataParameter */ Result resolve(DataStructure& dataStructure, const std::any& value) const override; +protected: + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; AllowedTypes m_AllowedTypes = {}; diff --git a/src/simplnx/Parameters/MultiArraySelectionParameter.cpp b/src/simplnx/Parameters/MultiArraySelectionParameter.cpp index 2f4d7641bc..626608769c 100644 --- a/src/simplnx/Parameters/MultiArraySelectionParameter.cpp +++ b/src/simplnx/Parameters/MultiArraySelectionParameter.cpp @@ -30,7 +30,13 @@ IParameter::AcceptedTypes MultiArraySelectionParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json MultiArraySelectionParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType MultiArraySelectionParameter::getVersion() const +{ + return 1; +} + +nlohmann::json MultiArraySelectionParameter::toJsonImpl(const std::any& value) const { const auto& paths = GetAnyRef(value); nlohmann::json json = nlohmann::json::array(); @@ -41,7 +47,7 @@ nlohmann::json MultiArraySelectionParameter::toJson(const std::any& value) const return json; } -Result MultiArraySelectionParameter::fromJson(const nlohmann::json& json) const +Result MultiArraySelectionParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'MultiArraySelectionParameter' JSON Error: "; if(!json.is_array()) diff --git a/src/simplnx/Parameters/MultiArraySelectionParameter.hpp b/src/simplnx/Parameters/MultiArraySelectionParameter.hpp index a6e4db7227..821f42b195 100644 --- a/src/simplnx/Parameters/MultiArraySelectionParameter.hpp +++ b/src/simplnx/Parameters/MultiArraySelectionParameter.hpp @@ -40,20 +40,6 @@ class SIMPLNX_EXPORT MultiArraySelectionParameter : public MutableDataParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Converts the given value to JSON. - * Throws if value is not an accepted type. - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Converts the given JSON to a std::any containing the appropriate input type. - * Returns any warnings/errors. - * @return - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates a copy of the parameter. * @return @@ -66,6 +52,14 @@ class SIMPLNX_EXPORT MultiArraySelectionParameter : public MutableDataParameter */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief * @return @@ -115,6 +109,21 @@ class SIMPLNX_EXPORT MultiArraySelectionParameter : public MutableDataParameter */ Result resolve(DataStructure& dataStructure, const std::any& value) const override; +protected: + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; AllowedTypes m_AllowedTypes = {}; diff --git a/src/simplnx/Parameters/MultiPathSelectionParameter.cpp b/src/simplnx/Parameters/MultiPathSelectionParameter.cpp index 6ae2b2d29f..dddccf80b0 100644 --- a/src/simplnx/Parameters/MultiPathSelectionParameter.cpp +++ b/src/simplnx/Parameters/MultiPathSelectionParameter.cpp @@ -24,7 +24,13 @@ IParameter::AcceptedTypes MultiPathSelectionParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json MultiPathSelectionParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType MultiPathSelectionParameter::getVersion() const +{ + return 1; +} + +nlohmann::json MultiPathSelectionParameter::toJsonImpl(const std::any& value) const { const auto& paths = GetAnyRef(value); nlohmann::json json = nlohmann::json::array(); @@ -35,7 +41,7 @@ nlohmann::json MultiPathSelectionParameter::toJson(const std::any& value) const return json; } -Result MultiPathSelectionParameter::fromJson(const nlohmann::json& json) const +Result MultiPathSelectionParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'MultiPathSelectionParameter' JSON Error: "; if(!json.is_array()) diff --git a/src/simplnx/Parameters/MultiPathSelectionParameter.hpp b/src/simplnx/Parameters/MultiPathSelectionParameter.hpp index 582904fdd5..cca209b5d2 100644 --- a/src/simplnx/Parameters/MultiPathSelectionParameter.hpp +++ b/src/simplnx/Parameters/MultiPathSelectionParameter.hpp @@ -36,20 +36,6 @@ class SIMPLNX_EXPORT MultiPathSelectionParameter : public MutableDataParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Converts the given value to JSON. - * Throws if value is not an accepted type. - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Converts the given JSON to a std::any containing the appropriate input type. - * Returns any warnings/errors. - * @return - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates a copy of the parameter. * @return @@ -62,6 +48,14 @@ class SIMPLNX_EXPORT MultiPathSelectionParameter : public MutableDataParameter */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief Returns the default path. * @return @@ -93,6 +87,21 @@ class SIMPLNX_EXPORT MultiPathSelectionParameter : public MutableDataParameter */ Result resolve(DataStructure& dataStructure, const std::any& value) const override; +protected: + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; }; diff --git a/src/simplnx/Parameters/NeighborListSelectionParameter.cpp b/src/simplnx/Parameters/NeighborListSelectionParameter.cpp index c14d460fd3..712752f3c7 100644 --- a/src/simplnx/Parameters/NeighborListSelectionParameter.cpp +++ b/src/simplnx/Parameters/NeighborListSelectionParameter.cpp @@ -53,14 +53,20 @@ IParameter::AcceptedTypes NeighborListSelectionParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json NeighborListSelectionParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType NeighborListSelectionParameter::getVersion() const +{ + return 1; +} + +nlohmann::json NeighborListSelectionParameter::toJsonImpl(const std::any& value) const { const auto& path = GetAnyRef(value); nlohmann::json json = path.toString(); return json; } -Result NeighborListSelectionParameter::fromJson(const nlohmann::json& json) const +Result NeighborListSelectionParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'NeighborListSelectionParameter' JSON Error: "; if(!json.is_string()) diff --git a/src/simplnx/Parameters/NeighborListSelectionParameter.hpp b/src/simplnx/Parameters/NeighborListSelectionParameter.hpp index d072d74aef..24b4d22bd8 100644 --- a/src/simplnx/Parameters/NeighborListSelectionParameter.hpp +++ b/src/simplnx/Parameters/NeighborListSelectionParameter.hpp @@ -39,20 +39,6 @@ class SIMPLNX_EXPORT NeighborListSelectionParameter : public MutableDataParamete */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Converts the given value to JSON. - * Throws if value is not an accepted type. - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Converts the given JSON to a std::any containing the appropriate input type. - * Returns any warnings/errors. - * @return - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates a copy of the parameter. * @return @@ -65,6 +51,14 @@ class SIMPLNX_EXPORT NeighborListSelectionParameter : public MutableDataParamete */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief * @return @@ -102,6 +96,21 @@ class SIMPLNX_EXPORT NeighborListSelectionParameter : public MutableDataParamete */ Result resolve(DataStructure& dataStructure, const std::any& value) const override; +protected: + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; AllowedTypes m_AllowedTypes = {}; diff --git a/src/simplnx/Parameters/NumberParameter.cpp b/src/simplnx/Parameters/NumberParameter.cpp index 1c7656b20a..4223d1973e 100644 --- a/src/simplnx/Parameters/NumberParameter.cpp +++ b/src/simplnx/Parameters/NumberParameter.cpp @@ -24,8 +24,15 @@ IParameter::AcceptedTypes NumberParameter::acceptedTypes() const return {typeid(ValueType)}; } +//------------------------------------------------------------------------------ template -nlohmann::json NumberParameter::toJson(const std::any& value) const +IParameter::VersionType NumberParameter::getVersion() const +{ + return 1; +} + +template +nlohmann::json NumberParameter::toJsonImpl(const std::any& value) const { auto number = std::any_cast(value); nlohmann::json json = number; @@ -33,7 +40,7 @@ nlohmann::json NumberParameter::toJson(const std::any& value) const } template -Result NumberParameter::fromJson(const nlohmann::json& json) const +Result NumberParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'NumberParameter' JSON Error: "; if(!json.is_number()) diff --git a/src/simplnx/Parameters/NumberParameter.hpp b/src/simplnx/Parameters/NumberParameter.hpp index 637336771d..39a05f2262 100644 --- a/src/simplnx/Parameters/NumberParameter.hpp +++ b/src/simplnx/Parameters/NumberParameter.hpp @@ -35,47 +35,56 @@ class NumberParameter : public ValueParameter /** * @brief - * @param value + * @return */ - nlohmann::json toJson(const std::any& value) const override; + UniquePointer clone() const override; /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - UniquePointer clone() const override; + VersionType getVersion() const override; /** * @brief * @return */ - std::any defaultValue() const override; + ValueType defaultNumber() const; /** * @brief + * @param value * @return */ - ValueType defaultNumber() const; + Result<> validate(const std::any& value) const override; /** * @brief * @param value * @return */ - Result<> validate(const std::any& value) const override; + Result<> validateNumber(ValueType value) const; +protected: /** * @brief * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief * @return */ - Result<> validateNumber(ValueType value) const; + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; private: ValueType m_DefaultValue = {}; diff --git a/src/simplnx/Parameters/NumericTypeParameter.cpp b/src/simplnx/Parameters/NumericTypeParameter.cpp index a8dad95df7..59a09772c3 100644 --- a/src/simplnx/Parameters/NumericTypeParameter.cpp +++ b/src/simplnx/Parameters/NumericTypeParameter.cpp @@ -75,14 +75,20 @@ IParameter::AcceptedTypes NumericTypeParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json NumericTypeParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType NumericTypeParameter::getVersion() const +{ + return 1; +} + +nlohmann::json NumericTypeParameter::toJsonImpl(const std::any& value) const { auto enumValue = std::any_cast(value); nlohmann::json json = enumValue; return json; } -Result NumericTypeParameter::fromJson(const nlohmann::json& json) const +Result NumericTypeParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'NumericTypeParameter' JSON Error: "; if(!json.is_number()) diff --git a/src/simplnx/Parameters/NumericTypeParameter.hpp b/src/simplnx/Parameters/NumericTypeParameter.hpp index e9bb05dd21..fd5eeb4f4e 100644 --- a/src/simplnx/Parameters/NumericTypeParameter.hpp +++ b/src/simplnx/Parameters/NumericTypeParameter.hpp @@ -36,40 +36,49 @@ class SIMPLNX_EXPORT NumericTypeParameter : public ValueParameter /** * @brief - * @param value + * @return */ - nlohmann::json toJson(const std::any& value) const override; + UniquePointer clone() const override; /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - UniquePointer clone() const override; + VersionType getVersion() const override; /** * @brief * @return */ - std::any defaultValue() const override; + ValueType defaultNumericType() const; /** * @brief + * @param value * @return */ - ValueType defaultNumericType() const; + Result<> validate(const std::any& value) const override; +protected: /** * @brief * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief * @return */ - Result<> validate(const std::any& value) const override; + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; private: ValueType m_DefaultValue = {}; diff --git a/src/simplnx/Parameters/ReadCSVFileParameter.cpp b/src/simplnx/Parameters/ReadCSVFileParameter.cpp index 15b428dad7..aa227c03a9 100644 --- a/src/simplnx/Parameters/ReadCSVFileParameter.cpp +++ b/src/simplnx/Parameters/ReadCSVFileParameter.cpp @@ -53,8 +53,14 @@ IParameter::AcceptedTypes ReadCSVFileParameter::acceptedTypes() const return {typeid(ValueType)}; } +//------------------------------------------------------------------------------ +IParameter::VersionType ReadCSVFileParameter::getVersion() const +{ + return 1; +} + // ----------------------------------------------------------------------------- -nlohmann::json ReadCSVFileParameter::toJson(const std::any& value) const +nlohmann::json ReadCSVFileParameter::toJsonImpl(const std::any& value) const { const auto& ReadCSVData = GetAnyRef(value); nlohmann::json json = ReadCSVData.writeJson(); @@ -62,7 +68,7 @@ nlohmann::json ReadCSVFileParameter::toJson(const std::any& value) const } // ----------------------------------------------------------------------------- -Result ReadCSVFileParameter::fromJson(const nlohmann::json& json) const +Result ReadCSVFileParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { return {ConvertResultTo(ReadCSVData::ReadJson(json))}; } diff --git a/src/simplnx/Parameters/ReadCSVFileParameter.hpp b/src/simplnx/Parameters/ReadCSVFileParameter.hpp index 42f8308764..dbbf6b6f23 100644 --- a/src/simplnx/Parameters/ReadCSVFileParameter.hpp +++ b/src/simplnx/Parameters/ReadCSVFileParameter.hpp @@ -64,21 +64,6 @@ class SIMPLNX_EXPORT ReadCSVFileParameter : public ValueParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Converts the given value to JSON. - * Throws if value is not an accepted type. - * @param value - * @return nlohmann::json - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Converts the given JSON to a std::any containing the appropriate input type. - * Returns any warnings/errors. - * @return Result - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates a copy of the parameter. * @return UniquePointer @@ -91,6 +76,14 @@ class SIMPLNX_EXPORT ReadCSVFileParameter : public ValueParameter */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief Validates the given value. Returns warnings/errors. * @param value @@ -98,6 +91,22 @@ class SIMPLNX_EXPORT ReadCSVFileParameter : public ValueParameter */ Result<> validate(const std::any& value) const override; +protected: + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + * @return nlohmann::json + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return Result + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; }; diff --git a/src/simplnx/Parameters/ReadHDF5DatasetParameter.cpp b/src/simplnx/Parameters/ReadHDF5DatasetParameter.cpp index 1affebcc49..94ddb7c26f 100644 --- a/src/simplnx/Parameters/ReadHDF5DatasetParameter.cpp +++ b/src/simplnx/Parameters/ReadHDF5DatasetParameter.cpp @@ -61,8 +61,14 @@ IParameter::AcceptedTypes ReadHDF5DatasetParameter::acceptedTypes() const return {typeid(ValueType)}; } +//------------------------------------------------------------------------------ +IParameter::VersionType ReadHDF5DatasetParameter::getVersion() const +{ + return 1; +} + // ----------------------------------------------------------------------------- -nlohmann::json ReadHDF5DatasetParameter::toJson(const std::any& value) const +nlohmann::json ReadHDF5DatasetParameter::toJsonImpl(const std::any& value) const { const auto& datasetImportInfo = GetAnyRef(value); nlohmann::json json; @@ -81,7 +87,7 @@ nlohmann::json ReadHDF5DatasetParameter::toJson(const std::any& value) const } // ----------------------------------------------------------------------------- -Result ReadHDF5DatasetParameter::fromJson(const nlohmann::json& json) const +Result ReadHDF5DatasetParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'ImportHDF5DatasetParameter' JSON Error: "; if(!json.is_object()) diff --git a/src/simplnx/Parameters/ReadHDF5DatasetParameter.hpp b/src/simplnx/Parameters/ReadHDF5DatasetParameter.hpp index 8fe2e2e4f5..eca3b587a7 100644 --- a/src/simplnx/Parameters/ReadHDF5DatasetParameter.hpp +++ b/src/simplnx/Parameters/ReadHDF5DatasetParameter.hpp @@ -135,21 +135,6 @@ class SIMPLNX_EXPORT ReadHDF5DatasetParameter : public ValueParameter */ AcceptedTypes acceptedTypes() const override; - /** - * @brief Converts the given value to JSON. - * Throws if value is not an accepted type. - * @param value - * @return nlohmann::json - */ - nlohmann::json toJson(const std::any& value) const override; - - /** - * @brief Converts the given JSON to a std::any containing the appropriate input type. - * Returns any warnings/errors. - * @return Result - */ - Result fromJson(const nlohmann::json& json) const override; - /** * @brief Creates a copy of the parameter. * @return UniquePointer @@ -162,6 +147,14 @@ class SIMPLNX_EXPORT ReadHDF5DatasetParameter : public ValueParameter */ std::any defaultValue() const override; + /** + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 + */ + VersionType getVersion() const override; + /** * @brief Validates the given value. Returns warnings/errors. * @param value @@ -169,6 +162,22 @@ class SIMPLNX_EXPORT ReadHDF5DatasetParameter : public ValueParameter */ Result<> validate(const std::any& value) const override; +protected: + /** + * @brief Converts the given value to JSON. + * Throws if value is not an accepted type. + * @param value + * @return nlohmann::json + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief Converts the given JSON to a std::any containing the appropriate input type. + * Returns any warnings/errors. + * @return Result + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; }; diff --git a/src/simplnx/Parameters/StringParameter.cpp b/src/simplnx/Parameters/StringParameter.cpp index d854c5d4c6..581859cd5a 100644 --- a/src/simplnx/Parameters/StringParameter.cpp +++ b/src/simplnx/Parameters/StringParameter.cpp @@ -23,14 +23,20 @@ IParameter::AcceptedTypes StringParameter::acceptedTypes() const return {typeid(ValueType)}; } -nlohmann::json StringParameter::toJson(const std::any& value) const +//------------------------------------------------------------------------------ +IParameter::VersionType StringParameter::getVersion() const +{ + return 1; +} + +nlohmann::json StringParameter::toJsonImpl(const std::any& value) const { const auto& stringValue = GetAnyRef(value); nlohmann::json json = stringValue; return json; } -Result StringParameter::fromJson(const nlohmann::json& json) const +Result StringParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'StringParameter' JSON Error: "; if(!json.is_string()) diff --git a/src/simplnx/Parameters/StringParameter.hpp b/src/simplnx/Parameters/StringParameter.hpp index 3b78ffa495..ae80ff122e 100644 --- a/src/simplnx/Parameters/StringParameter.hpp +++ b/src/simplnx/Parameters/StringParameter.hpp @@ -37,40 +37,49 @@ class SIMPLNX_EXPORT StringParameter : public ValueParameter /** * @brief - * @param value + * @return */ - nlohmann::json toJson(const std::any& value) const override; + UniquePointer clone() const override; /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - UniquePointer clone() const override; + VersionType getVersion() const override; /** * @brief * @return */ - std::any defaultValue() const override; + ValueType defaultString() const; /** * @brief + * @param value * @return */ - ValueType defaultString() const; + Result<> validate(const std::any& value) const override; +protected: /** * @brief * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief * @return */ - Result<> validate(const std::any& value) const override; + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; private: ValueType m_DefaultValue = {}; diff --git a/src/simplnx/Parameters/VectorParameter.cpp b/src/simplnx/Parameters/VectorParameter.cpp index 3fc52e7563..068e2b6792 100644 --- a/src/simplnx/Parameters/VectorParameter.cpp +++ b/src/simplnx/Parameters/VectorParameter.cpp @@ -43,8 +43,15 @@ IParameter::AcceptedTypes VectorParameter::acceptedTypes() const return {typeid(ValueType)}; } +//------------------------------------------------------------------------------ template -nlohmann::json VectorParameter::toJson(const std::any& value) const +IParameter::VersionType VectorParameter::getVersion() const +{ + return 1; +} + +template +nlohmann::json VectorParameter::toJsonImpl(const std::any& value) const { const auto& vec = GetAnyRef(value); @@ -58,7 +65,7 @@ nlohmann::json VectorParameter::toJson(const std::any& value) const } template -Result VectorParameter::fromJson(const nlohmann::json& json) const +Result VectorParameter::fromJsonImpl(const nlohmann::json& json, VersionType version) const { static constexpr StringLiteral prefix = "FilterParameter 'VectorParameter' JSON Error: "; diff --git a/src/simplnx/Parameters/VectorParameter.hpp b/src/simplnx/Parameters/VectorParameter.hpp index d66d397fd7..234c5653e5 100644 --- a/src/simplnx/Parameters/VectorParameter.hpp +++ b/src/simplnx/Parameters/VectorParameter.hpp @@ -58,29 +58,25 @@ class VectorParameter : public VectorParameterBase */ AcceptedTypes acceptedTypes() const override; - /** - * @brief - * @param value - */ - nlohmann::json toJson(const std::any& value) const override; - /** * @brief * @return */ - Result fromJson(const nlohmann::json& json) const override; + UniquePointer clone() const override; /** * @brief * @return */ - UniquePointer clone() const override; + std::any defaultValue() const override; /** - * @brief - * @return + * @brief Returns version integer. + * Initial version should always be 1. + * Should be incremented everytime the json format changes. + * @return uint64 */ - std::any defaultValue() const override; + VersionType getVersion() const override; /** * @brief @@ -114,6 +110,19 @@ class VectorParameter : public VectorParameterBase */ Result<> validateVector(const ValueType& value) const; +protected: + /** + * @brief + * @param value + */ + nlohmann::json toJsonImpl(const std::any& value) const override; + + /** + * @brief + * @return + */ + Result fromJsonImpl(const nlohmann::json& json, VersionType version) const override; + private: ValueType m_DefaultValue = {}; NamesType m_Names; diff --git a/test/PipelineSaveTest.cpp b/test/PipelineSaveTest.cpp index d235fba5a7..50ea03db62 100644 --- a/test/PipelineSaveTest.cpp +++ b/test/PipelineSaveTest.cpp @@ -50,6 +50,11 @@ class TestFilter : public IFilter return Parameters(); } + VersionType parametersVersion() const override + { + return 1; + } + UniquePointer clone() const override { return std::make_unique(); diff --git a/wrapping/python/CxPybind/CxPybind/CxPybind.hpp b/wrapping/python/CxPybind/CxPybind/CxPybind.hpp index 478e7ef982..9936979dd3 100644 --- a/wrapping/python/CxPybind/CxPybind/CxPybind.hpp +++ b/wrapping/python/CxPybind/CxPybind/CxPybind.hpp @@ -531,6 +531,7 @@ class PyFilter : public IFilter m_HumanName = m_Object.attr("human_name")().cast(); m_DefaultTags = m_Object.attr("default_tags")().cast>(); m_Parameters = m_Object.attr("parameters")().cast(); + m_ParametersVersion = m_Object.attr("parameters_version")().cast(); } ~PyFilter() noexcept @@ -575,6 +576,11 @@ class PyFilter : public IFilter return m_Parameters; } + VersionType parametersVersion() const override + { + return m_ParametersVersion; + } + UniquePointer clone() const override { py::gil_scoped_acquire gil; @@ -634,6 +640,7 @@ class PyFilter : public IFilter std::string m_HumanName; std::vector m_DefaultTags; Parameters m_Parameters; + VersionType m_ParametersVersion; }; class PythonPlugin : public AbstractPlugin diff --git a/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/CreateArray.py b/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/CreateArray.py index c993638ea1..f7f8e25337 100644 --- a/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/CreateArray.py +++ b/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/CreateArray.py @@ -49,6 +49,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: numeric_type_index: nx.NumericType = args[CreateArrayFilter.NUMERIC_TYPE_KEY] init_value: str = args[CreateArrayFilter.INITILIZATION_VALUE_KEY] diff --git a/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/ExampleFilter1.py b/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/ExampleFilter1.py index cca944f0d7..fa81c18ff6 100644 --- a/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/ExampleFilter1.py +++ b/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/ExampleFilter1.py @@ -185,6 +185,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the arrays are actually know at preflight time. Some filters will not be able to report output diff --git a/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/ExampleFilter2.py b/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/ExampleFilter2.py index 0e685cad4f..a427f1f27b 100644 --- a/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/ExampleFilter2.py +++ b/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/ExampleFilter2.py @@ -113,6 +113,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the arrays are actually know at preflight time. Some filters will not be able to report output diff --git a/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/InitializeData.py b/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/InitializeData.py index 75cbc4c4b7..5827e4aaab 100644 --- a/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/InitializeData.py +++ b/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/InitializeData.py @@ -64,6 +64,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: message_handler(nx.IFilter.Message(nx.IFilter.Message.Type.Info, f'Preflighting InitializeDataFilter')) diff --git a/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/TemplateFilter.py b/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/TemplateFilter.py index 7795497228..fd8b1323fd 100644 --- a/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/TemplateFilter.py +++ b/wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/TemplateFilter.py @@ -29,6 +29,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: value: float = args[TemplateFilter.TEST_KEY] message_handler(nx.IFilter.Message(nx.IFilter.Message.Type.Info, f'Preflight: {value}')) diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/CalculateHistogramFilter.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/CalculateHistogramFilter.py index 71bb2ad878..83503c510e 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/CalculateHistogramFilter.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/CalculateHistogramFilter.py @@ -79,6 +79,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: histogram_image_size: list = args[CalculateHistogramFilter.HISTOGRAM_IMAGE_SIZE] num_of_bins: int = args[CalculateHistogramFilter.NUMBER_OF_BINS] @@ -191,4 +194,4 @@ def execute_impl(self, data_structure: nx.DataStructure, args: dict, message_han npdata = data_store.npview() npdata[:] = img_array - return nx.Result() \ No newline at end of file + return nx.Result() diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/CliReaderFilter.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/CliReaderFilter.py index 89e128efb3..e22f3ce542 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/CliReaderFilter.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/CliReaderFilter.py @@ -110,6 +110,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: cli_file_path: str = args[CliReaderFilter.CLI_FILE_PATH_KEY] output_edge_geom_path: nx.DataPath = args[CliReaderFilter.OUTPUT_EDGE_GEOM_PATH_KEY] @@ -645,4 +648,4 @@ def clip(t_min, t_max, v1, v2, vmin, vmax): new_x = x1 + t * (x2 - x1) new_y = y1 + t * (y2 - y1) - return new_x, new_y \ No newline at end of file + return new_x, new_y diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/ContourDetectionFilter.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/ContourDetectionFilter.py index 960e40fc9c..92ae14a8e9 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/ContourDetectionFilter.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/ContourDetectionFilter.py @@ -75,6 +75,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the arrays are actually know at preflight time. Some filters will not be able to report output @@ -207,4 +210,4 @@ def execute_impl(self, data_structure: nx.DataStructure, args: dict, message_han # message_handler(nx.IFilter.Message(nx.IFilter.Message.Type.Info, f'Contour {i + 1}/{contour_count} - Perimeter: {cv2.arcLength(contour, True)}')) # message_handler(nx.IFilter.Message(nx.IFilter.Message.Type.Info, f'Contour {i + 1}/{contour_count} - Area: {cv2.contourArea(contour)}')) - return nx.Result() \ No newline at end of file + return nx.Result() diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/InterpolateGridDataFilter.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/InterpolateGridDataFilter.py index e4ce939808..f27fb2c9e4 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/InterpolateGridDataFilter.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/InterpolateGridDataFilter.py @@ -57,6 +57,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: input_pts_arr_path: nx.DataPath = args[InterpolateGridDataFilter.INPUT_POINTS_ARRAY_PATH] input_data_arr_path: nx.DataPath = args[InterpolateGridDataFilter.INPUT_DATA_ARRAY_PATH] diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/NPSortArray.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/NPSortArray.py index b182a7238f..1ea667d10d 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/NPSortArray.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/NPSortArray.py @@ -64,6 +64,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the arrays are actually know at preflight time. Some filters will not be able to report output diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/ReadMeshFile.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/ReadMeshFile.py index e87ff914df..cc38e8f0df 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/ReadMeshFile.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/ReadMeshFile.py @@ -94,6 +94,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the array sizes are actually known at preflight time. Some filters will not be able to report output @@ -218,4 +221,4 @@ def execute_impl(self, data_structure: nx.DataStructure, args: dict, message_han point_data_np_array = np.squeeze(data_structure[point_data_array_path].npview()) point_data_np_array[:] = _mesh_cache.point_data[point_data_array_name][0][:] - return nx.Result() \ No newline at end of file + return nx.Result() diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/ReadPeregrineHDF5File.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/ReadPeregrineHDF5File.py index f30003a1cf..02d4a38fa8 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/ReadPeregrineHDF5File.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/ReadPeregrineHDF5File.py @@ -206,6 +206,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the arrays are actually know at preflight time. Some filters will not be able to report output @@ -1097,4 +1100,4 @@ def _flip_vertices_across_x_axis(self, vertices: np.ndarray) -> np.ndarray: flipped_translated[:, 1] = -flipped_translated[:, 1] # Step 4: Translate back to original centroid - return flipped_translated + centroid \ No newline at end of file + return flipped_translated + centroid diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteAbaqusFile.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteAbaqusFile.py index 7bd7d4959a..ecefc18160 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteAbaqusFile.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteAbaqusFile.py @@ -79,6 +79,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the array sizes are actually known at preflight time. Some filters will not be able to report output @@ -105,4 +108,4 @@ def execute_impl(self, data_structure: nx.DataStructure, args: dict, message_han input_geometry_path: nx.DataPath = args[WriteAbaqusFile.INPUT_GEOMETRY_KEY] output_file_path: Path = args[WriteAbaqusFile.OUTPUT_FILE_PATH_KEY] - return mu.execute_meshio_writer_filter(file_format='abaqus', data_structure=data_structure, input_geometry_path=input_geometry_path, cell_data_array_paths=None, point_data_array_paths=None, output_file_path=output_file_path) \ No newline at end of file + return mu.execute_meshio_writer_filter(file_format='abaqus', data_structure=data_structure, input_geometry_path=input_geometry_path, cell_data_array_paths=None, point_data_array_paths=None, output_file_path=output_file_path) diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteAnsysFile.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteAnsysFile.py index 99566baaeb..3494b56971 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteAnsysFile.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteAnsysFile.py @@ -80,6 +80,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the array sizes are actually known at preflight time. Some filters will not be able to report output @@ -106,4 +109,4 @@ def execute_impl(self, data_structure: nx.DataStructure, args: dict, message_han input_geometry_path: nx.DataPath = args[WriteAnsysFile.INPUT_GEOMETRY_KEY] output_file_path: Path = args[WriteAnsysFile.OUTPUT_FILE_PATH_KEY] - return mu.execute_meshio_writer_filter(file_format='ansys', data_structure=data_structure, input_geometry_path=input_geometry_path, cell_data_array_paths=None, point_data_array_paths=None, output_file_path=output_file_path, binary=True) \ No newline at end of file + return mu.execute_meshio_writer_filter(file_format='ansys', data_structure=data_structure, input_geometry_path=input_geometry_path, cell_data_array_paths=None, point_data_array_paths=None, output_file_path=output_file_path, binary=True) diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteGmshFile.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteGmshFile.py index d5f0a99a10..33fb59d5d1 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteGmshFile.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteGmshFile.py @@ -84,6 +84,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the array sizes are actually known at preflight time. Some filters will not be able to report output @@ -114,4 +117,4 @@ def execute_impl(self, data_structure: nx.DataStructure, args: dict, message_han cell_data_array_paths = args[WriteGmshFile.CELL_DATA_ARRAY_PATHS_KEY] point_data_array_paths = args[WriteGmshFile.POINT_DATA_ARRAY_PATHS_KEY] - return mu.execute_meshio_writer_filter(file_format='gmsh', data_structure=data_structure, input_geometry_path=input_geometry_path, cell_data_array_paths=cell_data_array_paths, point_data_array_paths=point_data_array_paths, output_file_path=output_file_path) \ No newline at end of file + return mu.execute_meshio_writer_filter(file_format='gmsh', data_structure=data_structure, input_geometry_path=input_geometry_path, cell_data_array_paths=cell_data_array_paths, point_data_array_paths=point_data_array_paths, output_file_path=output_file_path) diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteMedFile.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteMedFile.py index 02b18a6fe1..e912bdbf01 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteMedFile.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteMedFile.py @@ -84,6 +84,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the array sizes are actually known at preflight time. Some filters will not be able to report output @@ -114,4 +117,4 @@ def execute_impl(self, data_structure: nx.DataStructure, args: dict, message_han cell_data_array_paths = args[WriteMedFile.CELL_DATA_ARRAY_PATHS_KEY] point_data_array_paths = args[WriteMedFile.POINT_DATA_ARRAY_PATHS_KEY] - return mu.execute_meshio_writer_filter(file_format='med', data_structure=data_structure, input_geometry_path=input_geometry_path, cell_data_array_paths=cell_data_array_paths, point_data_array_paths=point_data_array_paths, output_file_path=output_file_path) \ No newline at end of file + return mu.execute_meshio_writer_filter(file_format='med', data_structure=data_structure, input_geometry_path=input_geometry_path, cell_data_array_paths=cell_data_array_paths, point_data_array_paths=point_data_array_paths, output_file_path=output_file_path) diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteTetGenFile.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteTetGenFile.py index 237beb7e6b..125cac9604 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteTetGenFile.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteTetGenFile.py @@ -84,6 +84,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the array sizes are actually known at preflight time. Some filters will not be able to report output @@ -114,4 +117,4 @@ def execute_impl(self, data_structure: nx.DataStructure, args: dict, message_han cell_data_array_paths = args[WriteTetGenFile.CELL_DATA_ARRAY_PATHS_KEY] point_data_array_paths = args[WriteTetGenFile.POINT_DATA_ARRAY_PATHS_KEY] - return mu.execute_meshio_writer_filter(file_format='tetgen', data_structure=data_structure, input_geometry_path=input_geometry_path, cell_data_array_paths=cell_data_array_paths, point_data_array_paths=point_data_array_paths, output_file_path=output_file_path) \ No newline at end of file + return mu.execute_meshio_writer_filter(file_format='tetgen', data_structure=data_structure, input_geometry_path=input_geometry_path, cell_data_array_paths=cell_data_array_paths, point_data_array_paths=point_data_array_paths, output_file_path=output_file_path) diff --git a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteVtuFile.py b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteVtuFile.py index 59e221c775..feaf5730a2 100644 --- a/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteVtuFile.py +++ b/wrapping/python/plugins/NXDataAnalysisToolkit/src/NXDataAnalysisToolkit/WriteVtuFile.py @@ -101,6 +101,9 @@ def parameters(self) -> nx.Parameters: return params + def parameters_version(self) -> int: + return 1 + def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: """This method preflights the filter and should ensure that all inputs are sanity checked as best as possible. Array sizes can be checked if the array sizes are actually known at preflight time. Some filters will not be able to report output @@ -132,4 +135,4 @@ def execute_impl(self, data_structure: nx.DataStructure, args: dict, message_han cell_data_array_paths = args[WriteVtuFile.CELL_DATA_ARRAY_PATHS_KEY] point_data_array_paths = args[WriteVtuFile.POINT_DATA_ARRAY_PATHS_KEY] - return mu.execute_meshio_writer_filter(file_format='vtu', data_structure=data_structure, input_geometry_path=input_geometry_path, cell_data_array_paths=cell_data_array_paths, point_data_array_paths=point_data_array_paths, output_file_path=output_file_path, remove_array_name_spaces=True, binary=True, compression=self.compression_type_values[compression_type]) \ No newline at end of file + return mu.execute_meshio_writer_filter(file_format='vtu', data_structure=data_structure, input_geometry_path=input_geometry_path, cell_data_array_paths=cell_data_array_paths, point_data_array_paths=point_data_array_paths, output_file_path=output_file_path, remove_array_name_spaces=True, binary=True, compression=self.compression_type_values[compression_type])