From eed77ce5071aa34704ead1ad9124eb017c1ac410 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Fri, 19 Apr 2024 09:01:59 -0400 Subject: [PATCH] ENH: Refactor the Parameter Keys to make them consistent and easy to learn (#874) Signed-off-by: Michael Jackson Signed-off-by: Jared Duffey Co-authored-by: Jared Duffey --- CMakeLists.txt | 2 +- conda/meta.yaml | 2 +- conda/recipe.yaml | 2 +- pipelines/Combo-EBSD-osc_r0c0.d3dpipeline | 56 ++--- pipelines/PorosityAnalysis.d3dpipeline | 40 ++-- .../(02) Image Segmentation.d3dpipeline | 40 ++-- .../(03) Porosity Mesh Export.d3dpipeline | 38 +-- .../Filters/ITKAbsImage.cpp | 26 +-- .../Filters/ITKAbsImage.hpp | 6 +- .../Filters/ITKAcosImage.cpp | 26 +-- .../Filters/ITKAcosImage.hpp | 6 +- .../ITKAdaptiveHistogramEqualizationImage.cpp | 26 +-- .../ITKAdaptiveHistogramEqualizationImage.hpp | 6 +- .../ITKApproximateSignedDistanceMapImage.cpp | 6 +- .../ITKApproximateSignedDistanceMapImage.hpp | 4 +- .../Filters/ITKAsinImage.cpp | 26 +-- .../Filters/ITKAsinImage.hpp | 6 +- .../Filters/ITKAtanImage.cpp | 26 +-- .../Filters/ITKAtanImage.hpp | 6 +- .../Filters/ITKBinaryContourImage.cpp | 26 +-- .../Filters/ITKBinaryContourImage.hpp | 6 +- .../Filters/ITKBinaryDilateImage.cpp | 26 +-- .../Filters/ITKBinaryDilateImage.hpp | 8 +- .../Filters/ITKBinaryErodeImage.cpp | 26 +-- .../Filters/ITKBinaryErodeImage.hpp | 8 +- .../ITKBinaryMorphologicalClosingImage.cpp | 20 +- .../ITKBinaryMorphologicalClosingImage.hpp | 8 +- .../ITKBinaryMorphologicalOpeningImage.cpp | 26 +-- .../ITKBinaryMorphologicalOpeningImage.hpp | 8 +- .../ITKBinaryOpeningByReconstructionImage.cpp | 26 +-- .../ITKBinaryOpeningByReconstructionImage.hpp | 8 +- .../Filters/ITKBinaryProjectionImage.cpp | 26 +-- .../Filters/ITKBinaryProjectionImage.hpp | 6 +- .../Filters/ITKBinaryThinningImage.cpp | 26 +-- .../Filters/ITKBinaryThinningImage.hpp | 6 +- .../Filters/ITKBinaryThresholdImage.cpp | 26 +-- .../Filters/ITKBinaryThresholdImage.hpp | 6 +- .../Filters/ITKBlackTopHatImage.cpp | 26 +-- .../Filters/ITKBlackTopHatImage.hpp | 8 +- .../Filters/ITKBoundedReciprocalImage.hpp | 4 +- .../ITKClosingByReconstructionImage.cpp | 26 +-- .../ITKClosingByReconstructionImage.hpp | 8 +- .../Filters/ITKConnectedComponentImage.cpp | 6 +- .../Filters/ITKConnectedComponentImage.hpp | 4 +- .../Filters/ITKCosImage.cpp | 26 +-- .../Filters/ITKCosImage.hpp | 6 +- .../ITKCurvatureAnisotropicDiffusionImage.cpp | 6 +- .../ITKCurvatureAnisotropicDiffusionImage.hpp | 4 +- .../Filters/ITKCurvatureFlowImage.cpp | 6 +- .../Filters/ITKCurvatureFlowImage.hpp | 4 +- .../Filters/ITKDanielssonDistanceMapImage.cpp | 6 +- .../Filters/ITKDanielssonDistanceMapImage.hpp | 4 +- .../ITKDilateObjectMorphologyImage.cpp | 26 +-- .../ITKDilateObjectMorphologyImage.hpp | 8 +- .../Filters/ITKDiscreteGaussianImage.cpp | 26 +-- .../Filters/ITKDiscreteGaussianImage.hpp | 6 +- .../Filters/ITKDoubleThresholdImage.cpp | 6 +- .../Filters/ITKDoubleThresholdImage.hpp | 4 +- .../Filters/ITKErodeObjectMorphologyImage.cpp | 26 +-- .../Filters/ITKErodeObjectMorphologyImage.hpp | 8 +- .../Filters/ITKExpImage.cpp | 26 +-- .../Filters/ITKExpImage.hpp | 6 +- .../Filters/ITKExpNegativeImage.cpp | 26 +-- .../Filters/ITKExpNegativeImage.hpp | 6 +- .../ITKGradientAnisotropicDiffusionImage.cpp | 6 +- .../ITKGradientAnisotropicDiffusionImage.hpp | 4 +- .../Filters/ITKGradientMagnitudeImage.cpp | 26 +-- .../Filters/ITKGradientMagnitudeImage.hpp | 6 +- ...radientMagnitudeRecursiveGaussianImage.cpp | 20 +- ...radientMagnitudeRecursiveGaussianImage.hpp | 6 +- .../Filters/ITKGrayscaleDilateImage.cpp | 26 +-- .../Filters/ITKGrayscaleDilateImage.hpp | 8 +- .../Filters/ITKGrayscaleErodeImage.cpp | 26 +-- .../Filters/ITKGrayscaleErodeImage.hpp | 8 +- .../Filters/ITKGrayscaleFillholeImage.cpp | 26 +-- .../Filters/ITKGrayscaleFillholeImage.hpp | 6 +- .../Filters/ITKGrayscaleGrindPeakImage.cpp | 26 +-- .../Filters/ITKGrayscaleGrindPeakImage.hpp | 6 +- .../ITKGrayscaleMorphologicalClosingImage.cpp | 26 +-- .../ITKGrayscaleMorphologicalClosingImage.hpp | 8 +- .../ITKGrayscaleMorphologicalOpeningImage.cpp | 26 +-- .../ITKGrayscaleMorphologicalOpeningImage.hpp | 8 +- .../Filters/ITKHConvexImage.cpp | 26 +-- .../Filters/ITKHConvexImage.hpp | 6 +- .../Filters/ITKHMaximaImage.cpp | 26 +-- .../Filters/ITKHMaximaImage.hpp | 6 +- .../Filters/ITKHMinimaImage.cpp | 26 +-- .../Filters/ITKHMinimaImage.hpp | 6 +- .../Filters/ITKImageReader.hpp | 4 +- .../Filters/ITKImageWriter.hpp | 4 +- .../Filters/ITKImportFijiMontageFilter.hpp | 2 +- .../Filters/ITKImportImageStack.cpp | 6 +- .../Filters/ITKImportImageStack.hpp | 6 +- .../Filters/ITKIntensityWindowingImage.cpp | 26 +-- .../Filters/ITKIntensityWindowingImage.hpp | 6 +- .../Filters/ITKInvertIntensityImage.cpp | 26 +-- .../Filters/ITKInvertIntensityImage.hpp | 6 +- .../Filters/ITKIsoContourDistanceImage.cpp | 6 +- .../Filters/ITKIsoContourDistanceImage.hpp | 4 +- .../Filters/ITKLabelContourImage.cpp | 26 +-- .../Filters/ITKLabelContourImage.hpp | 6 +- .../ITKLaplacianRecursiveGaussianImage.cpp | 6 +- .../ITKLaplacianRecursiveGaussianImage.hpp | 4 +- .../Filters/ITKLog10Image.cpp | 26 +-- .../Filters/ITKLog10Image.hpp | 6 +- .../Filters/ITKLogImage.cpp | 26 +-- .../Filters/ITKLogImage.hpp | 6 +- .../Filters/ITKMaskImage.cpp | 28 +-- .../Filters/ITKMaskImage.hpp | 6 +- .../Filters/ITKMeanProjectionImage.hpp | 4 +- .../Filters/ITKMedianImage.cpp | 26 +-- .../Filters/ITKMedianImage.hpp | 6 +- .../Filters/ITKMhaFileReader.cpp | 5 +- .../Filters/ITKMhaFileReader.hpp | 3 +- .../Filters/ITKMinMaxCurvatureFlowImage.cpp | 6 +- .../Filters/ITKMinMaxCurvatureFlowImage.hpp | 4 +- .../Filters/ITKMorphologicalGradientImage.cpp | 26 +-- .../Filters/ITKMorphologicalGradientImage.hpp | 8 +- ...MorphologicalWatershedFromMarkersImage.hpp | 4 +- .../ITKMorphologicalWatershedImage.cpp | 26 +-- .../ITKMorphologicalWatershedImage.hpp | 6 +- .../Filters/ITKNormalizeImage.cpp | 26 +-- .../Filters/ITKNormalizeImage.hpp | 6 +- .../Filters/ITKNormalizeToConstantImage.hpp | 4 +- .../Filters/ITKNotImage.cpp | 26 +-- .../Filters/ITKNotImage.hpp | 6 +- .../ITKOpeningByReconstructionImage.cpp | 26 +-- .../ITKOpeningByReconstructionImage.hpp | 8 +- .../ITKOtsuMultipleThresholdsImage.cpp | 26 +-- .../ITKOtsuMultipleThresholdsImage.hpp | 6 +- .../Filters/ITKRegionalMaximaImage.cpp | 6 +- .../Filters/ITKRegionalMaximaImage.hpp | 4 +- .../Filters/ITKRegionalMinimaImage.cpp | 6 +- .../Filters/ITKRegionalMinimaImage.hpp | 4 +- .../Filters/ITKRelabelComponentImage.cpp | 26 +-- .../Filters/ITKRelabelComponentImage.hpp | 6 +- .../Filters/ITKRescaleIntensityImage.cpp | 26 +-- .../Filters/ITKRescaleIntensityImage.hpp | 6 +- .../Filters/ITKSigmoidImage.cpp | 26 +-- .../Filters/ITKSigmoidImage.hpp | 6 +- .../ITKSignedDanielssonDistanceMapImage.cpp | 6 +- .../ITKSignedDanielssonDistanceMapImage.hpp | 4 +- .../ITKSignedMaurerDistanceMapImage.cpp | 26 +-- .../ITKSignedMaurerDistanceMapImage.hpp | 6 +- .../Filters/ITKSinImage.cpp | 26 +-- .../Filters/ITKSinImage.hpp | 6 +- .../ITKSmoothingRecursiveGaussianImage.hpp | 4 +- .../Filters/ITKSqrtImage.cpp | 26 +-- .../Filters/ITKSqrtImage.hpp | 6 +- .../Filters/ITKSquareImage.cpp | 26 +-- .../Filters/ITKSquareImage.hpp | 6 +- .../ITKStandardDeviationProjectionImage.hpp | 4 +- .../Filters/ITKSumProjectionImage.hpp | 4 +- .../Filters/ITKTanImage.cpp | 26 +-- .../Filters/ITKTanImage.hpp | 6 +- .../Filters/ITKThresholdImage.cpp | 26 +-- .../Filters/ITKThresholdImage.hpp | 6 +- ...resholdMaximumConnectedComponentsImage.cpp | 6 +- ...resholdMaximumConnectedComponentsImage.hpp | 4 +- .../Filters/ITKValuedRegionalMaximaImage.cpp | 26 +-- .../Filters/ITKValuedRegionalMaximaImage.hpp | 6 +- .../Filters/ITKValuedRegionalMinimaImage.cpp | 26 +-- .../Filters/ITKValuedRegionalMinimaImage.hpp | 6 +- .../Filters/ITKWhiteTopHatImage.cpp | 26 +-- .../Filters/ITKWhiteTopHatImage.hpp | 8 +- .../Filters/ITKZeroCrossingImage.cpp | 6 +- .../Filters/ITKZeroCrossingImage.hpp | 4 +- .../test/ITKAbsImageTest.cpp | 12 +- .../test/ITKAcosImageTest.cpp | 6 +- ...AdaptiveHistogramEqualizationImageTest.cpp | 14 +- ...KApproximateSignedDistanceMapImageTest.cpp | 4 +- .../test/ITKAsinImageTest.cpp | 6 +- .../test/ITKAtanImageTest.cpp | 6 +- .../test/ITKBinaryContourImageTest.cpp | 12 +- .../test/ITKBinaryDilateImageTest.cpp | 12 +- .../test/ITKBinaryErodeImageTest.cpp | 6 +- ...ITKBinaryMorphologicalClosingImageTest.cpp | 12 +- ...ITKBinaryMorphologicalOpeningImageTest.cpp | 6 +- ...BinaryOpeningByReconstructionImageTest.cpp | 6 +- .../test/ITKBinaryProjectionImageTest.cpp | 12 +- .../test/ITKBinaryThinningImageTest.cpp | 6 +- .../test/ITKBinaryThresholdImageTest.cpp | 12 +- .../test/ITKBlackTopHatImageTest.cpp | 6 +- .../ITKClosingByReconstructionImageTest.cpp | 6 +- .../test/ITKConnectedComponentImageTest.cpp | 6 +- .../test/ITKCosImageTest.cpp | 12 +- ...CurvatureAnisotropicDiffusionImageTest.cpp | 4 +- .../test/ITKCurvatureFlowImageTest.cpp | 4 +- .../ITKDanielssonDistanceMapImageTest.cpp | 2 +- .../ITKDilateObjectMorphologyImageTest.cpp | 12 +- .../test/ITKDiscreteGaussianImageTest.cpp | 18 +- .../test/ITKDoubleThresholdImageTest.cpp | 4 +- .../ITKErodeObjectMorphologyImageTest.cpp | 12 +- .../test/ITKExpImageTest.cpp | 6 +- .../test/ITKExpNegativeImageTest.cpp | 6 +- ...KGradientAnisotropicDiffusionImageTest.cpp | 4 +- .../test/ITKGradientMagnitudeImageTest.cpp | 6 +- ...entMagnitudeRecursiveGaussianImageTest.cpp | 6 +- .../test/ITKGrayscaleDilateImageTest.cpp | 6 +- .../test/ITKGrayscaleErodeImageTest.cpp | 6 +- .../test/ITKGrayscaleFillholeImageTest.cpp | 12 +- .../test/ITKGrayscaleGrindPeakImageTest.cpp | 12 +- ...GrayscaleMorphologicalClosingImageTest.cpp | 6 +- ...GrayscaleMorphologicalOpeningImageTest.cpp | 18 +- .../test/ITKHConvexImageTest.cpp | 6 +- .../test/ITKHMaximaImageTest.cpp | 6 +- .../test/ITKHMinimaImageTest.cpp | 6 +- .../test/ITKIntensityWindowingImageTest.cpp | 18 +- .../test/ITKInvertIntensityImageTest.cpp | 6 +- .../test/ITKIsoContourDistanceImageTest.cpp | 2 +- .../test/ITKLabelContourImageTest.cpp | 6 +- ...ITKLaplacianRecursiveGaussianImageTest.cpp | 2 +- .../test/ITKLog10ImageTest.cpp | 6 +- .../test/ITKLogImageTest.cpp | 6 +- .../test/ITKMaskImageTest.cpp | 24 +- .../test/ITKMedianImageTest.cpp | 12 +- .../test/ITKMinMaxCurvatureFlowImageTest.cpp | 4 +- .../ITKMorphologicalGradientImageTest.cpp | 6 +- .../ITKMorphologicalWatershedImageTest.cpp | 12 +- .../test/ITKNormalizeImageTest.cpp | 12 +- .../test/ITKNotImageTest.cpp | 6 +- .../ITKOpeningByReconstructionImageTest.cpp | 6 +- .../ITKOtsuMultipleThresholdsImageTest.cpp | 24 +- .../test/ITKRegionalMaximaImageTest.cpp | 2 +- .../test/ITKRegionalMinimaImageTest.cpp | 2 +- .../test/ITKRelabelComponentImageTest.cpp | 18 +- .../test/ITKRescaleIntensityImageTest.cpp | 6 +- .../test/ITKSigmoidImageTest.cpp | 6 +- ...TKSignedDanielssonDistanceMapImageTest.cpp | 2 +- .../ITKSignedMaurerDistanceMapImageTest.cpp | 6 +- .../test/ITKSinImageTest.cpp | 6 +- .../test/ITKSqrtImageTest.cpp | 6 +- .../test/ITKSquareImageTest.cpp | 6 +- .../test/ITKTanImageTest.cpp | 6 +- .../test/ITKThresholdImageTest.cpp | 18 +- ...oldMaximumConnectedComponentsImageTest.cpp | 6 +- .../test/ITKValuedRegionalMaximaImageTest.cpp | 6 +- .../test/ITKValuedRegionalMinimaImageTest.cpp | 6 +- .../test/ITKWhiteTopHatImageTest.cpp | 6 +- .../test/ITKZeroCrossingImageTest.cpp | 4 +- .../ITKImageProcessing/tools/filter.cpp.in | 6 +- .../ITKImageProcessing/tools/filter.hpp.in | 6 +- ...AlignSectionsMutualInformation.d3dpipeline | 14 +- .../pipelines/CI_Histogram.d3dpipeline | 22 +- .../(01) Small IN100 Archive.d3dpipeline | 2 +- ...mall IN100 Full Reconstruction.d3dpipeline | 104 ++++----- ...IN100 Morphological Statistics.d3dpipeline | 42 ++-- ...00 Crystallographic Statistics.d3dpipeline | 144 ++++++------ .../(01) Small IN100 Quick Mesh.d3dpipeline | 16 +- .../(02) Small IN100 Smooth Mesh.d3dpipeline | 4 +- ...3) Small IN100 Mesh Statistics.d3dpipeline | 14 +- .../(04) Small IN100 GBCD.d3dpipeline | 10 +- .../(05) Small IN100 GBCD Metric.d3dpipeline | 6 +- .../pipelines/Edax_IPF_Colors.d3dpipeline | 16 +- .../pipelines/EnsembleInfoReader.d3dpipeline | 14 +- .../FindGBCD-GBPDMetricBased.d3dpipeline | 184 +++++++-------- .../pipelines/ImportEdaxOIMData.d3dpipeline | 8 +- .../pipelines/ReadAng.d3dpipeline | 14 +- .../pipelines/ReadCTF.d3dpipeline | 12 +- .../pipelines/TxCopper_Exposed.d3dpipeline | 20 +- .../pipelines/TxCopper_Unexposed.d3dpipeline | 20 +- .../pipelines/aptr12_Analysis.d3dpipeline | 68 +++--- .../pipelines/avtr12_Analysis.d3dpipeline | 69 +++--- .../Filters/Algorithms/ReadH5Ebsd.cpp | 11 +- .../AlignSectionsMisorientationFilter.cpp | 8 +- .../AlignSectionsMisorientationFilter.hpp | 2 +- .../AlignSectionsMutualInformationFilter.cpp | 8 +- .../AlignSectionsMutualInformationFilter.hpp | 2 +- .../BadDataNeighborOrientationCheckFilter.hpp | 2 +- .../Filters/CAxisSegmentFeaturesFilter.hpp | 2 +- .../Filters/ConvertOrientations.hpp | 5 +- .../Filters/ConvertQuaternionFilter.cpp | 8 +- .../Filters/ConvertQuaternionFilter.hpp | 6 +- .../Filters/CreateEnsembleInfoFilter.cpp | 8 +- .../Filters/CreateEnsembleInfoFilter.hpp | 2 +- .../Filters/EBSDSegmentFeaturesFilter.cpp | 6 +- .../Filters/EBSDSegmentFeaturesFilter.hpp | 6 +- .../Filters/EbsdToH5EbsdFilter.hpp | 6 +- .../Filters/FindAvgCAxesFilter.cpp | 17 +- .../Filters/FindAvgCAxesFilter.hpp | 4 +- .../Filters/FindAvgOrientationsFilter.cpp | 24 +- .../Filters/FindAvgOrientationsFilter.hpp | 6 +- ...ureReferenceCAxisMisorientationsFilter.hpp | 2 +- ...dFeatureReferenceMisorientationsFilter.hpp | 4 +- .../Filters/FindGBCDFilter.cpp | 9 +- .../Filters/FindGBCDFilter.hpp | 2 +- .../Filters/FindGBCDMetricBasedFilter.hpp | 4 +- .../Filters/FindGBPDMetricBasedFilter.hpp | 2 +- .../FindKernelAvgMisorientationsFilter.cpp | 8 +- .../FindKernelAvgMisorientationsFilter.hpp | 2 +- .../Filters/FindShapesFilter.cpp | 6 +- .../Filters/FindShapesFilter.hpp | 2 +- .../Filters/FindTriangleGeomShapesFilter.cpp | 6 +- .../Filters/FindTriangleGeomShapesFilter.hpp | 4 +- .../Filters/GenerateFZQuaternions.cpp | 8 +- .../Filters/GenerateFZQuaternions.hpp | 4 +- .../Filters/GenerateGBCDPoleFigureFilter.hpp | 2 +- .../GenerateQuaternionConjugateFilter.cpp | 8 +- .../GenerateQuaternionConjugateFilter.hpp | 4 +- .../Filters/MergeTwinsFilter.cpp | 8 +- .../Filters/MergeTwinsFilter.hpp | 2 +- .../NeighborOrientationCorrelationFilter.hpp | 2 +- .../Filters/ReadAngDataFilter.cpp | 9 +- .../Filters/ReadAngDataFilter.hpp | 2 +- .../Filters/ReadCtfDataFilter.cpp | 9 +- .../Filters/ReadCtfDataFilter.hpp | 2 +- .../Filters/ReadEnsembleInfoFilter.cpp | 8 +- .../Filters/ReadEnsembleInfoFilter.hpp | 2 +- .../Filters/ReadH5EbsdFilter.cpp | 9 +- .../Filters/ReadH5EbsdFilter.hpp | 4 +- .../Filters/ReadH5EspritDataFilter.hpp | 2 +- .../Filters/ReadH5OimDataFilter.cpp | 8 +- .../Filters/ReadH5OimDataFilter.hpp | 2 +- .../Filters/ReadH5OinaDataFilter.cpp | 6 +- .../Filters/ReadH5OinaDataFilter.hpp | 2 +- .../Filters/RodriguesConvertorFilter.cpp | 8 +- .../Filters/RodriguesConvertorFilter.hpp | 4 +- .../Filters/RotateEulerRefFrameFilter.hpp | 2 +- .../Filters/WriteINLFileFilter.hpp | 2 +- .../Filters/WritePoleFigureFilter.hpp | 6 +- .../WriteStatsGenOdfAngleFileFilter.hpp | 2 +- .../test/AlignSectionsMisorientationTest.cpp | 50 ++-- .../AlignSectionsMutualInformationTest.cpp | 50 ++-- .../test/ConvertQuaternionTest.cpp | 4 +- .../test/CreateEnsembleInfoTest.cpp | 10 +- .../test/EBSDSegmentFeaturesFilterTest.cpp | 2 +- .../test/FindAvgCAxesTest.cpp | 8 +- .../test/FindAvgOrientationsTest.cpp | 33 +-- .../test/FindGBCDMetricBasedTest.cpp | 64 +++-- .../OrientationAnalysis/test/FindGBCDTest.cpp | 2 +- .../test/FindGBPDMetricBasedTest.cpp | 63 +++-- .../test/FindKernelAvgMisorientationsTest.cpp | 2 +- .../test/FindShapesFilterTest.cpp | 2 +- .../test/FindTriangleGeomShapesTest.cpp | 2 +- .../test/GenerateFZQuaternionsTest.cpp | 2 +- .../test/GenerateQuaternionConjugateTest.cpp | 2 +- .../test/MergeTwinsTest.cpp | 10 +- .../test/OrientationAnalysisTestUtils.hpp | 187 +++++++-------- .../test/ReadAngDataTest.cpp | 2 +- .../test/ReadCtfDataTest.cpp | 2 +- .../test/ReadEnsembleInfoTest.cpp | 4 +- .../test/ReadH5EbsdTest.cpp | 8 +- .../test/ReadH5OimDataTest.cpp | 4 +- .../test/ReadH5OinaDataTest.cpp | 4 +- .../test/RodriguesConvertorTest.cpp | 2 +- .../test/RotateEulerRefFrameTest.cpp | 38 ++- .../test/WriteGBCDGMTFileTest.cpp | 6 +- .../test/WriteGBCDTriangleDataTest.cpp | 6 +- .../AppendImageGeometryZSlice.d3dpipeline | 50 ++-- .../ApplyTransformation_Demo.d3dpipeline | 8 +- .../ApplyTransformation_Image.d3dpipeline | 22 +- .../ApplyTransformation_Node.d3dpipeline | 14 +- .../ArrayCalculatorExample.d3dpipeline | 36 +-- .../pipelines/AvizoWriters.d3dpipeline | 6 +- .../ExtractVertexGeometry.d3dpipeline | 22 +- .../pipelines/FindBiasedFeatures.d3dpipeline | 28 +-- .../pipelines/FindBoundaryCells.d3dpipeline | 4 +- .../FindLargestCrossSections.d3dpipeline | 16 +- .../pipelines/Import_ASCII.d3dpipeline | 12 +- .../pipelines/Import_ASCII_Data.d3dworkflow | 10 +- .../pipelines/Import_CSV_Data.d3dpipeline | 56 ++--- .../pipelines/Import_STL_Model.d3dpipeline | 10 +- .../pipelines/Remove_Triangles.d3dpipeline | 22 +- ...eElementAttributesWithNeighbor.d3dpipeline | 20 +- .../ResamplePorosityImage.d3dpipeline | 10 +- .../ResampleRectGridToImageGeom.d3dpipeline | 80 +++---- .../pipelines/SurfaceNets_Demo.d3dpipeline | 20 +- .../Triangle_Face_Data_Demo.d3dpipeline | 14 +- .../VtkRectilinearGridWriter.d3dpipeline | 98 ++++---- .../SimplnxCore/Filters/AddBadDataFilter.hpp | 2 +- .../Filters/Algorithms/CombineStlFiles.cpp | 2 +- .../Algorithms/RemoveFlaggedFeatures.cpp | 6 +- .../SimplnxCore/Filters/AlignGeometries.hpp | 6 +- .../AlignSectionsFeatureCentroidFilter.cpp | 6 +- .../AlignSectionsFeatureCentroidFilter.hpp | 2 +- .../Filters/AlignSectionsListFilter.cpp | 8 +- .../Filters/AlignSectionsListFilter.hpp | 2 +- .../AppendImageGeometryZSliceFilter.hpp | 6 +- .../ApplyTransformationToGeometryFilter.cpp | 10 +- .../ApplyTransformationToGeometryFilter.hpp | 8 +- .../Filters/ApproximatePointCloudHull.hpp | 4 +- .../Filters/ArrayCalculatorFilter.hpp | 4 +- .../Filters/CalculateArrayHistogramFilter.cpp | 28 +-- .../Filters/CalculateArrayHistogramFilter.hpp | 6 +- .../Filters/CalculateFeatureSizesFilter.cpp | 30 +-- .../Filters/CalculateFeatureSizesFilter.hpp | 10 +- .../Filters/CalculateTriangleAreasFilter.cpp | 8 +- .../Filters/CalculateTriangleAreasFilter.hpp | 4 +- .../Filters/ChangeAngleRepresentation.hpp | 2 +- .../Filters/CombineAttributeArraysFilter.hpp | 4 +- .../Filters/CombineStlFilesFilter.cpp | 8 +- .../Filters/CombineStlFilesFilter.hpp | 2 +- .../Filters/ComputeFeatureRectFilter.cpp | 8 +- .../Filters/ComputeFeatureRectFilter.hpp | 2 +- .../ComputeMomentInvariants2DFilter.cpp | 26 +-- .../ComputeMomentInvariants2DFilter.hpp | 8 +- .../Filters/ConvertColorToGrayScaleFilter.cpp | 8 +- .../Filters/ConvertColorToGrayScaleFilter.hpp | 4 +- .../SimplnxCore/Filters/ConvertDataFilter.cpp | 16 +- .../SimplnxCore/Filters/ConvertDataFilter.hpp | 6 +- .../CopyFeatureArrayToElementArray.hpp | 2 +- .../SimplnxCore/Filters/CreateDataArray.cpp | 8 +- .../SimplnxCore/Filters/CreateDataArray.hpp | 8 +- .../Filters/CreateGeometryFilter.cpp | 88 +++---- .../Filters/CreateGeometryFilter.hpp | 26 +-- .../Filters/CreateImageGeometry.hpp | 2 +- .../SimplnxCore/Filters/CropImageGeometry.cpp | 30 +-- .../SimplnxCore/Filters/CropImageGeometry.hpp | 8 +- .../Filters/CropVertexGeometry.cpp | 23 +- .../Filters/CropVertexGeometry.hpp | 8 +- .../Filters/ErodeDilateBadDataFilter.cpp | 6 +- .../Filters/ErodeDilateBadDataFilter.hpp | 4 +- .../ErodeDilateCoordinationNumberFilter.cpp | 6 +- .../ErodeDilateCoordinationNumberFilter.hpp | 2 +- .../Filters/ErodeDilateMaskFilter.cpp | 6 +- .../Filters/ErodeDilateMaskFilter.hpp | 4 +- .../Filters/ExtractComponentAsArrayFilter.cpp | 10 +- .../Filters/ExtractComponentAsArrayFilter.hpp | 2 +- ...ctInternalSurfacesFromTriangleGeometry.cpp | 28 +-- ...ctInternalSurfacesFromTriangleGeometry.hpp | 10 +- .../Filters/ExtractVertexGeometryFilter.hpp | 4 +- .../Filters/FeatureFaceCurvatureFilter.cpp | 98 ++++---- .../Filters/FeatureFaceCurvatureFilter.hpp | 28 +-- .../SimplnxCore/Filters/FillBadDataFilter.cpp | 6 +- .../SimplnxCore/Filters/FillBadDataFilter.hpp | 2 +- .../Filters/FindArrayStatisticsFilter.cpp | 18 +- .../Filters/FindArrayStatisticsFilter.hpp | 4 +- .../Filters/FindBiasedFeaturesFilter.hpp | 2 +- .../Filters/FindBoundaryCellsFilter.hpp | 2 +- .../Filters/FindEuclideanDistMapFilter.cpp | 6 +- .../Filters/FindEuclideanDistMapFilter.hpp | 2 +- .../Filters/FindFeatureCentroidsFilter.cpp | 22 +- .../Filters/FindFeatureCentroidsFilter.hpp | 7 +- .../Filters/FindFeatureClusteringFilter.cpp | 14 +- .../Filters/FindFeatureClusteringFilter.hpp | 4 +- .../FindLargestCrossSectionsFilter.cpp | 8 +- .../FindLargestCrossSectionsFilter.hpp | 6 +- .../Filters/FindNeighborListStatistics.cpp | 68 +++--- .../Filters/FindNeighborListStatistics.hpp | 16 +- .../Filters/FindNeighborhoodsFilter.cpp | 6 +- .../Filters/FindNeighborhoodsFilter.hpp | 2 +- .../src/SimplnxCore/Filters/FindNeighbors.cpp | 70 +++--- .../src/SimplnxCore/Filters/FindNeighbors.hpp | 16 +- .../Filters/FindNumFeaturesFilter.cpp | 8 +- .../Filters/FindNumFeaturesFilter.hpp | 2 +- .../Filters/FindSurfaceAreaToVolumeFilter.cpp | 6 +- .../Filters/FindSurfaceAreaToVolumeFilter.hpp | 2 +- .../Filters/FindSurfaceFeatures.cpp | 8 +- .../Filters/FindSurfaceFeatures.hpp | 4 +- .../FindTriangleGeomCentroidsFilter.cpp | 6 +- .../FindTriangleGeomCentroidsFilter.hpp | 4 +- .../Filters/FindTriangleGeomSizesFilter.cpp | 6 +- .../Filters/FindTriangleGeomSizesFilter.hpp | 4 +- .../FindVertexToTriangleDistancesFilter.cpp | 33 +-- .../FindVertexToTriangleDistancesFilter.hpp | 8 +- .../Filters/FindVolFractionsFilter.cpp | 8 +- .../Filters/FindVolFractionsFilter.hpp | 2 +- .../Filters/FlyingEdges3DFilter.cpp | 23 +- .../Filters/FlyingEdges3DFilter.hpp | 8 +- .../Filters/GenerateColorTableFilter.hpp | 2 +- .../SimplnxCore/Filters/IdentifySample.cpp | 8 +- .../SimplnxCore/Filters/IdentifySample.hpp | 2 +- .../SimplnxCore/Filters/InitializeData.hpp | 4 +- .../Filters/InitializeImageGeomCellData.hpp | 4 +- ...terpolatePointCloudToRegularGridFilter.cpp | 52 +++-- ...terpolatePointCloudToRegularGridFilter.hpp | 16 +- .../Filters/IterativeClosestPointFilter.hpp | 6 +- .../src/SimplnxCore/Filters/KMeansFilter.hpp | 2 +- .../SimplnxCore/Filters/KMedoidsFilter.hpp | 2 +- .../Filters/LabelTriangleGeometryFilter.hpp | 2 +- .../Filters/LaplacianSmoothingFilter.hpp | 2 +- .../MapPointCloudToRegularGridFilter.cpp | 50 ++-- .../MapPointCloudToRegularGridFilter.hpp | 12 +- .../src/SimplnxCore/Filters/MinNeighbors.cpp | 58 ++--- .../src/SimplnxCore/Filters/MinNeighbors.hpp | 10 +- .../src/SimplnxCore/Filters/MoveData.cpp | 18 +- .../src/SimplnxCore/Filters/MoveData.hpp | 4 +- .../Filters/MultiThresholdObjects.cpp | 20 +- .../Filters/MultiThresholdObjects.hpp | 4 +- .../NearestPointFuseRegularGridsFilter.hpp | 4 +- .../Filters/PartitionGeometryFilter.hpp | 12 +- .../PointSampleTriangleGeometryFilter.cpp | 8 +- .../PointSampleTriangleGeometryFilter.hpp | 8 +- .../Filters/QuickSurfaceMeshFilter.cpp | 9 +- .../Filters/QuickSurfaceMeshFilter.hpp | 6 +- .../Filters/ReadBinaryCTNorthstarFilter.hpp | 4 +- .../SimplnxCore/Filters/ReadCSVFileFilter.cpp | 10 +- .../SimplnxCore/Filters/ReadCSVFileFilter.hpp | 6 +- .../SimplnxCore/Filters/ReadDREAM3DFilter.hpp | 2 +- .../Filters/ReadDeformKeyFileV12Filter.hpp | 2 +- .../Filters/ReadRawBinaryFilter.hpp | 4 +- .../SimplnxCore/Filters/ReadStlFileFilter.cpp | 24 +- .../SimplnxCore/Filters/ReadStlFileFilter.hpp | 8 +- .../Filters/ReadTextDataArrayFilter.cpp | 46 ++-- .../Filters/ReadTextDataArrayFilter.hpp | 16 +- .../Filters/ReadVolumeGraphicsFileFilter.cpp | 8 +- .../Filters/ReadVolumeGraphicsFileFilter.hpp | 2 +- .../Filters/ReadVtkStructuredPointsFilter.cpp | 20 +- .../Filters/ReadVtkStructuredPointsFilter.hpp | 4 +- .../RegularGridSampleSurfaceMeshFilter.hpp | 6 +- .../Filters/RemoveFlaggedFeaturesFilter.cpp | 6 +- .../Filters/RemoveFlaggedFeaturesFilter.hpp | 6 +- .../Filters/RemoveFlaggedTrianglesFilter.cpp | 16 +- .../Filters/RemoveFlaggedTrianglesFilter.hpp | 4 +- .../Filters/RemoveFlaggedVertices.cpp | 24 +- .../Filters/RemoveFlaggedVertices.hpp | 6 +- .../RemoveMinimumSizeFeaturesFilter.hpp | 2 +- .../SimplnxCore/Filters/RenameDataObject.cpp | 12 +- .../SimplnxCore/Filters/RenameDataObject.hpp | 2 +- ...mentAttributesWithNeighborValuesFilter.cpp | 7 +- ...mentAttributesWithNeighborValuesFilter.hpp | 4 +- .../Filters/ResampleImageGeomFilter.cpp | 6 +- .../Filters/ResampleImageGeomFilter.hpp | 4 +- .../ResampleRectGridToImageGeomFilter.cpp | 8 +- .../ResampleRectGridToImageGeomFilter.hpp | 6 +- .../Filters/ReverseTriangleWindingFilter.hpp | 2 +- .../Filters/RobustAutomaticThreshold.cpp | 24 +- .../Filters/RobustAutomaticThreshold.hpp | 6 +- .../Filters/RotateSampleRefFrameFilter.cpp | 17 +- .../Filters/RotateSampleRefFrameFilter.hpp | 8 +- .../Filters/ScalarSegmentFeaturesFilter.cpp | 24 +- .../Filters/ScalarSegmentFeaturesFilter.hpp | 8 +- .../SetImageGeomOriginScalingFilter.cpp | 6 +- .../SetImageGeomOriginScalingFilter.hpp | 2 +- .../Filters/SharedFeatureFaceFilter.hpp | 2 +- .../SimplnxCore/Filters/SilhouetteFilter.hpp | 2 +- .../Filters/SplitAttributeArrayFilter.cpp | 8 +- .../Filters/SplitAttributeArrayFilter.hpp | 2 +- .../SimplnxCore/Filters/SurfaceNetsFilter.cpp | 6 +- .../SimplnxCore/Filters/SurfaceNetsFilter.hpp | 6 +- .../Filters/TriangleCentroidFilter.hpp | 2 +- .../Filters/TriangleDihedralAngleFilter.hpp | 2 +- .../Filters/TriangleNormalFilter.cpp | 8 +- .../Filters/TriangleNormalFilter.hpp | 4 +- ...tainRegularGridSampleSurfaceMeshFilter.hpp | 4 +- .../Filters/WriteASCIIDataFilter.hpp | 8 +- .../Filters/WriteAbaqusHexahedronFilter.hpp | 2 +- .../WriteAvizoRectilinearCoordinateFilter.hpp | 2 +- .../WriteAvizoUniformCoordinateFilter.hpp | 2 +- .../Filters/WriteBinaryDataFilter.hpp | 4 +- .../Filters/WriteFeatureDataCSVFilter.hpp | 4 +- .../Filters/WriteLosAlamosFFTFilter.hpp | 2 +- .../Filters/WriteStlFileFilter.hpp | 4 +- .../Filters/WriteVtkRectilinearGridFilter.hpp | 4 +- .../WriteVtkStructuredPointsFilter.hpp | 4 +- .../test/AlignSectionsFeatureCentroidTest.cpp | 69 ++---- .../test/AlignSectionsListTest.cpp | 4 +- .../test/AppendImageGeometryZSliceTest.cpp | 14 +- .../ApplyTransformationToGeometryTest.cpp | 30 +-- .../test/ApproximatePointCloudHullTest.cpp | 2 +- .../test/CalculateArrayHistogramTest.cpp | 4 +- .../test/CalculateFeatureSizesTest.cpp | 6 +- .../test/CalculateTriangleAreasFilterTest.cpp | 4 +- .../SimplnxCore/test/CombineStlFilesTest.cpp | 4 +- .../test/ComputeFeatureRectTest.cpp | 2 +- .../test/ComputeMomentInvariants2DTest.cpp | 12 +- .../test/ConvertColorToGrayScaleTest.cpp | 2 +- .../SimplnxCore/test/ConvertDataTest.cpp | 4 +- .../SimplnxCore/test/CoreFilterTest.cpp | 14 +- .../SimplnxCore/test/CreateDataArrayTest.cpp | 22 +- .../SimplnxCore/test/CreateGeometryTest.cpp | 220 +++++++++--------- .../test/CropImageGeometryTest.cpp | 20 +- .../test/CropVertexGeometryTest.cpp | 12 +- .../SimplnxCore/test/DREAM3DFileTest.cpp | 14 +- .../test/ErodeDilateBadDataTest.cpp | 4 +- .../ErodeDilateCoordinationNumberTest.cpp | 2 +- .../SimplnxCore/test/ErodeDilateMaskTest.cpp | 4 +- .../test/ExtractComponentAsArrayTest.cpp | 4 +- ...ternalSurfacesFromTriangleGeometryTest.cpp | 16 +- .../test/FeatureFaceCurvatureTest.cpp | 30 +-- .../SimplnxCore/test/FillBadDataTest.cpp | 2 +- .../test/FindArrayStatisticsTest.cpp | 8 +- .../test/FindEuclideanDistMapTest.cpp | 2 +- .../test/FindFeatureCentroidsFilterTest.cpp | 6 +- .../test/FindFeatureClusteringTest.cpp | 8 +- .../test/FindLargestCrossSectionsTest.cpp | 4 +- .../test/FindNeighborListStatisticsTest.cpp | 32 +-- .../test/FindNeighborhoodsTest.cpp | 2 +- .../SimplnxCore/test/FindNeighborsTest.cpp | 16 +- .../SimplnxCore/test/FindNumFeaturesTest.cpp | 4 +- .../test/FindSurfaceAreaToVolumeTest.cpp | 2 +- .../test/FindSurfaceFeaturesTest.cpp | 4 +- .../test/FindTriangleGeomCentroidsTest.cpp | 2 +- .../test/FindTriangleGeomSizesTest.cpp | 2 +- .../FindVertexToTriangleDistancesTest.cpp | 8 +- .../SimplnxCore/test/FindVolFractionsTest.cpp | 4 +- .../SimplnxCore/test/FlyingEdges3DTest.cpp | 7 +- .../test/GenerateColorTableTest.cpp | 10 +- .../SimplnxCore/test/IdentifySampleTest.cpp | 4 +- ...InterpolatePointCloudToRegularGridTest.cpp | 32 +-- .../test/LaplacianSmoothingFilterTest.cpp | 2 +- .../test/MapPointCloudToRegularGridTest.cpp | 32 +-- .../SimplnxCore/test/MinNeighborsTest.cpp | 28 +-- src/Plugins/SimplnxCore/test/MoveDataTest.cpp | 20 +- .../test/MultiThresholdObjectsTest.cpp | 76 +++--- src/Plugins/SimplnxCore/test/PipelineTest.cpp | 2 +- .../PointSampleTriangleGeometryFilterTest.cpp | 6 +- .../test/QuickSurfaceMeshFilterTest.cpp | 2 +- .../SimplnxCore/test/ReadStlFileTest.cpp | 2 +- .../test/ReadTextDataArrayTest.cpp | 74 +++--- .../test/ReadVtkStructuredPointsTest.cpp | 4 +- .../test/RemoveFlaggedFeaturesTest.cpp | 6 +- .../test/RemoveFlaggedTrianglesTest.cpp | 4 +- .../test/RemoveFlaggedVerticesTest.cpp | 12 +- .../SimplnxCore/test/RenameDataObjectTest.cpp | 6 +- ...lementAttributesWithNeighborValuesTest.cpp | 2 +- .../test/ResampleImageGeomTest.cpp | 10 +- .../test/ResampleRectGridToImageGeomTest.cpp | 4 +- .../test/RobustAutomaticThresholdTest.cpp | 10 +- .../test/RotateSampleRefFrameTest.cpp | 6 +- .../test/ScalarSegmentFeaturesFilterTest.cpp | 6 +- .../SetImageGeomOriginScalingFilterTest.cpp | 8 +- .../test/SplitAttributeArrayTest.cpp | 2 +- .../SimplnxCore/test/SurfaceNetsTest.cpp | 4 +- .../test/TriangleNormalFilterTest.cpp | 4 +- .../SimplnxCore/wrapping/python/simplnxpy.cpp | 2 +- .../TestOne/Filters/CreateOutOfCoreArray.hpp | 6 +- .../src/TestOne/Filters/ExampleFilter1.cpp | 4 +- .../src/TestOne/Filters/ExampleFilter2.cpp | 20 +- .../src/TestTwo/Filters/Test2Filter.cpp | 2 +- src/nxrunner/src/CliObserver.cpp | 22 +- src/nxrunner/src/nxrunner.cpp | 21 +- src/simplnx/Filter/IFilter.cpp | 31 ++- src/simplnx/Utilities/FileUtilities.cpp | 18 +- src/simplnx/Utilities/StringUtilities.hpp | 63 +++++ src/simplnx/Utilities/TimeUtilities.hpp | 7 + test/PluginTest.cpp | 97 +++++++- .../simplnx/UnitTest/UnitTestCommon.hpp | 8 +- wrapping/python/docs/generate_sphinx_docs.cpp | 49 ---- wrapping/python/docs/index_template.rst | 1 + wrapping/python/docs/source/Installation.rst | 2 +- .../python/docs/source/ReleaseNotes_130.rst | 19 ++ wrapping/python/docs/source/User_API.rst | 4 +- .../source/Writing_A_New_Python_Filter.rst | 4 +- wrapping/python/docs/source/conf.py | 2 +- .../examples/notebooks/basic_ebsd_ipf.ipynb | 4 +- .../02_Image_Segmentation.py | 44 ++-- .../03_Porosity_Mesh_Export.py | 40 ++-- .../pipelines/Incomplete/ImportEdaxOIMData.py | 6 +- .../01_Small_IN100_Archive.py | 6 +- ...01_Small_IN100_Morphological_Statistics.py | 38 +-- .../01_Small_IN100_Quick_Mesh.py | 12 +- .../02_Small_IN100_Smooth_Mesh.py | 4 +- .../03_Small_IN100_Mesh_Statistics.py | 14 +- .../04_Small_IN100_GBCD.py | 10 +- ...Small_IN100_Crystallographic_Statistics.py | 12 +- .../05_Small_IN100_GBCD_Metric.py | 8 +- .../08_Small_IN100_Full_Reconstruction.py | 90 +++---- .../OrientationAnalysis/APTR12_Analysis.py | 84 +++---- .../OrientationAnalysis/AVTR12_Analysis.py | 84 +++---- .../AlignSectionsMutualInformation.py | 14 +- .../OrientationAnalysis/AvizoWriters.py | 6 +- .../OrientationAnalysis/CI_Histogram.py | 28 +-- .../OrientationAnalysis/Edax_IPF_Colors.py | 18 +- .../OrientationAnalysis/FindBiasedFeatures.py | 26 +-- .../OrientationAnalysis/FindBoundaryCells.py | 4 +- .../FindGBCD-GBPDMetricBased.py | 10 +- .../FindLargestCrossSections.py | 24 +- .../pipelines/OrientationAnalysis/ReadAng.py | 14 +- .../pipelines/OrientationAnalysis/ReadCTF.py | 14 +- .../OrientationAnalysis/TxCopper_Exposed.py | 24 +- .../OrientationAnalysis/TxCopper_Unexposed.py | 24 +- .../VtkRectilinearGridWriter.py | 32 +-- .../Simplnx/AppendImageGeometryZSlice.py | 72 +++--- .../Simplnx/ApplyTransformation_Demo.py | 20 +- .../Simplnx/ApplyTransformation_Image.py | 42 ++-- .../Simplnx/ApplyTransformation_Node.py | 50 ++-- .../Simplnx/ArrayCalculatorExample.py | 40 ++-- .../pipelines/Simplnx/CombineSTLFiles.py | 2 +- .../pipelines/Simplnx/EnsembleInfoReader.py | 20 +- .../pipelines/Simplnx/Import_ASCII.py | 32 +-- .../pipelines/Simplnx/Import_CSV_Data.py | 50 ++-- .../pipelines/Simplnx/Import_STL_Model.py | 20 +- .../ReplaceElementAttributesWithNeighbor.py | 22 +- .../Simplnx/ResamplePorosityImage.py | 18 +- .../Simplnx/ResampleRectGridToImageGeom.py | 96 ++++---- .../pipelines/Simplnx/SurfaceNets_Demo.py | 24 +- .../Simplnx/Triangle_Face_Data_Demo.py | 20 +- .../examples/scripts/Import_STL_File.py | 4 +- .../examples/scripts/angle_conversion.py | 10 +- .../python/examples/scripts/basic_arrays.py | 24 +- .../python/examples/scripts/basic_ebsd_ipf.py | 28 +-- .../python/examples/scripts/basic_numpy.py | 8 +- .../examples/scripts/create_ensemble_info.py | 2 +- .../examples/scripts/generated_file_list.py | 6 +- .../examples/scripts/geometry_examples.py | 84 +++---- .../python/examples/scripts/import_d3d.py | 2 +- .../python/examples/scripts/import_hdf5.py | 4 +- .../python/examples/scripts/output_file.py | 4 +- wrapping/python/examples/scripts/pipeline.py | 4 +- .../python/examples/scripts/read_csv_file.py | 6 +- .../plugins/ExamplePlugin/CreateArray.py | 22 +- .../plugins/ExamplePlugin/InitializeData.py | 8 +- 693 files changed, 4940 insertions(+), 4846 deletions(-) create mode 100644 wrapping/python/docs/source/ReleaseNotes_130.rst diff --git a/CMakeLists.txt b/CMakeLists.txt index 807439a583..bff07b059a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ endif() file(TO_CMAKE_PATH "${CMAKE_COMMAND}" CMAKE_COMMAND_NORM) project(simplnx - VERSION 1.2.7 + VERSION 1.3.0 DESCRIPTION "SIMPL Redesign" HOMEPAGE_URL "https://github.com/bluequartzsoftware/simplnx" LANGUAGES CXX diff --git a/conda/meta.yaml b/conda/meta.yaml index 1f5e9d985f..18ae71e668 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,5 +1,5 @@ {% set name = "simplnx" %} -{% set version = "1.2.7" %} +{% set version = "1.3.0" %} package: name: {{ name|lower }} diff --git a/conda/recipe.yaml b/conda/recipe.yaml index 889eff7cf5..af8f57db1e 100644 --- a/conda/recipe.yaml +++ b/conda/recipe.yaml @@ -1,5 +1,5 @@ context: - version: "1.2.7" + version: "1.3.0" name: simplnx package: diff --git a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline b/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline index ab2e944eff..8ad2739437 100644 --- a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline +++ b/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline @@ -7,7 +7,7 @@ "args": { "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "DataContainer", + "output_image_geometry_path": "DataContainer", "input_file": "Data/OrientationAnalysis/Combo-EBSD-120130.osc_r0c0.ang" }, "comments": "", @@ -19,10 +19,10 @@ }, { "args": { - "created_image_geometry": "", + "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -55,7 +55,7 @@ ] ], "rotation_representation": 0, - "selected_image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -67,7 +67,7 @@ { "args": { "euler_angles_array_path": "DataContainer/CellData/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -83,7 +83,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -98,7 +98,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -132,7 +132,7 @@ "args": { "file_name": "Data/Output/Examples/Combo-EBSD-osc_r0c0.png", "image_array_path": "DataContainer/CellData/IPFColors", - "image_geom_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "index_offset": 0, "plane": 0 }, @@ -146,9 +146,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -165,7 +165,7 @@ "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "feature_ids_array_name": "FeatureIds", "mask_array_path": "DataContainer/CellData/Mask", - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "misorientation_tolerance": 5.0, "quats_array_path": "DataContainer/CellData/Quats", "randomize_feature_ids": true, @@ -181,7 +181,7 @@ { "args": { "avg_c_axes_array_path": "AvgCAxes", - "cell_feature_attribute_matrix": "DataContainer/CellFeatureData", + "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_phases_array_path": "DataContainer/CellData/Phases", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "feature_ids_array_path": "DataContainer/CellData/FeatureIds", @@ -203,7 +203,7 @@ "feature_ids_array_path": "DataContainer/CellData/FeatureIds", "feature_reference_c_axis_misorientations_array_name": "FeatureRefCAxisMisorientation", "feature_stdev_c_axis_misorientations_array_name": "StdevCAxisMisorientation", - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "quats_array_path": "DataContainer/CellData/Quats" }, "comments": "", @@ -230,7 +230,7 @@ { "args": { "output_rgb_array_name": "Feature Ids (Color)", - "selected_data_array_path": "DataContainer/CellData/FeatureIds", + "input_data_array_path": "DataContainer/CellData/FeatureIds", "selected_preset": "hsv", "use_mask": false }, @@ -243,7 +243,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -258,7 +258,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask Inverse" + "output_data_array_name": "Mask Inverse" }, "comments": "", "filter": { @@ -287,7 +287,7 @@ "args": { "file_name": "Data/Output/Examples/Combo-EBSD-osc_r0c0._feature_ids.png", "image_array_path": "DataContainer/CellData/Feature Ids (Color)", - "image_geom_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "index_offset": 0, "plane": 0 }, @@ -314,9 +314,9 @@ }, { "args": { - "avg_euler_angles_array_path": "AvgEulerAngles", - "avg_quats_array_path": "AvgQuats", - "cell_feature_attribute_matrix": "DataContainer/CellFeatureData", + "avg_euler_angles_array_name": "AvgEulerAngles", + "avg_quats_array_name": "AvgQuats", + "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_feature_ids_array_path": "DataContainer/CellData/FeatureIds", "cell_phases_array_path": "DataContainer/CellData/Phases", "cell_quats_array_path": "DataContainer/CellData/Quats", @@ -331,16 +331,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList", - "number_of_neighbors": "NumNeighbors", - "shared_surface_area_list": "SharedSurfaceAreaList", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "comments": "", "filter": { diff --git a/pipelines/PorosityAnalysis.d3dpipeline b/pipelines/PorosityAnalysis.d3dpipeline index 6591173b37..1ba110fe77 100644 --- a/pipelines/PorosityAnalysis.d3dpipeline +++ b/pipelines/PorosityAnalysis.d3dpipeline @@ -7,9 +7,9 @@ "args": { "cell_attribute_matrix_name": "Optical Data", "image_data_array_name": "ImageData", - "image_geometry_path": "RoboMet.3D Image Stack", + "output_image_geometry_path": "RoboMet.3D Image Stack", "image_transform_choice": 0, - "input_file_list_info": { + "input_file_list_object": { "end_index": 174, "file_extension": ".tif", "file_prefix": "slice_", @@ -40,7 +40,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -55,7 +55,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -66,10 +66,10 @@ }, { "args": { - "active_array_path": "Active", - "cell_feature_group_path": "Pore Data", + "active_array_name": "Active", + "cell_feature_group_name": "Pore Data", "feature_ids_path": "FeatureIds", - "grid_geometry_path": "RoboMet.3D Image Stack", + "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, @@ -85,13 +85,13 @@ }, { "args": { - "equivalent_diameters_path": "EquivalentDiameters", - "feature_attribute_matrix": "RoboMet.3D Image Stack/Pore Data", + "equivalent_diameters_name": "EquivalentDiameters", + "feature_attribute_matrix_path": "RoboMet.3D Image Stack/Pore Data", "feature_ids_path": "RoboMet.3D Image Stack/Optical Data/FeatureIds", - "geometry_path": "RoboMet.3D Image Stack", - "num_elements_path": "NumElements", + "input_image_geometry_path": "RoboMet.3D Image Stack", + "num_elements_name": "NumElements", "save_element_sizes": false, - "volumes_path": "Volumes" + "volumes_name": "Volumes" }, "comments": "", "filter": { @@ -104,7 +104,7 @@ "args": { "created_array_suffix": "", "feature_ids_path": "RoboMet.3D Image Stack/Optical Data/FeatureIds", - "selected_feature_array_path": ["RoboMet.3D Image Stack/Pore Data/EquivalentDiameters"] + "selected_feature_array_paths": ["RoboMet.3D Image Stack/Pore Data/EquivalentDiameters"] }, "comments": "", "filter": { @@ -115,12 +115,12 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "component_count": 1, "data_format": "", - "initialization_value": "1", + "initialization_value_str": "1", "numeric_type": 4, - "output_data_array": "RoboMet.3D Image Stack/Optical Data/Phases", + "output_array_path": "RoboMet.3D Image Stack/Optical Data/Phases", "tuple_dimensions": [ [ 0.0 @@ -165,10 +165,10 @@ }, { "args": { - "centroids_array_path": "Centroids", - "feature_attribute_matrix": "RoboMet.3D Image Stack/Pore Data", + "centroids_array_name": "Centroids", + "feature_attribute_matrix_path": "RoboMet.3D Image Stack/Pore Data", "feature_ids_path": "RoboMet.3D Image Stack/Optical Data/FeatureIds", - "selected_image_geometry": "RoboMet.3D Image Stack" + "input_image_geometry_path": "RoboMet.3D Image Stack" }, "comments": "", "filter": { @@ -231,7 +231,7 @@ "rdf_array_name": "RDF", "remove_biased_features": false, "seed_value": 5489, - "selected_image_geometry": "RoboMet.3D Image Stack", + "input_image_geometry_path": "RoboMet.3D Image Stack", "set_random_seed": false }, "comments": "", diff --git a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline index 5a94f8b945..ae486a45de 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline @@ -7,9 +7,9 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "image_data_array_name": "ImageData", - "image_geometry_path": "ImageDataContainer", + "output_image_geometry_path": "ImageDataContainer", "image_transform_choice": 0, - "input_file_list_info": { + "input_file_list_object": { "end_index": 174, "file_extension": ".tif", "file_prefix": "slice_", @@ -40,7 +40,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -55,7 +55,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -66,10 +66,10 @@ }, { "args": { - "active_array_path": "Active", - "cell_feature_group_path": "CellFeatureData", - "feature_ids_path": "FeatureIds", - "grid_geometry_path": "ImageDataContainer", + "active_array_name": "Active", + "cell_feature_group_name": "CellFeatureData", + "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, @@ -85,13 +85,13 @@ }, { "args": { - "equivalent_diameters_path": "EquivalentDiameters", - "feature_attribute_matrix": "ImageDataContainer/CellFeatureData", + "equivalent_diameters_name": "EquivalentDiameters", + "feature_attribute_matrix_path": "ImageDataContainer/CellFeatureData", "feature_ids_path": "ImageDataContainer/Cell Data/FeatureIds", - "geometry_path": "ImageDataContainer", - "num_elements_path": "NumElements", + "input_image_geometry_path": "ImageDataContainer", + "num_elements_name": "NumElements", "save_element_sizes": false, - "volumes_path": "Volumes" + "volumes_name": "Volumes" }, "comments": "", "filter": { @@ -104,7 +104,7 @@ "args": { "created_array_suffix": "", "feature_ids_path": "ImageDataContainer/Cell Data/FeatureIds", - "selected_feature_array_path": ["ImageDataContainer/CellFeatureData/EquivalentDiameters"] + "selected_feature_array_paths": ["ImageDataContainer/CellFeatureData/EquivalentDiameters"] }, "comments": "", "filter": { @@ -115,12 +115,12 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "component_count": 1, "data_format": "", - "initialization_value": "1", + "initialization_value_str": "1", "numeric_type": 4, - "output_data_array": "ImageDataContainer/Cell Data/Phases", + "output_array_path": "ImageDataContainer/Cell Data/Phases", "tuple_dimensions": [ [ 164.0, @@ -167,10 +167,10 @@ }, { "args": { - "centroids_array_path": "Centroids", - "feature_attribute_matrix": "ImageDataContainer/CellFeatureData", + "centroids_array_name": "Centroids", + "feature_attribute_matrix_path": "ImageDataContainer/CellFeatureData", "feature_ids_path": "ImageDataContainer/Cell Data/FeatureIds", - "selected_image_geometry": "ImageDataContainer" + "input_image_geometry_path": "ImageDataContainer" }, "comments": "", "filter": { diff --git a/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline index e053862119..d444e10797 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline @@ -7,9 +7,9 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "image_data_array_name": "ImageData", - "image_geometry_path": "ImageDataContainer", + "output_image_geometry_path": "ImageDataContainer", "image_transform_choice": 0, - "input_file_list_info": { + "input_file_list_object": { "end_index": 174, "file_extension": ".tif", "file_prefix": "slice_", @@ -40,7 +40,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -55,7 +55,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -66,10 +66,10 @@ }, { "args": { - "active_array_path": "Active", - "cell_feature_group_path": "CellFeatureData", - "feature_ids_path": "FeatureIds", - "grid_geometry_path": "ImageDataContainer", + "active_array_name": "Active", + "cell_feature_group_name": "CellFeatureData", + "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, @@ -91,10 +91,10 @@ "feature_ids_path": "ImageDataContainer/Cell Data/FeatureIds", "fix_problem_voxels": true, "generate_triple_lines": false, - "grid_geometry_data_path": "ImageDataContainer", + "input_grid_geometry_path": "ImageDataContainer", "node_types_array_name": "NodeTypes", - "selected_data_array_paths": [], - "triangle_geometry_name": "TriangleDataContainer", + "input_data_array_paths": [], + "output_triangle_geometry_path": "TriangleDataContainer", "vertex_data_group_name": "Vertex Data" }, "comments": "", @@ -114,7 +114,7 @@ "surface_point_lambda": 0.0, "surface_quad_point_lambda": 0.0, "surface_triple_line_lambda": 0.0, - "triangle_geometry_data_path": "TriangleDataContainer", + "input_triangle_geometry_path": "TriangleDataContainer", "triple_line_lambda": 0.10000000149011612, "use_taubin_smoothing": true }, @@ -133,7 +133,7 @@ ] ], "delete_original_array": true, - "multicomponent_array": "TriangleDataContainer/Face Data/FaceLabels", + "multicomponent_array_path": "TriangleDataContainer/Face Data/FaceLabels", "postfix": "-", "select_components_to_extract": false }, @@ -146,7 +146,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -161,7 +161,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "FaceLabels-0 Mask" + "output_data_array_name": "FaceLabels-0 Mask" }, "comments": "", "filter": { @@ -172,7 +172,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -187,7 +187,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "FaceLabels-1 Mask" + "output_data_array_name": "FaceLabels-1 Mask" }, "comments": "", "filter": { @@ -230,11 +230,11 @@ "args": { "move_values": true, "normalize_data": false, - "selected_data_array_paths": [ + "input_data_array_paths": [ "TriangleDataContainer/Face Data/FaceLabels-0", "TriangleDataContainer/Face Data/FaceLabels-1" ], - "stacked_data_array_name": "Face Labels" + "output_data_array_name": "Face Labels" }, "comments": "", "filter": { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.cpp index 96caba6147..ca15995937 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.cpp @@ -68,14 +68,14 @@ Parameters ITKAbsImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKAbsImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKAbsImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKAbsImage::preflightImpl(const DataStructure& dataStr Result<> ITKAbsImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKAbsImage::ITKAbsImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKAbsImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.hpp index cbc3f055c4..496f147619 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKAbsImage : public IFilter ITKAbsImage& operator=(ITKAbsImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.cpp index 30183714b1..3ab91dae87 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.cpp @@ -68,14 +68,14 @@ Parameters ITKAcosImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKAcosImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKAcosImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKAcosImage::preflightImpl(const DataStructure& dataSt Result<> ITKAcosImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKAcosImage::ITKAcosImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKAcosImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.hpp index 4ebeabfc7e..4019ba4dec 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.hpp @@ -48,9 +48,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKAcosImage : public IFilter ITKAcosImage& operator=(ITKAcosImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.cpp index 789f9d91cd..5a80af0ff7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.cpp @@ -91,14 +91,14 @@ Parameters ITKAdaptiveHistogramEqualizationImage::parameters() const "Set/Get the value of beta. If beta = 1 (and alpha = 1), then the output image matches the input image. As beta approaches 0, the filter behaves as an unsharp mask. Default is 0.3.", 0.3f)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -113,9 +113,9 @@ IFilter::UniquePointer ITKAdaptiveHistogramEqualizationImage::clone() const IFilter::PreflightResult ITKAdaptiveHistogramEqualizationImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto radius = filterArgs.value(k_Radius_Key); auto alpha = filterArgs.value(k_Alpha_Key); @@ -131,9 +131,9 @@ IFilter::PreflightResult ITKAdaptiveHistogramEqualizationImage::preflightImpl(co Result<> ITKAdaptiveHistogramEqualizationImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto radius = filterArgs.value(k_Radius_Key); @@ -170,9 +170,9 @@ Result ITKAdaptiveHistogramEqualizationImage::FromSIMPLJson(const nlo results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_RadiusKey, k_Radius_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_AlphaKey, k_Alpha_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_BetaKey, k_Beta_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp index ab86d66901..5270cbfe20 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp @@ -44,9 +44,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKAdaptiveHistogramEqualizationImage : public I ITKAdaptiveHistogramEqualizationImage& operator=(ITKAdaptiveHistogramEqualizationImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Radius_Key = "radius"; static inline constexpr StringLiteral k_Alpha_Key = "alpha"; static inline constexpr StringLiteral k_Beta_Key = "beta"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImage.cpp index 43c41ecfdb..2c906a8839 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImage.cpp @@ -83,7 +83,7 @@ Parameters ITKApproximateSignedDistanceMapImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -100,7 +100,7 @@ IFilter::PreflightResult ITKApproximateSignedDistanceMapImage::preflightImpl(con { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto insideValue = filterArgs.value(k_InsideValue_Key); auto outsideValue = filterArgs.value(k_OutsideValue_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -117,7 +117,7 @@ Result<> ITKApproximateSignedDistanceMapImage::executeImpl(DataStructure& dataSt { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto insideValue = filterArgs.value(k_InsideValue_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImage.hpp index c328245448..2e51ac415f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImage.hpp @@ -62,9 +62,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKApproximateSignedDistanceMapImage : public IF ITKApproximateSignedDistanceMapImage& operator=(ITKApproximateSignedDistanceMapImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_InsideValue_Key = "inside_value"; static inline constexpr StringLiteral k_OutsideValue_Key = "outside_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.cpp index 3fedf436fd..6f94d79791 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.cpp @@ -68,14 +68,14 @@ Parameters ITKAsinImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKAsinImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKAsinImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKAsinImage::preflightImpl(const DataStructure& dataSt Result<> ITKAsinImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKAsinImage::ITKAsinImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKAsinImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.hpp index 79eb64752d..9a1ea56181 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.hpp @@ -48,9 +48,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKAsinImage : public IFilter ITKAsinImage& operator=(ITKAsinImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.cpp index 070156e82b..a74f2b0a28 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.cpp @@ -68,14 +68,14 @@ Parameters ITKAtanImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKAtanImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKAtanImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKAtanImage::preflightImpl(const DataStructure& dataSt Result<> ITKAtanImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKAtanImage::ITKAtanImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKAtanImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.hpp index 4bc85a3740..3e78ed3da2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.hpp @@ -44,9 +44,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKAtanImage : public IFilter ITKAtanImage& operator=(ITKAtanImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.cpp index f978da0f18..218c430573 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.cpp @@ -83,14 +83,14 @@ Parameters ITKBinaryContourImage::parameters() const params.insert(std::make_unique(k_ForegroundValue_Key, "Foreground Value", "Set/Get the foreground value used to identify the objects in the input and output images.", 1.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKBinaryContourImage::clone() const IFilter::PreflightResult ITKBinaryContourImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); auto foregroundValue = filterArgs.value(k_ForegroundValue_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKBinaryContourImage::preflightImpl(const DataStructur Result<> ITKBinaryContourImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -159,9 +159,9 @@ Result ITKBinaryContourImage::FromSIMPLJson(const nlohmann::json& jso results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ForegroundValueKey, k_ForegroundValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.hpp index f5295e2b4a..92104fd19b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.hpp @@ -39,9 +39,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryContourImage : public IFilter ITKBinaryContourImage& operator=(ITKBinaryContourImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.cpp index 65b328cc75..4e5f355d0a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.cpp @@ -90,14 +90,14 @@ Parameters ITKBinaryDilateImage::parameters() const params.insert(std::make_unique(k_BoundaryToForeground_Key, "BoundaryToForeground", "Mark the boundary between foreground and background.", false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -112,9 +112,9 @@ IFilter::UniquePointer ITKBinaryDilateImage::clone() const IFilter::PreflightResult ITKBinaryDilateImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); @@ -131,9 +131,9 @@ IFilter::PreflightResult ITKBinaryDilateImage::preflightImpl(const DataStructure Result<> ITKBinaryDilateImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -174,9 +174,9 @@ Result ITKBinaryDilateImage::FromSIMPLJson(const nlohmann::json& json results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ForegroundValueKey, k_ForegroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BoundaryToForegroundKey, k_BoundaryToForeground_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp index 0d38838331..f21539a70b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp @@ -48,11 +48,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryDilateImage : public IFilter ITKBinaryDilateImage& operator=(ITKBinaryDilateImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_BoundaryToForeground_Key = "boundary_to_foreground"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.cpp index 6ae06bf92b..7f5030e94e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.cpp @@ -90,14 +90,14 @@ Parameters ITKBinaryErodeImage::parameters() const params.insert(std::make_unique(k_BoundaryToForeground_Key, "BoundaryToForeground", "Mark the boundary between foreground and background.", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -112,9 +112,9 @@ IFilter::UniquePointer ITKBinaryErodeImage::clone() const IFilter::PreflightResult ITKBinaryErodeImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); @@ -131,9 +131,9 @@ IFilter::PreflightResult ITKBinaryErodeImage::preflightImpl(const DataStructure& Result<> ITKBinaryErodeImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -174,9 +174,9 @@ Result ITKBinaryErodeImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ForegroundValueKey, k_ForegroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BoundaryToForegroundKey, k_BoundaryToForeground_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp index e9359caeda..bab3948853 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp @@ -48,11 +48,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryErodeImage : public IFilter ITKBinaryErodeImage& operator=(ITKBinaryErodeImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_BoundaryToForeground_Key = "boundary_to_foreground"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.cpp index 8121d36447..ea182d0ad2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.cpp @@ -86,14 +86,14 @@ Parameters ITKBinaryMorphologicalClosingImage::parameters() const params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -108,9 +108,9 @@ IFilter::UniquePointer ITKBinaryMorphologicalClosingImage::clone() const IFilter::PreflightResult ITKBinaryMorphologicalClosingImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto foregroundValue = filterArgs.value(k_ForegroundValue_Key); @@ -126,9 +126,9 @@ IFilter::PreflightResult ITKBinaryMorphologicalClosingImage::preflightImpl(const Result<> ITKBinaryMorphologicalClosingImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp index b6a305cdca..7935eedbb2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp @@ -39,11 +39,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryMorphologicalClosingImage : public IFil ITKBinaryMorphologicalClosingImage& operator=(ITKBinaryMorphologicalClosingImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.cpp index 5d350860cb..bbf3968a7c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.cpp @@ -86,14 +86,14 @@ Parameters ITKBinaryMorphologicalOpeningImage::parameters() const params.insert(std::make_unique(k_ForegroundValue_Key, "Foreground Value", "Set the value in the image to consider as 'foreground'. Defaults to maximum value of PixelType.", 1.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -108,9 +108,9 @@ IFilter::UniquePointer ITKBinaryMorphologicalOpeningImage::clone() const IFilter::PreflightResult ITKBinaryMorphologicalOpeningImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); @@ -126,9 +126,9 @@ IFilter::PreflightResult ITKBinaryMorphologicalOpeningImage::preflightImpl(const Result<> ITKBinaryMorphologicalOpeningImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -166,9 +166,9 @@ Result ITKBinaryMorphologicalOpeningImage::FromSIMPLJson(const nlohma results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ForegroundValueKey, k_ForegroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp index efad2f5d01..bc027ab431 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp @@ -39,11 +39,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryMorphologicalOpeningImage : public IFil ITKBinaryMorphologicalOpeningImage& operator=(ITKBinaryMorphologicalOpeningImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.cpp index 7e152cbdb8..2813f3faa4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.cpp @@ -93,14 +93,14 @@ Parameters ITKBinaryOpeningByReconstructionImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -115,9 +115,9 @@ IFilter::UniquePointer ITKBinaryOpeningByReconstructionImage::clone() const IFilter::PreflightResult ITKBinaryOpeningByReconstructionImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto foregroundValue = filterArgs.value(k_ForegroundValue_Key); @@ -134,9 +134,9 @@ IFilter::PreflightResult ITKBinaryOpeningByReconstructionImage::preflightImpl(co Result<> ITKBinaryOpeningByReconstructionImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -177,9 +177,9 @@ Result ITKBinaryOpeningByReconstructionImage::FromSIMPLJson(const nlo results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp index 29d1587b9f..1e50eef4ca 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp @@ -38,11 +38,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryOpeningByReconstructionImage : public I ITKBinaryOpeningByReconstructionImage& operator=(ITKBinaryOpeningByReconstructionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.cpp index fe16b043f6..35f60a9952 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.cpp @@ -84,14 +84,14 @@ Parameters ITKBinaryProjectionImage::parameters() const 0.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -106,9 +106,9 @@ IFilter::UniquePointer ITKBinaryProjectionImage::clone() const IFilter::PreflightResult ITKBinaryProjectionImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto projectionDimension = filterArgs.value(k_ProjectionDimension_Key); auto foregroundValue = filterArgs.value(k_ForegroundValue_Key); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); @@ -123,9 +123,9 @@ IFilter::PreflightResult ITKBinaryProjectionImage::preflightImpl(const DataStruc Result<> ITKBinaryProjectionImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto projectionDimension = filterArgs.value(k_ProjectionDimension_Key); @@ -177,9 +177,9 @@ Result ITKBinaryProjectionImage::FromSIMPLJson(const nlohmann::json& results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_ProjectionDimensionKey, k_ProjectionDimension_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ForegroundValueKey, k_ForegroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp index 4d81e22340..eb503fac9a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp @@ -55,9 +55,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryProjectionImage : public IFilter ITKBinaryProjectionImage& operator=(ITKBinaryProjectionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_ProjectionDimension_Key = "projection_dimension"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.cpp index d16990cdb7..bb647ffd60 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.cpp @@ -67,14 +67,14 @@ Parameters ITKBinaryThinningImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKBinaryThinningImage::clone() const IFilter::PreflightResult ITKBinaryThinningImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKBinaryThinningImage::preflightImpl(const DataStructu Result<> ITKBinaryThinningImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKBinaryThinningImage::ITKBinaryThinningImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKBinaryThinningImage::FromSIMPLJson(const nlohmann::json& js std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp index b68a579d21..0ac4f0fce7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp @@ -41,9 +41,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryThinningImage : public IFilter ITKBinaryThinningImage& operator=(ITKBinaryThinningImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.cpp index 091eafee4e..b48f41c807 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.cpp @@ -84,14 +84,14 @@ Parameters ITKBinaryThresholdImage::parameters() const params.insert(std::make_unique(k_OutsideValue_Key, "OutsideValue", "Set the 'outside' pixel value. The default value NumericTraits::ZeroValue() .", 0u)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -106,9 +106,9 @@ IFilter::UniquePointer ITKBinaryThresholdImage::clone() const IFilter::PreflightResult ITKBinaryThresholdImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto lowerThreshold = filterArgs.value(k_LowerThreshold_Key); auto upperThreshold = filterArgs.value(k_UpperThreshold_Key); auto insideValue = filterArgs.value(k_InsideValue_Key); @@ -125,9 +125,9 @@ IFilter::PreflightResult ITKBinaryThresholdImage::preflightImpl(const DataStruct Result<> ITKBinaryThresholdImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto lowerThreshold = filterArgs.value(k_LowerThreshold_Key); @@ -166,9 +166,9 @@ Result ITKBinaryThresholdImage::FromSIMPLJson(const nlohmann::json& j results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UpperThresholdKey, k_UpperThreshold_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_InsideValueKey, k_InsideValue_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_OutsideValueKey, k_OutsideValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp index 9d8b72023f..980894d32a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp @@ -39,9 +39,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryThresholdImage : public IFilter ITKBinaryThresholdImage& operator=(ITKBinaryThresholdImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_LowerThreshold_Key = "lower_threshold"; static inline constexpr StringLiteral k_UpperThreshold_Key = "upper_threshold"; static inline constexpr StringLiteral k_InsideValue_Key = "inside_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.cpp index f4b2772c97..55b86f96c9 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.cpp @@ -83,14 +83,14 @@ Parameters ITKBlackTopHatImage::parameters() const params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKBlackTopHatImage::clone() const IFilter::PreflightResult ITKBlackTopHatImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto safeBorder = filterArgs.value(k_SafeBorder_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKBlackTopHatImage::preflightImpl(const DataStructure& Result<> ITKBlackTopHatImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -159,9 +159,9 @@ Result ITKBlackTopHatImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SafeBorderKey, k_SafeBorder_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp index cd70055a2a..922f982612 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp @@ -34,11 +34,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKBlackTopHatImage : public IFilter ITKBlackTopHatImage& operator=(ITKBlackTopHatImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImage.hpp index a9b80533e9..61bbae146f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBoundedReciprocalImage : public IFilter ITKBoundedReciprocalImage& operator=(ITKBoundedReciprocalImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.cpp index aa535d05e6..890b3413ae 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.cpp @@ -91,14 +91,14 @@ Parameters ITKClosingByReconstructionImage::parameters() const "Set/Get whether the original intensities of the image retained for those pixels unaffected by the opening by reconstruction. If Off, the output pixel contrast will be reduced.", false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -113,9 +113,9 @@ IFilter::UniquePointer ITKClosingByReconstructionImage::clone() const IFilter::PreflightResult ITKClosingByReconstructionImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -131,9 +131,9 @@ IFilter::PreflightResult ITKClosingByReconstructionImage::preflightImpl(const Da Result<> ITKClosingByReconstructionImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -171,9 +171,9 @@ Result ITKClosingByReconstructionImage::FromSIMPLJson(const nlohmann: results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_PreserveIntensitiesKey, k_PreserveIntensities_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp index f3f4a5d4bb..4f6256e6b3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp @@ -43,11 +43,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKClosingByReconstructionImage : public IFilter ITKClosingByReconstructionImage& operator=(ITKClosingByReconstructionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; static inline constexpr StringLiteral k_PreserveIntensities_Key = "preserve_intensities"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImage.cpp index 4178f12b15..f45e3f2bbe 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImage.cpp @@ -83,7 +83,7 @@ Parameters ITKConnectedComponentImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -100,7 +100,7 @@ IFilter::PreflightResult ITKConnectedComponentImage::preflightImpl(const DataStr { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -116,7 +116,7 @@ Result<> ITKConnectedComponentImage::executeImpl(DataStructure& dataStructure, c { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImage.hpp index 5552f0b888..ca01aa9c7b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImage.hpp @@ -37,9 +37,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKConnectedComponentImage : public IFilter ITKConnectedComponentImage& operator=(ITKConnectedComponentImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; static inline constexpr StringLiteral k_ImageDataPath_Key = "image_data_path"; static inline constexpr StringLiteral k_MaskImage_Key = "mask_image"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.cpp index 4174d07df0..a6969c162b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.cpp @@ -68,14 +68,14 @@ Parameters ITKCosImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKCosImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKCosImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKCosImage::preflightImpl(const DataStructure& dataStr Result<> ITKCosImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKCosImage::ITKCosImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKCosImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.hpp index db4dc5f98e..0d2218510c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.hpp @@ -48,9 +48,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKCosImage : public IFilter ITKCosImage& operator=(ITKCosImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImage.cpp index 8646f08944..16d3980681 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImage.cpp @@ -89,7 +89,7 @@ Parameters ITKCurvatureAnisotropicDiffusionImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -106,7 +106,7 @@ IFilter::PreflightResult ITKCurvatureAnisotropicDiffusionImage::preflightImpl(co { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto timeStep = filterArgs.value(k_TimeStep_Key); auto conductanceParameter = filterArgs.value(k_ConductanceParameter_Key); auto conductanceScalingUpdateInterval = filterArgs.value(k_ConductanceScalingUpdateInterval_Key); @@ -124,7 +124,7 @@ Result<> ITKCurvatureAnisotropicDiffusionImage::executeImpl(DataStructure& dataS { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto timeStep = filterArgs.value(k_TimeStep_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImage.hpp index 07515d5ee1..72b7e8ab82 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImage.hpp @@ -49,9 +49,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKCurvatureAnisotropicDiffusionImage : public I ITKCurvatureAnisotropicDiffusionImage& operator=(ITKCurvatureAnisotropicDiffusionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_TimeStep_Key = "time_step"; static inline constexpr StringLiteral k_ConductanceParameter_Key = "conductance_parameter"; static inline constexpr StringLiteral k_ConductanceScalingUpdateInterval_Key = "conductance_scaling_update_interval"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImage.cpp index fd3d684260..14a4e3e30f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImage.cpp @@ -83,7 +83,7 @@ Parameters ITKCurvatureFlowImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -100,7 +100,7 @@ IFilter::PreflightResult ITKCurvatureFlowImage::preflightImpl(const DataStructur { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto timeStep = filterArgs.value(k_TimeStep_Key); auto numberOfIterations = filterArgs.value(k_NumberOfIterations_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -116,7 +116,7 @@ Result<> ITKCurvatureFlowImage::executeImpl(DataStructure& dataStructure, const { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto timeStep = filterArgs.value(k_TimeStep_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImage.hpp index c538a0d860..3a809d1b1f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImage.hpp @@ -65,9 +65,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKCurvatureFlowImage : public IFilter ITKCurvatureFlowImage& operator=(ITKCurvatureFlowImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_TimeStep_Key = "time_step"; static inline constexpr StringLiteral k_NumberOfIterations_Key = "number_of_iterations"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImage.cpp index f720bbac9a..26f596c3b5 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImage.cpp @@ -90,7 +90,7 @@ Parameters ITKDanielssonDistanceMapImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -107,7 +107,7 @@ IFilter::PreflightResult ITKDanielssonDistanceMapImage::preflightImpl(const Data { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto inputIsBinary = filterArgs.value(k_InputIsBinary_Key); auto squaredDistance = filterArgs.value(k_SquaredDistance_Key); auto useImageSpacing = filterArgs.value(k_UseImageSpacing_Key); @@ -125,7 +125,7 @@ Result<> ITKDanielssonDistanceMapImage::executeImpl(DataStructure& dataStructure { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto inputIsBinary = filterArgs.value(k_InputIsBinary_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImage.hpp index 00f5535fab..08c8dd61be 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImage.hpp @@ -66,9 +66,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKDanielssonDistanceMapImage : public IFilter ITKDanielssonDistanceMapImage& operator=(ITKDanielssonDistanceMapImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_InputIsBinary_Key = "input_is_binary"; static inline constexpr StringLiteral k_SquaredDistance_Key = "squared_distance"; static inline constexpr StringLiteral k_UseImageSpacing_Key = "use_image_spacing"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.cpp index c59916b17c..22ac205492 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.cpp @@ -83,14 +83,14 @@ Parameters ITKDilateObjectMorphologyImage::parameters() const params.insert(std::make_unique(k_ObjectValue_Key, "ObjectValue", "The pixel value of the 'Object' to be dilated", 1)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKDilateObjectMorphologyImage::clone() const IFilter::PreflightResult ITKDilateObjectMorphologyImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto objectValue = filterArgs.value(k_ObjectValue_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKDilateObjectMorphologyImage::preflightImpl(const Dat Result<> ITKDilateObjectMorphologyImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -159,9 +159,9 @@ Result ITKDilateObjectMorphologyImage::FromSIMPLJson(const nlohmann:: results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ObjectValueKey, k_ObjectValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp index 94cfbc481f..c4c534a71c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp @@ -38,11 +38,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKDilateObjectMorphologyImage : public IFilter ITKDilateObjectMorphologyImage& operator=(ITKDilateObjectMorphologyImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_ObjectValue_Key = "object_value"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.cpp index 3cb378a089..a580c8dd2e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.cpp @@ -94,14 +94,14 @@ Parameters ITKDiscreteGaussianImage::parameters() const true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -116,9 +116,9 @@ IFilter::UniquePointer ITKDiscreteGaussianImage::clone() const IFilter::PreflightResult ITKDiscreteGaussianImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto variance = filterArgs.value(k_Variance_Key); auto maximumKernelWidth = filterArgs.value(k_MaximumKernelWidth_Key); @@ -136,9 +136,9 @@ IFilter::PreflightResult ITKDiscreteGaussianImage::preflightImpl(const DataStruc Result<> ITKDiscreteGaussianImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto variance = filterArgs.value(k_Variance_Key); @@ -178,9 +178,9 @@ Result ITKDiscreteGaussianImage::FromSIMPLJson(const nlohmann::json& results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_MaximumKernelWidthKey, k_MaximumKernelWidth_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaximumErrorKey, k_MaximumError_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseImageSpacingKey, k_UseImageSpacing_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.hpp index bf5e92e49f..0b16d8c95e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.hpp @@ -49,9 +49,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKDiscreteGaussianImage : public IFilter ITKDiscreteGaussianImage& operator=(ITKDiscreteGaussianImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Variance_Key = "variance"; static inline constexpr StringLiteral k_MaximumKernelWidth_Key = "maximum_kernel_width"; static inline constexpr StringLiteral k_MaximumError_Key = "maximum_error"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImage.cpp index 09196a52c1..f752bcb742 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImage.cpp @@ -114,7 +114,7 @@ Parameters ITKDoubleThresholdImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -131,7 +131,7 @@ IFilter::PreflightResult ITKDoubleThresholdImage::preflightImpl(const DataStruct { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto threshold1 = filterArgs.value(k_Threshold1_Key); auto threshold2 = filterArgs.value(k_Threshold2_Key); auto threshold3 = filterArgs.value(k_Threshold3_Key); @@ -153,7 +153,7 @@ Result<> ITKDoubleThresholdImage::executeImpl(DataStructure& dataStructure, cons { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto threshold1 = filterArgs.value(k_Threshold1_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImage.hpp index e10511afc1..f19c76cf9c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImage.hpp @@ -41,9 +41,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKDoubleThresholdImage : public IFilter ITKDoubleThresholdImage& operator=(ITKDoubleThresholdImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Threshold1_Key = "threshold1"; static inline constexpr StringLiteral k_Threshold2_Key = "threshold2"; static inline constexpr StringLiteral k_Threshold3_Key = "threshold3"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.cpp index 44f15d9485..18edd056c7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.cpp @@ -86,14 +86,14 @@ Parameters ITKErodeObjectMorphologyImage::parameters() const params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set the value to be assigned to eroded pixels", 0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -108,9 +108,9 @@ IFilter::UniquePointer ITKErodeObjectMorphologyImage::clone() const IFilter::PreflightResult ITKErodeObjectMorphologyImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto objectValue = filterArgs.value(k_ObjectValue_Key); @@ -126,9 +126,9 @@ IFilter::PreflightResult ITKErodeObjectMorphologyImage::preflightImpl(const Data Result<> ITKErodeObjectMorphologyImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -166,9 +166,9 @@ Result ITKErodeObjectMorphologyImage::FromSIMPLJson(const nlohmann::j results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ObjectValueKey, k_ObjectValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp index 487d92b48a..2a39c3d123 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp @@ -38,11 +38,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKErodeObjectMorphologyImage : public IFilter ITKErodeObjectMorphologyImage& operator=(ITKErodeObjectMorphologyImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_ObjectValue_Key = "object_value"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.cpp index 6423061fbc..c0d821bc15 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.cpp @@ -68,14 +68,14 @@ Parameters ITKExpImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKExpImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKExpImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKExpImage::preflightImpl(const DataStructure& dataStr Result<> ITKExpImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKExpImage::ITKExpImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKExpImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.hpp index ed47035824..d3180938c6 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKExpImage : public IFilter ITKExpImage& operator=(ITKExpImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.cpp index 3987250417..82d769cc1f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.cpp @@ -68,14 +68,14 @@ Parameters ITKExpNegativeImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -90,9 +90,9 @@ IFilter::UniquePointer ITKExpNegativeImage::clone() const IFilter::PreflightResult ITKExpNegativeImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -104,9 +104,9 @@ IFilter::PreflightResult ITKExpNegativeImage::preflightImpl(const DataStructure& Result<> ITKExpNegativeImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKExpNegativeImage::ITKExpNegativeImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKExpNegativeImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.hpp index 195f75e578..b396814992 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKExpNegativeImage : public IFilter ITKExpNegativeImage& operator=(ITKExpNegativeImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImage.cpp index 864e40ff8b..66d52be80f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImage.cpp @@ -91,7 +91,7 @@ Parameters ITKGradientAnisotropicDiffusionImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -108,7 +108,7 @@ IFilter::PreflightResult ITKGradientAnisotropicDiffusionImage::preflightImpl(con { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto timeStep = filterArgs.value(k_TimeStep_Key); auto conductanceParameter = filterArgs.value(k_ConductanceParameter_Key); auto conductanceScalingUpdateInterval = filterArgs.value(k_ConductanceScalingUpdateInterval_Key); @@ -126,7 +126,7 @@ Result<> ITKGradientAnisotropicDiffusionImage::executeImpl(DataStructure& dataSt { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto timeStep = filterArgs.value(k_TimeStep_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImage.hpp index 7329ff5aae..70c8144940 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImage.hpp @@ -45,9 +45,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientAnisotropicDiffusionImage : public IF ITKGradientAnisotropicDiffusionImage& operator=(ITKGradientAnisotropicDiffusionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_TimeStep_Key = "time_step"; static inline constexpr StringLiteral k_ConductanceParameter_Key = "conductance_parameter"; static inline constexpr StringLiteral k_ConductanceScalingUpdateInterval_Key = "conductance_scaling_update_interval"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.cpp index 82bf150902..f71afbcefe 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.cpp @@ -78,14 +78,14 @@ Parameters ITKGradientMagnitudeImage::parameters() const true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -100,9 +100,9 @@ IFilter::UniquePointer ITKGradientMagnitudeImage::clone() const IFilter::PreflightResult ITKGradientMagnitudeImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto useImageSpacing = filterArgs.value(k_UseImageSpacing_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -116,9 +116,9 @@ IFilter::PreflightResult ITKGradientMagnitudeImage::preflightImpl(const DataStru Result<> ITKGradientMagnitudeImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto useImageSpacing = filterArgs.value(k_UseImageSpacing_Key); @@ -148,9 +148,9 @@ Result ITKGradientMagnitudeImage::FromSIMPLJson(const nlohmann::json& std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseImageSpacingKey, k_UseImageSpacing_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp index e616b4f443..df26e86e16 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp @@ -38,9 +38,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientMagnitudeImage : public IFilter ITKGradientMagnitudeImage& operator=(ITKGradientMagnitudeImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_UseImageSpacing_Key = "use_image_spacing"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.cpp index dc392ea579..1ea580ceed 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.cpp @@ -1,7 +1,6 @@ #include "ITKGradientMagnitudeRecursiveGaussianImage.hpp" #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" -#include "ITKImageProcessing/Common/sitkCommon.hpp" #include "simplnx/Parameters/ArraySelectionParameter.hpp" #include "simplnx/Parameters/BoolParameter.hpp" @@ -72,20 +71,21 @@ std::vector ITKGradientMagnitudeRecursiveGaussianImage::defaultTags Parameters ITKGradientMagnitudeRecursiveGaussianImage::parameters() const { Parameters params; + params.insertSeparator(Parameters::Separator{"Input Parameters"}); params.insert(std::make_unique(k_Sigma_Key, "Sigma", "Set/Get Sigma value. Sigma is measured in the units of image spacing.", 1.0)); params.insert(std::make_unique(k_NormalizeAcrossScale_Key, "Normalize Across Scale", "Set/Get the normalization factor that will be used for the Gaussian. RecursiveGaussianImageFilter::SetNormalizeAcrossScale", false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -100,9 +100,9 @@ IFilter::UniquePointer ITKGradientMagnitudeRecursiveGaussianImage::clone() const IFilter::PreflightResult ITKGradientMagnitudeRecursiveGaussianImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto sigma = filterArgs.value(k_Sigma_Key); auto normalizeAcrossScale = filterArgs.value(k_NormalizeAcrossScale_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -117,9 +117,9 @@ IFilter::PreflightResult ITKGradientMagnitudeRecursiveGaussianImage::preflightIm Result<> ITKGradientMagnitudeRecursiveGaussianImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto sigma = filterArgs.value(k_Sigma_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.hpp index a8d8da1b10..08b1ad08a4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientMagnitudeRecursiveGaussianImage : pub ITKGradientMagnitudeRecursiveGaussianImage& operator=(ITKGradientMagnitudeRecursiveGaussianImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Sigma_Key = "sigma"; static inline constexpr StringLiteral k_NormalizeAcrossScale_Key = "normalize_across_scale"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.cpp index 4e53b175fb..13d9ec85db 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.cpp @@ -79,14 +79,14 @@ Parameters ITKGrayscaleDilateImage::parameters() const ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -101,9 +101,9 @@ IFilter::UniquePointer ITKGrayscaleDilateImage::clone() const IFilter::PreflightResult ITKGrayscaleDilateImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -117,9 +117,9 @@ IFilter::PreflightResult ITKGrayscaleDilateImage::preflightImpl(const DataStruct Result<> ITKGrayscaleDilateImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -151,9 +151,9 @@ Result ITKGrayscaleDilateImage::FromSIMPLJson(const nlohmann::json& j results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp index 725bdb3779..4c59cd036b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp @@ -33,11 +33,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleDilateImage : public IFilter ITKGrayscaleDilateImage& operator=(ITKGrayscaleDilateImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.cpp index d78323724e..86b9b1fe08 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.cpp @@ -79,14 +79,14 @@ Parameters ITKGrayscaleErodeImage::parameters() const ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -101,9 +101,9 @@ IFilter::UniquePointer ITKGrayscaleErodeImage::clone() const IFilter::PreflightResult ITKGrayscaleErodeImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -117,9 +117,9 @@ IFilter::PreflightResult ITKGrayscaleErodeImage::preflightImpl(const DataStructu Result<> ITKGrayscaleErodeImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -151,9 +151,9 @@ Result ITKGrayscaleErodeImage::FromSIMPLJson(const nlohmann::json& js results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp index 8fcdcbbf66..c49c9ab8db 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp @@ -33,11 +33,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleErodeImage : public IFilter ITKGrayscaleErodeImage& operator=(ITKGrayscaleErodeImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.cpp index 6ca202233c..b8dc4a8885 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.cpp @@ -76,14 +76,14 @@ Parameters ITKGrayscaleFillholeImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -98,9 +98,9 @@ IFilter::UniquePointer ITKGrayscaleFillholeImage::clone() const IFilter::PreflightResult ITKGrayscaleFillholeImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -113,9 +113,9 @@ IFilter::PreflightResult ITKGrayscaleFillholeImage::preflightImpl(const DataStru Result<> ITKGrayscaleFillholeImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -144,9 +144,9 @@ Result ITKGrayscaleFillholeImage::FromSIMPLJson(const nlohmann::json& std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp index 77a9ff9098..a5ab02bdc8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp @@ -44,9 +44,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleFillholeImage : public IFilter ITKGrayscaleFillholeImage& operator=(ITKGrayscaleFillholeImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.cpp index f80e9fc8e0..574568e9de 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.cpp @@ -76,14 +76,14 @@ Parameters ITKGrayscaleGrindPeakImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -98,9 +98,9 @@ IFilter::UniquePointer ITKGrayscaleGrindPeakImage::clone() const IFilter::PreflightResult ITKGrayscaleGrindPeakImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -113,9 +113,9 @@ IFilter::PreflightResult ITKGrayscaleGrindPeakImage::preflightImpl(const DataStr Result<> ITKGrayscaleGrindPeakImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -144,9 +144,9 @@ Result ITKGrayscaleGrindPeakImage::FromSIMPLJson(const nlohmann::json std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp index ef280dbce7..fdd944c4f8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp @@ -46,9 +46,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleGrindPeakImage : public IFilter ITKGrayscaleGrindPeakImage& operator=(ITKGrayscaleGrindPeakImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.cpp index 6d3e1638cd..bcb5d194f2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.cpp @@ -83,14 +83,14 @@ Parameters ITKGrayscaleMorphologicalClosingImage::parameters() const params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKGrayscaleMorphologicalClosingImage::clone() const IFilter::PreflightResult ITKGrayscaleMorphologicalClosingImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto safeBorder = filterArgs.value(k_SafeBorder_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKGrayscaleMorphologicalClosingImage::preflightImpl(co Result<> ITKGrayscaleMorphologicalClosingImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -159,9 +159,9 @@ Result ITKGrayscaleMorphologicalClosingImage::FromSIMPLJson(const nlo results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SafeBorderKey, k_SafeBorder_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp index c28c3de9a1..84cfe70433 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp @@ -33,11 +33,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleMorphologicalClosingImage : public I ITKGrayscaleMorphologicalClosingImage& operator=(ITKGrayscaleMorphologicalClosingImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.cpp index fce5e7af67..459952599b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.cpp @@ -83,14 +83,14 @@ Parameters ITKGrayscaleMorphologicalOpeningImage::parameters() const params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKGrayscaleMorphologicalOpeningImage::clone() const IFilter::PreflightResult ITKGrayscaleMorphologicalOpeningImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto safeBorder = filterArgs.value(k_SafeBorder_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKGrayscaleMorphologicalOpeningImage::preflightImpl(co Result<> ITKGrayscaleMorphologicalOpeningImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -159,9 +159,9 @@ Result ITKGrayscaleMorphologicalOpeningImage::FromSIMPLJson(const nlo results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SafeBorderKey, k_SafeBorder_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp index 29d1e04c4e..37bc12e391 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp @@ -33,11 +33,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleMorphologicalOpeningImage : public I ITKGrayscaleMorphologicalOpeningImage& operator=(ITKGrayscaleMorphologicalOpeningImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.cpp index 2f2520f453..4ca098f13d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.cpp @@ -83,14 +83,14 @@ Parameters ITKHConvexImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKHConvexImage::clone() const IFilter::PreflightResult ITKHConvexImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto height = filterArgs.value(k_Height_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -121,9 +121,9 @@ IFilter::PreflightResult ITKHConvexImage::preflightImpl(const DataStructure& dat Result<> ITKHConvexImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto height = filterArgs.value(k_Height_Key); @@ -155,9 +155,9 @@ Result ITKHConvexImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_HeightKey, k_Height_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.hpp index 72224f4212..43c33369da 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.hpp @@ -40,9 +40,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKHConvexImage : public IFilter ITKHConvexImage& operator=(ITKHConvexImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Height_Key = "height"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.cpp index 80c54ee58d..15d8e6f66b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.cpp @@ -76,14 +76,14 @@ Parameters ITKHMaximaImage::parameters() const 2.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -98,9 +98,9 @@ IFilter::UniquePointer ITKHMaximaImage::clone() const IFilter::PreflightResult ITKHMaximaImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto height = filterArgs.value(k_Height_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -113,9 +113,9 @@ IFilter::PreflightResult ITKHMaximaImage::preflightImpl(const DataStructure& dat Result<> ITKHMaximaImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto height = filterArgs.value(k_Height_Key); @@ -144,9 +144,9 @@ Result ITKHMaximaImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_HeightKey, k_Height_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.hpp index cd296e8bc7..4ab5a7878c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.hpp @@ -46,9 +46,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKHMaximaImage : public IFilter ITKHMaximaImage& operator=(ITKHMaximaImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Height_Key = "height"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.cpp index f2c50165d6..9e4ac17362 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.cpp @@ -83,14 +83,14 @@ Parameters ITKHMinimaImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKHMinimaImage::clone() const IFilter::PreflightResult ITKHMinimaImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto height = filterArgs.value(k_Height_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -121,9 +121,9 @@ IFilter::PreflightResult ITKHMinimaImage::preflightImpl(const DataStructure& dat Result<> ITKHMinimaImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto height = filterArgs.value(k_Height_Key); @@ -155,9 +155,9 @@ Result ITKHMinimaImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_HeightKey, k_Height_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.hpp index 05e8fcadf4..e37ccd88ba 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.hpp @@ -43,9 +43,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKHMinimaImage : public IFilter ITKHMinimaImage& operator=(ITKHMinimaImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Height_Key = "height"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.hpp index ebaf64ce4d..0c3b803185 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.hpp @@ -25,11 +25,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKImageReader : public IFilter // Parameter Keys static inline constexpr StringLiteral k_FileName_Key = "file_name"; - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "created_geometry_path"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "output_geometry_path"; static inline constexpr StringLiteral k_ImageDataArrayPath_Key = "image_data_array_name"; static inline constexpr StringLiteral k_CellDataName_Key = "cell_attribute_matrix_name"; - static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit"; + static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit_index"; static inline constexpr StringLiteral k_ChangeOrigin_Key = "change_origin"; static inline constexpr StringLiteral k_CenterOrigin_Key = "center_origin"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.hpp index 4be7e2df82..d87a6aaa45 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.hpp @@ -24,11 +24,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKImageWriter : public IFilter ITKImageWriter& operator=(ITKImageWriter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_Plane_Key = "plane"; + static inline constexpr StringLiteral k_Plane_Key = "plane_index"; static inline constexpr StringLiteral k_FileName_Key = "file_name"; static inline constexpr StringLiteral k_IndexOffset_Key = "index_offset"; static inline constexpr StringLiteral k_ImageArrayPath_Key = "image_array_path"; - static inline constexpr StringLiteral k_ImageGeomPath_Key = "image_geom_path"; + static inline constexpr StringLiteral k_ImageGeomPath_Key = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp index 3368299ea5..dbcb6cee2c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp @@ -31,7 +31,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKImportFijiMontageFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InputFile_Key = "input_file"; static inline constexpr StringLiteral k_DataGroupName_Key = "data_group_name"; - static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit"; + static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit_index"; static inline constexpr StringLiteral k_ChangeOrigin_Key = "change_origin"; static inline constexpr StringLiteral k_Origin_Key = "origin"; static inline constexpr StringLiteral k_ParentDataGroup_Key = "parent_data_group"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.cpp index 153a127a1f..ee504f9f3d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.cpp @@ -33,8 +33,8 @@ namespace RotateSampleRefFrame static inline constexpr nx::core::StringLiteral k_RotationRepresentation_Key = "rotation_representation"; static inline constexpr nx::core::StringLiteral k_RotationAxisAngle_Key = "rotation_axis"; static inline constexpr nx::core::StringLiteral k_RotationMatrix_Key = "rotation_matrix"; -static inline constexpr nx::core::StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; -static inline constexpr nx::core::StringLiteral k_CreatedImageGeometry_Key = "created_image_geometry"; +static inline constexpr nx::core::StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; +static inline constexpr nx::core::StringLiteral k_CreatedImageGeometry_Key = "output_image_geometry_path"; static inline constexpr nx::core::StringLiteral k_RotateSliceBySlice_Key = "rotate_slice_by_slice"; static inline constexpr nx::core::StringLiteral k_RemoveOriginalGeometry_Key = "remove_original_geometry"; @@ -191,7 +191,7 @@ Result<> ReadImageStack(DataStructure& dataStructure, const DataPath& imageGeomP Arguments colorToGrayscaleArgs; colorToGrayscaleArgs.insertOrAssign("conversion_algorithm", std::make_any(0)); colorToGrayscaleArgs.insertOrAssign("color_weights", std::make_any(luminosityValues)); - colorToGrayscaleArgs.insertOrAssign("input_data_array_vector", std::make_any>(std::vector{imageDataPath})); + colorToGrayscaleArgs.insertOrAssign("input_data_array_paths", std::make_any>(std::vector{imageDataPath})); colorToGrayscaleArgs.insertOrAssign("output_array_prefix", std::make_any("gray")); // Run grayscale filter and process results and messages diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.hpp index d884022606..d895467060 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.hpp @@ -24,13 +24,13 @@ class ITKIMAGEPROCESSING_EXPORT ITKImportImageStack : public IFilter ITKImportImageStack& operator=(ITKImportImageStack&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_InputFileListInfo_Key = "input_file_list_info"; + static inline constexpr StringLiteral k_InputFileListInfo_Key = "input_file_list_object"; static inline constexpr StringLiteral k_Origin_Key = "origin"; static inline constexpr StringLiteral k_Spacing_Key = "spacing"; - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_ImageDataArrayPath_Key = "image_data_array_name"; static inline constexpr StringLiteral k_CellDataName_Key = "cell_attribute_matrix_name"; - static inline constexpr StringLiteral k_ImageTransformChoice_Key = "image_transform_choice"; + static inline constexpr StringLiteral k_ImageTransformChoice_Key = "image_transform_index"; static inline constexpr StringLiteral k_ConvertToGrayScale_Key = "convert_to_gray_scale"; static inline constexpr StringLiteral k_ColorWeights_Key = "color_weights"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.cpp index 27a1577d87..2814f965fd 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.cpp @@ -82,14 +82,14 @@ Parameters ITKIntensityWindowingImage::parameters() const params.insert(std::make_unique(k_OutputMaximum_Key, "Output Maximum", "Set/Get the values of the maximum and minimum intensities of the output image.", 255.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -104,9 +104,9 @@ IFilter::UniquePointer ITKIntensityWindowingImage::clone() const IFilter::PreflightResult ITKIntensityWindowingImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto windowMinimum = filterArgs.value(k_WindowMinimum_Key); auto windowMaximum = filterArgs.value(k_WindowMaximum_Key); auto outputMinimum = filterArgs.value(k_OutputMinimum_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKIntensityWindowingImage::preflightImpl(const DataStr Result<> ITKIntensityWindowingImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto windowMinimum = filterArgs.value(k_WindowMinimum_Key); @@ -162,9 +162,9 @@ Result ITKIntensityWindowingImage::FromSIMPLJson(const nlohmann::json results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_WindowMaximumKey, k_WindowMaximum_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputMinimumKey, k_OutputMinimum_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputMaximumKey, k_OutputMaximum_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp index b218dc653d..b3f5d32d56 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp @@ -36,9 +36,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKIntensityWindowingImage : public IFilter ITKIntensityWindowingImage& operator=(ITKIntensityWindowingImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_WindowMinimum_Key = "window_minimum"; static inline constexpr StringLiteral k_WindowMaximum_Key = "window_maximum"; static inline constexpr StringLiteral k_OutputMinimum_Key = "output_minimum"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.cpp index 462c536a8b..dfb6e49f5a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.cpp @@ -74,14 +74,14 @@ Parameters ITKInvertIntensityImage::parameters() const params.insert(std::make_unique(k_Maximum_Key, "Maximum", "Set/Get the maximum intensity value for the inversion.", 255)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -96,9 +96,9 @@ IFilter::UniquePointer ITKInvertIntensityImage::clone() const IFilter::PreflightResult ITKInvertIntensityImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto maximum = filterArgs.value(k_Maximum_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -111,9 +111,9 @@ IFilter::PreflightResult ITKInvertIntensityImage::preflightImpl(const DataStruct Result<> ITKInvertIntensityImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto maximum = filterArgs.value(k_Maximum_Key); @@ -142,9 +142,9 @@ Result ITKInvertIntensityImage::FromSIMPLJson(const nlohmann::json& j std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaximumKey, k_Maximum_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp index 1481222e63..42ffa6b918 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp @@ -35,9 +35,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKInvertIntensityImage : public IFilter ITKInvertIntensityImage& operator=(ITKInvertIntensityImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Maximum_Key = "maximum"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImage.cpp index 4ff4447826..2ab9f30eb8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImage.cpp @@ -83,7 +83,7 @@ Parameters ITKIsoContourDistanceImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -100,7 +100,7 @@ IFilter::PreflightResult ITKIsoContourDistanceImage::preflightImpl(const DataStr { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto levelSetValue = filterArgs.value(k_LevelSetValue_Key); auto farValue = filterArgs.value(k_FarValue_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -117,7 +117,7 @@ Result<> ITKIsoContourDistanceImage::executeImpl(DataStructure& dataStructure, c { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto levelSetValue = filterArgs.value(k_LevelSetValue_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImage.hpp index d1dacb71f0..458a01770f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImage.hpp @@ -35,9 +35,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKIsoContourDistanceImage : public IFilter ITKIsoContourDistanceImage& operator=(ITKIsoContourDistanceImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_LevelSetValue_Key = "level_set_value"; static inline constexpr StringLiteral k_FarValue_Key = "far_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.cpp index d0570281f5..45354e4308 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.cpp @@ -81,14 +81,14 @@ Parameters ITKLabelContourImage::parameters() const "Set/Get the background value used to identify the objects and mark the pixels not on the border of the objects.", 0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -103,9 +103,9 @@ IFilter::UniquePointer ITKLabelContourImage::clone() const IFilter::PreflightResult ITKLabelContourImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -119,9 +119,9 @@ IFilter::PreflightResult ITKLabelContourImage::preflightImpl(const DataStructure Result<> ITKLabelContourImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -153,9 +153,9 @@ Result ITKLabelContourImage::FromSIMPLJson(const nlohmann::json& json results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.hpp index c0d1c3236a..f5bdbafceb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.hpp @@ -39,9 +39,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKLabelContourImage : public IFilter ITKLabelContourImage& operator=(ITKLabelContourImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImage.cpp index 4e15d6f97a..729e3a3676 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImage.cpp @@ -85,7 +85,7 @@ Parameters ITKLaplacianRecursiveGaussianImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -102,7 +102,7 @@ IFilter::PreflightResult ITKLaplacianRecursiveGaussianImage::preflightImpl(const { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto sigma = filterArgs.value(k_Sigma_Key); auto normalizeAcrossScale = filterArgs.value(k_NormalizeAcrossScale_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -119,7 +119,7 @@ Result<> ITKLaplacianRecursiveGaussianImage::executeImpl(DataStructure& dataStru { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto sigma = filterArgs.value(k_Sigma_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImage.hpp index 46f0f3c58a..78a4c4cd56 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKLaplacianRecursiveGaussianImage : public IFil ITKLaplacianRecursiveGaussianImage& operator=(ITKLaplacianRecursiveGaussianImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Sigma_Key = "sigma"; static inline constexpr StringLiteral k_NormalizeAcrossScale_Key = "normalize_across_scale"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.cpp index b26781fe85..02c735a2ad 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.cpp @@ -68,14 +68,14 @@ Parameters ITKLog10Image::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKLog10Image::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKLog10Image::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKLog10Image::preflightImpl(const DataStructure& dataS Result<> ITKLog10Image::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKLog10Image::ITKLog10ImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKLog10Image::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.hpp index 7890e90c9f..ba165592df 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKLog10Image : public IFilter ITKLog10Image& operator=(ITKLog10Image&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.cpp index a8c02f1ba6..c0597b5979 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.cpp @@ -68,14 +68,14 @@ Parameters ITKLogImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKLogImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKLogImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKLogImage::preflightImpl(const DataStructure& dataStr Result<> ITKLogImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKLogImage::ITKLogImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKLogImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.hpp index 6d959e9b93..55ad5f8d9d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKLogImage : public IFilter ITKLogImage& operator=(ITKLogImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.cpp index 916bb1b350..7f7344c4e3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.cpp @@ -148,16 +148,16 @@ Parameters ITKMaskImage::parameters() const params.insert(std::make_unique(k_OutsideValue_Key, "Outside Value", "Method to explicitly set the outside value of the mask.", 0)); params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath{}, + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - nx::core::GetAllDataTypes())); + params.insert( + std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::GetAllDataTypes())); params.insert(std::make_unique(k_MaskImageDataPath_Key, "MaskImage", "The path to the image data to be used as the mask (should be the same size as the input image)", DataPath{}, nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -171,9 +171,9 @@ IFilter::UniquePointer ITKMaskImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKMaskImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto outsideValue = filterArgs.value(k_OutsideValue_Key); auto maskArrayPath = filterArgs.value(k_MaskImageDataPath_Key); @@ -194,9 +194,9 @@ IFilter::PreflightResult ITKMaskImage::preflightImpl(const DataStructure& dataSt Result<> ITKMaskImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto outsideValue = filterArgs.value(k_OutsideValue_Key); auto maskArrayPath = filterArgs.value(k_MaskImageDataPath_Key); @@ -229,10 +229,10 @@ Result ITKMaskImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutsideValueKey, k_OutsideValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskCellArrayPathKey, k_MaskImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.hpp index c584bda85e..55af764a0e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.hpp @@ -52,9 +52,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKMaskImage : public IFilter ITKMaskImage& operator=(ITKMaskImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_OutsideValue_Key = "outside_value"; static inline constexpr StringLiteral k_MaskImageDataPath_Key = "mask_image_data_path"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImage.hpp index 96ccd380f7..9d578461bc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImage.hpp @@ -52,9 +52,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKMeanProjectionImage : public IFilter ITKMeanProjectionImage& operator=(ITKMeanProjectionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_ProjectionDimension_Key = "projection_dimension"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.cpp index 1de9b8053f..5abb20127d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.cpp @@ -81,14 +81,14 @@ Parameters ITKMedianImage::parameters() const params.insert(std::make_unique(k_Radius_Key, "Radius", "Radius Dimensions XYZ", std::vector(3, 1), std::vector{"X", "Y", "Z"})); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -103,9 +103,9 @@ IFilter::UniquePointer ITKMedianImage::clone() const IFilter::PreflightResult ITKMedianImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto radius = filterArgs.value(k_Radius_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -119,9 +119,9 @@ IFilter::PreflightResult ITKMedianImage::preflightImpl(const DataStructure& data Result<> ITKMedianImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto radius = filterArgs.value(k_Radius_Key); @@ -150,9 +150,9 @@ Result ITKMedianImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_RadiusKey, k_Radius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.hpp index ff0a2217a0..ca1bb365b0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.hpp @@ -44,9 +44,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKMedianImage : public IFilter ITKMedianImage& operator=(ITKMedianImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Radius_Key = "radius"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.cpp index c6cafa57b8..609362f2d2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.cpp @@ -32,11 +32,10 @@ const Uuid k_SimplnxCorePluginId = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43 const Uuid k_ApplyTransformationToGeometryFilterId = *Uuid::FromString("f5bbc16b-3426-4ae0-b27b-ba7862dc40fe"); const FilterHandle k_ApplyTransformationToGeometryFilterHandle(k_ApplyTransformationToGeometryFilterId, k_SimplnxCorePluginId); -inline constexpr StringLiteral k_SelectedImageGeometryKey = "selected_image_geometry"; +inline constexpr StringLiteral k_SelectedImageGeometryKey = "input_image_geometry_path"; inline constexpr StringLiteral k_CellAttributeMatrixPathKey = "cell_attribute_matrix_path"; -inline constexpr StringLiteral k_TransformationTypeKey = "transformation_type"; +inline constexpr StringLiteral k_TransformationTypeKey = "transformation_type_index"; inline constexpr StringLiteral k_ManualTransformationMatrixKey = "manual_transformation_matrix"; -inline constexpr StringLiteral k_InterpolationTypeKey = "interpolation_type"; inline constexpr StringLiteral k_TranslateGeometryToGlobalOrigin_Key = "translate_geometry_to_global_origin"; const nx::core::ChoicesParameter::ValueType k_ManualTransformationMatrixIdx = 2ULL; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.hpp index 35ad4e1c0a..7bd03475e2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.hpp @@ -22,8 +22,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKMhaFileReader : public IFilter // Parameter Keys static inline constexpr StringLiteral k_ApplyImageTransformation = "apply_image_transformation"; static inline constexpr StringLiteral k_SaveImageTransformationAsArray = "save_image_transformation"; - static inline constexpr StringLiteral k_TransformationMatrixDataArrayPathKey = "transformation_matrix_data_array_path"; + static inline constexpr StringLiteral k_TransformationMatrixDataArrayPathKey = "output_transformation_matrix_path"; static inline constexpr StringLiteral k_TransposeTransformMatrix = "transpose_transform_matrix"; + static inline constexpr StringLiteral k_InterpolationTypeKey = "interpolation_type_index"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImage.cpp index de349b38b4..1a08d65d5c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImage.cpp @@ -87,7 +87,7 @@ Parameters ITKMinMaxCurvatureFlowImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -104,7 +104,7 @@ IFilter::PreflightResult ITKMinMaxCurvatureFlowImage::preflightImpl(const DataSt { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto timeStep = filterArgs.value(k_TimeStep_Key); auto numberOfIterations = filterArgs.value(k_NumberOfIterations_Key); auto stencilRadius = filterArgs.value(k_StencilRadius_Key); @@ -121,7 +121,7 @@ Result<> ITKMinMaxCurvatureFlowImage::executeImpl(DataStructure& dataStructure, { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto timeStep = filterArgs.value(k_TimeStep_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImage.hpp index 167366c027..1dc85865ee 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImage.hpp @@ -57,9 +57,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKMinMaxCurvatureFlowImage : public IFilter ITKMinMaxCurvatureFlowImage& operator=(ITKMinMaxCurvatureFlowImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_TimeStep_Key = "time_step"; static inline constexpr StringLiteral k_NumberOfIterations_Key = "number_of_iterations"; static inline constexpr StringLiteral k_StencilRadius_Key = "stencil_radius"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.cpp index a29b2ec8a7..22d92adea3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.cpp @@ -79,14 +79,14 @@ Parameters ITKMorphologicalGradientImage::parameters() const ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -101,9 +101,9 @@ IFilter::UniquePointer ITKMorphologicalGradientImage::clone() const IFilter::PreflightResult ITKMorphologicalGradientImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -117,9 +117,9 @@ IFilter::PreflightResult ITKMorphologicalGradientImage::preflightImpl(const Data Result<> ITKMorphologicalGradientImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -151,9 +151,9 @@ Result ITKMorphologicalGradientImage::FromSIMPLJson(const nlohmann::j results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp index 8bd4c42372..5335db2089 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp @@ -31,11 +31,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalGradientImage : public IFilter ITKMorphologicalGradientImage& operator=(ITKMorphologicalGradientImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImage.hpp index 587161100e..65ecbb66ab 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImage.hpp @@ -56,9 +56,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalWatershedFromMarkersImage : publ ITKMorphologicalWatershedFromMarkersImage& operator=(ITKMorphologicalWatershedFromMarkersImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_MarkWatershedLine_Key = "mark_watershed_line"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; static inline constexpr StringLiteral k_ImageDataPath_Key = "image_data_path"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.cpp index 164712b000..1e01af3216 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.cpp @@ -87,14 +87,14 @@ Parameters ITKMorphologicalWatershedImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -109,9 +109,9 @@ IFilter::UniquePointer ITKMorphologicalWatershedImage::clone() const IFilter::PreflightResult ITKMorphologicalWatershedImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto level = filterArgs.value(k_Level_Key); auto markWatershedLine = filterArgs.value(k_MarkWatershedLine_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -127,9 +127,9 @@ IFilter::PreflightResult ITKMorphologicalWatershedImage::preflightImpl(const Dat Result<> ITKMorphologicalWatershedImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto level = filterArgs.value(k_Level_Key); @@ -165,9 +165,9 @@ Result ITKMorphologicalWatershedImage::FromSIMPLJson(const nlohmann:: results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_LevelKey, k_Level_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MarkWatershedLineKey, k_MarkWatershedLine_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp index 44131e5a18..abbfe83acd 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp @@ -41,9 +41,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalWatershedImage : public IFilter ITKMorphologicalWatershedImage& operator=(ITKMorphologicalWatershedImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Level_Key = "level"; static inline constexpr StringLiteral k_MarkWatershedLine_Key = "mark_watershed_line"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.cpp index 8e26135a96..ac1d141a98 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.cpp @@ -70,14 +70,14 @@ Parameters ITKNormalizeImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -92,9 +92,9 @@ IFilter::UniquePointer ITKNormalizeImage::clone() const IFilter::PreflightResult ITKNormalizeImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = @@ -107,9 +107,9 @@ IFilter::PreflightResult ITKNormalizeImage::preflightImpl(const DataStructure& d Result<> ITKNormalizeImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKNormalizeImage::ITKNormalizeImageFunctor itkFunctor = {}; @@ -134,9 +134,9 @@ Result ITKNormalizeImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.hpp index 4fcb31cbae..d127275d29 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.hpp @@ -35,9 +35,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKNormalizeImage : public IFilter ITKNormalizeImage& operator=(ITKNormalizeImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImage.hpp index a312d0ac94..8e5bf70d61 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImage.hpp @@ -45,9 +45,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKNormalizeToConstantImage : public IFilter ITKNormalizeToConstantImage& operator=(ITKNormalizeToConstantImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Constant_Key = "constant"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.cpp index 4eaf1edf79..3d836bfea8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.cpp @@ -67,14 +67,14 @@ Parameters ITKNotImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -88,9 +88,9 @@ IFilter::UniquePointer ITKNotImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKNotImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -102,9 +102,9 @@ IFilter::PreflightResult ITKNotImage::preflightImpl(const DataStructure& dataStr Result<> ITKNotImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKNotImage::ITKNotImageFunctor itkFunctor = {}; @@ -129,9 +129,9 @@ Result ITKNotImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.hpp index 2e6abe31be..d38a705e01 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.hpp @@ -50,9 +50,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKNotImage : public IFilter ITKNotImage& operator=(ITKNotImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.cpp index cb8178bd08..f1c2a97e37 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.cpp @@ -91,14 +91,14 @@ Parameters ITKOpeningByReconstructionImage::parameters() const "Set/Get whether the original intensities of the image retained for those pixels unaffected by the opening by reconstruction. If Off, the output pixel contrast will be reduced.", false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -113,9 +113,9 @@ IFilter::UniquePointer ITKOpeningByReconstructionImage::clone() const IFilter::PreflightResult ITKOpeningByReconstructionImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -131,9 +131,9 @@ IFilter::PreflightResult ITKOpeningByReconstructionImage::preflightImpl(const Da Result<> ITKOpeningByReconstructionImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -171,9 +171,9 @@ Result ITKOpeningByReconstructionImage::FromSIMPLJson(const nlohmann: results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_PreserveIntensitiesKey, k_PreserveIntensities_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp index e14fb28337..40c2c365f3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp @@ -43,11 +43,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKOpeningByReconstructionImage : public IFilter ITKOpeningByReconstructionImage& operator=(ITKOpeningByReconstructionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; static inline constexpr StringLiteral k_PreserveIntensities_Key = "preserve_intensities"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.cpp index 62e98726e9..a938e8ba4e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.cpp @@ -89,14 +89,14 @@ Parameters ITKOtsuMultipleThresholdsImage::parameters() const std::make_unique(k_ReturnBinMidpoint_Key, "Return Bin Midpoint", "Should the threshold value be mid-point of the bin or the maximum? Default is to return bin maximum.", false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -111,9 +111,9 @@ IFilter::UniquePointer ITKOtsuMultipleThresholdsImage::clone() const IFilter::PreflightResult ITKOtsuMultipleThresholdsImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto numberOfThresholds = filterArgs.value(k_NumberOfThresholds_Key); auto labelOffset = filterArgs.value(k_LabelOffset_Key); auto numberOfHistogramBins = filterArgs.value(k_NumberOfHistogramBins_Key); @@ -131,9 +131,9 @@ IFilter::PreflightResult ITKOtsuMultipleThresholdsImage::preflightImpl(const Dat Result<> ITKOtsuMultipleThresholdsImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto numberOfThresholds = filterArgs.value(k_NumberOfThresholds_Key); @@ -173,9 +173,9 @@ Result ITKOtsuMultipleThresholdsImage::FromSIMPLJson(const nlohmann:: results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_LabelOffsetKey, k_LabelOffset_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_NumberOfHistogramBinsKey, k_NumberOfHistogramBins_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ValleyEmphasisKey, k_ValleyEmphasis_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp index aaf6d84807..23452b30e3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp @@ -43,9 +43,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKOtsuMultipleThresholdsImage : public IFilter ITKOtsuMultipleThresholdsImage& operator=(ITKOtsuMultipleThresholdsImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_NumberOfThresholds_Key = "number_of_thresholds"; static inline constexpr StringLiteral k_LabelOffset_Key = "label_offset"; static inline constexpr StringLiteral k_NumberOfHistogramBins_Key = "number_of_histogram_bins"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImage.cpp index 134c632083..73cda07071 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImage.cpp @@ -95,7 +95,7 @@ Parameters ITKRegionalMaximaImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -112,7 +112,7 @@ IFilter::PreflightResult ITKRegionalMaximaImage::preflightImpl(const DataStructu { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); auto foregroundValue = filterArgs.value(k_ForegroundValue_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -131,7 +131,7 @@ Result<> ITKRegionalMaximaImage::executeImpl(DataStructure& dataStructure, const { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImage.hpp index 1f2a149cf1..4e76696f72 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImage.hpp @@ -45,9 +45,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKRegionalMaximaImage : public IFilter ITKRegionalMaximaImage& operator=(ITKRegionalMaximaImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImage.cpp index 4ad621b0f6..762284b90b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImage.cpp @@ -95,7 +95,7 @@ Parameters ITKRegionalMinimaImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -112,7 +112,7 @@ IFilter::PreflightResult ITKRegionalMinimaImage::preflightImpl(const DataStructu { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); auto foregroundValue = filterArgs.value(k_ForegroundValue_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -131,7 +131,7 @@ Result<> ITKRegionalMinimaImage::executeImpl(DataStructure& dataStructure, const { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImage.hpp index d38b473cb7..5777995b3c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImage.hpp @@ -43,9 +43,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKRegionalMinimaImage : public IFilter ITKRegionalMinimaImage& operator=(ITKRegionalMinimaImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.cpp index 8fb18517d7..e6239b1fd3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.cpp @@ -82,14 +82,14 @@ Parameters ITKRelabelComponentImage::parameters() const std::make_unique(k_SortByObjectSize_Key, "Sort By Object Size", "Controls whether the object labels are sorted by size. If false, initial order of labels is kept.", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -104,9 +104,9 @@ IFilter::UniquePointer ITKRelabelComponentImage::clone() const IFilter::PreflightResult ITKRelabelComponentImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto minimumObjectSize = filterArgs.value(k_MinimumObjectSize_Key); auto sortByObjectSize = filterArgs.value(k_SortByObjectSize_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -120,9 +120,9 @@ IFilter::PreflightResult ITKRelabelComponentImage::preflightImpl(const DataStruc Result<> ITKRelabelComponentImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto minimumObjectSize = filterArgs.value(k_MinimumObjectSize_Key); @@ -154,9 +154,9 @@ Result ITKRelabelComponentImage::FromSIMPLJson(const nlohmann::json& results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MinimumObjectSizeKey, k_MinimumObjectSize_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SortByObjectSizeKey, k_SortByObjectSize_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp index a3c2aeaf2c..38f2dab027 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp @@ -47,9 +47,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKRelabelComponentImage : public IFilter ITKRelabelComponentImage& operator=(ITKRelabelComponentImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_MinimumObjectSize_Key = "minimum_object_size"; static inline constexpr StringLiteral k_SortByObjectSize_Key = "sort_by_object_size"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.cpp index 89f6329886..625b7a5c9f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.cpp @@ -77,14 +77,14 @@ Parameters ITKRescaleIntensityImage::parameters() const params.insert(std::make_unique(k_OutputMaximum_Key, "Output Maximum", "The maximum output value that is used.", 255)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -99,9 +99,9 @@ IFilter::UniquePointer ITKRescaleIntensityImage::clone() const IFilter::PreflightResult ITKRescaleIntensityImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto outputMinimum = filterArgs.value(k_OutputMinimum_Key); auto outputMaximum = filterArgs.value(k_OutputMaximum_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -115,9 +115,9 @@ IFilter::PreflightResult ITKRescaleIntensityImage::preflightImpl(const DataStruc Result<> ITKRescaleIntensityImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto outputMinimum = filterArgs.value(k_OutputMinimum_Key); @@ -151,9 +151,9 @@ Result ITKRescaleIntensityImage::FromSIMPLJson(const nlohmann::json& // Output Type parameter is not applicable in NX results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputMinimumKey, k_OutputMinimum_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputMaximumKey, k_OutputMaximum_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.hpp index 8289af9a57..9f2ee68edc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.hpp @@ -44,9 +44,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKRescaleIntensityImage : public IFilter ITKRescaleIntensityImage& operator=(ITKRescaleIntensityImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_OutputMinimum_Key = "output_minimum"; static inline constexpr StringLiteral k_OutputMaximum_Key = "output_maximum"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.cpp index a10ab77b5f..32db82c264 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.cpp @@ -82,14 +82,14 @@ Parameters ITKSigmoidImage::parameters() const params.insert(std::make_unique(k_OutputMinimum_Key, "Output Minimum", "The minimum output value", 0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -104,9 +104,9 @@ IFilter::UniquePointer ITKSigmoidImage::clone() const IFilter::PreflightResult ITKSigmoidImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto alpha = filterArgs.value(k_Alpha_Key); auto beta = filterArgs.value(k_Beta_Key); auto outputMaximum = filterArgs.value(k_OutputMaximum_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKSigmoidImage::preflightImpl(const DataStructure& dat Result<> ITKSigmoidImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto alpha = filterArgs.value(k_Alpha_Key); @@ -162,9 +162,9 @@ Result ITKSigmoidImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BetaKey, k_Beta_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputMaximumKey, k_OutputMaximum_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputMinimumKey, k_OutputMinimum_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.hpp index 2444c00f7d..8f07b81ff8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.hpp @@ -33,9 +33,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSigmoidImage : public IFilter ITKSigmoidImage& operator=(ITKSigmoidImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Alpha_Key = "alpha"; static inline constexpr StringLiteral k_Beta_Key = "beta"; static inline constexpr StringLiteral k_OutputMaximum_Key = "output_maximum"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImage.cpp index e9b64ac3ba..f83a093006 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImage.cpp @@ -87,7 +87,7 @@ Parameters ITKSignedDanielssonDistanceMapImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -104,7 +104,7 @@ IFilter::PreflightResult ITKSignedDanielssonDistanceMapImage::preflightImpl(cons { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto insideIsPositive = filterArgs.value(k_InsideIsPositive_Key); auto squaredDistance = filterArgs.value(k_SquaredDistance_Key); auto useImageSpacing = filterArgs.value(k_UseImageSpacing_Key); @@ -122,7 +122,7 @@ Result<> ITKSignedDanielssonDistanceMapImage::executeImpl(DataStructure& dataStr { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto insideIsPositive = filterArgs.value(k_InsideIsPositive_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImage.hpp index 43894b8a1e..a62a0b60a4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImage.hpp @@ -51,9 +51,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSignedDanielssonDistanceMapImage : public IFi ITKSignedDanielssonDistanceMapImage& operator=(ITKSignedDanielssonDistanceMapImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_InsideIsPositive_Key = "inside_is_positive"; static inline constexpr StringLiteral k_SquaredDistance_Key = "squared_distance"; static inline constexpr StringLiteral k_UseImageSpacing_Key = "use_image_spacing"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.cpp index 757b3067f5..f4b3636288 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.cpp @@ -86,14 +86,14 @@ Parameters ITKSignedMaurerDistanceMapImage::parameters() const params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set the background value which defines the object. Usually this value is = 0.", 0.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -108,9 +108,9 @@ IFilter::UniquePointer ITKSignedMaurerDistanceMapImage::clone() const IFilter::PreflightResult ITKSignedMaurerDistanceMapImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto insideIsPositive = filterArgs.value(k_InsideIsPositive_Key); auto squaredDistance = filterArgs.value(k_SquaredDistance_Key); auto useImageSpacing = filterArgs.value(k_UseImageSpacing_Key); @@ -127,9 +127,9 @@ IFilter::PreflightResult ITKSignedMaurerDistanceMapImage::preflightImpl(const Da Result<> ITKSignedMaurerDistanceMapImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto insideIsPositive = filterArgs.value(k_InsideIsPositive_Key); @@ -168,9 +168,9 @@ Result ITKSignedMaurerDistanceMapImage::FromSIMPLJson(const nlohmann: results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SquaredDistanceKey, k_SquaredDistance_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseImageSpacingKey, k_UseImageSpacing_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp index 367755d4a7..6f6bd2085d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp @@ -45,9 +45,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSignedMaurerDistanceMapImage : public IFilter ITKSignedMaurerDistanceMapImage& operator=(ITKSignedMaurerDistanceMapImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_InsideIsPositive_Key = "inside_is_positive"; static inline constexpr StringLiteral k_SquaredDistance_Key = "squared_distance"; static inline constexpr StringLiteral k_UseImageSpacing_Key = "use_image_spacing"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.cpp index 1e7f063a2d..6d88fd612b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.cpp @@ -68,14 +68,14 @@ Parameters ITKSinImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKSinImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKSinImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKSinImage::preflightImpl(const DataStructure& dataStr Result<> ITKSinImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKSinImage::ITKSinImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKSinImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.hpp index 25058a8d87..45bc6cd0ce 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSinImage : public IFilter ITKSinImage& operator=(ITKSinImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImage.hpp index 56851c9356..f805dfe2cd 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImage.hpp @@ -31,9 +31,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSmoothingRecursiveGaussianImage : public IFil ITKSmoothingRecursiveGaussianImage& operator=(ITKSmoothingRecursiveGaussianImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Sigma_Key = "sigma"; static inline constexpr StringLiteral k_NormalizeAcrossScale_Key = "normalize_across_scale"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.cpp index ca89d14fe9..bd5cdf965f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.cpp @@ -68,14 +68,14 @@ Parameters ITKSqrtImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKSqrtImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKSqrtImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKSqrtImage::preflightImpl(const DataStructure& dataSt Result<> ITKSqrtImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKSqrtImage::ITKSqrtImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKSqrtImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.hpp index 306da35f69..da11cdcd5a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSqrtImage : public IFilter ITKSqrtImage& operator=(ITKSqrtImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.cpp index f8c4a21879..713505321b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.cpp @@ -68,14 +68,14 @@ Parameters ITKSquareImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -90,9 +90,9 @@ IFilter::UniquePointer ITKSquareImage::clone() const IFilter::PreflightResult ITKSquareImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -104,9 +104,9 @@ IFilter::PreflightResult ITKSquareImage::preflightImpl(const DataStructure& data Result<> ITKSquareImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKSquareImage::ITKSquareImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKSquareImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.hpp index 10499f4d6d..3dae8f1b0d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSquareImage : public IFilter ITKSquareImage& operator=(ITKSquareImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImage.hpp index 31663433b9..fa64cdc26f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImage.hpp @@ -55,9 +55,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKStandardDeviationProjectionImage : public IFi ITKStandardDeviationProjectionImage& operator=(ITKStandardDeviationProjectionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_ProjectionDimension_Key = "projection_dimension"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImage.hpp index b89d0b0a97..bb647aab5e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImage.hpp @@ -55,9 +55,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSumProjectionImage : public IFilter ITKSumProjectionImage& operator=(ITKSumProjectionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_ProjectionDimension_Key = "projection_dimension"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.cpp index e4d75b9682..827ddbc3db 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.cpp @@ -68,14 +68,14 @@ Parameters ITKTanImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKTanImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKTanImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKTanImage::preflightImpl(const DataStructure& dataStr Result<> ITKTanImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKTanImage::ITKTanImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKTanImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.hpp index 953f7fa99e..9793c3ef97 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKTanImage : public IFilter ITKTanImage& operator=(ITKTanImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.cpp index 131582eec3..45bb6dc59f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.cpp @@ -80,14 +80,14 @@ Parameters ITKThresholdImage::parameters() const "The pixel type must support comparison operators. Set the 'outside' pixel value. The default value NumericTraits::ZeroValue() .", 0.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -102,9 +102,9 @@ IFilter::UniquePointer ITKThresholdImage::clone() const IFilter::PreflightResult ITKThresholdImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto lower = filterArgs.value(k_Lower_Key); auto upper = filterArgs.value(k_Upper_Key); auto outsideValue = filterArgs.value(k_OutsideValue_Key); @@ -119,9 +119,9 @@ IFilter::PreflightResult ITKThresholdImage::preflightImpl(const DataStructure& d Result<> ITKThresholdImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto lower = filterArgs.value(k_Lower_Key); @@ -156,9 +156,9 @@ Result ITKThresholdImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_LowerKey, k_Lower_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UpperKey, k_Upper_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutsideValueKey, k_OutsideValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.hpp index c9b34b4d4e..0c7c24cb87 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.hpp @@ -41,9 +41,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKThresholdImage : public IFilter ITKThresholdImage& operator=(ITKThresholdImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Lower_Key = "lower"; static inline constexpr StringLiteral k_Upper_Key = "upper"; static inline constexpr StringLiteral k_OutsideValue_Key = "outside_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImage.cpp index 6b6b86a4c5..2fcd6983d0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImage.cpp @@ -108,7 +108,7 @@ Parameters ITKThresholdMaximumConnectedComponentsImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -125,7 +125,7 @@ IFilter::PreflightResult ITKThresholdMaximumConnectedComponentsImage::preflightI { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto minimumObjectSizeInPixels = filterArgs.value(k_MinimumObjectSizeInPixels_Key); auto upperBoundary = filterArgs.value(k_UpperBoundary_Key); auto insideValue = filterArgs.value(k_InsideValue_Key); @@ -144,7 +144,7 @@ Result<> ITKThresholdMaximumConnectedComponentsImage::executeImpl(DataStructure& { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto minimumObjectSizeInPixels = filterArgs.value(k_MinimumObjectSizeInPixels_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImage.hpp index 5b10bd08df..40e81db7cb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImage.hpp @@ -54,9 +54,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKThresholdMaximumConnectedComponentsImage : pu ITKThresholdMaximumConnectedComponentsImage& operator=(ITKThresholdMaximumConnectedComponentsImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_MinimumObjectSizeInPixels_Key = "minimum_object_size_in_pixels"; static inline constexpr StringLiteral k_UpperBoundary_Key = "upper_boundary"; static inline constexpr StringLiteral k_InsideValue_Key = "inside_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.cpp index 99f4e5cfb9..ab2c7a9e57 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.cpp @@ -76,14 +76,14 @@ Parameters ITKValuedRegionalMaximaImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -98,9 +98,9 @@ IFilter::UniquePointer ITKValuedRegionalMaximaImage::clone() const IFilter::PreflightResult ITKValuedRegionalMaximaImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -113,9 +113,9 @@ IFilter::PreflightResult ITKValuedRegionalMaximaImage::preflightImpl(const DataS Result<> ITKValuedRegionalMaximaImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -144,9 +144,9 @@ Result ITKValuedRegionalMaximaImage::FromSIMPLJson(const nlohmann::js std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp index 877c557fef..ec47788561 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp @@ -42,9 +42,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKValuedRegionalMaximaImage : public IFilter ITKValuedRegionalMaximaImage& operator=(ITKValuedRegionalMaximaImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.cpp index 6daf00a111..e682ed7ced 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.cpp @@ -76,14 +76,14 @@ Parameters ITKValuedRegionalMinimaImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -98,9 +98,9 @@ IFilter::UniquePointer ITKValuedRegionalMinimaImage::clone() const IFilter::PreflightResult ITKValuedRegionalMinimaImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -113,9 +113,9 @@ IFilter::PreflightResult ITKValuedRegionalMinimaImage::preflightImpl(const DataS Result<> ITKValuedRegionalMinimaImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -144,9 +144,9 @@ Result ITKValuedRegionalMinimaImage::FromSIMPLJson(const nlohmann::js std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp index dd4be487b0..1b41cce87d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp @@ -39,9 +39,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKValuedRegionalMinimaImage : public IFilter ITKValuedRegionalMinimaImage& operator=(ITKValuedRegionalMinimaImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.cpp index 5eb82f3167..2af6f94abf 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.cpp @@ -83,14 +83,14 @@ Parameters ITKWhiteTopHatImage::parameters() const params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKWhiteTopHatImage::clone() const IFilter::PreflightResult ITKWhiteTopHatImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto safeBorder = filterArgs.value(k_SafeBorder_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKWhiteTopHatImage::preflightImpl(const DataStructure& Result<> ITKWhiteTopHatImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -159,9 +159,9 @@ Result ITKWhiteTopHatImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SafeBorderKey, k_SafeBorder_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp index 8ce8b36006..9a67d40238 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp @@ -31,11 +31,11 @@ class ITKIMAGEPROCESSING_EXPORT ITKWhiteTopHatImage : public IFilter ITKWhiteTopHatImage& operator=(ITKWhiteTopHatImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImage.cpp index c4bad68422..6a84fb6597 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImage.cpp @@ -83,7 +83,7 @@ Parameters ITKZeroCrossingImage::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); return params; } @@ -100,7 +100,7 @@ IFilter::PreflightResult ITKZeroCrossingImage::preflightImpl(const DataStructure { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto foregroundValue = filterArgs.value(k_ForegroundValue_Key); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -117,7 +117,7 @@ Result<> ITKZeroCrossingImage::executeImpl(DataStructure& dataStructure, const A { auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto foregroundValue = filterArgs.value(k_ForegroundValue_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImage.hpp index 448a706dd7..0f6a6df947 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImage.hpp @@ -56,9 +56,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKZeroCrossingImage : public IFilter ITKZeroCrossingImage& operator=(ITKZeroCrossingImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; + static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; diff --git a/src/Plugins/ITKImageProcessing/test/ITKAbsImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAbsImageTest.cpp index 52d2600178..6b6242fe35 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAbsImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAbsImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKAbsImageFilter(float)", "[ITKImageProcessing][ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKAbsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAbsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAbsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAbsImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAbsImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAbsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -71,9 +71,9 @@ TEST_CASE("ITKImageProcessing::ITKAbsImageFilter(short)", "[ITKImageProcessing][ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKAbsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAbsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAbsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAbsImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAbsImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAbsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKAcosImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAcosImageTest.cpp index 84c95316b6..fccf4161fc 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAcosImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAcosImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKAcosImageFilter(defaults)", "[ITKImageProcessi } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKAcosImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAcosImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAcosImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAcosImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAcosImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAcosImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp index ce391c06b2..497361b528 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp @@ -45,7 +45,7 @@ DataPath ConvertColorToGrayScale(DataStructure& dataStructure, const DataPath& i constexpr StringLiteral k_ConversionAlgorithm_Key = "conversion_algorithm"; constexpr StringLiteral k_ColorWeights_Key = "color_weights"; constexpr StringLiteral k_ColorChannel_Key = "color_channel"; - constexpr StringLiteral k_InputDataArrayVector_Key = "input_data_array_vector"; + constexpr StringLiteral k_InputDataArrayVector_Key = "input_data_array_paths"; constexpr StringLiteral k_OutputArrayPrefix_Key = "output_array_prefix"; auto filter = s_FilterList->createFilter(k_ColorToGrayScaleFilterHandle); @@ -97,9 +97,9 @@ TEST_CASE("ITKImageProcessing::ITKAdaptiveHistogramEqualizationImageFilter(defau const ITKAdaptiveHistogramEqualizationImage filter; Arguments args; - args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Alpha_Key, std::make_any(0.5f)); args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Beta_Key, std::make_any(0.5f)); args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Radius_Key, std::make_any(VectorUInt32Parameter::ValueType{10, 19, 10})); @@ -145,9 +145,9 @@ TEST_CASE("ITKImageProcessing::ITKAdaptiveHistogramEqualizationImageFilter(histo ITKAdaptiveHistogramEqualizationImage filter; Arguments args; - args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Alpha_Key, std::make_any(1.0f)); args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Beta_Key, std::make_any(0.25f)); args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Radius_Key, std::make_any(VectorUInt32Parameter::ValueType{10, 10, 10})); diff --git a/src/Plugins/ITKImageProcessing/test/ITKApproximateSignedDistanceMapImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKApproximateSignedDistanceMapImageTest.cpp index f8d5457fb7..167b1282bd 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKApproximateSignedDistanceMapImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKApproximateSignedDistanceMapImageTest.cpp @@ -35,7 +35,7 @@ TEST_CASE("ITKImageProcessing::ITKApproximateSignedDistanceMapImageFilter(defaul Arguments args; args.insertOrAssign(ITKApproximateSignedDistanceMapImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKApproximateSignedDistanceMapImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKApproximateSignedDistanceMapImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKApproximateSignedDistanceMapImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -71,7 +71,7 @@ TEST_CASE("ITKImageProcessing::ITKApproximateSignedDistanceMapImageFilter(modifi Arguments args; args.insertOrAssign(ITKApproximateSignedDistanceMapImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKApproximateSignedDistanceMapImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKApproximateSignedDistanceMapImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKApproximateSignedDistanceMapImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKApproximateSignedDistanceMapImage::k_InsideValue_Key, std::make_any(100)); args.insertOrAssign(ITKApproximateSignedDistanceMapImage::k_OutsideValue_Key, std::make_any(0)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKAsinImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAsinImageTest.cpp index 54e6377d6b..30cd5e51ad 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAsinImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAsinImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKAsinImageFilter(defaults)", "[ITKImageProcessi } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKAsinImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAsinImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAsinImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAsinImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAsinImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAsinImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKAtanImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAtanImageTest.cpp index ba97052905..53ca83e8ad 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAtanImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAtanImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKAtanImageFilter(defaults)", "[ITKImageProcessi } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKAtanImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAtanImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAtanImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAtanImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAtanImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAtanImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryContourImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryContourImageTest.cpp index 2a0c275142..34f691f069 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryContourImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryContourImageTest.cpp @@ -36,9 +36,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryContourImageFilter(default)", "[ITKImage } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryContourImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryContourImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryContourImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryContourImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryContourImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryContourImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryContourImage::k_ForegroundValue_Key, std::make_any(255.0)); auto preflightResult = filter.preflight(dataStructure, args); @@ -70,9 +70,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryContourImageFilter(custom)", "[ITKImageP } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryContourImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryContourImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryContourImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryContourImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryContourImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryContourImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryContourImage::k_ForegroundValue_Key, std::make_any(100)); args.insertOrAssign(ITKBinaryContourImage::k_FullyConnected_Key, std::make_any(true)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryDilateImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryDilateImageTest.cpp index a4c7596312..ca9cac2c72 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryDilateImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryDilateImageTest.cpp @@ -38,9 +38,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryDilateImageFilter(BinaryDilate)", "[ITKI } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryDilateImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryDilateImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryDilateImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryDilateImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryDilateImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryDilateImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryDilateImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKBinaryDilateImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); args.insertOrAssign(ITKBinaryDilateImage::k_ForegroundValue_Key, std::make_any(255.0)); @@ -74,9 +74,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryDilateImageFilter(BinaryDilateVectorRadi } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryDilateImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryDilateImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryDilateImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryDilateImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryDilateImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryDilateImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryDilateImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{20, 1, 1})); args.insertOrAssign(ITKBinaryDilateImage::k_KernelType_Key, std::make_any(itk::simple::sitkBox)); args.insertOrAssign(ITKBinaryDilateImage::k_ForegroundValue_Key, std::make_any(255)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryErodeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryErodeImageTest.cpp index 2d45ecc7db..32e11f04a9 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryErodeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryErodeImageTest.cpp @@ -36,9 +36,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryErodeImageFilter(BinaryErode)", "[ITKIma } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryErodeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryErodeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryErodeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryErodeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryErodeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryErodeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryErodeImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKBinaryErodeImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); args.insertOrAssign(ITKBinaryErodeImage::k_ForegroundValue_Key, std::make_any(255)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalClosingImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalClosingImageTest.cpp index ef6838ad89..cc6e275bb4 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalClosingImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalClosingImageTest.cpp @@ -35,9 +35,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalClosingImageFilter(BinaryMo } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); @@ -69,9 +69,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalClosingImageFilter(BinaryMo } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{5, 5, 5})); args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_SafeBorder_Key, std::make_any(false)); args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_ForegroundValue_Key, std::make_any(255)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalOpeningImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalOpeningImageTest.cpp index d84e456f00..150089eb19 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalOpeningImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalOpeningImageTest.cpp @@ -35,9 +35,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalOpeningImageFilter(BinaryMo } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_ForegroundValue_Key, std::make_any(255)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryOpeningByReconstructionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryOpeningByReconstructionImageTest.cpp index 1955fb614d..65c39d9358 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryOpeningByReconstructionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryOpeningByReconstructionImageTest.cpp @@ -37,9 +37,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryOpeningByReconstructionImageFilter(Binar } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{5, 1, 1})); args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_ForegroundValue_Key, std::make_any(200)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryProjectionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryProjectionImageTest.cpp index 36b920868d..c723abae5e 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryProjectionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryProjectionImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryProjectionImageFilter(defaults)", "[ITKI } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryProjectionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryProjectionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryProjectionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryProjectionImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryProjectionImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryProjectionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -64,9 +64,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryProjectionImageFilter(another_dimension) } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryProjectionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryProjectionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryProjectionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryProjectionImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryProjectionImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryProjectionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryProjectionImage::k_ProjectionDimension_Key, std::make_any(1)); args.insertOrAssign(ITKBinaryProjectionImage::k_ForegroundValue_Key, std::make_any(255)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryThinningImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryThinningImageTest.cpp index 66db1a78f1..de2b9e6836 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryThinningImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryThinningImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryThinningImageFilter(BinaryThinning)", "[ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryThinningImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryThinningImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryThinningImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryThinningImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryThinningImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryThinningImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryThresholdImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryThresholdImageTest.cpp index 4958295653..d38bc24e2b 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryThresholdImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryThresholdImageTest.cpp @@ -29,9 +29,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryThresholdImageFilter(default)", "[ITKIma SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKBinaryThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryThresholdImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryThresholdImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryThresholdImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryThresholdImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -58,9 +58,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryThresholdImageFilter(NarrowThreshold)", SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKBinaryThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryThresholdImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryThresholdImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryThresholdImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryThresholdImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryThresholdImage::k_LowerThreshold_Key, std::make_any(10)); args.insertOrAssign(ITKBinaryThresholdImage::k_UpperThreshold_Key, std::make_any(100)); args.insertOrAssign(ITKBinaryThresholdImage::k_InsideValue_Key, std::make_any(255)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBlackTopHatImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBlackTopHatImageTest.cpp index 896f921f0b..5f9e0c3927 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBlackTopHatImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBlackTopHatImageTest.cpp @@ -35,9 +35,9 @@ TEST_CASE("ITKImageProcessing::ITKBlackTopHatImageFilter(BlackTopHapErode)", "[I } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBlackTopHatImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBlackTopHatImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBlackTopHatImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBlackTopHatImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBlackTopHatImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBlackTopHatImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBlackTopHatImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKBlackTopHatImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKClosingByReconstructionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKClosingByReconstructionImageTest.cpp index 66dfee9410..04f943876d 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKClosingByReconstructionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKClosingByReconstructionImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKClosingByReconstructionImageFilter(ClosingByRe } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKClosingByReconstructionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKClosingByReconstructionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKClosingByReconstructionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKClosingByReconstructionImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKClosingByReconstructionImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKClosingByReconstructionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKClosingByReconstructionImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKClosingByReconstructionImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKConnectedComponentImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKConnectedComponentImageTest.cpp index 8b5225472e..272fc54f17 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKConnectedComponentImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKConnectedComponentImageTest.cpp @@ -35,7 +35,7 @@ TEST_CASE("ITKImageProcessing::ITKConnectedComponentImageFilter(default)", "[ITK Arguments args; args.insertOrAssign(ITKConnectedComponentImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKConnectedComponentImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKConnectedComponentImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKConnectedComponentImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -66,7 +66,7 @@ TEST_CASE("ITKImageProcessing::ITKConnectedComponentImageFilter(mask)", "[ITKIma Arguments args; args.insertOrAssign(ITKConnectedComponentImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKConnectedComponentImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKConnectedComponentImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKConnectedComponentImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -97,7 +97,7 @@ TEST_CASE("ITKImageProcessing::ITKConnectedComponentImageFilter(fullyconnected)" Arguments args; args.insertOrAssign(ITKConnectedComponentImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKConnectedComponentImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKConnectedComponentImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKConnectedComponentImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKConnectedComponentImage::k_FullyConnected_Key, std::make_any(true)); auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ITKImageProcessing/test/ITKCosImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKCosImageTest.cpp index 2bafbcea25..8caf3432d0 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKCosImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKCosImageTest.cpp @@ -30,9 +30,9 @@ TEST_CASE("ITKImageProcessing::ITKCosImageFilter(float)", "[ITKImageProcessing][ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKCosImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKCosImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKCosImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKCosImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKCosImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKCosImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -66,9 +66,9 @@ TEST_CASE("ITKImageProcessing::ITKCosImageFilter(short)", "[ITKImageProcessing][ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKCosImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKCosImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKCosImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKCosImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKCosImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKCosImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKCurvatureAnisotropicDiffusionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKCurvatureAnisotropicDiffusionImageTest.cpp index 7f9676b913..e7f5923fa9 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKCurvatureAnisotropicDiffusionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKCurvatureAnisotropicDiffusionImageTest.cpp @@ -35,7 +35,7 @@ TEST_CASE("ITKImageProcessing::ITKCurvatureAnisotropicDiffusionImageFilter(defau Arguments args; args.insertOrAssign(ITKCurvatureAnisotropicDiffusionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKCurvatureAnisotropicDiffusionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKCurvatureAnisotropicDiffusionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKCurvatureAnisotropicDiffusionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKCurvatureAnisotropicDiffusionImage::k_TimeStep_Key, std::make_any(0.01)); auto preflightResult = filter.preflight(dataStructure, args); @@ -72,7 +72,7 @@ TEST_CASE("ITKImageProcessing::ITKCurvatureAnisotropicDiffusionImageFilter(longe Arguments args; args.insertOrAssign(ITKCurvatureAnisotropicDiffusionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKCurvatureAnisotropicDiffusionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKCurvatureAnisotropicDiffusionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKCurvatureAnisotropicDiffusionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKCurvatureAnisotropicDiffusionImage::k_TimeStep_Key, std::make_any(0.01)); args.insertOrAssign(ITKCurvatureAnisotropicDiffusionImage::k_NumberOfIterations_Key, std::make_any(10)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKCurvatureFlowImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKCurvatureFlowImageTest.cpp index 3a54796a38..40945d1728 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKCurvatureFlowImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKCurvatureFlowImageTest.cpp @@ -35,7 +35,7 @@ TEST_CASE("ITKImageProcessing::ITKCurvatureFlowImageFilter(defaults)", "[ITKImag Arguments args; args.insertOrAssign(ITKCurvatureFlowImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKCurvatureFlowImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKCurvatureFlowImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKCurvatureFlowImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -71,7 +71,7 @@ TEST_CASE("ITKImageProcessing::ITKCurvatureFlowImageFilter(longer)", "[ITKImageP Arguments args; args.insertOrAssign(ITKCurvatureFlowImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKCurvatureFlowImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKCurvatureFlowImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKCurvatureFlowImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKCurvatureFlowImage::k_TimeStep_Key, std::make_any(0.1)); args.insertOrAssign(ITKCurvatureFlowImage::k_NumberOfIterations_Key, std::make_any(10)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKDanielssonDistanceMapImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKDanielssonDistanceMapImageTest.cpp index da294a8204..a523a1eebe 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKDanielssonDistanceMapImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKDanielssonDistanceMapImageTest.cpp @@ -35,7 +35,7 @@ TEST_CASE("ITKImageProcessing::ITKDanielssonDistanceMapImageFilter(default)", "[ Arguments args; args.insertOrAssign(ITKDanielssonDistanceMapImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKDanielssonDistanceMapImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDanielssonDistanceMapImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDanielssonDistanceMapImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKDilateObjectMorphologyImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKDilateObjectMorphologyImageTest.cpp index e33e775689..4a3516fe85 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKDilateObjectMorphologyImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKDilateObjectMorphologyImageTest.cpp @@ -35,9 +35,9 @@ TEST_CASE("ITKImageProcessing::ITKDilateObjectMorphologyImageFilter(float)", "[I } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKDilateObjectMorphologyImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKDilateObjectMorphologyImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDilateObjectMorphologyImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDilateObjectMorphologyImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKDilateObjectMorphologyImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKDilateObjectMorphologyImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKDilateObjectMorphologyImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKDilateObjectMorphologyImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); @@ -73,9 +73,9 @@ TEST_CASE("ITKImageProcessing::ITKDilateObjectMorphologyImageFilter(short)", "[I } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKDilateObjectMorphologyImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKDilateObjectMorphologyImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDilateObjectMorphologyImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDilateObjectMorphologyImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKDilateObjectMorphologyImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKDilateObjectMorphologyImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKDilateObjectMorphologyImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKDilateObjectMorphologyImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKDiscreteGaussianImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKDiscreteGaussianImageTest.cpp index b406362bb4..dde0449f2c 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKDiscreteGaussianImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKDiscreteGaussianImageTest.cpp @@ -37,9 +37,9 @@ TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(float)", "[ITKImag } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKDiscreteGaussianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKDiscreteGaussianImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -75,9 +75,9 @@ TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(short)", "[ITKImag } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKDiscreteGaussianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKDiscreteGaussianImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -113,9 +113,9 @@ TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(bigG)", "[ITKImage } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKDiscreteGaussianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKDiscreteGaussianImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKDiscreteGaussianImage::k_Variance_Key, std::make_any(VectorFloat64Parameter::ValueType{ 100.0, 100.0, diff --git a/src/Plugins/ITKImageProcessing/test/ITKDoubleThresholdImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKDoubleThresholdImageTest.cpp index 949f505f77..fcd1b29e3c 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKDoubleThresholdImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKDoubleThresholdImageTest.cpp @@ -36,7 +36,7 @@ TEST_CASE("ITKImageProcessing::ITKDoubleThresholdImageFilter(DoubleThreshold1)", Arguments args; args.insertOrAssign(ITKDoubleThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKDoubleThresholdImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDoubleThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDoubleThresholdImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -67,7 +67,7 @@ TEST_CASE("ITKImageProcessing::ITKDoubleThresholdImageFilter(DoubleThreshold2)", Arguments args; args.insertOrAssign(ITKDoubleThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKDoubleThresholdImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDoubleThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDoubleThresholdImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKDoubleThresholdImage::k_Threshold1_Key, std::make_any(0)); args.insertOrAssign(ITKDoubleThresholdImage::k_Threshold2_Key, std::make_any(0)); args.insertOrAssign(ITKDoubleThresholdImage::k_Threshold3_Key, std::make_any(3000)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKErodeObjectMorphologyImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKErodeObjectMorphologyImageTest.cpp index e354d9d309..b49871d3b0 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKErodeObjectMorphologyImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKErodeObjectMorphologyImageTest.cpp @@ -35,9 +35,9 @@ TEST_CASE("ITKImageProcessing::ITKErodeObjectMorphologyImageFilter(float)", "[IT } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKErodeObjectMorphologyImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKErodeObjectMorphologyImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKErodeObjectMorphologyImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKErodeObjectMorphologyImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKErodeObjectMorphologyImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKErodeObjectMorphologyImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKErodeObjectMorphologyImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKErodeObjectMorphologyImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); @@ -73,9 +73,9 @@ TEST_CASE("ITKImageProcessing::ITKErodeObjectMorphologyImageFilter(short)", "[IT } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKErodeObjectMorphologyImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKErodeObjectMorphologyImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKErodeObjectMorphologyImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKErodeObjectMorphologyImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKErodeObjectMorphologyImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKErodeObjectMorphologyImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKErodeObjectMorphologyImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKErodeObjectMorphologyImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKExpImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKExpImageTest.cpp index 47805468cd..8223ee3ac0 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKExpImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKExpImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKExpImageFilter(defaults)", "[ITKImageProcessin } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKExpImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKExpImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKExpImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKExpImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKExpImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKExpImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKExpNegativeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKExpNegativeImageTest.cpp index 9cc4e45b96..22e64206c6 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKExpNegativeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKExpNegativeImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKExpNegativeImageFilter(defaults)", "[ITKImageP } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKExpNegativeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKExpNegativeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKExpNegativeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKExpNegativeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKExpNegativeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKExpNegativeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKGradientAnisotropicDiffusionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGradientAnisotropicDiffusionImageTest.cpp index c6037877c0..a9bcbf7717 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGradientAnisotropicDiffusionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGradientAnisotropicDiffusionImageTest.cpp @@ -35,7 +35,7 @@ TEST_CASE("ITKImageProcessing::ITKGradientAnisotropicDiffusionImageFilter(defaul Arguments args; args.insertOrAssign(ITKGradientAnisotropicDiffusionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKGradientAnisotropicDiffusionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGradientAnisotropicDiffusionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGradientAnisotropicDiffusionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGradientAnisotropicDiffusionImage::k_TimeStep_Key, std::make_any(0.01)); auto preflightResult = filter.preflight(dataStructure, args); @@ -72,7 +72,7 @@ TEST_CASE("ITKImageProcessing::ITKGradientAnisotropicDiffusionImageFilter(longer Arguments args; args.insertOrAssign(ITKGradientAnisotropicDiffusionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKGradientAnisotropicDiffusionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGradientAnisotropicDiffusionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGradientAnisotropicDiffusionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGradientAnisotropicDiffusionImage::k_TimeStep_Key, std::make_any(0.01)); args.insertOrAssign(ITKGradientAnisotropicDiffusionImage::k_NumberOfIterations_Key, std::make_any(10)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeImageTest.cpp index 15ede3ea8b..857da8986c 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeImageTest.cpp @@ -29,9 +29,9 @@ TEST_CASE("ITKImageProcessing::ITKGradientMagnitudeImageFilter(default)", "[ITKI SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKGradientMagnitudeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGradientMagnitudeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGradientMagnitudeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGradientMagnitudeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGradientMagnitudeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGradientMagnitudeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeRecursiveGaussianImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeRecursiveGaussianImageTest.cpp index 78dfe148e8..8c70047566 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeRecursiveGaussianImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeRecursiveGaussianImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKGradientMagnitudeRecursiveGaussianImageFilter( } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGradientMagnitudeRecursiveGaussianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGradientMagnitudeRecursiveGaussianImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGradientMagnitudeRecursiveGaussianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGradientMagnitudeRecursiveGaussianImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGradientMagnitudeRecursiveGaussianImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGradientMagnitudeRecursiveGaussianImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleDilateImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleDilateImageTest.cpp index 9fb1379a7f..959f039634 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleDilateImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleDilateImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleDilateImageFilter(GrayscaleDilate)", } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleDilateImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleDilateImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleDilateImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleDilateImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleDilateImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleDilateImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGrayscaleDilateImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKGrayscaleDilateImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleErodeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleErodeImageTest.cpp index 71f78a7a30..4976971e72 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleErodeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleErodeImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleErodeImageFilter(GrayscaleErode)", "[ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleErodeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleErodeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleErodeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleErodeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleErodeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleErodeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGrayscaleErodeImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKGrayscaleErodeImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleFillholeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleFillholeImageTest.cpp index 178755dd3c..15919c91b1 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleFillholeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleFillholeImageTest.cpp @@ -29,9 +29,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleFillholeImageFilter(GrayscaleFillhole SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKGrayscaleFillholeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleFillholeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleFillholeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleFillholeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleFillholeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleFillholeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -58,9 +58,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleFillholeImageFilter(GrayscaleFillhole SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKGrayscaleFillholeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleFillholeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleFillholeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleFillholeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleFillholeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleFillholeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleGrindPeakImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleGrindPeakImageTest.cpp index c7fdcef7cc..569622edba 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleGrindPeakImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleGrindPeakImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleGrindPeakImageFilter(GrayscaleGrindPe } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -64,9 +64,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleGrindPeakImageFilter(GrayscaleGrindPe } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalClosingImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalClosingImageTest.cpp index db1cba7994..762314e017 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalClosingImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalClosingImageTest.cpp @@ -36,9 +36,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalClosingImageFilter(Grays } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalOpeningImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalOpeningImageTest.cpp index 2c3f45704e..7922d4adb6 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalOpeningImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalOpeningImageTest.cpp @@ -36,9 +36,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(Grays } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); @@ -70,9 +70,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(Grays } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{20, 5, 2})); args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelType_Key, std::make_any(itk::simple::sitkCross)); @@ -104,9 +104,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(Grays } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{20, 5, 1})); args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelType_Key, std::make_any(itk::simple::sitkBox)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKHConvexImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKHConvexImageTest.cpp index 4d41fdc958..ea0639db9d 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKHConvexImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKHConvexImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKHConvexImageFilter(HConvex)", "[ITKImageProces } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKHConvexImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKHConvexImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKHConvexImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKHConvexImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKHConvexImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKHConvexImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKHConvexImage::k_Height_Key, std::make_any(10000)); auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ITKImageProcessing/test/ITKHMaximaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKHMaximaImageTest.cpp index e730794b1f..bf2e32cb98 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKHMaximaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKHMaximaImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKHMaximaImageFilter(HMaxima)", "[ITKImageProces } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKHMaximaImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKHMaximaImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKHMaximaImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKHMaximaImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKHMaximaImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKHMaximaImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKHMaximaImage::k_Height_Key, std::make_any(2000)); auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ITKImageProcessing/test/ITKHMinimaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKHMinimaImageTest.cpp index 6af42b9223..e8629651b0 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKHMinimaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKHMinimaImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKHMinimaImageFilter(HMinima)", "[ITKImageProces } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKHMinimaImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKHMinimaImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKHMinimaImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKHMinimaImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKHMinimaImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKHMinimaImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKHMinimaImage::k_Height_Key, std::make_any(2000)); auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ITKImageProcessing/test/ITKIntensityWindowingImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKIntensityWindowingImageTest.cpp index af5b42b7ed..15a4f5d060 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKIntensityWindowingImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKIntensityWindowingImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(2d)", "[ITKImage } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKIntensityWindowingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKIntensityWindowingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKIntensityWindowingImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKIntensityWindowingImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -64,9 +64,9 @@ TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(3dFloat)", "[ITK } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKIntensityWindowingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKIntensityWindowingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKIntensityWindowingImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKIntensityWindowingImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -95,9 +95,9 @@ TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(3dShort)", "[ITK } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKIntensityWindowingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKIntensityWindowingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKIntensityWindowingImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKIntensityWindowingImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKInvertIntensityImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKInvertIntensityImageTest.cpp index efce49a40a..be04d93e8c 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKInvertIntensityImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKInvertIntensityImageTest.cpp @@ -31,9 +31,9 @@ TEST_CASE("ITKImageProcessing::ITKInvertIntensityImageFilter(3d)", "[ITKImagePro } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKInvertIntensityImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKInvertIntensityImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKInvertIntensityImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKInvertIntensityImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKInvertIntensityImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKInvertIntensityImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKIsoContourDistanceImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKIsoContourDistanceImageTest.cpp index 57cfdf1eeb..6530d84753 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKIsoContourDistanceImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKIsoContourDistanceImageTest.cpp @@ -35,7 +35,7 @@ TEST_CASE("ITKImageProcessing::ITKIsoContourDistanceImageFilter(default)", "[ITK Arguments args; args.insertOrAssign(ITKIsoContourDistanceImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKIsoContourDistanceImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKIsoContourDistanceImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKIsoContourDistanceImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKIsoContourDistanceImage::k_LevelSetValue_Key, std::make_any(50.0)); auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ITKImageProcessing/test/ITKLabelContourImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKLabelContourImageTest.cpp index 24f8713079..f7bce62dcd 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKLabelContourImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKLabelContourImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKLabelContourImageFilter(default)", "[ITKImageP } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKLabelContourImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKLabelContourImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKLabelContourImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKLabelContourImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKLabelContourImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKLabelContourImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKLaplacianRecursiveGaussianImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKLaplacianRecursiveGaussianImageTest.cpp index aa9b797431..a05219821c 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKLaplacianRecursiveGaussianImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKLaplacianRecursiveGaussianImageTest.cpp @@ -36,7 +36,7 @@ TEST_CASE("ITKImageProcessing::ITKLaplacianRecursiveGaussianImageFilter(default) Arguments args; args.insertOrAssign(ITKLaplacianRecursiveGaussianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKLaplacianRecursiveGaussianImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKLaplacianRecursiveGaussianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKLaplacianRecursiveGaussianImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKLog10ImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKLog10ImageTest.cpp index 79f72a1faa..ec2750d3f6 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKLog10ImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKLog10ImageTest.cpp @@ -30,9 +30,9 @@ TEST_CASE("ITKImageProcessing::ITKLog10ImageFilter(defaults)", "[ITKImageProcess } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKLog10Image::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKLog10Image::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKLog10Image::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKLog10Image::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKLog10Image::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKLog10Image::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKLogImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKLogImageTest.cpp index e930b43beb..5590728f65 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKLogImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKLogImageTest.cpp @@ -30,9 +30,9 @@ TEST_CASE("ITKImageProcessing::ITKLogImageFilter(defaults)", "[ITKImageProcessin } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKLogImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKLogImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKLogImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKLogImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKLogImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKLogImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKMaskImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMaskImageTest.cpp index ac2490117d..9dbe9880d3 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMaskImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMaskImageTest.cpp @@ -42,9 +42,9 @@ TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(2d)", "[ITKImageProcessing][IT REQUIRE(inputGeom.getDimensions() == maskGeom.getDimensions()); Arguments args; - args.insertOrAssign(ITKMaskImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMaskImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMaskImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMaskImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMaskImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMaskImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKMaskImage::k_MaskImageDataPath_Key, std::make_any(maskDataPath)); auto preflightResult = filter.preflight(dataStructure, args); @@ -85,9 +85,9 @@ TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(cthead1)", "[ITKImageProcessin REQUIRE(inputGeom.getDimensions() == maskGeom.getDimensions()); Arguments args; - args.insertOrAssign(ITKMaskImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMaskImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMaskImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMaskImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMaskImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMaskImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKMaskImage::k_MaskImageDataPath_Key, std::make_any(maskDataPath)); auto preflightResult = filter.preflight(dataStructure, args); @@ -128,9 +128,9 @@ TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(rgb)", "[ITKImageProcessing][I REQUIRE(inputGeom.getDimensions() == maskGeom.getDimensions()); Arguments args; - args.insertOrAssign(ITKMaskImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMaskImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMaskImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMaskImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMaskImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMaskImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKMaskImage::k_MaskImageDataPath_Key, std::make_any(maskDataPath)); args.insertOrAssign(ITKMaskImage::k_OutsideValue_Key, std::make_any(10.0)); @@ -173,9 +173,9 @@ TEST_CASE("ITKMaskImageFilter(cthead1_maskvalue)", "[ITKImageProcessing][ITKMask REQUIRE(inputGeom.getDimensions() == maskGeom.getDimensions()); Arguments args; - args.insertOrAssign(ITKMaskImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMaskImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMaskImage::k_OutputImageDataPath_Key, std::make_any(outputDataPath)); + args.insertOrAssign(ITKMaskImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMaskImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMaskImage::k_OutputImageArrayName_Key, std::make_any(outputDataPath)); args.insertOrAssign(ITKMaskImage::k_MaskImageDataPath_Key, std::make_any(maskDataPath)); args.insertOrAssign(ITKMaskImage::k_MaskingValue_Key, std::make_any(100.0)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKMedianImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMedianImageTest.cpp index deb5303468..320557be6e 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMedianImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMedianImageTest.cpp @@ -37,9 +37,9 @@ TEST_CASE("ITKImageProcessing::ITKMedianImageFilter(defaults)", "[ITKImageProces SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKMedianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMedianImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMedianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMedianImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMedianImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMedianImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -68,9 +68,9 @@ TEST_CASE("ITKImageProcessing::ITKMedianImageFilter(by23)", "[ITKImageProcessing SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKMedianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMedianImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMedianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMedianImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMedianImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMedianImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); // 0 should be unused args.insertOrAssign(ITKMedianImage::k_Radius_Key, std::make_any(VectorUInt32Parameter::ValueType{2, 3, 0})); diff --git a/src/Plugins/ITKImageProcessing/test/ITKMinMaxCurvatureFlowImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMinMaxCurvatureFlowImageTest.cpp index 8a62d8ff36..6ff50398d7 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMinMaxCurvatureFlowImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMinMaxCurvatureFlowImageTest.cpp @@ -35,7 +35,7 @@ TEST_CASE("ITKImageProcessing::ITKMinMaxCurvatureFlowImageFilter(defaults)", "[I Arguments args; args.insertOrAssign(ITKMinMaxCurvatureFlowImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKMinMaxCurvatureFlowImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMinMaxCurvatureFlowImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMinMaxCurvatureFlowImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -73,7 +73,7 @@ TEST_CASE("ITKImageProcessing::ITKMinMaxCurvatureFlowImageFilter(longer)", "[ITK Arguments args; args.insertOrAssign(ITKMinMaxCurvatureFlowImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKMinMaxCurvatureFlowImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMinMaxCurvatureFlowImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMinMaxCurvatureFlowImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKMinMaxCurvatureFlowImage::k_TimeStep_Key, std::make_any(0.1)); args.insertOrAssign(ITKMinMaxCurvatureFlowImage::k_NumberOfIterations_Key, std::make_any(10)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKMorphologicalGradientImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMorphologicalGradientImageTest.cpp index e53d2571ca..98cbde81b0 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMorphologicalGradientImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMorphologicalGradientImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKMorphologicalGradientImageFilter(Morphological } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKMorphologicalGradientImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMorphologicalGradientImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMorphologicalGradientImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMorphologicalGradientImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMorphologicalGradientImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMorphologicalGradientImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKMorphologicalGradientImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKMorphologicalGradientImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKMorphologicalWatershedImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMorphologicalWatershedImageTest.cpp index e9b786e7e5..211c2c4b10 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMorphologicalWatershedImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMorphologicalWatershedImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKMorphologicalWatershedImageFilter(defaults)", } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKMorphologicalWatershedImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMorphologicalWatershedImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMorphologicalWatershedImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMorphologicalWatershedImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMorphologicalWatershedImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMorphologicalWatershedImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -63,9 +63,9 @@ TEST_CASE("ITKImageProcessing::ITKMorphologicalWatershedImageFilter(level_1)", " } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKMorphologicalWatershedImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMorphologicalWatershedImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMorphologicalWatershedImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMorphologicalWatershedImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMorphologicalWatershedImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMorphologicalWatershedImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKMorphologicalWatershedImage::k_Level_Key, std::make_any(1.0)); args.insertOrAssign(ITKMorphologicalWatershedImage::k_MarkWatershedLine_Key, std::make_any(false)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKNormalizeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKNormalizeImageTest.cpp index 2385fb0cee..50c6857cb2 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKNormalizeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKNormalizeImageTest.cpp @@ -28,9 +28,9 @@ TEST_CASE("ITKImageProcessing::ITKNormalizeImageFilter(defaults)", "[ITKImagePro SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKNormalizeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKNormalizeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKNormalizeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKNormalizeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKNormalizeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKNormalizeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -66,9 +66,9 @@ TEST_CASE("ITKImageProcessing::ITKNormalizeImageFilter(vector)", "[.][ITKImagePr SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKNormalizeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKNormalizeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKNormalizeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKNormalizeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKNormalizeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKNormalizeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKNotImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKNotImageTest.cpp index 818a55e7dc..3aee80115d 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKNotImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKNotImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKNotImageFilter(defaults)", "[ITKImageProcessin } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKNotImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKNotImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKNotImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKNotImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKNotImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKNotImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKOpeningByReconstructionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKOpeningByReconstructionImageTest.cpp index 51d6afb7b6..e1ac56ff64 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKOpeningByReconstructionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKOpeningByReconstructionImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKOpeningByReconstructionImageFilter(OpeningByRe } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKOpeningByReconstructionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKOpeningByReconstructionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKOpeningByReconstructionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKOpeningByReconstructionImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKOpeningByReconstructionImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKOpeningByReconstructionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKOpeningByReconstructionImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKOpeningByReconstructionImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKOtsuMultipleThresholdsImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKOtsuMultipleThresholdsImageTest.cpp index f535ec0ec4..b5256332bc 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKOtsuMultipleThresholdsImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKOtsuMultipleThresholdsImageTest.cpp @@ -30,9 +30,9 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(default)", " SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -59,9 +59,9 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(two_on_float SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_NumberOfThresholds_Key, std::make_any(2)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_ReturnBinMidpoint_Key, std::make_any(true)); @@ -90,9 +90,9 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(three_on)", SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_NumberOfThresholds_Key, std::make_any(3)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_NumberOfHistogramBins_Key, std::make_any(256)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_ReturnBinMidpoint_Key, std::make_any(true)); @@ -122,9 +122,9 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(valley_empha SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_NumberOfThresholds_Key, std::make_any(3)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_ValleyEmphasis_Key, std::make_any(true)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_ReturnBinMidpoint_Key, std::make_any(true)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKRegionalMaximaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKRegionalMaximaImageTest.cpp index eb44e51dcb..f2f99d94ea 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKRegionalMaximaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKRegionalMaximaImageTest.cpp @@ -36,7 +36,7 @@ TEST_CASE("ITKImageProcessing::ITKRegionalMaximaImageFilter(defaults)", "[ITKIma Arguments args; args.insertOrAssign(ITKRegionalMaximaImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKRegionalMaximaImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKRegionalMaximaImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKRegionalMaximaImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKRegionalMinimaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKRegionalMinimaImageTest.cpp index ad7dd60ac4..71a0623146 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKRegionalMinimaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKRegionalMinimaImageTest.cpp @@ -36,7 +36,7 @@ TEST_CASE("ITKImageProcessing::ITKRegionalMinimaImageFilter(defaults)", "[ITKIma Arguments args; args.insertOrAssign(ITKRegionalMinimaImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKRegionalMinimaImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKRegionalMinimaImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKRegionalMinimaImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKRelabelComponentImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKRelabelComponentImageTest.cpp index 1aff7df806..246c8832ed 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKRelabelComponentImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKRelabelComponentImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(default)", "[ITKIm } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKRelabelComponentImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKRelabelComponentImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKRelabelComponentImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKRelabelComponentImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -65,9 +65,9 @@ TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(no_sorting)", "[IT } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKRelabelComponentImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKRelabelComponentImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKRelabelComponentImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKRelabelComponentImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKRelabelComponentImage::k_SortByObjectSize_Key, std::make_any(false)); auto preflightResult = filter.preflight(dataStructure, args); @@ -97,9 +97,9 @@ TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(no_sorting2)", "[I } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKRelabelComponentImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKRelabelComponentImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKRelabelComponentImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKRelabelComponentImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKRelabelComponentImage::k_SortByObjectSize_Key, std::make_any(false)); args.insertOrAssign(ITKRelabelComponentImage::k_MinimumObjectSize_Key, std::make_any(140)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKRescaleIntensityImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKRescaleIntensityImageTest.cpp index 8eff28fcbb..b367f8ad2f 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKRescaleIntensityImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKRescaleIntensityImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKRescaleIntensityImageFilter(3d)", "[ITKImagePr } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKRescaleIntensityImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKRescaleIntensityImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKRescaleIntensityImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKRescaleIntensityImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKRescaleIntensityImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKRescaleIntensityImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKSigmoidImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSigmoidImageTest.cpp index 4920d0e081..cda9be77ab 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSigmoidImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSigmoidImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKSigmoidImageFilter(defaults)", "[ITKImageProce } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKSigmoidImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKSigmoidImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKSigmoidImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKSigmoidImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKSigmoidImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKSigmoidImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKSignedDanielssonDistanceMapImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSignedDanielssonDistanceMapImageTest.cpp index ca2476cd29..3cb01738f0 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSignedDanielssonDistanceMapImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSignedDanielssonDistanceMapImageTest.cpp @@ -35,7 +35,7 @@ TEST_CASE("ITKImageProcessing::ITKSignedDanielssonDistanceMapImageFilter(default Arguments args; args.insertOrAssign(ITKSignedDanielssonDistanceMapImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKSignedDanielssonDistanceMapImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKSignedDanielssonDistanceMapImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKSignedDanielssonDistanceMapImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKSignedMaurerDistanceMapImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSignedMaurerDistanceMapImageTest.cpp index b1cd7c7d78..0b92ab3ef4 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSignedMaurerDistanceMapImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSignedMaurerDistanceMapImageTest.cpp @@ -31,9 +31,9 @@ TEST_CASE("ITKImageProcessing::ITKSignedMaurerDistanceMapImageFilter(default)", } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKSinImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSinImageTest.cpp index ebf44a1ae3..caf20ad219 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSinImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSinImageTest.cpp @@ -30,9 +30,9 @@ TEST_CASE("ITKImageProcessing::ITKSinImageFilter(defaults)", "[ITKImageProcessin } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKSinImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKSinImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKSinImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKSinImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKSinImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKSinImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKSqrtImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSqrtImageTest.cpp index 936f071ffa..2f446c3ef1 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSqrtImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSqrtImageTest.cpp @@ -30,9 +30,9 @@ TEST_CASE("ITKImageProcessing::ITKSqrtImageFilter(defaults)", "[ITKImageProcessi } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKSqrtImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKSqrtImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKSqrtImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKSqrtImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKSqrtImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKSqrtImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKSquareImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSquareImageTest.cpp index 9acd55d18a..2ff938cc42 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSquareImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSquareImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKSquareImageFilter(defaults)", "[ITKImageProces } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKSquareImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKSquareImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKSquareImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKSquareImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKSquareImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKSquareImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKTanImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKTanImageTest.cpp index c8d9568cbc..fe7e52722c 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKTanImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKTanImageTest.cpp @@ -31,9 +31,9 @@ TEST_CASE("ITKImageProcessing::ITKTanImageFilter(defaults)", "[ITKImageProcessin } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKTanImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKTanImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKTanImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKTanImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKTanImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKTanImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKThresholdImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKThresholdImageTest.cpp index 22a327a41e..756e955fff 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKThresholdImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKThresholdImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Default)", "[ITKImageProc } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKThresholdImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKThresholdImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKThresholdImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKThresholdImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -64,9 +64,9 @@ TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Threshold1)", "[ITKImageP } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKThresholdImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKThresholdImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKThresholdImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKThresholdImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKThresholdImage::k_Lower_Key, std::make_any(25000)); args.insertOrAssign(ITKThresholdImage::k_Upper_Key, std::make_any(65535)); @@ -97,9 +97,9 @@ TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Threshold2)", "[ITKImageP } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKThresholdImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKThresholdImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKThresholdImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKThresholdImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKThresholdImage::k_Lower_Key, std::make_any(0)); args.insertOrAssign(ITKThresholdImage::k_Upper_Key, std::make_any(25000)); args.insertOrAssign(ITKThresholdImage::k_OutsideValue_Key, std::make_any(25000)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKThresholdMaximumConnectedComponentsImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKThresholdMaximumConnectedComponentsImageTest.cpp index 97551659d6..19a1befc21 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKThresholdMaximumConnectedComponentsImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKThresholdMaximumConnectedComponentsImageTest.cpp @@ -35,7 +35,7 @@ TEST_CASE("ITKImageProcessing::ITKThresholdMaximumConnectedComponentsImageFilter Arguments args; args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -66,7 +66,7 @@ TEST_CASE("ITKImageProcessing::ITKThresholdMaximumConnectedComponentsImageFilter Arguments args; args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_MinimumObjectSizeInPixels_Key, std::make_any(40)); args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_UpperBoundary_Key, std::make_any(150)); @@ -99,7 +99,7 @@ TEST_CASE("ITKImageProcessing::ITKThresholdMaximumConnectedComponentsImageFilter Arguments args; args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKThresholdMaximumConnectedComponentsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMaximaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMaximaImageTest.cpp index 46d5b6c706..c57ec8d19d 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMaximaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMaximaImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKValuedRegionalMaximaImageFilter(defaults)", "[ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKValuedRegionalMaximaImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKValuedRegionalMaximaImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKValuedRegionalMaximaImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKValuedRegionalMaximaImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKValuedRegionalMaximaImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKValuedRegionalMaximaImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMinimaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMinimaImageTest.cpp index 3cbc374055..568013a463 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMinimaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMinimaImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKValuedRegionalMinimaImageFilter(defaults)", "[ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKValuedRegionalMinimaImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKValuedRegionalMinimaImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKValuedRegionalMinimaImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKValuedRegionalMinimaImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKValuedRegionalMinimaImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKValuedRegionalMinimaImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKWhiteTopHatImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKWhiteTopHatImageTest.cpp index ce96233003..123cca20c3 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKWhiteTopHatImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKWhiteTopHatImageTest.cpp @@ -35,9 +35,9 @@ TEST_CASE("ITKImageProcessing::ITKWhiteTopHatImageFilter(WhiteTopHatErode)", "[I } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKWhiteTopHatImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKWhiteTopHatImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKWhiteTopHatImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKWhiteTopHatImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKWhiteTopHatImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKWhiteTopHatImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKWhiteTopHatImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKWhiteTopHatImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKZeroCrossingImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKZeroCrossingImageTest.cpp index 4a1e0933ab..5c645d1928 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKZeroCrossingImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKZeroCrossingImageTest.cpp @@ -35,7 +35,7 @@ TEST_CASE("ITKImageProcessing::ITKZeroCrossingImageFilter(defaults)", "[ITKImage Arguments args; args.insertOrAssign(ITKZeroCrossingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKZeroCrossingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKZeroCrossingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKZeroCrossingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -66,7 +66,7 @@ TEST_CASE("ITKImageProcessing::ITKZeroCrossingImageFilter(inverted)", "[ITKImage Arguments args; args.insertOrAssign(ITKZeroCrossingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ITKZeroCrossingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKZeroCrossingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKZeroCrossingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKZeroCrossingImage::k_ForegroundValue_Key, std::make_any(0)); args.insertOrAssign(ITKZeroCrossingImage::k_BackgroundValue_Key, std::make_any(2)); diff --git a/src/Plugins/ITKImageProcessing/tools/filter.cpp.in b/src/Plugins/ITKImageProcessing/tools/filter.cpp.in index a0cf6fe106..2d77d31065 100644 --- a/src/Plugins/ITKImageProcessing/tools/filter.cpp.in +++ b/src/Plugins/ITKImageProcessing/tools/filter.cpp.in @@ -54,11 +54,11 @@ Parameters ${FILTER_NAME}::parameters() const Parameters params; ${PARAMETER_DEFS} params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, ${INPUT_ARRAY_TYPES})); + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, ${INPUT_ARRAY_TYPES})); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } diff --git a/src/Plugins/ITKImageProcessing/tools/filter.hpp.in b/src/Plugins/ITKImageProcessing/tools/filter.hpp.in index 1bda691ffd..da29f729f2 100644 --- a/src/Plugins/ITKImageProcessing/tools/filter.hpp.in +++ b/src/Plugins/ITKImageProcessing/tools/filter.hpp.in @@ -29,9 +29,9 @@ public: ${FILTER_NAME}& operator=(${FILTER_NAME}&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path";${PARAMETER_KEYS} + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name";${PARAMETER_KEYS} /** * @brief Returns the name of the filter. * @return diff --git a/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline index 1a355360ad..636eac9073 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline @@ -7,8 +7,8 @@ "args": { "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "DataContainer", - "read_h5_ebsd_parameter": { + "output_image_geometry_path": "DataContainer", + "read_h5_ebsd_object": { "end_slice": 117, "euler_representation": 0, "hdf5_data_paths": [ @@ -35,7 +35,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -58,7 +58,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -70,9 +70,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -89,7 +89,7 @@ "mask_array_path": "DataContainer/CellData/Mask", "misorientation_tolerance": 5.0, "quats_array_path": "DataContainer/CellData/Quats", - "selected_image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "use_mask": true, "write_alignment_shifts": true }, diff --git a/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline index f597c67115..30012ea5ae 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline @@ -7,7 +7,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "DataContainer", + "output_image_geometry_path": "DataContainer", "input_file": "Data/Small_IN100/Slice_1.ang" }, "comments": "", @@ -20,7 +20,7 @@ { "args": { "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -36,10 +36,10 @@ }, { "args": { - "created_image_geometry": "DataContainer", + "output_image_geometry_path": "DataContainer", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -63,7 +63,7 @@ ] ], "rotation_representation": 0, - "selected_image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -74,7 +74,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -89,7 +89,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -116,12 +116,12 @@ }, { "args": { - "data_group_name": "", + "new_data_group_path": "DataContainer/Statistics", "histogram_suffix": " Histogram", "max_range": 1.0, "min_range": 0.0, - "new_data_group": true, - "new_data_group_name": "DataContainer/Statistics", + "create_new_data_group": true, + "output_data_group_path": "", "number_of_bins": 25, "selected_array_paths": [ "DataContainer/Cell Data/Confidence Index" @@ -144,7 +144,7 @@ "output_dir": "Data/Output/OrientationAnalysis/", "output_path": "Data/Output/OrientationAnalysis/Test/CI_Histogram.csv", "output_style": 1, - "selected_data_array_paths": [ + "input_data_array_paths": [ "DataContainer/Statistics/Confidence Index Histogram" ] }, 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 db7cd06c72..914d1df917 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 @@ -4,7 +4,7 @@ "pipeline": [ { "args": { - "input_file_list_info": { + "input_file_list_object": { "end_index": 117, "file_extension": ".ang", "file_prefix": "Slice_", 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 09c2e1dd5e..023ab26ae1 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 @@ -7,8 +7,8 @@ "args": { "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "DataContainer", - "read_h5_ebsd_parameter": { + "output_image_geometry_path": "DataContainer", + "read_h5_ebsd_object": { "end_slice": 117, "euler_representation": 0, "hdf5_data_paths": [ @@ -35,7 +35,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -58,7 +58,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -70,9 +70,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -89,7 +89,7 @@ "mask_array_path": "DataContainer/CellData/Mask", "misorientation_tolerance": 5.0, "quats_array_path": "DataContainer/CellData/Quats", - "selected_image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "use_mask": true, "write_alignment_shifts": false }, @@ -104,7 +104,7 @@ "args": { "fill_holes": false, "mask_array_path": "DataContainer/CellData/Mask", - "image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -119,7 +119,7 @@ "mask_array_path": "DataContainer/CellData/Mask", "reference_slice": 0, "selected_cell_data_path": "DataContainer/CellData", - "selected_image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "use_reference_slice": true, "write_alignment_shifts": false }, @@ -135,7 +135,7 @@ "cell_phases_array_path": "DataContainer/CellData/Phases", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "mask_array_path": "DataContainer/CellData/Mask", - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "misorientation_tolerance": 5.0, "number_of_neighbors": 4, "quats_array_path": "DataContainer/CellData/Quats" @@ -153,7 +153,7 @@ "correlation_array_path": "DataContainer/CellData/Confidence Index", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "ignored_data_array_paths": [], - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "level": 2, "min_confidence": 0.20000000298023224, "misorientation_tolerance": 5.0, @@ -173,10 +173,10 @@ "cell_phases_array_path": "DataContainer/CellData/Phases", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "feature_ids_array_name": "FeatureIds", - "mask_array_path": "DataContainer/CellData/Mask", - "grid_geometry_path": "DataContainer", + "cell_mask_array_path": "DataContainer/CellData/Mask", + "input_image_geometry_path": "DataContainer", "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/CellData/Quats", + "cell_quats_array_path": "DataContainer/CellData/Quats", "randomize_features": true, "use_mask": true }, @@ -203,9 +203,9 @@ }, { "args": { - "avg_euler_angles_array_path": "AvgEulerAngles", - "avg_quats_array_path": "AvgQuats", - "cell_feature_attribute_matrix": "DataContainer/CellFeatureData", + "avg_euler_angles_array_name": "AvgEulerAngles", + "avg_quats_array_name": "AvgQuats", + "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_feature_ids_array_path": "DataContainer/CellData/FeatureIds", "cell_phases_array_path": "DataContainer/CellData/Phases", "cell_quats_array_path": "DataContainer/CellData/Quats", @@ -220,16 +220,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList2", - "number_of_neighbors": "NumNeighbors2", - "shared_surface_area_list": "SharedSurfaceAreaList2", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "comments": "", "filter": { @@ -250,7 +250,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "feature_parent_ids_array_name": "ParentIds", "feature_phases_array_path": "DataContainer/CellFeatureData/Phases", - "new_cell_feature_attribute_matrix_name": "NewGrain Data", + "created_feature_attribute_matrix_name": "NewGrain Data", "non_contiguous_neighbor_list_array_path": "", "use_non_contiguous_neighbors": false }, @@ -263,13 +263,13 @@ }, { "args": { - "equivalent_diameters_path": "EquivalentDiameters", - "feature_attribute_matrix": "DataContainer/CellFeatureData", + "equivalent_diameters_name": "EquivalentDiameters", + "feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "geometry_path": "DataContainer", - "num_elements_path": "NumElements", + "input_image_geometry_path": "DataContainer", + "num_elements_name": "NumElements", "save_element_sizes": false, - "volumes_path": "Volumes" + "volumes_name": "Volumes" }, "comments": "", "filter": { @@ -283,7 +283,7 @@ "apply_single_phase": false, "feature_ids_path": "DataContainer/CellData/FeatureIds", "feature_phases_path": "", - "image_geom_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "min_allowed_features_size": 16, "num_cells_path": "DataContainer/CellFeatureData/NumElements", "phase_number": 0 @@ -297,16 +297,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList", - "number_of_neighbors": "NumNeighbors", - "shared_surface_area_list": "SharedSurfaceAreaList", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "comments": "", "filter": { @@ -318,13 +318,13 @@ { "args": { "apply_to_single_phase": false, - "cell_attribute_matrix": "DataContainer/CellData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "feature_phases": "Data Container/Feature Data/Phases", + "cell_attribute_matrix_path": "DataContainer/CellData", + "feature_ids_path": "DataContainer/CellData/FeatureIds", + "feature_phases_path": "Data Container/Feature Data/Phases", "ignored_voxel_arrays": [], - "image_geom": "DataContainer", + "input_image_geometry_path": "DataContainer", "min_num_neighbors": 2, - "num_neighbors": "DataContainer/CellFeatureData/NumNeighbors", + "num_neighbors_path": "DataContainer/CellFeatureData/NumNeighbors", "phase_number": 0 }, "comments": "", @@ -341,7 +341,7 @@ "ignored_data_array_paths": [], "min_allowed_defect_size": 1000, "selected_cell_data_group": "DataContainer/CellData", - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "store_as_new_phase": false }, "comments": "", @@ -356,9 +356,9 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 0, - "selected_feature_group": "DataContainer/CellFeatureData", - "selected_image_geometry": "DataContainer", + "operation_index": 0, + "selected_feature_group_path": "DataContainer/CellFeatureData", + "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, "z_dir_on": true @@ -375,9 +375,9 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 1, - "selected_feature_group": "DataContainer/CellFeatureData", - "selected_image_geometry": "DataContainer", + "operation_index": 1, + "selected_feature_group_path": "DataContainer/CellFeatureData", + "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, "z_dir_on": true 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 d809694445..c1028550a9 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 @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer/CellEnsembleData", "DataContainer/CellEnsembleData/CrystalStructures", @@ -49,10 +49,10 @@ }, { "args": { - "centroids_array_path": "Centroids", - "feature_attribute_matrix": "DataContainer/CellFeatureData", + "centroids_array_name": "Centroids", + "feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "selected_image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "filter": { "name": "simplnx::FindFeatureCentroidsFilter", @@ -62,13 +62,13 @@ }, { "args": { - "equivalent_diameters_path": "EquivalentDiameters", - "feature_attribute_matrix": "DataContainer/CellFeatureData", + "equivalent_diameters_name": "EquivalentDiameters", + "feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "geometry_path": "DataContainer", - "num_elements_path": "NumElements", + "input_image_geometry_path": "DataContainer", + "num_elements_name": "NumElements", "save_element_sizes": false, - "volumes_path": "Size Volumes" + "volumes_name": "Size Volumes" }, "filter": { "name": "simplnx::CalculateFeatureSizesFilter", @@ -84,7 +84,7 @@ "centroids_array_path": "DataContainer/CellFeatureData/Centroids", "feature_ids_path": "DataContainer/CellData/FeatureIds", "omega3s_array_name": "Omega3s", - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "volumes_array_name": "Shape Volumes" }, "filter": { @@ -95,16 +95,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList", - "number_of_neighbors": "NumNeighbors", - "shared_surface_area_list": "SharedSurfaceAreaList", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "filter": { "name": "simplnx::FindNeighbors", @@ -120,7 +120,7 @@ "multiples_of_average": 1.0, "neighborhood_list_array_name": "NeighborhoodList", "neighborhoods_array_name": "Neighborhoods", - "selected_image_geometry_path": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "filter": { "name": "simplnx::FindNeighborhoodsFilter", @@ -139,7 +139,7 @@ "nearest_neighbors_array_name": "NearestNeighbors", "q_pdistances_array_name": "QPManhattanDistances", "save_nearest_neighbors": false, - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "t_jdistances_array_name": "TJManhattanDistances" }, "filter": { @@ -153,7 +153,7 @@ "calculate_sphericity": true, "feature_ids_path": "DataContainer/CellData/FeatureIds", "num_cells_array_path": "DataContainer/CellFeatureData/NumElements", - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "sphericity_array_name": "Sphericity", "surface_area_volume_ratio_array_name": "SurfaceAreaVolumeRatio" }, 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 f4b0a23bbc..5e03982fbf 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 @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -56,7 +56,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -94,8 +94,8 @@ "args": { "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "DataContainer", - "read_h5_ebsd_parameter": { + "output_image_geometry_path": "DataContainer", + "read_h5_ebsd_object": { "end_slice": 117, "euler_representation": 0, "hdf5_data_paths": [ @@ -122,7 +122,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -145,7 +145,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -157,9 +157,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -176,7 +176,7 @@ "mask_array_path": "DataContainer/CellData/Mask", "misorientation_tolerance": 5.0, "quats_array_path": "DataContainer/CellData/Quats", - "selected_image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "use_mask": true, "write_alignment_shifts": false }, @@ -206,7 +206,7 @@ "mask_array_path": "DataContainer/CellData/Mask", "reference_slice": 0, "selected_cell_data_path": "DataContainer/CellData", - "selected_image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "use_reference_slice": true, "write_alignment_shifts": false }, @@ -222,7 +222,7 @@ "cell_phases_array_path": "DataContainer/CellData/Phases", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "mask_array_path": "DataContainer/CellData/Mask", - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "misorientation_tolerance": 5.0, "number_of_neighbors": 4, "quats_array_path": "DataContainer/CellData/Quats" @@ -240,7 +240,7 @@ "correlation_array_path": "DataContainer/CellData/Confidence Index", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "ignored_data_array_paths": [], - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "level": 2, "min_confidence": 0.20000000298023224, "misorientation_tolerance": 5.0, @@ -261,7 +261,7 @@ "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "feature_ids_array_name": "FeatureIds", "mask_array_path": "DataContainer/CellData/Mask", - "grid_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "misorientation_tolerance": 5.0, "quats_array_path": "DataContainer/CellData/Quats", "randomize_features": true, @@ -290,9 +290,9 @@ }, { "args": { - "avg_euler_angles_array_path": "AvgEulerAngles", - "avg_quats_array_path": "AvgQuats", - "cell_feature_attribute_matrix": "DataContainer/CellFeatureData", + "avg_euler_angles_array_name": "AvgEulerAngles", + "avg_quats_array_name": "AvgQuats", + "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_feature_ids_array_path": "DataContainer/CellData/FeatureIds", "cell_phases_array_path": "DataContainer/CellData/Phases", "cell_quats_array_path": "DataContainer/CellData/Quats", @@ -307,16 +307,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList2", - "number_of_neighbors": "NumNeighbors2", - "shared_surface_area_list": "SharedSurfaceAreaList2", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "comments": "", "filter": { @@ -337,7 +337,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "feature_parent_ids_array_name": "ParentIds", "feature_phases_array_path": "DataContainer/CellFeatureData/Phases", - "new_cell_feature_attribute_matrix_name": "NewGrain Data", + "created_feature_attribute_matrix_name": "NewGrain Data", "non_contiguous_neighbor_list_array_path": "", "use_non_contiguous_neighbors": false }, @@ -350,13 +350,13 @@ }, { "args": { - "equivalent_diameters_path": "EquivalentDiameters", - "feature_attribute_matrix": "DataContainer/CellFeatureData", + "equivalent_diameters_name": "EquivalentDiameters", + "feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "geometry_path": "DataContainer", - "num_elements_path": "NumElements", + "input_image_geometry_path": "DataContainer", + "num_elements_name": "NumElements", "save_element_sizes": false, - "volumes_path": "Volumes" + "volumes_name": "Volumes" }, "comments": "", "filter": { @@ -370,7 +370,7 @@ "apply_single_phase": false, "feature_ids_path": "DataContainer/CellData/FeatureIds", "feature_phases_path": "", - "image_geom_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "min_allowed_features_size": 16, "num_cells_path": "DataContainer/CellFeatureData/NumElements", "phase_number": 0 @@ -384,16 +384,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList", - "number_of_neighbors": "NumNeighbors", - "shared_surface_area_list": "SharedSurfaceAreaList", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "comments": "", "filter": { @@ -405,13 +405,13 @@ { "args": { "apply_to_single_phase": false, - "cell_attribute_matrix": "DataContainer/CellData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "feature_phases": "Data Container/Feature Data/Phases", + "cell_attribute_matrix_path": "DataContainer/CellData", + "feature_ids_path": "DataContainer/CellData/FeatureIds", + "feature_phases_path": "Data Container/Feature Data/Phases", "ignored_voxel_arrays": [], "image_geom": "DataContainer", "min_num_neighbors": 2, - "num_neighbors": "DataContainer/CellFeatureData/NumNeighbors", + "num_neighbors_path": "DataContainer/CellFeatureData/NumNeighbors", "phase_number": 0 }, "comments": "", @@ -427,7 +427,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "min_allowed_defect_size": 1000, - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "store_as_new_phase": false }, "comments": "", @@ -442,8 +442,8 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 0, - "selected_image_geometry": "DataContainer", + "operation_index": 0, + "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, "z_dir_on": true @@ -460,8 +460,8 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 1, - "selected_image_geometry": "DataContainer", + "operation_index": 1, + "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, "z_dir_on": true @@ -518,10 +518,10 @@ }, { "args": { - "centroids_array_path": "Centroids", - "feature_attribute_matrix": "DataContainer/CellFeatureData", + "centroids_array_name": "Centroids", + "feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "selected_image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -532,13 +532,13 @@ }, { "args": { - "equivalent_diameters_path": "EquivalentDiameters", - "feature_attribute_matrix": "DataContainer/CellFeatureData", + "equivalent_diameters_name": "EquivalentDiameters", + "feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "geometry_path": "DataContainer", - "num_elements_path": "NumElements", + "input_image_geometry_path": "DataContainer", + "num_elements_name": "NumElements", "save_element_sizes": false, - "volumes_path": "Size Volumes" + "volumes_name": "Size Volumes" }, "comments": "", "filter": { @@ -555,7 +555,7 @@ "centroids_array_path": "DataContainer/CellFeatureData/Centroids", "feature_ids_path": "DataContainer/CellData/FeatureIds", "omega3s_array_name": "Omega3s", - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "volumes_array_name": "Shape Volumes" }, "comments": "", @@ -567,16 +567,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList", - "number_of_neighbors": "NumNeighbors", - "shared_surface_area_list": "SharedSurfaceAreaList", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "comments": "", "filter": { @@ -593,7 +593,7 @@ "multiples_of_average": 1.0, "neighborhood_list_array_name": "NeighborhoodList", "neighborhoods_array_name": "Neighborhoods", - "selected_image_geometry_path": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -613,7 +613,7 @@ "nearest_neighbors_array_name": "NearestNeighbors", "q_pdistances_array_name": "QPManhattanDistances", "save_nearest_neighbors": false, - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "t_jdistances_array_name": "TJManhattanDistances" }, "comments": "", @@ -628,7 +628,7 @@ "calculate_sphericity": true, "feature_ids_path": "DataContainer/CellData/FeatureIds", "num_cells_array_path": "DataContainer/CellFeatureData/NumElements", - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "sphericity_array_name": "Sphericity", "surface_area_volume_ratio_array_name": "SurfaceAreaVolumeRatio" }, @@ -674,9 +674,9 @@ }, { "args": { - "avg_euler_angles_array_path": "AvgEulerAngles", - "avg_quats_array_path": "AvgQuats", - "cell_feature_attribute_matrix": "DataContainer/CellFeatureData", + "avg_euler_angles_array_name": "AvgEulerAngles", + "avg_quats_array_name": "AvgQuats", + "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_feature_ids_array_path": "DataContainer/CellData/FeatureIds", "cell_phases_array_path": "DataContainer/CellData/Phases", "cell_quats_array_path": "DataContainer/CellData/Quats", @@ -773,7 +773,7 @@ 1 ], "quats_array_path": "DataContainer/CellData/Quats", - "selected_image_geometry_path": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { 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 4951b7059f..4d9086f5eb 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 @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer/CellEnsembleData", "DataContainer/CellEnsembleData/CrystalStructures", @@ -74,9 +74,9 @@ }, { "args": { - "cell_feature_attribute_matrix": "DataContainer/CellFeatureData", - "created_image_geometry": "DataContainer", - "feature_ids": "DataContainer/CellData/FeatureIds", + "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", + "output_image_geometry_path": "DataContainer", + "feature_ids_path": "DataContainer/CellData/FeatureIds", "max_voxel": [ 140, 140, @@ -89,7 +89,7 @@ ], "remove_original_geometry": true, "renumber_features": true, - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "update_origin": true }, "comments": "", @@ -119,10 +119,10 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "fix_problem_voxels": false, "generate_triple_lines": false, - "grid_geometry_data_path": "DataContainer", + "input_grid_geometry_path": "DataContainer", "node_types_array_name": "NodeType", - "selected_data_array_paths": [], - "triangle_geometry_name": "TriangleDataContainer", + "input_data_array_paths": [], + "output_triangle_geometry_path": "TriangleDataContainer", "vertex_data_group_name": "VertexData" }, "comments": "", 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 2d0381cce3..bdd5a97902 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 @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -84,7 +84,7 @@ "surface_point_lambda": 0.0, "surface_quad_point_lambda": 0.0, "surface_triple_line_lambda": 0.0, - "triangle_geometry_data_path": "TriangleDataContainer", + "input_triangle_geometry_path": "TriangleDataContainer", "triple_line_lambda": 0.20000000298023224, "use_taubin_smoothing": true }, 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 e4fbac3d34..a9f78c6b95 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 @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -78,8 +78,8 @@ }, { "args": { - "triangle_areas_array_path": "FaceAreas", - "triangle_geometry_data_path": "TriangleDataContainer" + "triangle_areas_array_name": "FaceAreas", + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { @@ -90,8 +90,8 @@ }, { "args": { - "surface_mesh_triangle_normals_array_path": "FaceNormals", - "tri_geometry_data_path": "TriangleDataContainer" + "output_normals_array_name": "FaceNormals", + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { @@ -103,7 +103,7 @@ { "args": { "surface_mesh_triangle_dihedral_angles_array_name": "FaceDihedralAngles", - "tri_geometry_data_path": "TriangleDataContainer" + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { @@ -151,7 +151,7 @@ "feature_num_triangles_array_name": "NumTriangles", "grain_boundary_attribute_matrix_name": "SharedFeatureFace", "randomize_features": false, - "triangle_geometry_path": "TriangleDataContainer" + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { 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 af17a071c4..676a5b171d 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 @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -90,7 +90,7 @@ "surface_mesh_face_areas_array_path": "TriangleDataContainer/FaceData/FaceAreas", "surface_mesh_face_labels_array_path": "TriangleDataContainer/FaceData/FaceLabels", "surface_mesh_face_normals_array_path": "TriangleDataContainer/FaceData/FaceNormals", - "triangle_geometry": "TriangleDataContainer" + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { @@ -105,7 +105,7 @@ "cell_intensity_array_name": "MRD", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "gbcd_array_path": "TriangleDataContainer/FaceEnsembleData/GBCD", - "image_geometry_name": "GBCD Pole Figure [Sigma 3]", + "output_image_geometry_path": "GBCD Pole Figure [Sigma 3]", "misorientation_rotation": [ 60.0, 1.0, @@ -128,7 +128,7 @@ "cell_intensity_array_name": "MRD", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "gbcd_array_path": "TriangleDataContainer/FaceEnsembleData/GBCD", - "image_geometry_name": "GBCD Pole Figure [Sigma 9]", + "output_image_geometry_path": "GBCD Pole Figure [Sigma 9]", "misorientation_rotation": [ 39.0, 1.0, @@ -151,7 +151,7 @@ "cell_intensity_array_name": "MRD", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "gbcd_array_path": "TriangleDataContainer/FaceEnsembleData/GBCD", - "image_geometry_name": "GBCD Pole Figure [Sigma 11]", + "output_image_geometry_path": "GBCD Pole Figure [Sigma 11]", "misorientation_rotation": [ 50.5, 1.0, 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 63fc59e3f2..d62b2db768 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 @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -86,7 +86,7 @@ "feature_face_labels_array_name": "FaceLabels", "feature_num_triangles_array_name": "NumTriangles", "grain_boundary_attribute_matrix_name": "SharedFeatureFace", - "triangle_geometry_path": "TriangleDataContainer" + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { @@ -118,7 +118,7 @@ "surface_mesh_face_labels_array_path": "TriangleDataContainer/FaceData/FaceLabels", "surface_mesh_face_normals_array_path": "TriangleDataContainer/FaceData/FaceNormals", "surface_mesh_feature_face_labels_array_path": "TriangleDataContainer/SharedFeatureFace/FaceLabels", - "triangle_geometry_path": "TriangleDataContainer" + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline index 95c974d867..fcc997f613 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline @@ -7,7 +7,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "DataContainer", + "output_image_geometry_path": "DataContainer", "input_file": "Data/Small_IN100/Slice_1.ang" }, "comments": "", @@ -20,7 +20,7 @@ { "args": { "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -36,10 +36,10 @@ }, { "args": { - "created_image_geometry": "DataContainer", + "output_image_geometry_path": "DataContainer", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -63,7 +63,7 @@ ] ], "rotation_representation": 0, - "selected_image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -74,7 +74,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -89,7 +89,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -123,7 +123,7 @@ "args": { "file_name": "Data/Output/Edax_IPF_Colors/Small_IN100_Slice_1.png", "image_array_path": "DataContainer/Cell Data/IPFColors", - "image_geom_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "index_offset": 0, "plane": 0 }, diff --git a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline index 421be6c196..c0e5151b24 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline @@ -33,10 +33,10 @@ { "args": { "created_attribute_array_path": "[Image Geometry]/Cell Data/Quats", - "endian": 0, + "endian_index": 0, "input_file": "Data/OrientationAnalysis/quats.raw", "number_of_components": 4, - "scalar_type": 8, + "scalar_type_index": 8, "skip_header_bytes": 0, "tuple_dimensions": [ [ @@ -56,9 +56,9 @@ { "args": { "input_orientation_array_path": "[Image Geometry]/Cell Data/Quats", - "input_type": 2, + "input_representation_index": 2, "output_orientation_array_name": "Eulers", - "output_type": 0 + "output_representation_index": 0 }, "comments": "", "filter": { @@ -70,9 +70,9 @@ { "args": { "component_count": 1, - "initialization_value": "1", + "initialization_value_str": "1", "numeric_type": 4, - "output_data_array": "[Image Geometry]/Cell Data/Phases", + "output_array_path": "[Image Geometry]/Cell Data/Phases", "tuple_dimensions": [ [ 2.0, @@ -92,7 +92,7 @@ "args": { "cell_ensemble_attribute_matrix_name": "Cell Ensemble", "crystal_structures_array_name": "CrystalStructures", - "data_container_name": "[Image Geometry]", + "parent_group_path": "[Image Geometry]", "input_file": "Data/OrientationAnalysis/Ensemble.ini", "phase_types_array_name": "PhaseTypes" }, diff --git a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline index bc2e8f9088..9373178e78 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -74,7 +74,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -138,7 +138,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -201,7 +201,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -261,7 +261,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -312,7 +312,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -350,8 +350,8 @@ "args": { "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "DataContainer", - "read_h5_ebsd_parameter": { + "output_image_geometry_path": "DataContainer", + "read_h5_ebsd_object": { "end_slice": 117, "euler_representation": 0, "hdf5_data_paths": [ @@ -378,7 +378,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -401,7 +401,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -413,9 +413,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -432,7 +432,7 @@ "mask_array_path": "DataContainer/CellData/Mask", "misorientation_tolerance": 5.0, "quats_array_path": "DataContainer/CellData/Quats", - "selected_image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "use_mask": true, "write_alignment_shifts": false }, @@ -462,7 +462,7 @@ "mask_array_path": "DataContainer/CellData/Mask", "reference_slice": 0, "selected_cell_data_path": "DataContainer/CellData", - "selected_image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "use_reference_slice": true, "write_alignment_shifts": false }, @@ -478,7 +478,7 @@ "cell_phases_array_path": "DataContainer/CellData/Phases", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "mask_array_path": "DataContainer/CellData/Mask", - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "misorientation_tolerance": 5.0, "number_of_neighbors": 4, "quats_array_path": "DataContainer/CellData/Quats" @@ -496,7 +496,7 @@ "correlation_array_path": "DataContainer/CellData/Confidence Index", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "ignored_data_array_paths": [], - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "level": 2, "min_confidence": 0.20000000298023224, "misorientation_tolerance": 5.0, @@ -517,7 +517,7 @@ "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "feature_ids_array_name": "FeatureIds", "mask_array_path": "DataContainer/CellData/Mask", - "grid_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "misorientation_tolerance": 5.0, "quats_array_path": "DataContainer/CellData/Quats", "randomize_features": true, @@ -546,9 +546,9 @@ }, { "args": { - "avg_euler_angles_array_path": "AvgEulerAngles", - "avg_quats_array_path": "AvgQuats", - "cell_feature_attribute_matrix": "DataContainer/CellFeatureData", + "avg_euler_angles_array_name": "AvgEulerAngles", + "avg_quats_array_name": "AvgQuats", + "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_feature_ids_array_path": "DataContainer/CellData/FeatureIds", "cell_phases_array_path": "DataContainer/CellData/Phases", "cell_quats_array_path": "DataContainer/CellData/Quats", @@ -563,16 +563,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList2", - "number_of_neighbors": "NumNeighbors2", - "shared_surface_area_list": "SharedSurfaceAreaList2", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "comments": "", "filter": { @@ -593,7 +593,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "feature_parent_ids_array_name": "ParentIds", "feature_phases_array_path": "DataContainer/CellFeatureData/Phases", - "new_cell_feature_attribute_matrix_name": "NewGrain Data", + "created_feature_attribute_matrix_name": "NewGrain Data", "non_contiguous_neighbor_list_array_path": "", "use_non_contiguous_neighbors": false }, @@ -606,13 +606,13 @@ }, { "args": { - "equivalent_diameters_path": "EquivalentDiameters", - "feature_attribute_matrix": "DataContainer/CellFeatureData", + "equivalent_diameters_name": "EquivalentDiameters", + "feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "geometry_path": "DataContainer", - "num_elements_path": "NumElements", + "input_image_geometry_path": "DataContainer", + "num_elements_name": "NumElements", "save_element_sizes": false, - "volumes_path": "Volumes" + "volumes_name": "Volumes" }, "comments": "", "filter": { @@ -626,7 +626,7 @@ "apply_single_phase": false, "feature_ids_path": "DataContainer/CellData/FeatureIds", "feature_phases_path": "", - "image_geom_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "min_allowed_features_size": 16, "num_cells_path": "DataContainer/CellFeatureData/NumElements", "phase_number": 0 @@ -640,16 +640,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList", - "number_of_neighbors": "NumNeighbors", - "shared_surface_area_list": "SharedSurfaceAreaList", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "comments": "", "filter": { @@ -661,13 +661,13 @@ { "args": { "apply_to_single_phase": false, - "cell_attribute_matrix": "DataContainer/CellData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "feature_phases": "Data Container/Feature Data/Phases", + "cell_attribute_matrix_path": "DataContainer/CellData", + "feature_ids_path": "DataContainer/CellData/FeatureIds", + "feature_phases_path": "Data Container/Feature Data/Phases", "ignored_voxel_arrays": [], "image_geom": "DataContainer", "min_num_neighbors": 2, - "num_neighbors": "DataContainer/CellFeatureData/NumNeighbors", + "num_neighbors_path": "DataContainer/CellFeatureData/NumNeighbors", "phase_number": 0 }, "comments": "", @@ -683,7 +683,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "min_allowed_defect_size": 1000, - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "store_as_new_phase": false }, "comments": "", @@ -698,8 +698,8 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 0, - "selected_image_geometry": "DataContainer", + "operation_index": 0, + "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, "z_dir_on": true @@ -716,8 +716,8 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 1, - "selected_image_geometry": "DataContainer", + "operation_index": 1, + "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, "z_dir_on": true @@ -774,10 +774,10 @@ }, { "args": { - "centroids_array_path": "Centroids", - "feature_attribute_matrix": "DataContainer/CellFeatureData", + "centroids_array_name": "Centroids", + "feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "selected_image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -788,13 +788,13 @@ }, { "args": { - "equivalent_diameters_path": "EquivalentDiameters", - "feature_attribute_matrix": "DataContainer/CellFeatureData", + "equivalent_diameters_name": "EquivalentDiameters", + "feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "geometry_path": "DataContainer", - "num_elements_path": "NumElements", + "input_image_geometry_path": "DataContainer", + "num_elements_name": "NumElements", "save_element_sizes": false, - "volumes_path": "Size Volumes" + "volumes_name": "Size Volumes" }, "comments": "", "filter": { @@ -811,7 +811,7 @@ "centroids_array_path": "DataContainer/CellFeatureData/Centroids", "feature_ids_path": "DataContainer/CellData/FeatureIds", "omega3s_array_name": "Omega3s", - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "volumes_array_name": "Shape Volumes" }, "comments": "", @@ -823,16 +823,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList", - "number_of_neighbors": "NumNeighbors", - "shared_surface_area_list": "SharedSurfaceAreaList", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "comments": "", "filter": { @@ -849,7 +849,7 @@ "multiples_of_average": 1.0, "neighborhood_list_array_name": "NeighborhoodList", "neighborhoods_array_name": "Neighborhoods", - "selected_image_geometry_path": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -869,7 +869,7 @@ "nearest_neighbors_array_name": "NearestNeighbors", "q_pdistances_array_name": "QPManhattanDistances", "save_nearest_neighbors": false, - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "t_jdistances_array_name": "TJManhattanDistances" }, "comments": "", @@ -884,7 +884,7 @@ "calculate_sphericity": true, "feature_ids_path": "DataContainer/CellData/FeatureIds", "num_cells_array_path": "DataContainer/CellFeatureData/NumElements", - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "sphericity_array_name": "Sphericity", "surface_area_volume_ratio_array_name": "SurfaceAreaVolumeRatio" }, @@ -930,9 +930,9 @@ }, { "args": { - "avg_euler_angles_array_path": "AvgEulerAngles", - "avg_quats_array_path": "AvgQuats", - "cell_feature_attribute_matrix": "DataContainer/CellFeatureData", + "avg_euler_angles_array_name": "AvgEulerAngles", + "avg_quats_array_name": "AvgQuats", + "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_feature_ids_array_path": "DataContainer/CellData/FeatureIds", "cell_phases_array_path": "DataContainer/CellData/Phases", "cell_quats_array_path": "DataContainer/CellData/Quats", @@ -1029,7 +1029,7 @@ 1 ], "quats_array_path": "DataContainer/CellData/Quats", - "selected_image_geometry_path": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -1062,9 +1062,9 @@ }, { "args": { - "cell_feature_attribute_matrix": "DataContainer/CellFeatureData", - "created_image_geometry": "DataContainer", - "feature_ids": "DataContainer/CellData/FeatureIds", + "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", + "output_image_geometry_path": "DataContainer", + "feature_ids_path": "DataContainer/CellData/FeatureIds", "max_voxel": [ 140, 140, @@ -1077,7 +1077,7 @@ ], "remove_original_geometry": true, "renumber_features": true, - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "update_origin": true }, "comments": "", @@ -1107,10 +1107,10 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "fix_problem_voxels": false, "generate_triple_lines": false, - "grid_geometry_data_path": "DataContainer", + "input_grid_geometry_path": "DataContainer", "node_types_array_name": "NodeType", - "selected_data_array_paths": [], - "triangle_geometry_name": "TriangleDataContainer", + "input_data_array_paths": [], + "output_triangle_geometry_path": "TriangleDataContainer", "vertex_data_group_name": "VertexData" }, "comments": "", @@ -1152,7 +1152,7 @@ "surface_point_lambda": 0.0, "surface_quad_point_lambda": 0.0, "surface_triple_line_lambda": 0.0, - "triangle_geometry_data_path": "TriangleDataContainer", + "input_triangle_geometry_path": "TriangleDataContainer", "triple_line_lambda": 0.20000000298023224, "use_taubin_smoothing": true }, @@ -1187,8 +1187,8 @@ }, { "args": { - "triangle_areas_array_path": "FaceAreas", - "triangle_geometry_data_path": "TriangleDataContainer" + "triangle_areas_array_name": "FaceAreas", + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { @@ -1199,8 +1199,8 @@ }, { "args": { - "surface_mesh_triangle_normals_array_path": "FaceNormals", - "tri_geometry_data_path": "TriangleDataContainer" + "output_normals_array_name": "FaceNormals", + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { @@ -1212,7 +1212,7 @@ { "args": { "surface_mesh_triangle_dihedral_angles_array_name": "FaceDihedralAngles", - "tri_geometry_data_path": "TriangleDataContainer" + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { @@ -1281,7 +1281,7 @@ "feature_face_labels_array_name": "FaceLabels", "feature_num_triangles_array_name": "NumTriangles", "grain_boundary_attribute_matrix_name": "FaceFeatureData", - "triangle_geometry_path": "TriangleDataContainer" + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { @@ -1313,7 +1313,7 @@ "surface_mesh_face_labels_array_path": "TriangleDataContainer/FaceData/FaceLabels", "surface_mesh_face_normals_array_path": "TriangleDataContainer/FaceData/FaceNormals", "surface_mesh_feature_face_labels_array_path": "TriangleDataContainer/FaceFeatureData/FaceLabels", - "triangle_geometry_path": "TriangleDataContainer" + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { @@ -1339,7 +1339,7 @@ "surface_mesh_face_labels_array_path": "TriangleDataContainer/FaceData/FaceLabels", "surface_mesh_face_normals_array_path": "TriangleDataContainer/FaceData/FaceNormals", "surface_mesh_feature_face_labels_array_path": "TriangleDataContainer/FaceFeatureData/FaceLabels", - "triangle_geometry_path": "TriangleDataContainer" + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline index 89827fb504..27086657a3 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline @@ -40,7 +40,7 @@ { "args": { "euler_angles_array_path": "ImageGeom/Cell Data/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -56,10 +56,10 @@ }, { "args": { - "created_image_geometry": "", + "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": true, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -92,7 +92,7 @@ ] ], "rotation_representation": 0, - "selected_image_geometry": "ImageGeom" + "input_image_geometry_path": "ImageGeom" }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline index e860c93937..81719ed549 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline @@ -6,7 +6,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "data_container_name": "DataContainer", + "output_image_geometry_path": "DataContainer", "input_file": "Data/Small_IN100/Slice_1.ang" }, "comments": "", @@ -19,7 +19,7 @@ { "args": { "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -35,10 +35,10 @@ }, { "args": { - "created_image_geometry": "DataContainer", + "output_image_geometry_path": "DataContainer", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -62,7 +62,7 @@ ] ], "rotation_representation": 0, - "selected_image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -73,7 +73,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -88,7 +88,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask", + "output_data_array_name": "Mask", "created_mask_type": 10, "custom_false_value": 0.0, "custom_true_value": 1.0, diff --git a/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline index 827e8b7d7d..3f616ec8b4 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline @@ -6,7 +6,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "DataContainer", + "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" @@ -20,10 +20,10 @@ }, { "args": { - "created_image_geometry": "", + "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -56,7 +56,7 @@ ] ], "rotation_representation": 0, - "selected_image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -67,7 +67,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -82,7 +82,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask", + "output_data_array_name": "Mask", "created_mask_type": 10, "custom_false_value": 0.0, "custom_true_value": 1.0, diff --git a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline index 44e9d14d03..02f2b488a0 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline @@ -7,7 +7,7 @@ "args": { "cell_attribute_matrix_name": "EBSD Scan Data", "cell_ensemble_attribute_matrix_name": "Phase Data", - "data_container_name": "Cugrid_after 2nd_15kv_2kx_2", + "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" @@ -21,10 +21,10 @@ }, { "args": { - "created_image_geometry": "Cugrid_after 2nd_15kv_2kx_2 [ROTATED]", + "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2 [ROTATED]", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -48,7 +48,7 @@ ] ], "rotation_representation": 0, - "selected_image_geometry": "Cugrid_after 2nd_15kv_2kx_2" + "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2" }, "comments": "", "filter": { @@ -60,7 +60,7 @@ { "args": { "cell_feature_attribute_matrix": "CellFeatureData", - "created_image_geometry": "Cugrid_after 2nd_15kv_2kx_2", + "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", "feature_ids": "", "max_voxel": [ 460, @@ -74,7 +74,7 @@ ], "remove_original_geometry": true, "renumber_features": false, - "selected_image_geometry": "Cugrid_after 2nd_15kv_2kx_2", + "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", "update_origin": true }, "comments": "", @@ -86,7 +86,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -101,7 +101,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -135,7 +135,7 @@ "args": { "file_name": "Data/Output/TexturedCopper/IPF_Exposed.png", "image_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/IPF_Exposed_001", - "image_geom_path": "Cugrid_after 2nd_15kv_2kx_2", + "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", "index_offset": 0, "plane": 0 }, @@ -153,7 +153,7 @@ "crystal_structures_array_path": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures", "generation_algorithm": 0, "mask_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask", - "image_geometry_path": "PoleFigure", + "output_image_geometry_path": "PoleFigure", "image_layout": 2, "image_prefix": "Cugrid_after 2nd_15kv_2kx_2_Exposed_", "image_size": 1024, diff --git a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline index 7fc57520a3..f7018ba84c 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline @@ -7,7 +7,7 @@ "args": { "cell_attribute_matrix_name": "EBSD Scan Data", "cell_ensemble_attribute_matrix_name": "Phase Data", - "data_container_name": "Cugrid_after 2nd_15kv_2kx_2", + "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" @@ -21,10 +21,10 @@ }, { "args": { - "created_image_geometry": "Cugrid_after 2nd_15kv_2kx_2 [ROTATED]", + "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2 [ROTATED]", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -48,7 +48,7 @@ ] ], "rotation_representation": 0, - "selected_image_geometry": "Cugrid_after 2nd_15kv_2kx_2" + "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2" }, "comments": "", "filter": { @@ -60,7 +60,7 @@ { "args": { "cell_feature_attribute_matrix": "CellFeatureData", - "created_image_geometry": "Cugrid_after 2nd_15kv_2kx_2", + "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", "feature_ids": "", "max_voxel": [ 549, @@ -74,7 +74,7 @@ ], "remove_original_geometry": true, "renumber_features": false, - "selected_image_geometry": "Cugrid_after 2nd_15kv_2kx_2", + "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", "update_origin": true }, "comments": "", @@ -86,7 +86,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -101,7 +101,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -135,7 +135,7 @@ "args": { "file_name": "Data/Output/TexturedCopper/IPF_Unexposed.png", "image_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/IPF_Unexposed_001", - "image_geom_path": "Cugrid_after 2nd_15kv_2kx_2", + "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", "index_offset": 0, "plane": 0 }, @@ -153,7 +153,7 @@ "crystal_structures_array_path": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures", "generation_algorithm": 0, "mask_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask", - "image_geometry_path": "PoleFigure", + "output_image_geometry_path": "PoleFigure", "image_layout": 2, "image_prefix": "Cugrid_after 2nd_15kv_2kx_2_Unexposed_", "image_size": 1024, diff --git a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline index be90ba6f75..069c9cd1fc 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline @@ -7,7 +7,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "fw-ar-IF1-aptr12-corr", + "output_image_geometry_path": "fw-ar-IF1-aptr12-corr", "degrees_to_radians": true, "edax_hexagonal_alignment": true, "input_file": "Data/T12-MAI-2010/fw-ar-IF1-aptr12-corr.ctf" @@ -21,10 +21,10 @@ }, { "args": { - "created_image_geometry": "", + "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -57,7 +57,7 @@ ] ], "rotation_representation": 0, - "selected_image_geometry": "fw-ar-IF1-aptr12-corr" + "input_image_geometry_path": "fw-ar-IF1-aptr12-corr" }, "comments": "", "filter": { @@ -68,7 +68,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -83,7 +83,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "ThresholdArray" + "output_data_array_name": "ThresholdArray" }, "comments": "", "filter": { @@ -95,9 +95,9 @@ { "args": { "input_orientation_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -112,7 +112,7 @@ "loop": true, "min_confidence": 0.0, "selected_comparison": 0, - "selected_image_geometry": "fw-ar-IF1-aptr12-corr" + "input_image_geometry_path": "fw-ar-IF1-aptr12-corr" }, "comments": "", "filter": { @@ -146,7 +146,7 @@ "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", - "image_geom_path": "fw-ar-IF1-aptr12-corr", + "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", "index_offset": 0, "plane": 0 }, @@ -182,7 +182,7 @@ "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", - "image_geom_path": "fw-ar-IF1-aptr12-corr", + "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", "index_offset": 0, "plane": 0 }, @@ -218,7 +218,7 @@ "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", - "image_geom_path": "fw-ar-IF1-aptr12-corr", + "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", "index_offset": 0, "plane": 0 }, @@ -236,10 +236,10 @@ "cell_phases_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Phases", "crystal_structures_array_path": "fw-ar-IF1-aptr12-corr/CellEnsembleData/CrystalStructures", "feature_ids_array_name": "FeatureIds", - "mask_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/ThresholdArray", - "grid_geometry_path": "fw-ar-IF1-aptr12-corr", + "cell_mask_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/ThresholdArray", + "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", "misorientation_tolerance": 5.0, - "quats_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Quats", + "cell_quats_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Quats", "randomize_features": true, "use_mask": true }, @@ -256,7 +256,7 @@ "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", "ignored_data_array_paths": [], "min_allowed_defect_size": 10, - "selected_image_geometry": "fw-ar-IF1-aptr12-corr", + "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", "store_as_new_phase": false }, "comments": "", @@ -268,13 +268,13 @@ }, { "args": { - "equivalent_diameters_path": "EquivalentDiameters", - "feature_attribute_matrix": "fw-ar-IF1-aptr12-corr/CellFeatureData", + "equivalent_diameters_name": "EquivalentDiameters", + "feature_attribute_matrix_path": "fw-ar-IF1-aptr12-corr/CellFeatureData", "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", - "geometry_path": "fw-ar-IF1-aptr12-corr", - "num_elements_path": "NumElements", + "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", + "num_elements_name": "NumElements", "save_element_sizes": false, - "volumes_path": "Volumes" + "volumes_name": "Volumes" }, "comments": "", "filter": { @@ -288,7 +288,7 @@ "apply_single_phase": false, "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", "feature_phases_path": "", - "image_geom_path": "fw-ar-IF1-aptr12-corr", + "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", "min_allowed_features_size": 5, "num_cells_path": "fw-ar-IF1-aptr12-corr/CellFeatureData/NumElements", "phase_number": 0 @@ -302,9 +302,9 @@ }, { "args": { - "avg_euler_angles_array_path": "AvgEulerAngles", - "avg_quats_array_path": "AvgQuats", - "cell_feature_attribute_matrix": "fw-ar-IF1-aptr12-corr/CellFeatureData", + "avg_euler_angles_array_name": "AvgEulerAngles", + "avg_quats_array_name": "AvgQuats", + "cell_feature_attribute_matrix_path": "fw-ar-IF1-aptr12-corr/CellFeatureData", "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", @@ -329,7 +329,7 @@ 1 ], "quats_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Quats", - "selected_image_geometry_path": "fw-ar-IF1-aptr12-corr" + "input_image_geometry_path": "fw-ar-IF1-aptr12-corr" }, "comments": "", "filter": { @@ -340,10 +340,10 @@ }, { "args": { - "centroids_array_path": "Centroids", - "feature_attribute_matrix": "fw-ar-IF1-aptr12-corr/CellFeatureData", + "centroids_array_name": "Centroids", + "feature_attribute_matrix_path": "fw-ar-IF1-aptr12-corr/CellFeatureData", "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", - "selected_image_geometry": "fw-ar-IF1-aptr12-corr" + "input_image_geometry_path": "fw-ar-IF1-aptr12-corr" }, "comments": "", "filter": { @@ -363,7 +363,7 @@ "nearest_neighbors_array_name": "NearestNeighbors", "q_pdistances_array_name": "QPManhattanDistances", "save_nearest_neighbors": false, - "selected_image_geometry": "fw-ar-IF1-aptr12-corr", + "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", "t_jdistances_array_name": "TJManhattanDistances" }, "comments": "", @@ -410,12 +410,11 @@ }, { "args": { - "data_group_name": "", "histogram_suffix": " Histogram", "max_range": 1.0, "min_range": 0.0, - "new_data_group": true, - "new_data_group_name": "fw-ar-IF1-aptr12-corr/Histograms", + "create_new_data_group": true, + "new_data_group_path": "fw-ar-IF1-aptr12-corr/Histograms", "number_of_bins": 256, "selected_array_paths": [ "fw-ar-IF1-aptr12-corr/CellFeatureData/EquivalentDiameters" @@ -434,11 +433,10 @@ "output_path": "Data/Output/fw-ar-IF1-aptr12-corr/EqDiamHistogram.csv", "delimiter": 2, "file_extension": ".csv", - "file_name": "EqDiamHistogram", "includes": 1, "max_val_per_line": 0, "output_style": 1, - "selected_data_array_paths": [ + "input_data_array_paths": [ "fw-ar-IF1-aptr12-corr/Histograms/EquivalentDiameters Histogram" ] }, diff --git a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline index 4842317c81..0462e8c707 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline @@ -7,7 +7,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "fw-ar-IF1-avtr12-corr", + "output_image_geometry_path": "fw-ar-IF1-avtr12-corr", "degrees_to_radians": true, "edax_hexagonal_alignment": true, "input_file": "Data/T12-MAI-2010/fw-ar-IF1-avtr12-corr.ctf" @@ -21,10 +21,10 @@ }, { "args": { - "created_image_geometry": "", + "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -57,7 +57,7 @@ ] ], "rotation_representation": 0, - "selected_image_geometry": "fw-ar-IF1-avtr12-corr" + "input_image_geometry_path": "fw-ar-IF1-avtr12-corr" }, "comments": "", "filter": { @@ -68,7 +68,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -83,7 +83,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "ThresholdArray" + "output_data_array_name": "ThresholdArray" }, "comments": "", "filter": { @@ -95,9 +95,9 @@ { "args": { "input_orientation_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -112,7 +112,7 @@ "loop": true, "min_confidence": 0.0, "selected_comparison": 0, - "selected_image_geometry": "fw-ar-IF1-avtr12-corr" + "input_image_geometry_path": "fw-ar-IF1-avtr12-corr" }, "comments": "", "filter": { @@ -146,7 +146,7 @@ "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", - "image_geom_path": "fw-ar-IF1-avtr12-corr", + "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", "index_offset": 0, "plane": 0 }, @@ -182,7 +182,7 @@ "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", - "image_geom_path": "fw-ar-IF1-avtr12-corr", + "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", "index_offset": 0, "plane": 0 }, @@ -218,7 +218,7 @@ "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", - "image_geom_path": "fw-ar-IF1-avtr12-corr", + "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", "index_offset": 0, "plane": 0 }, @@ -236,10 +236,10 @@ "cell_phases_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Phases", "crystal_structures_array_path": "fw-ar-IF1-avtr12-corr/CellEnsembleData/CrystalStructures", "feature_ids_array_name": "FeatureIds", - "mask_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/ThresholdArray", - "grid_geometry_path": "fw-ar-IF1-avtr12-corr", + "cell_mask_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/ThresholdArray", + "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", "misorientation_tolerance": 5.0, - "quats_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Quats", + "cell_quats_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Quats", "randomize_features": false, "use_mask": true }, @@ -256,7 +256,7 @@ "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", "ignored_data_array_paths": [], "min_allowed_defect_size": 10, - "selected_image_geometry": "fw-ar-IF1-avtr12-corr", + "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", "store_as_new_phase": false }, "comments": "", @@ -268,13 +268,13 @@ }, { "args": { - "equivalent_diameters_path": "EquivalentDiameters", - "feature_attribute_matrix": "fw-ar-IF1-avtr12-corr/CellFeatureData", + "equivalent_diameters_name": "EquivalentDiameters", + "feature_attribute_matrix_path": "fw-ar-IF1-avtr12-corr/CellFeatureData", "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", - "geometry_path": "fw-ar-IF1-avtr12-corr", - "num_elements_path": "NumElements", + "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", + "num_elements_name": "NumElements", "save_element_sizes": false, - "volumes_path": "Volumes" + "volumes_name": "Volumes" }, "comments": "", "filter": { @@ -288,7 +288,7 @@ "apply_single_phase": false, "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", "feature_phases_path": "", - "image_geom_path": "fw-ar-IF1-avtr12-corr", + "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", "min_allowed_features_size": 5, "num_cells_path": "fw-ar-IF1-avtr12-corr/CellFeatureData/NumElements", "phase_number": 0 @@ -302,9 +302,9 @@ }, { "args": { - "avg_euler_angles_array_path": "AvgEulerAngles", - "avg_quats_array_path": "AvgQuats", - "cell_feature_attribute_matrix": "fw-ar-IF1-avtr12-corr/CellFeatureData", + "avg_euler_angles_array_name": "AvgEulerAngles", + "avg_quats_array_name": "AvgQuats", + "cell_feature_attribute_matrix_path": "fw-ar-IF1-avtr12-corr/CellFeatureData", "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", @@ -329,7 +329,7 @@ 1 ], "quats_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Quats", - "selected_image_geometry_path": "fw-ar-IF1-avtr12-corr" + "input_image_geometry_path": "fw-ar-IF1-avtr12-corr" }, "comments": "", "filter": { @@ -340,10 +340,10 @@ }, { "args": { - "centroids_array_path": "Centroids", - "feature_attribute_matrix": "fw-ar-IF1-avtr12-corr/CellFeatureData", + "centroids_array_name": "Centroids", + "feature_attribute_matrix_path": "fw-ar-IF1-avtr12-corr/CellFeatureData", "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", - "selected_image_geometry": "fw-ar-IF1-avtr12-corr" + "input_image_geometry_path": "fw-ar-IF1-avtr12-corr" }, "comments": "", "filter": { @@ -363,7 +363,7 @@ "nearest_neighbors_array_name": "NearestNeighbors", "q_pdistances_array_name": "QPManhattanDistances", "save_nearest_neighbors": false, - "selected_image_geometry": "fw-ar-IF1-avtr12-corr", + "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", "t_jdistances_array_name": "TJManhattanDistances" }, "comments": "", @@ -410,12 +410,11 @@ }, { "args": { - "data_group_name": "", "histogram_suffix": "Histogram", "max_range": 1.0, "min_range": 0.0, - "new_data_group": true, - "new_data_group_name": "fw-ar-IF1-avtr12-corr/Histograms", + "create_new_data_group": true, + "new_data_group_path": "fw-ar-IF1-avtr12-corr/Histograms", "number_of_bins": 256, "selected_array_paths": [ "fw-ar-IF1-avtr12-corr/CellFeatureData/EquivalentDiameters" @@ -434,11 +433,11 @@ "output_path": "Data/Output/fw-ar-IF1-avtr12-corr/EqDiamHistogram.csv", "delimiter": 2, "file_extension": ".csv", - "file_name": "EqDiamHistogram", + "output_dir": "", "includes": 1, "max_val_per_line": 0, "output_style": 1, - "selected_data_array_paths": [ + "input_data_array_paths": [ "fw-ar-IF1-avtr12-corr/Histograms/EquivalentDiametersHistogram" ] }, diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp index fafaa9397c..3b85e6f419 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp @@ -24,11 +24,11 @@ namespace RotateSampleRefFrame { // Parameter Keys -static inline constexpr nx::core::StringLiteral k_RotationRepresentation_Key = "rotation_representation"; -static inline constexpr nx::core::StringLiteral k_RotationAxisAngle_Key = "rotation_axis"; +static inline constexpr nx::core::StringLiteral k_RotationRepresentation_Key = "rotation_representation_index"; +static inline constexpr nx::core::StringLiteral k_RotationAxisAngle_Key = "rotation_axis_angle"; static inline constexpr nx::core::StringLiteral k_RotationMatrix_Key = "rotation_matrix"; -static inline constexpr nx::core::StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; -static inline constexpr nx::core::StringLiteral k_CreatedImageGeometry_Key = "created_image_geometry"; +static inline constexpr nx::core::StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; +static inline constexpr nx::core::StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr nx::core::StringLiteral k_RotateSliceBySlice_Key = "rotate_slice_by_slice"; static inline constexpr nx::core::StringLiteral k_RemoveOriginalGeometry_Key = "remove_original_geometry"; @@ -51,7 +51,6 @@ static inline constexpr nx::core::StringLiteral k_NewName_Key = "new_name"; namespace DeleteData { static inline constexpr nx::core::StringLiteral k_DataPath_Key = "removed_data_path"; - } namespace @@ -398,7 +397,7 @@ Result<> ReadH5Ebsd::operator()() } Arguments args; - args.insertOrAssign(RotateSampleRefFrame::k_SelectedImageGeometry_Key, std::make_any(m_InputValues->dataContainerPath)); + args.insertOrAssign(RotateSampleRefFrame::k_SelectedImageGeometryPath_Key, std::make_any(m_InputValues->dataContainerPath)); args.insertOrAssign(RotateSampleRefFrame::k_RemoveOriginalGeometry_Key, std::make_any(true)); args.insertOrAssign(RotateSampleRefFrame::k_RotationRepresentation_Key, std::make_any(to_underlying(RotateSampleRefFrame::RotationRepresentation::AxisAngle))); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp index 10039f3d92..33832bed97 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp @@ -84,7 +84,7 @@ Parameters AlignSectionsMisorientationFilter::parameters() const params.linkParameters(k_UseMask_Key, k_MaskArrayPath_Key, true); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath({"Data Container"}), + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath({"Data Container"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath({"Quats"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); @@ -124,7 +124,7 @@ IFilter::PreflightResult AlignSectionsMisorientationFilter::preflightImpl(const auto pCellPhasesArrayPath = filterArgs.value(k_CellPhasesArrayPath_Key); auto pGoodVoxelsArrayPath = filterArgs.value(k_MaskArrayPath_Key); auto pCrystalStructuresArrayPath = filterArgs.value(k_CrystalStructuresArrayPath_Key); - auto inputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + auto inputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); PreflightResult preflightResult; @@ -184,7 +184,7 @@ Result<> AlignSectionsMisorientationFilter::executeImpl(DataStructure& dataStruc const std::atomic_bool& shouldCancel) const { AlignSectionsMisorientationInputValues inputValues; - inputValues.inputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.inputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); auto* inputGeom = dataStructure.getDataAs(inputValues.inputImageGeometry); inputValues.cellDataGroupPath = inputGeom->getCellDataPath(); inputValues.writeAlignmentShifts = filterArgs.value(k_WriteAlignmentShifts_Key); @@ -224,7 +224,7 @@ Result AlignSectionsMisorientationFilter::FromSIMPLJson(const nlohman results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_AlignmentShiftFileNameKey, k_AlignmentShiftFileName_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_MisorientationToleranceKey, k_MisorientationTolerance_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseGoodVoxelsKey, k_UseMask_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_QuatsArrayPathKey, k_SelectedImageGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_QuatsArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_QuatsArrayPathKey, k_QuatsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellPhasesArrayPathKey, k_CellPhasesArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GoodVoxelsArrayPathKey, k_MaskArrayPath_Key)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp index 1e15181209..5e11327272 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp @@ -35,7 +35,7 @@ class ORIENTATIONANALYSIS_EXPORT AlignSectionsMisorientationFilter : public IFil static inline constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry_path"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp index 1a4f787fc5..09749ee130 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp @@ -69,7 +69,7 @@ Parameters AlignSectionsMutualInformationFilter::parameters() const params.linkParameters(k_UseMask_Key, k_MaskArrayPath_Key, true); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath({"Data Container"}), + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath({"Data Container"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); @@ -105,7 +105,7 @@ IFilter::PreflightResult AlignSectionsMutualInformationFilter::preflightImpl(con auto pAlignmentShiftFileNameValue = filterArgs.value(k_AlignmentShiftFileName_Key); auto pMisorientationToleranceValue = filterArgs.value(k_MisorientationTolerance_Key); auto pUseGoodVoxelsValue = filterArgs.value(k_UseMask_Key); - auto imageGeometryPath = filterArgs.value(k_SelectedImageGeometry_Key); + auto imageGeometryPath = filterArgs.value(k_SelectedImageGeometryPath_Key); auto pQuatsArrayPathValue = filterArgs.value(k_QuatsArrayPath_Key); auto pCellPhasesArrayPathValue = filterArgs.value(k_CellPhasesArrayPath_Key); auto pGoodVoxelsArrayPathValue = filterArgs.value(k_MaskArrayPath_Key); @@ -151,7 +151,7 @@ Result<> AlignSectionsMutualInformationFilter::executeImpl(DataStructure& dataSt inputValues.AlignmentShiftFileName = filterArgs.value(k_AlignmentShiftFileName_Key); inputValues.MisorientationTolerance = filterArgs.value(k_MisorientationTolerance_Key); inputValues.UseMask = filterArgs.value(k_UseMask_Key); - inputValues.ImageGeometryPath = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.ImageGeometryPath = filterArgs.value(k_SelectedImageGeometryPath_Key); inputValues.QuatsArrayPath = filterArgs.value(k_QuatsArrayPath_Key); inputValues.CellPhasesArrayPath = filterArgs.value(k_CellPhasesArrayPath_Key); inputValues.MaskArrayPath = filterArgs.value(k_MaskArrayPath_Key); @@ -191,7 +191,7 @@ Result AlignSectionsMutualInformationFilter::FromSIMPLJson(const nloh results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CrystalStructuresArrayPathKey, k_CrystalStructuresArrayPath_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CrystalStructuresArrayPathKey, k_SelectedImageGeometry_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CrystalStructuresArrayPathKey, k_SelectedImageGeometryPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.hpp index a9a632f310..dcb212fd89 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.hpp @@ -33,7 +33,7 @@ class ORIENTATIONANALYSIS_EXPORT AlignSectionsMutualInformationFilter : public I static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry_path"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp index d6c2090dfe..77e9da9f0c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp @@ -26,7 +26,7 @@ class ORIENTATIONANALYSIS_EXPORT BadDataNeighborOrientationCheckFilter : public // Parameter Keys static inline constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance"; static inline constexpr StringLiteral k_NumberOfNeighbors_Key = "number_of_neighbors"; - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp index 149ef994dd..29751809cd 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp @@ -24,7 +24,7 @@ class ORIENTATIONANALYSIS_EXPORT CAxisSegmentFeaturesFilter : public IFilter CAxisSegmentFeaturesFilter& operator=(CAxisSegmentFeaturesFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_RandomizeFeatureIds_Key = "randomize_feature_ids"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.hpp index 575c2d6f19..e8de77010e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.hpp @@ -19,6 +19,7 @@ namespace nx::core * "Rodrigues" = 4 * "Homochoric" = 5 * "Cubochoric" = 6 + * "Stereographic" = 7 * */ class ORIENTATIONANALYSIS_EXPORT ConvertOrientations : public IFilter @@ -34,8 +35,8 @@ class ORIENTATIONANALYSIS_EXPORT ConvertOrientations : public IFilter ConvertOrientations& operator=(ConvertOrientations&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_InputType_Key = "input_type"; - static inline constexpr StringLiteral k_OutputType_Key = "output_type"; + static inline constexpr StringLiteral k_InputType_Key = "input_representation_index"; + static inline constexpr StringLiteral k_OutputType_Key = "output_representation_index"; static inline constexpr StringLiteral k_InputOrientationArrayPath_Key = "input_orientation_array_path"; static inline constexpr StringLiteral k_OutputOrientationArrayName_Key = "output_orientation_array_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp index 14ffd154ba..b2c84ab112 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp @@ -70,7 +70,7 @@ Parameters ConvertQuaternionFilter::parameters() const params.insert(std::make_unique(k_CellQuatsArrayPath_Key, "Input Quaternions", "Specifies the quaternions to convert", DataPath({"CellData", "Quats"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); params.insertSeparator(Parameters::Separator{"Output Data"}); - params.insert(std::make_unique(k_OutputDataArrayPath_Key, "Output Quaternions", "The DataPath to the converted quaternions", "Quaternions [Converted]")); + params.insert(std::make_unique(k_OutputDataArrayName_Key, "Output Quaternions", "The DataPath to the converted quaternions", "Quaternions [Converted]")); return params; } @@ -86,7 +86,7 @@ IFilter::PreflightResult ConvertQuaternionFilter::preflightImpl(const DataStruct const std::atomic_bool& shouldCancel) const { auto pQuaternionDataArrayPathValue = filterArgs.value(k_CellQuatsArrayPath_Key); - auto pOutputDataArrayPathValue = pQuaternionDataArrayPathValue.getParent().createChildPath(filterArgs.value(k_OutputDataArrayPath_Key)); + auto pOutputDataArrayPathValue = pQuaternionDataArrayPathValue.getParent().createChildPath(filterArgs.value(k_OutputDataArrayName_Key)); nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -121,7 +121,7 @@ Result<> ConvertQuaternionFilter::executeImpl(DataStructure& dataStructure, cons ConvertQuaternionInputValues inputValues; inputValues.QuaternionDataArrayPath = filterArgs.value(k_CellQuatsArrayPath_Key); - inputValues.OutputDataArrayPath = inputValues.QuaternionDataArrayPath.getParent().createChildPath(filterArgs.value(k_OutputDataArrayPath_Key)); + inputValues.OutputDataArrayPath = inputValues.QuaternionDataArrayPath.getParent().createChildPath(filterArgs.value(k_OutputDataArrayName_Key)); inputValues.DeleteOriginalData = filterArgs.value(k_DeleteOriginalData_Key); inputValues.ConversionType = filterArgs.value(k_ConversionType_Key); @@ -146,7 +146,7 @@ Result ConvertQuaternionFilter::FromSIMPLJson(const nlohmann::json& j std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_QuaternionDataArrayPathKey, k_CellQuatsArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputDataArrayPathKey, k_OutputDataArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputDataArrayPathKey, k_OutputDataArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DeleteOriginalDataKey, k_DeleteOriginalData_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ConversionTypeKey, k_ConversionType_Key)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp index a1e8695f40..0a293b9f40 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp @@ -24,10 +24,10 @@ class ORIENTATIONANALYSIS_EXPORT ConvertQuaternionFilter : public IFilter ConvertQuaternionFilter& operator=(ConvertQuaternionFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_CellQuatsArrayPath_Key = "quaternion_data_array_path"; - static inline constexpr StringLiteral k_OutputDataArrayPath_Key = "output_data_array_path"; + static inline constexpr StringLiteral k_CellQuatsArrayPath_Key = "input_data_array_path"; + static inline constexpr StringLiteral k_OutputDataArrayName_Key = "output_data_array_name"; static inline constexpr StringLiteral k_DeleteOriginalData_Key = "delete_original_data"; - static inline constexpr StringLiteral k_ConversionType_Key = "conversion_type"; + static inline constexpr StringLiteral k_ConversionType_Key = "conversion_index"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp index cebbc203b0..512784b699 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp @@ -57,7 +57,7 @@ Parameters CreateEnsembleInfoFilter::parameters() const k_Ensemble_Key, "Created Ensemble Info", "The values with which to populate the crystal structures, phase types, and phase names data arrays. Each row corresponds to an ensemble phase.", EnsembleInfoParameter::ValueType{})); params.insertSeparator(Parameters::Separator{"Created Cell Ensemble Data"}); - params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", + params.insert(std::make_unique(k_CellEnsembleAttributeMatrixPath_Key, "Ensemble Attribute Matrix", "The complete path to the attribute matrix in which to store the ensemble phase data arrays", DataPath({"EnsembleAttributeMatrix"}))); params.insert(std::make_unique(k_CrystalStructuresArrayName_Key, "Crystal Structures", "The name of the data array representing the crystal structure for each Ensemble", "CrystalStructures")); @@ -78,7 +78,7 @@ IFilter::PreflightResult CreateEnsembleInfoFilter::preflightImpl(const DataStruc const std::atomic_bool& shouldCancel) const { auto pEnsembleValue = filterArgs.value(k_Ensemble_Key); - auto pCellEnsembleAttributeMatrixNameValue = filterArgs.value(k_CellEnsembleAttributeMatrixName_Key); + auto pCellEnsembleAttributeMatrixNameValue = filterArgs.value(k_CellEnsembleAttributeMatrixPath_Key); auto pCrystalStructuresArrayNameValue = filterArgs.value(k_CrystalStructuresArrayName_Key); auto pPhaseTypesArrayNameValue = filterArgs.value(k_PhaseTypesArrayName_Key); auto pPhaseNamesArrayNameValue = filterArgs.value(k_PhaseNamesArrayName_Key); @@ -110,7 +110,7 @@ Result<> CreateEnsembleInfoFilter::executeImpl(DataStructure& dataStructure, con { CreateEnsembleInfoInputValues inputValues; inputValues.Ensemble = filterArgs.value(k_Ensemble_Key); - inputValues.CellEnsembleAttributeMatrixName = filterArgs.value(k_CellEnsembleAttributeMatrixName_Key); + inputValues.CellEnsembleAttributeMatrixName = filterArgs.value(k_CellEnsembleAttributeMatrixPath_Key); inputValues.CrystalStructuresArrayName = filterArgs.value(k_CrystalStructuresArrayName_Key); inputValues.PhaseTypesArrayName = filterArgs.value(k_PhaseTypesArrayName_Key); inputValues.PhaseNamesArrayName = filterArgs.value(k_PhaseNamesArrayName_Key); @@ -141,7 +141,7 @@ Result CreateEnsembleInfoFilter::FromSIMPLJson(const nlohmann::json& results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_EnsembleKey, k_Ensemble_Key)); results.push_back(SIMPLConversion::Convert2Parameters(args, json, SIMPL::k_DataContainerNameKey, SIMPL::k_CellEnsembleAttributeMatrixNameKey, - k_CellEnsembleAttributeMatrixName_Key)); + k_CellEnsembleAttributeMatrixPath_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CrystalStructuresArrayNameKey, k_CrystalStructuresArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_PhaseTypesArrayNameKey, k_PhaseTypesArrayName_Key)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp index 4b0897ad90..b8fe1785eb 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp @@ -25,7 +25,7 @@ class ORIENTATIONANALYSIS_EXPORT CreateEnsembleInfoFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_Ensemble_Key = "ensemble"; - static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; + static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixPath_Key = "cell_ensemble_attribute_matrix_path"; static inline constexpr StringLiteral k_CrystalStructuresArrayName_Key = "crystal_structures_array_name"; static inline constexpr StringLiteral k_PhaseTypesArrayName_Key = "phase_types_array_name"; static inline constexpr StringLiteral k_PhaseNamesArrayName_Key = "phase_names_array_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp index f6aac8d7c1..a2e5ca88a4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp @@ -75,7 +75,7 @@ Parameters EBSDSegmentFeaturesFilter::parameters() const params.linkParameters(k_UseMask_Key, k_MaskArrayPath_Key, true); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_GridGeomPath_Key, "Input Grid Geometry", "DataPath to input Grid Geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Input Grid Geometry", "DataPath to input Grid Geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image, IGeometry::Type::RectGrid})); params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath{}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); @@ -128,7 +128,7 @@ IFilter::PreflightResult EBSDSegmentFeaturesFilter::preflightImpl(const DataStru } // Validate the Grid Geometry - auto gridGeomPath = args.value(k_GridGeomPath_Key); + auto gridGeomPath = args.value(k_SelectedImageGeometryPath_Key); const auto* inputGridGeom = dataStructure.getDataAs(gridGeomPath); DataPath inputCellDataPath = inputGridGeom->getCellDataPath(); auto featureIdsPath = inputCellDataPath.createChildPath(args.value(k_FeatureIdsArrayName_Key)); @@ -202,7 +202,7 @@ Result<> EBSDSegmentFeaturesFilter::executeImpl(DataStructure& dataStructure, co inputValues.misorientationTolerance = filterArgs.value(k_MisorientationTolerance_Key) * static_cast(nx::core::numbers::pi / 180.0f); inputValues.useGoodVoxels = filterArgs.value(k_UseMask_Key); inputValues.shouldRandomizeFeatureIds = filterArgs.value(k_RandomizeFeatures_Key); - inputValues.gridGeomPath = filterArgs.value(k_GridGeomPath_Key); + inputValues.gridGeomPath = filterArgs.value(k_SelectedImageGeometryPath_Key); inputValues.quatsArrayPath = filterArgs.value(k_QuatsArrayPath_Key); inputValues.cellPhasesArrayPath = filterArgs.value(k_CellPhasesArrayPath_Key); inputValues.goodVoxelsArrayPath = filterArgs.value(k_MaskArrayPath_Key); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp index f86285dbec..4c06581773 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp @@ -24,12 +24,12 @@ class ORIENTATIONANALYSIS_EXPORT EBSDSegmentFeaturesFilter : public IFilter EBSDSegmentFeaturesFilter& operator=(EBSDSegmentFeaturesFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_GridGeomPath_Key = "grid_geometry_path"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; - static inline constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; + static inline constexpr StringLiteral k_QuatsArrayPath_Key = "cell_quats_array_path"; static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; - static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; + static inline constexpr StringLiteral k_MaskArrayPath_Key = "cell_mask_array_path"; static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; static inline constexpr StringLiteral k_FeatureIdsArrayName_Key = "feature_ids_array_name"; static inline constexpr StringLiteral k_CellFeatureAttributeMatrixName_Key = "cell_feature_attribute_matrix_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp index faee55509c..8b78860712 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp @@ -25,10 +25,10 @@ class ORIENTATIONANALYSIS_EXPORT EbsdToH5EbsdFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_ZSpacing_Key = "z_spacing"; - static inline constexpr StringLiteral k_StackingOrder_Key = "stacking_order"; - static inline constexpr StringLiteral k_ReferenceFrame_Key = "reference_frame"; + static inline constexpr StringLiteral k_StackingOrder_Key = "stacking_order_index"; + static inline constexpr StringLiteral k_ReferenceFrame_Key = "reference_frame_index"; static inline constexpr StringLiteral k_OutputPath_Key = "output_file_path"; - static inline constexpr StringLiteral k_InputFileListInfo_Key = "input_file_list_info"; + static inline constexpr StringLiteral k_InputFileListInfo_Key = "input_file_list_object"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.cpp index 97b9469575..b80543a4e9 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.cpp @@ -57,12 +57,13 @@ Parameters FindAvgCAxesFilter::parameters() const params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each Cell belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Required Cell Feature Data"}); - params.insert(std::make_unique(k_CellFeatureAttributeMatrix_Key, "Cell Feature Attribute Matrix", "The path to the cell feature attribute matrix", DataPath{})); + params.insert( + std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", "The path to the cell feature attribute matrix", DataPath{})); params.insertSeparator(Parameters::Separator{"Required Cell Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); - params.insert(std::make_unique(k_AvgCAxesArrayPath_Key, "Average C-Axes", "The output average C-Axis values for each feature", "AvgCAxes")); + params.insert(std::make_unique(k_AvgCAxesArrayName_Key, "Average C-Axes", "The output average C-Axis values for each feature", "AvgCAxes")); return params; } @@ -80,8 +81,8 @@ IFilter::PreflightResult FindAvgCAxesFilter::preflightImpl(const DataStructure& auto pQuatsArrayPathValue = filterArgs.value(k_QuatsArrayPath_Key); auto pFeatureIdsArrayPathValue = filterArgs.value(k_FeatureIdsArrayPath_Key); auto pCellPhasesArrayPathValue = filterArgs.value(k_CellPhasesArrayPath_Key); - auto pCellFeatureAttributeMatrixPathValue = filterArgs.value(k_CellFeatureAttributeMatrix_Key); - auto pAvgCAxesArrayNameValue = filterArgs.value(k_AvgCAxesArrayPath_Key); + auto pCellFeatureAttributeMatrixPathValue = filterArgs.value(k_CellFeatureAttributeMatrixPath_Key); + auto pAvgCAxesArrayNameValue = filterArgs.value(k_AvgCAxesArrayName_Key); const DataPath avgCAxesPath = pCellFeatureAttributeMatrixPathValue.createChildPath(pAvgCAxesArrayNameValue); @@ -117,8 +118,8 @@ Result<> FindAvgCAxesFilter::executeImpl(DataStructure& dataStructure, const Arg inputValues.QuatsArrayPath = filterArgs.value(k_QuatsArrayPath_Key); inputValues.FeatureIdsArrayPath = filterArgs.value(k_FeatureIdsArrayPath_Key); inputValues.CellPhasesArrayPath = filterArgs.value(k_CellPhasesArrayPath_Key); - inputValues.CellFeatureDataPath = filterArgs.value(k_CellFeatureAttributeMatrix_Key); - inputValues.AvgCAxesArrayPath = inputValues.CellFeatureDataPath.createChildPath(filterArgs.value(k_AvgCAxesArrayPath_Key)); + inputValues.CellFeatureDataPath = filterArgs.value(k_CellFeatureAttributeMatrixPath_Key); + inputValues.AvgCAxesArrayPath = inputValues.CellFeatureDataPath.createChildPath(filterArgs.value(k_AvgCAxesArrayName_Key)); inputValues.CrystalStructuresArrayPath = filterArgs.value(k_CrystalStructuresArrayPath_Key); return FindAvgCAxes(dataStructure, messageHandler, shouldCancel, &inputValues)(); @@ -140,12 +141,12 @@ Result FindAvgCAxesFilter::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_QuatsArrayPathKey, k_CellFeatureAttributeMatrix_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_QuatsArrayPathKey, k_CellFeatureAttributeMatrixPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_QuatsArrayPathKey, k_QuatsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellPhasesArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_FeatureIdsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_AvgCAxesArrayPathKey, k_CrystalStructuresArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_AvgCAxesArrayPathKey, k_AvgCAxesArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_AvgCAxesArrayPathKey, k_AvgCAxesArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.hpp index c28bb61790..e435cec850 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.hpp @@ -26,8 +26,8 @@ class ORIENTATIONANALYSIS_EXPORT FindAvgCAxesFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; static inline constexpr StringLiteral k_FeatureIdsArrayPath_Key = "feature_ids_array_path"; - static inline constexpr StringLiteral k_AvgCAxesArrayPath_Key = "avg_c_axes_array_path"; - static inline constexpr StringLiteral k_CellFeatureAttributeMatrix_Key = "cell_feature_attribute_matrix"; + static inline constexpr StringLiteral k_AvgCAxesArrayName_Key = "avg_c_axes_array_name"; + static inline constexpr StringLiteral k_CellFeatureAttributeMatrixPath_Key = "cell_feature_attribute_matrix_path"; static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.cpp index ad3b9d189b..209bb069ec 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.cpp @@ -75,12 +75,12 @@ Parameters FindAvgOrientationsFilter::parameters() const DataPath({"CellEnsembleData", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{nx::core::DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Input Feature Data"}); - params.insert(std::make_unique(k_CellFeatureAttributeMatrix_Key, "Cell Feature Attribute Matrix", "The path to the cell feature attribute matrix", + params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", "The path to the cell feature attribute matrix", DataPath({"CellFeatureData"}))); params.insertSeparator(Parameters::Separator{"Created Feature Data"}); - params.insert(std::make_unique(k_AvgQuatsArrayPath_Key, "Average Quaternions", + params.insert(std::make_unique(k_AvgQuatsArrayName_Key, "Average Quaternions", "The name of the array specifying the average orientation of the Feature in quaternion representation", "AvgQuats")); - params.insert(std::make_unique(k_AvgEulerAnglesArrayPath_Key, "Average Euler Angles", + params.insert(std::make_unique(k_AvgEulerAnglesArrayName_Key, "Average Euler Angles", "The name of the array specifying the orientation of each Feature in Bunge convention (Z-X-Z)", "AvgEulerAngles")); return params; @@ -100,9 +100,9 @@ IFilter::PreflightResult FindAvgOrientationsFilter::preflightImpl(const DataStru auto pCellPhasesArrayPathValue = filterArgs.value(k_CellPhasesArrayPath_Key); auto pCellQuatsArrayPathValue = filterArgs.value(k_CellQuatsArrayPath_Key); auto pCrystalStructuresArrayPathValue = filterArgs.value(k_CrystalStructuresArrayPath_Key); - auto pCellFeatureAttributeMatrixPathValue = filterArgs.value(k_CellFeatureAttributeMatrix_Key); - auto pAvgQuatsArrayPathValue = pCellFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_AvgQuatsArrayPath_Key)); - auto pAvgEulerAnglesArrayPathValue = pCellFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_AvgEulerAnglesArrayPath_Key)); + auto pCellFeatureAttributeMatrixPathValue = filterArgs.value(k_CellFeatureAttributeMatrixPath_Key); + auto pAvgQuatsArrayPathValue = pCellFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_AvgQuatsArrayName_Key)); + auto pAvgEulerAnglesArrayPathValue = pCellFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_AvgEulerAnglesArrayName_Key)); // Validate the Crystal Structures array const UInt32Array& crystalStructures = dataStructure.getDataRefAs(pCrystalStructuresArrayPathValue); @@ -174,9 +174,9 @@ Result<> FindAvgOrientationsFilter::executeImpl(DataStructure& dataStructure, co inputValues.cellPhasesArrayPath = filterArgs.value(k_CellPhasesArrayPath_Key); inputValues.cellQuatsArrayPath = filterArgs.value(k_CellQuatsArrayPath_Key); inputValues.crystalStructuresArrayPath = filterArgs.value(k_CrystalStructuresArrayPath_Key); - auto pCellFeatureAttributeMatrixPathValue = filterArgs.value(k_CellFeatureAttributeMatrix_Key); - inputValues.avgQuatsArrayPath = pCellFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_AvgQuatsArrayPath_Key)); - inputValues.avgEulerAnglesArrayPath = pCellFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_AvgEulerAnglesArrayPath_Key)); + auto pCellFeatureAttributeMatrixPathValue = filterArgs.value(k_CellFeatureAttributeMatrixPath_Key); + inputValues.avgQuatsArrayPath = pCellFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_AvgQuatsArrayName_Key)); + inputValues.avgEulerAnglesArrayPath = pCellFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_AvgEulerAnglesArrayName_Key)); // Let the Algorithm instance do the work return FindAvgOrientations(dataStructure, messageHandler, shouldCancel, &inputValues)(); @@ -203,13 +203,13 @@ Result FindAvgOrientationsFilter::FromSIMPLJson(const nlohmann::json& results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureAttributeMatrix_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureAttributeMatrixPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellPhasesArrayPathKey, k_CellPhasesArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_QuatsArrayPathKey, k_CellQuatsArrayPath_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CrystalStructuresArrayPathKey, k_CrystalStructuresArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_AvgQuatsArrayPathKey, k_AvgQuatsArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_AvgEulerAnglesArrayPathKey, k_AvgEulerAnglesArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_AvgQuatsArrayPathKey, k_AvgQuatsArrayName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_AvgEulerAnglesArrayPathKey, k_AvgEulerAnglesArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.hpp index 4d5c5f89ae..fe907f4457 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.hpp @@ -28,9 +28,9 @@ class ORIENTATIONANALYSIS_EXPORT FindAvgOrientationsFilter : public IFilter static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; static inline constexpr StringLiteral k_CellQuatsArrayPath_Key = "cell_quats_array_path"; static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; - static inline constexpr StringLiteral k_AvgQuatsArrayPath_Key = "avg_quats_array_path"; - static inline constexpr StringLiteral k_AvgEulerAnglesArrayPath_Key = "avg_euler_angles_array_path"; - static inline constexpr StringLiteral k_CellFeatureAttributeMatrix_Key = "cell_feature_attribute_matrix"; + static inline constexpr StringLiteral k_AvgQuatsArrayName_Key = "avg_quats_array_name"; + static inline constexpr StringLiteral k_AvgEulerAnglesArrayName_Key = "avg_euler_angles_array_name"; + static inline constexpr StringLiteral k_CellFeatureAttributeMatrixPath_Key = "cell_feature_attribute_matrix_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.hpp index 5a8e0b688d..d5de57cf4d 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.hpp @@ -24,7 +24,7 @@ class ORIENTATIONANALYSIS_EXPORT FindFeatureReferenceCAxisMisorientationsFilter FindFeatureReferenceCAxisMisorientationsFilter& operator=(FindFeatureReferenceCAxisMisorientationsFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_FeatureIdsArrayPath_Key = "feature_ids_array_path"; static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; static inline constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp index cb0772e7ac..59942593fb 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp @@ -24,11 +24,11 @@ class ORIENTATIONANALYSIS_EXPORT FindFeatureReferenceMisorientationsFilter : pub FindFeatureReferenceMisorientationsFilter& operator=(FindFeatureReferenceMisorientationsFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ReferenceOrientation_Key = "reference_orientation"; + static inline constexpr StringLiteral k_ReferenceOrientation_Key = "reference_orientation_index"; static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; static inline constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; - static inline constexpr StringLiteral k_GBEuclideanDistancesArrayPath_Key = "g_beuclidean_distances_array_path"; + static inline constexpr StringLiteral k_GBEuclideanDistancesArrayPath_Key = "gb_euclidean_distances_array_path"; static inline constexpr StringLiteral k_AvgQuatsArrayPath_Key = "avg_quats_array_path"; static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; static inline constexpr StringLiteral k_FeatureReferenceMisorientationsArrayName_Key = "feature_reference_misorientations_array_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.cpp index 6c00505640..a3eefc9033 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.cpp @@ -55,7 +55,7 @@ Parameters FindGBCDFilter::parameters() const params.insertSeparator(Parameters::Separator{"Input Parameters"}); params.insert(std::make_unique(k_GBCDRes_Key, "GBCD Spacing (Degrees)", "The resolution in degrees for the GBCD calculation", 9.0f)); params.insertSeparator(Parameters::Separator{"Face Data"}); - params.insert(std::make_unique(k_TriangleGeometry_Key, "Triangle Geometry", "Path to the triangle geometry for which to calculate the GBCD", DataPath{}, + params.insert(std::make_unique(k_SelectedTriangleGeometryPath_Key, "Triangle Geometry", "Path to the triangle geometry for which to calculate the GBCD", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insert(std::make_unique(k_SurfaceMeshFaceLabelsArrayPath_Key, "Face Labels", "Array specifying which Features are on either side of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{2}})); @@ -93,7 +93,7 @@ IFilter::PreflightResult FindGBCDFilter::preflightImpl(const DataStructure& data const std::atomic_bool& shouldCancel) const { auto pGBCDResValue = filterArgs.value(k_GBCDRes_Key); - auto pTriangleGeometryPathValue = filterArgs.value(k_TriangleGeometry_Key); + auto pTriangleGeometryPathValue = filterArgs.value(k_SelectedTriangleGeometryPath_Key); auto pSurfaceMeshFaceLabelsArrayPathValue = filterArgs.value(k_SurfaceMeshFaceLabelsArrayPath_Key); auto pSurfaceMeshFaceNormalsArrayPathValue = filterArgs.value(k_SurfaceMeshFaceNormalsArrayPath_Key); auto pSurfaceMeshFaceAreasArrayPathValue = filterArgs.value(k_SurfaceMeshFaceAreasArrayPath_Key); @@ -168,7 +168,7 @@ Result<> FindGBCDFilter::executeImpl(DataStructure& dataStructure, const Argumen { FindGBCDInputValues inputValues; inputValues.GBCDRes = filterArgs.value(k_GBCDRes_Key); - inputValues.TriangleGeometryPath = filterArgs.value(k_TriangleGeometry_Key); + inputValues.TriangleGeometryPath = filterArgs.value(k_SelectedTriangleGeometryPath_Key); inputValues.SurfaceMeshFaceLabelsArrayPath = filterArgs.value(k_SurfaceMeshFaceLabelsArrayPath_Key); inputValues.SurfaceMeshFaceNormalsArrayPath = filterArgs.value(k_SurfaceMeshFaceNormalsArrayPath_Key); inputValues.SurfaceMeshFaceAreasArrayPath = filterArgs.value(k_SurfaceMeshFaceAreasArrayPath_Key); @@ -204,7 +204,8 @@ Result FindGBCDFilter::FromSIMPLJson(const nlohmann::json& json) std::vector> results; results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_GBCDResKey, k_GBCDRes_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceMeshFaceLabelsArrayPathKey, k_TriangleGeometry_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceMeshFaceLabelsArrayPathKey, k_SelectedTriangleGeometryPath_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceMeshFaceLabelsArrayPathKey, k_SurfaceMeshFaceLabelsArrayPath_Key)); results.push_back( diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.hpp index a1d863010b..e026bba418 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.hpp @@ -25,7 +25,7 @@ class ORIENTATIONANALYSIS_EXPORT FindGBCDFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_GBCDRes_Key = "gbcd_resolution"; - static inline constexpr StringLiteral k_TriangleGeometry_Key = "triangle_geometry"; + static inline constexpr StringLiteral k_SelectedTriangleGeometryPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_SurfaceMeshFaceLabelsArrayPath_Key = "surface_mesh_face_labels_array_path"; static inline constexpr StringLiteral k_SurfaceMeshFaceNormalsArrayPath_Key = "surface_mesh_face_normals_array_path"; static inline constexpr StringLiteral k_SurfaceMeshFaceAreasArrayPath_Key = "surface_mesh_face_areas_array_path"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp index f08bf3fee9..8c97cc1d58 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp @@ -26,13 +26,13 @@ class ORIENTATIONANALYSIS_EXPORT FindGBCDMetricBasedFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_PhaseOfInterest_Key = "phase_of_interest"; static inline constexpr StringLiteral k_MisorientationRotation_Key = "misorientation_rotation"; - static inline constexpr StringLiteral k_ChosenLimitDists_Key = "chosen_limit_dists"; + static inline constexpr StringLiteral k_ChosenLimitDists_Key = "chosen_limit_dists_index"; static inline constexpr StringLiteral k_NumSamplPts_Key = "num_sampl_pts"; static inline constexpr StringLiteral k_ExcludeTripleLines_Key = "exclude_triple_lines"; static inline constexpr StringLiteral k_DistOutputFile_Key = "dist_output_file"; static inline constexpr StringLiteral k_ErrOutputFile_Key = "err_output_file"; static inline constexpr StringLiteral k_SaveRelativeErr_Key = "save_relative_err"; - static inline constexpr StringLiteral k_TriangleGeometryPath_Key = "triangle_geometry_path"; + static inline constexpr StringLiteral k_TriangleGeometryPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_NodeTypesArrayPath_Key = "node_types_array_path"; static inline constexpr StringLiteral k_SurfaceMeshFaceLabelsArrayPath_Key = "surface_mesh_face_labels_array_path"; static inline constexpr StringLiteral k_SurfaceMeshFaceNormalsArrayPath_Key = "surface_mesh_face_normals_array_path"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.hpp index d21cbf2b4d..cb08ea097c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.hpp @@ -31,7 +31,7 @@ class ORIENTATIONANALYSIS_EXPORT FindGBPDMetricBasedFilter : public IFilter static inline constexpr StringLiteral k_DistOutputFile_Key = "dist_output_file"; static inline constexpr StringLiteral k_ErrOutputFile_Key = "err_output_file"; static inline constexpr StringLiteral k_SaveRelativeErr_Key = "save_relative_err"; - static inline constexpr StringLiteral k_TriangleGeometryPath_Key = "triangle_geometry_path"; + static inline constexpr StringLiteral k_TriangleGeometryPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_NodeTypesArrayPath_Key = "node_types_array_path"; static inline constexpr StringLiteral k_SurfaceMeshFaceLabelsArrayPath_Key = "surface_mesh_face_labels_array_path"; static inline constexpr StringLiteral k_SurfaceMeshFaceNormalsArrayPath_Key = "surface_mesh_face_normals_array_path"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.cpp index 810087cac4..883177c0c3 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.cpp @@ -56,7 +56,7 @@ Parameters FindKernelAvgMisorientationsFilter::parameters() const params.insert(std::make_unique(k_KernelSize_Key, "Kernel Radius", "Size of the kernel in the X, Y and Z directions (in number of Cells)", std::vector{1, 1, 1}, std::vector{"X", "Y", "Z"})); params.insertSeparator(Parameters::Separator{"Required Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "Path to the target geometry", DataPath({"Data Container"}), + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "Path to the target geometry", DataPath({"Data Container"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); @@ -92,7 +92,7 @@ IFilter::PreflightResult FindKernelAvgMisorientationsFilter::preflightImpl(const auto pQuatsArrayPathValue = filterArgs.value(k_QuatsArrayPath_Key); auto pCrystalStructuresArrayPathValue = filterArgs.value(k_CrystalStructuresArrayPath_Key); auto pKernelAverageMisorientationsArrayNameValue = pCellPhasesArrayPathValue.getParent().createChildPath(filterArgs.value(k_KernelAverageMisorientationsArrayName_Key)); - auto inputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + auto inputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); PreflightResult preflightResult; @@ -124,7 +124,7 @@ Result<> FindKernelAvgMisorientationsFilter::executeImpl(DataStructure& dataStru inputValues.QuatsArrayPath = filterArgs.value(k_QuatsArrayPath_Key); inputValues.CrystalStructuresArrayPath = filterArgs.value(k_CrystalStructuresArrayPath_Key); inputValues.KernelAverageMisorientationsArrayName = inputValues.CellPhasesArrayPath.getParent().createChildPath(filterArgs.value(k_KernelAverageMisorientationsArrayName_Key)); - inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); return FindKernelAvgMisorientations(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -153,7 +153,7 @@ Result FindKernelAvgMisorientationsFilter::FromSIMPLJson(const nlohma results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellPhasesArrayPathKey, k_CellPhasesArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_QuatsArrayPathKey, k_QuatsArrayPath_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CrystalStructuresArrayPathKey, k_SelectedImageGeometry_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CrystalStructuresArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CrystalStructuresArrayPathKey, k_CrystalStructuresArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelAverageMisorientationsArrayNameKey, diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.hpp index b247058d27..161a7e2271 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.hpp @@ -30,7 +30,7 @@ class ORIENTATIONANALYSIS_EXPORT FindKernelAvgMisorientationsFilter : public IFi static inline constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; static inline constexpr StringLiteral k_KernelAverageMisorientationsArrayName_Key = "kernel_average_misorientations_array_name"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry_path"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.cpp index bf2d76b030..62bba06e16 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.cpp @@ -53,7 +53,7 @@ Parameters FindShapesFilter::parameters() const // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Cell belongs", DataPath({"FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32})); @@ -170,7 +170,7 @@ Result<> FindShapesFilter::executeImpl(DataStructure& dataStructure, const Argum inputValues.AxisEulerAnglesArrayPath = inputValues.FeatureAttributeMatrixPath.createChildPath(pAxisEulerAnglesArrayName); inputValues.AspectRatiosArrayPath = inputValues.FeatureAttributeMatrixPath.createChildPath(pAspectRatiosArrayName); inputValues.VolumesArrayPath = inputValues.FeatureAttributeMatrixPath.createChildPath(pVolumesArrayName); - inputValues.ImageGeometryPath = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.ImageGeometryPath = filterArgs.value(k_SelectedImageGeometryPath_Key); return FindShapes(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -197,7 +197,7 @@ Result FindShapesFilter::FromSIMPLJson(const nlohmann::json& json) std::vector> results; results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometry_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); // Cell Feature Attribute Matrix parameter is not applicable in NX results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CentroidsArrayPathKey, k_CentroidsArrayPath_Key)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.hpp index 4f793d53c1..b54b7f21df 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.hpp @@ -32,7 +32,7 @@ class ORIENTATIONANALYSIS_EXPORT FindShapesFilter : public IFilter static inline constexpr StringLiteral k_AxisEulerAnglesArrayName_Key = "axis_euler_angles_array_name"; static inline constexpr StringLiteral k_AspectRatiosArrayName_Key = "aspect_ratios_array_name"; static inline constexpr StringLiteral k_VolumesArrayName_Key = "volumes_array_name"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.cpp index abfc88488a..e8fd0c792a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.cpp @@ -55,7 +55,7 @@ Parameters FindTriangleGeomShapesFilter::parameters() const ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); params.insertSeparator(Parameters::Separator{"Required Face Feature Data"}); - params.insert(std::make_unique(k_FeatureAttributeMatrixName_Key, "Face Feature Attribute Matrix", + params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Face Feature Attribute Matrix", "The DataPath to the AttributeMatrix that holds feature data for the faces", DataPath({"TriangleDataContainer", "FaceFeatureData"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); params.insert(std::make_unique(k_CentroidsArrayPath_Key, "Face Feature Centroids", "Input DataPath to the **Feature Centroids** for the face data", @@ -85,7 +85,7 @@ IFilter::PreflightResult FindTriangleGeomShapesFilter::preflightImpl(const DataS { auto pFaceLabelsArrayPathValue = filterArgs.value(k_FaceLabelsArrayPath_Key); - auto pFeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixName_Key); + auto pFeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixPath_Key); auto pCentroidsArrayPathValue = filterArgs.value(k_CentroidsArrayPath_Key); auto pVolumesArrayPathValue = filterArgs.value(k_VolumesArrayPath_Key); auto omega3sArrayNameValue = filterArgs.value(k_Omega3sArrayName_Key); @@ -149,7 +149,7 @@ Result<> FindTriangleGeomShapesFilter::executeImpl(DataStructure& dataStructure, FindTriangleGeomShapesInputValues inputValues; inputValues.TriangleGeometryPath = filterArgs.value(k_TriGeometryDataPath_Key); inputValues.FaceLabelsArrayPath = filterArgs.value(k_FaceLabelsArrayPath_Key); - inputValues.FeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixName_Key); + inputValues.FeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixPath_Key); inputValues.CentroidsArrayPath = filterArgs.value(k_CentroidsArrayPath_Key); inputValues.VolumesArrayPath = filterArgs.value(k_VolumesArrayPath_Key); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.hpp index 9db6ae5334..3f5b26acbd 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.hpp @@ -25,14 +25,14 @@ class ORIENTATIONANALYSIS_EXPORT FindTriangleGeomShapesFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_FaceLabelsArrayPath_Key = "face_labels_array_path"; - static inline constexpr StringLiteral k_FeatureAttributeMatrixName_Key = "feature_attribute_matrix_name"; + static inline constexpr StringLiteral k_FeatureAttributeMatrixPath_Key = "feature_attribute_matrix_path"; static inline constexpr StringLiteral k_CentroidsArrayPath_Key = "centroids_array_path"; static inline constexpr StringLiteral k_VolumesArrayPath_Key = "volumes_array_path"; static inline constexpr StringLiteral k_Omega3sArrayName_Key = "omega3s_array_name"; static inline constexpr StringLiteral k_AxisLengthsArrayName_Key = "axis_lengths_array_name"; static inline constexpr StringLiteral k_AxisEulerAnglesArrayName_Key = "axis_euler_angles_array_name"; static inline constexpr StringLiteral k_AspectRatiosArrayName_Key = "aspect_ratios_array_name"; - static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "triangle_geometry_path"; + static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "input_triangle_geometry_path"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp index 9d9f8a74aa..9b51caf76d 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp @@ -166,7 +166,7 @@ Parameters GenerateFZQuaternions::parameters() const DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Created Element Data"}); - params.insert(std::make_unique(k_FZQuatsArrayPath_Key, "Created FZ Quaternions", + params.insert(std::make_unique(k_FZQuatsArrayName_Key, "Created FZ Quaternions", "The name of the array containing the Quaternion that represents an orientation within the fundamental zone for each Element", "")); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_UseMask_Key, k_MaskArrayPath_Key, true); @@ -189,7 +189,7 @@ IFilter::PreflightResult GenerateFZQuaternions::preflightImpl(const DataStructur auto pCellPhasesArrayPathValue = filterArgs.value(k_CellPhasesArrayPath_Key); auto pGoodVoxelsArrayPathValue = filterArgs.value(k_MaskArrayPath_Key); auto pCrystalStructuresArrayPathValue = filterArgs.value(k_CrystalStructuresArrayPath_Key); - auto pFZQuatsArrayPathValue = pQuatsArrayPathValue.getParent().createChildPath(filterArgs.value(k_FZQuatsArrayPath_Key)); + auto pFZQuatsArrayPathValue = pQuatsArrayPathValue.getParent().createChildPath(filterArgs.value(k_FZQuatsArrayName_Key)); const Int32Array& phaseData = dataStructure.getDataRefAs(pCellPhasesArrayPathValue); @@ -256,7 +256,7 @@ Result<> GenerateFZQuaternions::executeImpl(DataStructure& dataStructure, const auto pCellPhasesArrayPathValue = filterArgs.value(k_CellPhasesArrayPath_Key); auto pGoodVoxelsArrayPathValue = filterArgs.value(k_MaskArrayPath_Key); auto pCrystalStructuresArrayPathValue = filterArgs.value(k_CrystalStructuresArrayPath_Key); - auto pFZQuatsArrayPathValue = pQuatsArrayPathValue.getParent().createChildPath(filterArgs.value(k_FZQuatsArrayPath_Key)); + auto pFZQuatsArrayPathValue = pQuatsArrayPathValue.getParent().createChildPath(filterArgs.value(k_FZQuatsArrayName_Key)); Int32Array& phaseArray = dataStructure.getDataRefAs(pCellPhasesArrayPathValue); Float32Array& quatArray = dataStructure.getDataRefAs(pQuatsArrayPathValue); @@ -342,7 +342,7 @@ Result GenerateFZQuaternions::FromSIMPLJson(const nlohmann::json& jso results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GoodVoxelsArrayPathKey, k_MaskArrayPath_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CrystalStructuresArrayPathKey, k_CrystalStructuresArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FZQuatsArrayPathKey, k_FZQuatsArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FZQuatsArrayPathKey, k_FZQuatsArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.hpp index 04e6fbc9d8..04c4a68377 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.hpp @@ -25,11 +25,11 @@ class ORIENTATIONANALYSIS_EXPORT GenerateFZQuaternions : public IFilter // Parameter Keys static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; - static inline constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; + static inline constexpr StringLiteral k_QuatsArrayPath_Key = "input_quats_array_path"; static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; - static inline constexpr StringLiteral k_FZQuatsArrayPath_Key = "f_zquats_array_path"; + static inline constexpr StringLiteral k_FZQuatsArrayName_Key = "output_fz_quats_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.hpp index 1ef215d812..3e69bbbc4a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.hpp @@ -29,7 +29,7 @@ class ORIENTATIONANALYSIS_EXPORT GenerateGBCDPoleFigureFilter : public IFilter static inline constexpr StringLiteral k_OutputImageDimension_Key = "output_image_dimension"; static inline constexpr StringLiteral k_GBCDArrayPath_Key = "gbcd_array_path"; static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; - static inline constexpr StringLiteral k_ImageGeometryName_Key = "image_geometry_name"; + static inline constexpr StringLiteral k_ImageGeometryName_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_CellIntensityArrayName_Key = "cell_intensity_array_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.cpp index 426c14f664..83984bd7cd 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.cpp @@ -65,7 +65,7 @@ Parameters GenerateQuaternionConjugateFilter::parameters() const ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); params.insertSeparator(Parameters::Separator{"Created Data"}); params.insert( - std::make_unique(k_OutputDataArrayPath_Key, "Created Quaternion Conjugate", "The name of the generated quaternion conjugate array", "Quaternions [Conjugate]")); + std::make_unique(k_OutputDataArrayName_Key, "Created Quaternion Conjugate", "The name of the generated quaternion conjugate array", "Quaternions [Conjugate]")); return params; } @@ -81,7 +81,7 @@ IFilter::PreflightResult GenerateQuaternionConjugateFilter::preflightImpl(const const std::atomic_bool& shouldCancel) const { auto pQuaternionDataArrayPathValue = filterArgs.value(k_CellQuatsArrayPath_Key); - auto pOutputDataArrayPathValue = pQuaternionDataArrayPathValue.getParent().createChildPath(filterArgs.value(k_OutputDataArrayPath_Key)); + auto pOutputDataArrayPathValue = pQuaternionDataArrayPathValue.getParent().createChildPath(filterArgs.value(k_OutputDataArrayName_Key)); nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -116,7 +116,7 @@ Result<> GenerateQuaternionConjugateFilter::executeImpl(DataStructure& dataStruc GenerateQuaternionConjugateInputValues inputValues; inputValues.QuaternionDataArrayPath = filterArgs.value(k_CellQuatsArrayPath_Key); - inputValues.OutputDataArrayPath = inputValues.QuaternionDataArrayPath.getParent().createChildPath(filterArgs.value(k_OutputDataArrayPath_Key)); + inputValues.OutputDataArrayPath = inputValues.QuaternionDataArrayPath.getParent().createChildPath(filterArgs.value(k_OutputDataArrayName_Key)); inputValues.DeleteOriginalData = filterArgs.value(k_DeleteOriginalData_Key); return GenerateQuaternionConjugate(dataStructure, messageHandler, shouldCancel, &inputValues)(); @@ -139,7 +139,7 @@ Result GenerateQuaternionConjugateFilter::FromSIMPLJson(const nlohman std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_QuaternionDataArrayPathKey, k_CellQuatsArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputDataArrayPathKey, k_OutputDataArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputDataArrayPathKey, k_OutputDataArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DeleteOriginalDataKey, k_DeleteOriginalData_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.hpp index 9d8d02a756..2ad526bc9b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.hpp @@ -24,8 +24,8 @@ class ORIENTATIONANALYSIS_EXPORT GenerateQuaternionConjugateFilter : public IFil GenerateQuaternionConjugateFilter& operator=(GenerateQuaternionConjugateFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_CellQuatsArrayPath_Key = "quaternion_data_array_path"; - static inline constexpr StringLiteral k_OutputDataArrayPath_Key = "output_data_array_path"; + static inline constexpr StringLiteral k_CellQuatsArrayPath_Key = "input_quats_data_path"; + static inline constexpr StringLiteral k_OutputDataArrayName_Key = "output_data_array_name"; static inline constexpr StringLiteral k_DeleteOriginalData_Key = "delete_original_data"; /** diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp index b6f5d71d6a..67ce4c9abb 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp @@ -99,7 +99,7 @@ Parameters MergeTwinsFilter::parameters() const params.insertSeparator(Parameters::Separator{"Created Feature Data"}); params.insert( - std::make_unique(k_NewCellFeatureAttributeMatrixName_Key, "Feature Attribute Matrix", "The name of the created cell feature attribute matrix", "NewGrain Data")); + std::make_unique(k_CreatedFeatureAttributeMatrixName_Key, "Feature Attribute Matrix", "The name of the created cell feature attribute matrix", "NewGrain Data")); params.insert(std::make_unique(k_FeatureParentIdsArrayName_Key, "Parent Ids", "The name of the array specifying to which parent each Feature belongs", "ParentIds")); params.insert(std::make_unique( k_ActiveArrayName_Key, "Active", @@ -131,7 +131,7 @@ IFilter::PreflightResult MergeTwinsFilter::preflightImpl(const DataStructure& da auto pCrystalStructuresArrayPathValue = filterArgs.value(k_CrystalStructuresArrayPath_Key); DataPath cellFeatureDataPath = pFeaturePhasesArrayPathValue.getParent(); auto pCellParentIdsArrayNameValue = pFeatureIdsArrayPathValue.getParent().createChildPath(filterArgs.value(k_CellParentIdsArrayName_Key)); - auto pNewCellFeatureAttributeMatrixNameValue = cellFeatureDataPath.getParent().createChildPath(filterArgs.value(k_NewCellFeatureAttributeMatrixName_Key)); + auto pNewCellFeatureAttributeMatrixNameValue = cellFeatureDataPath.getParent().createChildPath(filterArgs.value(k_CreatedFeatureAttributeMatrixName_Key)); auto pFeatureParentIdsArrayNameValue = cellFeatureDataPath.createChildPath(filterArgs.value(k_FeatureParentIdsArrayName_Key)); auto pActiveArrayNameValue = pNewCellFeatureAttributeMatrixNameValue.createChildPath(filterArgs.value(k_ActiveArrayName_Key)); auto pSeedArrayNameValue = filterArgs.value(k_SeedArrayName_Key); @@ -239,7 +239,7 @@ Result<> MergeTwinsFilter::executeImpl(DataStructure& dataStructure, const Argum inputValues.CrystalStructuresArrayPath = filterArgs.value(k_CrystalStructuresArrayPath_Key); DataPath cellFeatureDataPath = inputValues.FeaturePhasesArrayPath.getParent(); inputValues.CellParentIdsArrayName = inputValues.FeatureIdsArrayPath.getParent().createChildPath(filterArgs.value(k_CellParentIdsArrayName_Key)); - inputValues.NewCellFeatureAttributeMatrixName = cellFeatureDataPath.getParent().createChildPath(filterArgs.value(k_NewCellFeatureAttributeMatrixName_Key)); + inputValues.NewCellFeatureAttributeMatrixName = cellFeatureDataPath.getParent().createChildPath(filterArgs.value(k_CreatedFeatureAttributeMatrixName_Key)); inputValues.FeatureParentIdsArrayName = cellFeatureDataPath.createChildPath(filterArgs.value(k_FeatureParentIdsArrayName_Key)); inputValues.ActiveArrayName = inputValues.NewCellFeatureAttributeMatrixName.createChildPath(filterArgs.value(k_ActiveArrayName_Key)); inputValues.Seed = seed; @@ -287,7 +287,7 @@ Result MergeTwinsFilter::FromSIMPLJson(const nlohmann::json& json) SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CrystalStructuresArrayPathKey, k_CrystalStructuresArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellParentIdsArrayNameKey, k_CellParentIdsArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellFeatureAttributeMatrixNameKey, - k_NewCellFeatureAttributeMatrixName_Key)); + k_CreatedFeatureAttributeMatrixName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureParentIdsArrayNameKey, k_FeatureParentIdsArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ActiveArrayNameKey, k_ActiveArrayName_Key)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.hpp index a0dfcbdfd5..78673079b8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.hpp @@ -34,7 +34,7 @@ class ORIENTATIONANALYSIS_EXPORT MergeTwinsFilter : public IFilter static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; static inline constexpr StringLiteral k_CellParentIdsArrayName_Key = "cell_parent_ids_array_name"; - static inline constexpr StringLiteral k_NewCellFeatureAttributeMatrixName_Key = "new_cell_feature_attribute_matrix_name"; + static inline constexpr StringLiteral k_CreatedFeatureAttributeMatrixName_Key = "created_feature_attribute_matrix_name"; static inline constexpr StringLiteral k_FeatureParentIdsArrayName_Key = "feature_parent_ids_array_name"; static inline constexpr StringLiteral k_ActiveArrayName_Key = "active_array_name"; static inline constexpr StringLiteral k_UseSeed_Key = "use_seed"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp index dd22b823b9..cd3d062b07 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp @@ -24,7 +24,7 @@ class ORIENTATIONANALYSIS_EXPORT NeighborOrientationCorrelationFilter : public I NeighborOrientationCorrelationFilter& operator=(NeighborOrientationCorrelationFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_MinConfidence_Key = "min_confidence"; static inline constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance"; static inline constexpr StringLiteral k_Level_Key = "level"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp index c500a69689..876fc62235 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp @@ -63,7 +63,8 @@ Parameters ReadAngDataFilter::parameters() const params.insert(std::make_unique(k_InputFile_Key, "Input File", "The input .ang file path", fs::path("input.ang"), FileSystemPathParameter::ExtensionsType{".ang"}, FileSystemPathParameter::PathType::InputFile)); params.insertSeparator(Parameters::Separator{"Created Data Structure Objects"}); - params.insert(std::make_unique(k_DataContainerName_Key, "Created Image Geometry", "The complete path to the Geometry being created.", DataPath({"DataContainer"}))); + params.insert( + std::make_unique(k_CreatedImageGeometryPath_Key, "Created Image Geometry", "The complete path to the Geometry being created.", DataPath({"DataContainer"}))); params.insert( std::make_unique(k_CellAttributeMatrixName_Key, "Created Cell Attribute Matrix", "The Attribute Matrix where the scan data is stored.", ImageGeom::k_CellDataName)); params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Created Cell Ensemble Attribute Matrix", @@ -83,7 +84,7 @@ IFilter::PreflightResult ReadAngDataFilter::preflightImpl(const DataStructure& d const std::atomic_bool& shouldCancel) const { auto pInputFileValue = filterArgs.value(k_InputFile_Key); - auto pImageGeometryPath = filterArgs.value(k_DataContainerName_Key); + auto pImageGeometryPath = filterArgs.value(k_CreatedImageGeometryPath_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); auto pCellEnsembleAttributeMatrixNameValue = filterArgs.value(k_CellEnsembleAttributeMatrixName_Key); @@ -212,7 +213,7 @@ Result<> ReadAngDataFilter::executeImpl(DataStructure& dataStructure, const Argu ReadAngDataInputValues inputValues; inputValues.InputFile = filterArgs.value(k_InputFile_Key); - inputValues.DataContainerName = filterArgs.value(k_DataContainerName_Key); + inputValues.DataContainerName = filterArgs.value(k_CreatedImageGeometryPath_Key); inputValues.CellAttributeMatrixName = filterArgs.value(k_CellAttributeMatrixName_Key); inputValues.CellEnsembleAttributeMatrixName = filterArgs.value(k_CellEnsembleAttributeMatrixName_Key); @@ -238,7 +239,7 @@ Result ReadAngDataFilter::FromSIMPLJson(const nlohmann::json& json) std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InputFileKey, k_InputFile_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_DataContainerName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_CreatedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellAttributeMatrixNameKey, k_CellAttributeMatrixName_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellEnsembleAttributeMatrixNameKey, k_CellEnsembleAttributeMatrixName_Key)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.hpp index 40d8915b2b..abed787991 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.hpp @@ -31,7 +31,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadAngDataFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InputFile_Key = "input_file"; - static inline constexpr StringLiteral k_DataContainerName_Key = "data_container_name"; + static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp index 81b911b950..e4938d7366 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp @@ -70,7 +70,8 @@ Parameters ReadCtfDataFilter::parameters() const "Whether or not to convert a Hexagonal phase to the EDAX standard for x-axis alignment", false)); params.insertSeparator(Parameters::Separator{"Created Data Structure Objects"}); - params.insert(std::make_unique(k_DataContainerName_Key, "Created Image Geometry", "The complete path to the Geometry being created.", DataPath({"DataContainer"}))); + params.insert( + std::make_unique(k_CreatedImageGeometryPath_Key, "Created Image Geometry", "The complete path to the Geometry being created.", DataPath({"DataContainer"}))); params.insert( std::make_unique(k_CellAttributeMatrixName_Key, "Created Cell Attribute Matrix", "The Attribute Matrix where the scan data is stored.", ImageGeom::k_CellDataName)); params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Created Cell Ensemble Attribute Matrix", @@ -90,7 +91,7 @@ IFilter::PreflightResult ReadCtfDataFilter::preflightImpl(const DataStructure& d const std::atomic_bool& shouldCancel) const { auto pInputFileValue = filterArgs.value(k_InputFile_Key); - auto pImageGeometryPath = filterArgs.value(k_DataContainerName_Key); + auto pImageGeometryPath = filterArgs.value(k_CreatedImageGeometryPath_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); auto pCellEnsembleAttributeMatrixNameValue = filterArgs.value(k_CellEnsembleAttributeMatrixName_Key); @@ -213,7 +214,7 @@ Result<> ReadCtfDataFilter::executeImpl(DataStructure& dataStructure, const Argu inputValues.InputFile = filterArgs.value(k_InputFile_Key); inputValues.DegreesToRadians = filterArgs.value(k_DegreesToRadians_Key); inputValues.EdaxHexagonalAlignment = filterArgs.value(k_EdaxHexagonalAlignment_Key); - inputValues.DataContainerName = filterArgs.value(k_DataContainerName_Key); + inputValues.DataContainerName = filterArgs.value(k_CreatedImageGeometryPath_Key); inputValues.CellAttributeMatrixName = filterArgs.value(k_CellAttributeMatrixName_Key); inputValues.CellEnsembleAttributeMatrixName = filterArgs.value(k_CellEnsembleAttributeMatrixName_Key); @@ -243,7 +244,7 @@ Result ReadCtfDataFilter::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InputFileKey, k_InputFile_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DegreesToRadiansKey, k_DegreesToRadians_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_EdaxHexagonalAlignmentKey, k_EdaxHexagonalAlignment_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_DataContainerName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_CreatedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellAttributeMatrixNameKey, k_CellAttributeMatrixName_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellEnsembleAttributeMatrixNameKey, k_CellEnsembleAttributeMatrixName_Key)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.hpp index 28dc804da6..776bd649f1 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.hpp @@ -28,7 +28,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadCtfDataFilter : public IFilter static inline constexpr StringLiteral k_InputFile_Key = "input_file"; static inline constexpr StringLiteral k_DegreesToRadians_Key = "degrees_to_radians"; static inline constexpr StringLiteral k_EdaxHexagonalAlignment_Key = "edax_hexagonal_alignment"; - static inline constexpr StringLiteral k_DataContainerName_Key = "data_container_name"; + static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp index d2a2ef70ca..21518df5bd 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp @@ -60,7 +60,7 @@ Parameters ReadEnsembleInfoFilter::parameters() const FileSystemPathParameter::ExtensionsType{".ini", ".txt"}, FileSystemPathParameter::PathType::InputFile)); DataGroupSelectionParameter::AllowedTypes allowedGroupTypes = BaseGroup::GetAllGeometryGroupTypes(); allowedGroupTypes.insert(BaseGroup::GroupType::DataGroup); - params.insert(std::make_unique(k_DataContainerName_Key, "Data Container", "The path to the data object in which the ensemble information will be stored", DataPath{}, + params.insert(std::make_unique(k_ParentGroupPath_Key, "Data Container", "The path to the data object in which the ensemble information will be stored", DataPath{}, allowedGroupTypes)); params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); params.insert( @@ -83,7 +83,7 @@ IFilter::PreflightResult ReadEnsembleInfoFilter::preflightImpl(const DataStructu const std::atomic_bool& shouldCancel) const { auto pInputFileValue = filterArgs.value(k_InputFile_Key).string(); - auto pDataContainerNameValue = filterArgs.value(k_DataContainerName_Key); + auto pDataContainerNameValue = filterArgs.value(k_ParentGroupPath_Key); auto pCellEnsembleAttributeMatrixNameValue = filterArgs.value(k_CellEnsembleAttributeMatrixName_Key); auto pCrystalStructuresArrayNameValue = filterArgs.value(k_CrystalStructuresArrayName_Key); auto pPhaseTypesArrayNameValue = filterArgs.value(k_PhaseTypesArrayName_Key); @@ -136,7 +136,7 @@ Result<> ReadEnsembleInfoFilter::executeImpl(DataStructure& dataStructure, const ReadEnsembleInfoInputValues inputValues; inputValues.InputFile = filterArgs.value(k_InputFile_Key).string(); - inputValues.DataContainerName = filterArgs.value(k_DataContainerName_Key); + inputValues.DataContainerName = filterArgs.value(k_ParentGroupPath_Key); inputValues.CellEnsembleAttributeMatrixName = inputValues.DataContainerName.createChildPath(filterArgs.value(k_CellEnsembleAttributeMatrixName_Key)); inputValues.CrystalStructuresArrayName = inputValues.CellEnsembleAttributeMatrixName.createChildPath(filterArgs.value(k_CrystalStructuresArrayName_Key)); inputValues.PhaseTypesArrayName = inputValues.CellEnsembleAttributeMatrixName.createChildPath(filterArgs.value(k_PhaseTypesArrayName_Key)); @@ -163,7 +163,7 @@ Result ReadEnsembleInfoFilter::FromSIMPLJson(const nlohmann::json& js std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InputFileKey, k_InputFile_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_DataContainerName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_ParentGroupPath_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellEnsembleAttributeMatrixNameKey, k_CellEnsembleAttributeMatrixName_Key)); results.push_back( diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp index b69c3e504e..c134fb2076 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp @@ -25,7 +25,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadEnsembleInfoFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InputFile_Key = "input_file"; - static inline constexpr StringLiteral k_DataContainerName_Key = "data_container_name"; + static inline constexpr StringLiteral k_ParentGroupPath_Key = "parent_group_path"; static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; static inline constexpr StringLiteral k_CrystalStructuresArrayName_Key = "crystal_structures_array_name"; static inline constexpr StringLiteral k_PhaseTypesArrayName_Key = "phase_types_array_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp index f0268a2dec..39f039facd 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp @@ -63,7 +63,8 @@ Parameters ReadH5EbsdFilter::parameters() const ReadH5EbsdFileParameter::ValueType{})); params.insertSeparator(Parameters::Separator{"Created Data Structure Objects"}); - params.insert(std::make_unique(k_DataContainerName_Key, "Created Image Geometry", "The complete path to the imported Image Geometry", DataPath({"DataContainer"}))); + params.insert( + std::make_unique(k_CreatedImageGeometryPath_Key, "Created Image Geometry", "The complete path to the imported Image Geometry", DataPath({"DataContainer"}))); // params.insertSeparator(Parameters::Separator{"Cell Data"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Created Cell Attribute Matrix", "The name of the created cell attribute matrix associated with the imported geometry", "CellData")); @@ -86,7 +87,7 @@ IFilter::PreflightResult ReadH5EbsdFilter::preflightImpl(const DataStructure& da { auto pReadH5EbsdFilterValue = filterArgs.value(k_ReadH5EbsdParameter_Key); - auto imageGeomPath = filterArgs.value(k_DataContainerName_Key); + auto imageGeomPath = filterArgs.value(k_CreatedImageGeometryPath_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); DataPath cellAttributeMatrixPath = imageGeomPath.createChildPath(pCellAttributeMatrixNameValue); auto pCellEnsembleAttributeMatrixNameValue = imageGeomPath.createChildPath(filterArgs.value(k_CellEnsembleAttributeMatrixName_Key)); @@ -246,7 +247,7 @@ Result<> ReadH5EbsdFilter::executeImpl(DataStructure& dataStructure, const Argum * Extract the actual input values from the 'filterArgs' object ***************************************************************************/ auto pReadH5EbsdFilterValue = filterArgs.value(k_ReadH5EbsdParameter_Key); - auto pDataContainerNameValue = filterArgs.value(k_DataContainerName_Key); + auto pDataContainerNameValue = filterArgs.value(k_CreatedImageGeometryPath_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); auto pCellEnsembleAttributeMatrixNameValue = pDataContainerNameValue.createChildPath(filterArgs.value(k_CellEnsembleAttributeMatrixName_Key)); @@ -349,7 +350,7 @@ Result ReadH5EbsdFilter::FromSIMPLJson(const nlohmann::json& json) std::vector> results; results.push_back(SIMPLConversion::ConvertTopParameters(args, json, k_ReadH5EbsdParameter_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_DataContainerName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_CreatedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellAttributeMatrixNameKey, k_CellAttributeMatrixName_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellEnsembleAttributeMatrixNameKey, k_CellEnsembleAttributeMatrixName_Key)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp index 1e3152dabe..a0e1d01f81 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp @@ -24,8 +24,8 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5EbsdFilter : public IFilter ReadH5EbsdFilter& operator=(ReadH5EbsdFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ReadH5EbsdParameter_Key = "read_h5_ebsd_parameter"; - static inline constexpr StringLiteral k_DataContainerName_Key = "data_container_name"; + static inline constexpr StringLiteral k_ReadH5EbsdParameter_Key = "read_h5_ebsd_object"; + static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp index 42f8171631..2d6fdfdd70 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp @@ -29,7 +29,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5EspritDataFilter : public IFilter static inline constexpr StringLiteral k_Origin_Key = "origin"; static inline constexpr StringLiteral k_DegreesToRadians_Key = "degrees_to_radians"; static inline constexpr StringLiteral k_ReadPatternData_Key = "read_pattern_data"; - static inline constexpr StringLiteral k_ImageGeometryName_Key = "image_geometry_name"; + static inline constexpr StringLiteral k_ImageGeometryName_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp index ae5d0e1989..72c5c8ebc2 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp @@ -70,7 +70,7 @@ Parameters ReadH5OimDataFilter::parameters() const params.insert(std::make_unique(k_ZSpacing_Key, "Z Spacing (Microns)", "The spacing in microns between each layer.", 1.0f)); params.insert(std::make_unique(k_Origin_Key, "Origin", "The origin of the volume", std::vector{0.0F, 0.0F, 0.0F}, std::vector{"x", "y", "z"})); params.insert(std::make_unique(k_ReadPatternData_Key, "Import Pattern Data", "Whether or not to import the pattern data", false)); - params.insert(std::make_unique(k_ImageGeometryName_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); + params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); params.insertSeparator(Parameters::Separator{"Cell Data"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", ImageGeom::k_CellDataName)); @@ -95,7 +95,7 @@ IFilter::PreflightResult ReadH5OimDataFilter::preflightImpl(const DataStructure& auto pZSpacingValue = filterArgs.value(k_ZSpacing_Key); auto pOriginValue = filterArgs.value(k_Origin_Key); auto pReadPatternDataValue = filterArgs.value(k_ReadPatternData_Key); - auto pImageGeometryNameValue = filterArgs.value(k_ImageGeometryName_Key); + auto pImageGeometryNameValue = filterArgs.value(k_CreatedImageGeometryPath_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); auto pCellEnsembleAttributeMatrixNameValue = filterArgs.value(k_CellEnsembleAttributeMatrixName_Key); @@ -204,7 +204,7 @@ Result<> ReadH5OimDataFilter::executeImpl(DataStructure& dataStructure, const Ar inputValues.SelectedScanNames = filterArgs.value(k_SelectedScanNames_Key); inputValues.ReadPatternData = filterArgs.value(k_ReadPatternData_Key); - inputValues.ImageGeometryPath = filterArgs.value(k_ImageGeometryName_Key); + inputValues.ImageGeometryPath = filterArgs.value(k_CreatedImageGeometryPath_Key); inputValues.CellEnsembleAttributeMatrixPath = inputValues.ImageGeometryPath.createChildPath(filterArgs.value(k_CellEnsembleAttributeMatrixName_Key)); inputValues.CellAttributeMatrixPath = inputValues.ImageGeometryPath.createChildPath(filterArgs.value(k_CellAttributeMatrixName_Key)); @@ -237,7 +237,7 @@ Result ReadH5OimDataFilter::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_ZSpacingKey, k_ZSpacing_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OriginKey, k_Origin_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ReadPatternDataKey, k_ReadPatternData_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_ImageGeometryName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_CreatedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellAttributeMatrixNameKey, k_CellAttributeMatrixName_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellEnsembleAttributeMatrixNameKey, k_CellEnsembleAttributeMatrixName_Key)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp index c01b264c98..9882963e57 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp @@ -29,7 +29,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5OimDataFilter : public IFilter static inline constexpr StringLiteral k_ZSpacing_Key = "z_spacing"; static inline constexpr StringLiteral k_Origin_Key = "origin"; static inline constexpr StringLiteral k_ReadPatternData_Key = "read_pattern_data"; - static inline constexpr StringLiteral k_ImageGeometryName_Key = "image_geometry_name"; + static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp index fe3d9fc96f..958ed06b44 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp @@ -72,7 +72,7 @@ Parameters ReadH5OinaDataFilter::parameters() const params.insert(std::make_unique(k_ZSpacing_Key, "Z Spacing (Microns)", "The spacing in microns between each layer.", 1.0f)); params.insert(std::make_unique(k_Origin_Key, "Origin", "The origin of the volume", std::vector{0.0F, 0.0F, 0.0F}, std::vector{"x", "y", "z"})); params.insert(std::make_unique(k_ReadPatternData_Key, "Import Pattern Data", "Whether or not to import the pattern data", false)); - params.insert(std::make_unique(k_ImageGeometryName_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); + params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); params.insertSeparator(Parameters::Separator{"Cell Data"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", ImageGeom::k_CellDataName)); @@ -97,7 +97,7 @@ IFilter::PreflightResult ReadH5OinaDataFilter::preflightImpl(const DataStructure auto pZSpacingValue = filterArgs.value(k_ZSpacing_Key); auto pOriginValue = filterArgs.value(k_Origin_Key); auto pReadPatternDataValue = filterArgs.value(k_ReadPatternData_Key); - auto pImageGeometryNameValue = filterArgs.value(k_ImageGeometryName_Key); + auto pImageGeometryNameValue = filterArgs.value(k_CreatedImageGeometryPath_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); auto pCellEnsembleAttributeMatrixNameValue = filterArgs.value(k_CellEnsembleAttributeMatrixName_Key); auto pConvertPhaseData = filterArgs.value(k_ConvertPhaseToInt32_Key); @@ -200,7 +200,7 @@ Result<> ReadH5OinaDataFilter::executeImpl(DataStructure& dataStructure, const A inputValues.SelectedScanNames = filterArgs.value(k_SelectedScanNames_Key); inputValues.ReadPatternData = filterArgs.value(k_ReadPatternData_Key); - inputValues.ImageGeometryPath = filterArgs.value(k_ImageGeometryName_Key); + inputValues.ImageGeometryPath = filterArgs.value(k_CreatedImageGeometryPath_Key); inputValues.CellEnsembleAttributeMatrixPath = inputValues.ImageGeometryPath.createChildPath(filterArgs.value(k_CellEnsembleAttributeMatrixName_Key)); inputValues.CellAttributeMatrixPath = inputValues.ImageGeometryPath.createChildPath(filterArgs.value(k_CellAttributeMatrixName_Key)); inputValues.ConvertPhaseToInt32 = filterArgs.value(k_ConvertPhaseToInt32_Key); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.hpp index 178e7a0bdb..5d03665b3a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.hpp @@ -28,7 +28,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5OinaDataFilter : public IFilter static inline constexpr StringLiteral k_ZSpacing_Key = "z_spacing"; static inline constexpr StringLiteral k_Origin_Key = "origin"; static inline constexpr StringLiteral k_ReadPatternData_Key = "read_pattern_data"; - static inline constexpr StringLiteral k_ImageGeometryName_Key = "image_geometry_name"; + static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; static inline constexpr StringLiteral k_EdaxHexagonalAlignment_Key = "edax_hexagonal_alignment"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp index 33bc3ed5ac..21fe8c23e5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp @@ -65,7 +65,7 @@ Parameters RodriguesConvertorFilter::parameters() const ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); params.insertSeparator(Parameters::Separator{"Output Data"}); params.insert( - std::make_unique(k_OutputDataArrayPath_Key, "Converted Rodrigues Data Array", "The DataArray name of the converted Rodrigues vectors", "rodrigues [Converted]")); + std::make_unique(k_OutputDataArrayName_Key, "Converted Rodrigues Data Array", "The DataArray name of the converted Rodrigues vectors", "rodrigues [Converted]")); return params; } @@ -81,7 +81,7 @@ IFilter::PreflightResult RodriguesConvertorFilter::preflightImpl(const DataStruc const std::atomic_bool& shouldCancel) const { auto pRodriguesDataArrayPathValue = filterArgs.value(k_RodriguesDataArrayPath_Key); - auto pOutputDataArrayPathValue = pRodriguesDataArrayPathValue.getParent().createChildPath(filterArgs.value(k_OutputDataArrayPath_Key)); + auto pOutputDataArrayPathValue = pRodriguesDataArrayPathValue.getParent().createChildPath(filterArgs.value(k_OutputDataArrayName_Key)); nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -116,7 +116,7 @@ Result<> RodriguesConvertorFilter::executeImpl(DataStructure& dataStructure, con RodriguesConvertorInputValues inputValues; inputValues.RodriguesDataArrayPath = filterArgs.value(k_RodriguesDataArrayPath_Key); - inputValues.OutputDataArrayPath = inputValues.RodriguesDataArrayPath.getParent().createChildPath(filterArgs.value(k_OutputDataArrayPath_Key)); + inputValues.OutputDataArrayPath = inputValues.RodriguesDataArrayPath.getParent().createChildPath(filterArgs.value(k_OutputDataArrayName_Key)); inputValues.DeleteOriginalData = filterArgs.value(k_DeleteOriginalData_Key); return RodriguesConvertor(dataStructure, messageHandler, shouldCancel, &inputValues)(); @@ -139,7 +139,7 @@ Result RodriguesConvertorFilter::FromSIMPLJson(const nlohmann::json& std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_RodriguesDataArrayPathKey, k_RodriguesDataArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputDataArrayPathKey, k_OutputDataArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputDataArrayPathKey, k_OutputDataArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DeleteOriginalDataKey, k_DeleteOriginalData_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp index 0fa61d6335..402803c86b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp @@ -24,8 +24,8 @@ class ORIENTATIONANALYSIS_EXPORT RodriguesConvertorFilter : public IFilter RodriguesConvertorFilter& operator=(RodriguesConvertorFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_RodriguesDataArrayPath_Key = "rodrigues_data_array_path"; - static inline constexpr StringLiteral k_OutputDataArrayPath_Key = "output_data_array_path"; + static inline constexpr StringLiteral k_RodriguesDataArrayPath_Key = "input_data_array_path"; + static inline constexpr StringLiteral k_OutputDataArrayName_Key = "output_data_array_name"; static inline constexpr StringLiteral k_DeleteOriginalData_Key = "delete_original_data"; /** diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp index 3ca97bd604..abe882798c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp @@ -24,7 +24,7 @@ class ORIENTATIONANALYSIS_EXPORT RotateEulerRefFrameFilter : public IFilter RotateEulerRefFrameFilter& operator=(RotateEulerRefFrameFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_RotationAxisAngle_Key = "rotation_axis"; + static inline constexpr StringLiteral k_RotationAxisAngle_Key = "rotation_axis_angle"; static inline constexpr StringLiteral k_EulerAnglesArrayPath_Key = "euler_angles_array_path"; /** diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp index 6684b64c43..a7649213d3 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp @@ -31,7 +31,7 @@ class ORIENTATIONANALYSIS_EXPORT WriteINLFileFilter : public IFilter static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; static inline constexpr StringLiteral k_MaterialNameArrayPath_Key = "material_name_array_path"; static inline constexpr StringLiteral k_NumFeaturesArrayPath_Key = "num_features_array_path"; - static inline constexpr StringLiteral k_ImageGeomPath_Key = "image_geom_path"; + static inline constexpr StringLiteral k_ImageGeomPath_Key = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp index bc7882bb98..cebb39adc1 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp @@ -25,11 +25,11 @@ class ORIENTATIONANALYSIS_EXPORT WritePoleFigureFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_Title_Key = "title"; - static inline constexpr StringLiteral k_GenerationAlgorithm_Key = "generation_algorithm"; + static inline constexpr StringLiteral k_GenerationAlgorithm_Key = "generation_algorithm_index"; static inline constexpr StringLiteral k_LambertSize_Key = "lambert_size"; static inline constexpr StringLiteral k_NumColors_Key = "num_colors"; static inline constexpr StringLiteral k_ImageFormat_Key = "image_format"; - static inline constexpr StringLiteral k_ImageLayout_Key = "image_layout"; + static inline constexpr StringLiteral k_ImageLayout_Key = "image_layout_index"; static inline constexpr StringLiteral k_OutputPath_Key = "output_path"; static inline constexpr StringLiteral k_ImagePrefix_Key = "image_prefix"; static inline constexpr StringLiteral k_ImageSize_Key = "image_size"; @@ -41,7 +41,7 @@ class ORIENTATIONANALYSIS_EXPORT WritePoleFigureFilter : public IFilter static inline constexpr StringLiteral k_MaterialNameArrayPath_Key = "material_name_array_path"; static inline constexpr StringLiteral k_SaveAsImageGeometry_Key = "save_as_image_geometry"; static inline constexpr StringLiteral k_WriteImageToDisk = "write_image_to_disk"; - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "output_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp index e45a3a7932..983c00fdbf 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp @@ -27,7 +27,7 @@ class ORIENTATIONANALYSIS_EXPORT WriteStatsGenOdfAngleFileFilter : public IFilte static inline constexpr StringLiteral k_OutputFile_Key = "output_file"; static inline constexpr StringLiteral k_Weight_Key = "weight"; static inline constexpr StringLiteral k_Sigma_Key = "sigma"; - static inline constexpr StringLiteral k_Delimiter_Key = "delimiter"; + static inline constexpr StringLiteral k_Delimiter_Key = "delimiter_index"; static inline constexpr StringLiteral k_ConvertToDegrees_Key = "convert_to_degrees"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_CellEulerAnglesArrayPath_Key = "cell_euler_angles_array_path"; diff --git a/src/Plugins/OrientationAnalysis/test/AlignSectionsMisorientationTest.cpp b/src/Plugins/OrientationAnalysis/test/AlignSectionsMisorientationTest.cpp index 28c405f410..7dcbe67892 100644 --- a/src/Plugins/OrientationAnalysis/test/AlignSectionsMisorientationTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/AlignSectionsMisorientationTest.cpp @@ -7,6 +7,7 @@ #include "simplnx/Common/Types.hpp" #include "simplnx/Core/Application.hpp" #include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataStoreFormatParameter.hpp" #include "simplnx/Parameters/Dream3dImportParameter.hpp" #include "simplnx/Parameters/DynamicTableParameter.hpp" #include "simplnx/Parameters/FileSystemPathParameter.hpp" @@ -69,14 +70,6 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline // Read Exemplar Shifts File { - static constexpr StringLiteral k_InputFileKey = "input_file"; - static constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; - static constexpr StringLiteral k_NTuplesKey = "n_tuples"; - static constexpr StringLiteral k_NCompKey = "n_comp"; - static constexpr StringLiteral k_NSkipLinesKey = "n_skip_lines"; - static constexpr StringLiteral k_DelimiterChoiceKey = "delimiter_choice"; - static constexpr StringLiteral k_DataArrayKey = "output_data_array"; - // Compare the output of the shifts file with the exemplar file auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); @@ -84,13 +77,15 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline Arguments args; // read in the exemplar shift data file - args.insertOrAssign(k_InputFileKey, std::make_any(fs::path(fmt::format("{}/align_sections_misorientation.txt", unit_test::k_TestFilesDir)))); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::int32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(116)}})); - args.insertOrAssign(k_NCompKey, std::make_any(6)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(0)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(4)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_ExemplarShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, + std::make_any(fs::path(fmt::format("{}/align_sections_misorientation.txt", unit_test::k_TestFilesDir)))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::int32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(116)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(6)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataFormat_Key, std::make_any("")); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -125,7 +120,7 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline args.insertOrAssign(AlignSectionsMisorientationFilter::k_CrystalStructuresArrayPath_Key, std::make_any(k_CrystalStructuresArrayPath)); - args.insertOrAssign(AlignSectionsMisorientationFilter::k_SelectedImageGeometry_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -140,27 +135,20 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline // Use the Read Text File Filter to read in the generated Shift File { - static constexpr StringLiteral k_InputFileKey = "input_file"; - static constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; - static constexpr StringLiteral k_NTuplesKey = "n_tuples"; - static constexpr StringLiteral k_NCompKey = "n_comp"; - static constexpr StringLiteral k_NSkipLinesKey = "n_skip_lines"; - static constexpr StringLiteral k_DelimiterChoiceKey = "delimiter_choice"; - static constexpr StringLiteral k_DataArrayKey = "output_data_array"; - // Compare the output of the shifts file with the exemplar file auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(computedShiftsFile)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::int32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(116)}})); - args.insertOrAssign(k_NCompKey, std::make_any(6)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(0)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(4)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_CalculatedShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedShiftsFile)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::int32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(116)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(6)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_CalculatedShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataFormat_Key, std::make_any("")); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); diff --git a/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp b/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp index 27ad17aa08..78feef3f09 100644 --- a/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp @@ -56,7 +56,7 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt args.insertOrAssign(AlignSectionsMutualInformationFilter::k_AlignmentShiftFileName_Key, std::make_any(computedShiftsFile)); args.insertOrAssign(AlignSectionsMutualInformationFilter::k_MisorientationTolerance_Key, std::make_any(5.0f)); args.insertOrAssign(AlignSectionsMutualInformationFilter::k_UseMask_Key, std::make_any(true)); - args.insertOrAssign(AlignSectionsMutualInformationFilter::k_SelectedImageGeometry_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(AlignSectionsMutualInformationFilter::k_SelectedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); args.insertOrAssign(AlignSectionsMutualInformationFilter::k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); args.insertOrAssign(AlignSectionsMutualInformationFilter::k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); args.insertOrAssign(AlignSectionsMutualInformationFilter::k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); @@ -75,14 +75,6 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt // Read Exemplar Shifts File { - static constexpr StringLiteral k_InputFileKey = "input_file"; - static constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; - static constexpr StringLiteral k_NTuplesKey = "n_tuples"; - static constexpr StringLiteral k_NCompKey = "n_comp"; - static constexpr StringLiteral k_NSkipLinesKey = "n_skip_lines"; - static constexpr StringLiteral k_DelimiterChoiceKey = "delimiter_choice"; - static constexpr StringLiteral k_DataArrayKey = "output_data_array"; - // Compare the output of the shifts file with the exemplar file auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); @@ -90,14 +82,14 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt Arguments args; // read in the exemplar shift data file - args.insertOrAssign(k_InputFileKey, std::make_any( - fs::path(fmt::format("{}/6_5_align_sections_mutual_information/6_5_align_sections_mutual_information.txt", unit_test::k_TestFilesDir)))); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::int32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(k_TupleDims)); - args.insertOrAssign(k_NCompKey, std::make_any(6)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(0)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(4)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_ExemplarShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path( + fmt::format("{}/6_5_align_sections_mutual_information/6_5_align_sections_mutual_information.txt", unit_test::k_TestFilesDir)))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::int32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_TupleDims)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(6)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarShiftsPath)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -110,27 +102,19 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt // Read Computed Shifts File { - static constexpr StringLiteral k_InputFileKey = "input_file"; - static constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; - static constexpr StringLiteral k_NTuplesKey = "n_tuples"; - static constexpr StringLiteral k_NCompKey = "n_comp"; - static constexpr StringLiteral k_NSkipLinesKey = "n_skip_lines"; - static constexpr StringLiteral k_DelimiterChoiceKey = "delimiter_choice"; - static constexpr StringLiteral k_DataArrayKey = "output_data_array"; - // Compare the output of the shifts file with the exemplar file auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(computedShiftsFile)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::int32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(k_TupleDims)); - args.insertOrAssign(k_NCompKey, std::make_any(6)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(0)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(4)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_CalculatedShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedShiftsFile)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::int32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_TupleDims)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(6)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_CalculatedShiftsPath)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -167,7 +151,7 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: InValid fi std::make_any(fs::path(fmt::format("{}/AlignSectionsMutualInformation_2.txt", unit_test::k_BinaryDir)))); args.insertOrAssign(AlignSectionsMutualInformationFilter::k_MisorientationTolerance_Key, std::make_any(5.0f)); args.insertOrAssign(AlignSectionsMutualInformationFilter::k_UseMask_Key, std::make_any(true)); - args.insertOrAssign(AlignSectionsMutualInformationFilter::k_SelectedImageGeometry_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(AlignSectionsMutualInformationFilter::k_SelectedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); args.insertOrAssign(AlignSectionsMutualInformationFilter::k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); args.insertOrAssign(AlignSectionsMutualInformationFilter::k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); args.insertOrAssign(AlignSectionsMutualInformationFilter::k_MaskArrayPath_Key, diff --git a/src/Plugins/OrientationAnalysis/test/ConvertQuaternionTest.cpp b/src/Plugins/OrientationAnalysis/test/ConvertQuaternionTest.cpp index 8c97682b3c..561efa4747 100644 --- a/src/Plugins/OrientationAnalysis/test/ConvertQuaternionTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ConvertQuaternionTest.cpp @@ -62,7 +62,7 @@ TEST_CASE("OrientationAnalysis::ConvertQuaternionFilter", "[OrientationAnalysis] // Create default Parameters for the filter. args.insertOrAssign(ConvertQuaternionFilter::k_CellQuatsArrayPath_Key, std::make_any(DataPath({k_QuatName}))); - args.insertOrAssign(ConvertQuaternionFilter::k_OutputDataArrayPath_Key, std::make_any(k_ConvertedName)); + args.insertOrAssign(ConvertQuaternionFilter::k_OutputDataArrayName_Key, std::make_any(k_ConvertedName)); args.insertOrAssign(ConvertQuaternionFilter::k_DeleteOriginalData_Key, std::make_any(false)); args.insertOrAssign(ConvertQuaternionFilter::k_ConversionType_Key, std::make_any(k_ToScalarVector)); @@ -87,7 +87,7 @@ TEST_CASE("OrientationAnalysis::ConvertQuaternionFilter", "[OrientationAnalysis] // Create default Parameters for the filter. args.insertOrAssign(ConvertQuaternionFilter::k_CellQuatsArrayPath_Key, std::make_any(DataPath({k_ConvertedName}))); - args.insertOrAssign(ConvertQuaternionFilter::k_OutputDataArrayPath_Key, std::make_any(k_Exemplar1)); + args.insertOrAssign(ConvertQuaternionFilter::k_OutputDataArrayName_Key, std::make_any(k_Exemplar1)); args.insertOrAssign(ConvertQuaternionFilter::k_DeleteOriginalData_Key, std::make_any(false)); args.insertOrAssign(ConvertQuaternionFilter::k_ConversionType_Key, std::make_any(k_ToVectorScalar)); diff --git a/src/Plugins/OrientationAnalysis/test/CreateEnsembleInfoTest.cpp b/src/Plugins/OrientationAnalysis/test/CreateEnsembleInfoTest.cpp index 72a2390537..c92662447e 100644 --- a/src/Plugins/OrientationAnalysis/test/CreateEnsembleInfoTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/CreateEnsembleInfoTest.cpp @@ -22,7 +22,7 @@ TEST_CASE("OrientationAnalysis::CreateEnsembleInfoFilter: Invalid filter executi { // Create default Parameters for the filter. args.insertOrAssign(CreateEnsembleInfoFilter::k_Ensemble_Key, std::make_any(EnsembleInfoParameter::ValueType{})); - args.insertOrAssign(CreateEnsembleInfoFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(DataPath({"EnsembleAttributeMatrix"}))); + args.insertOrAssign(CreateEnsembleInfoFilter::k_CellEnsembleAttributeMatrixPath_Key, std::make_any(DataPath({"EnsembleAttributeMatrix"}))); args.insertOrAssign(CreateEnsembleInfoFilter::k_CrystalStructuresArrayName_Key, std::make_any("CrystalStructures")); args.insertOrAssign(CreateEnsembleInfoFilter::k_PhaseTypesArrayName_Key, std::make_any("PhaseTypes")); args.insertOrAssign(CreateEnsembleInfoFilter::k_PhaseNamesArrayName_Key, std::make_any("PhaseNames")); @@ -36,7 +36,7 @@ TEST_CASE("OrientationAnalysis::CreateEnsembleInfoFilter: Invalid filter executi { // Create default Parameters for the filter. args.insertOrAssign(CreateEnsembleInfoFilter::k_Ensemble_Key, std::make_any(EnsembleInfoParameter::ValueType{{"Cubic-High m-3m", "Primary", "Cubic"}})); - args.insertOrAssign(CreateEnsembleInfoFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateEnsembleInfoFilter::k_CellEnsembleAttributeMatrixPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateEnsembleInfoFilter::k_CrystalStructuresArrayName_Key, std::make_any("CrystalStructures")); args.insertOrAssign(CreateEnsembleInfoFilter::k_PhaseTypesArrayName_Key, std::make_any("PhaseTypes")); args.insertOrAssign(CreateEnsembleInfoFilter::k_PhaseNamesArrayName_Key, std::make_any("PhaseNames")); @@ -50,7 +50,7 @@ TEST_CASE("OrientationAnalysis::CreateEnsembleInfoFilter: Invalid filter executi { // Create default Parameters for the filter. args.insertOrAssign(CreateEnsembleInfoFilter::k_Ensemble_Key, std::make_any(EnsembleInfoParameter::ValueType{{"", "Primary", "Cubic"}})); - args.insertOrAssign(CreateEnsembleInfoFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(DataPath({"EnsembleAttributeMatrix"}))); + args.insertOrAssign(CreateEnsembleInfoFilter::k_CellEnsembleAttributeMatrixPath_Key, std::make_any(DataPath({"EnsembleAttributeMatrix"}))); args.insertOrAssign(CreateEnsembleInfoFilter::k_CrystalStructuresArrayName_Key, std::make_any("CrystalStructures")); args.insertOrAssign(CreateEnsembleInfoFilter::k_PhaseTypesArrayName_Key, std::make_any("PhaseTypes")); args.insertOrAssign(CreateEnsembleInfoFilter::k_PhaseNamesArrayName_Key, std::make_any("PhaseNames")); @@ -64,7 +64,7 @@ TEST_CASE("OrientationAnalysis::CreateEnsembleInfoFilter: Invalid filter executi { // Create default Parameters for the filter. args.insertOrAssign(CreateEnsembleInfoFilter::k_Ensemble_Key, std::make_any(EnsembleInfoParameter::ValueType{{"Cubic-High m-3m", "Uknown", "Cubic"}})); - args.insertOrAssign(CreateEnsembleInfoFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(DataPath({"EnsembleAttributeMatrix"}))); + args.insertOrAssign(CreateEnsembleInfoFilter::k_CellEnsembleAttributeMatrixPath_Key, std::make_any(DataPath({"EnsembleAttributeMatrix"}))); args.insertOrAssign(CreateEnsembleInfoFilter::k_CrystalStructuresArrayName_Key, std::make_any("CrystalStructures")); args.insertOrAssign(CreateEnsembleInfoFilter::k_PhaseTypesArrayName_Key, std::make_any("PhaseTypes")); args.insertOrAssign(CreateEnsembleInfoFilter::k_PhaseNamesArrayName_Key, std::make_any("PhaseNames")); @@ -98,7 +98,7 @@ TEST_CASE("OrientationAnalysis::CreateEnsembleInfoFilter: Valid filter execution // Create Parameters for the filter. args.insertOrAssign(CreateEnsembleInfoFilter::k_Ensemble_Key, std::make_any(EnsembleInfoParameter::ValueType{{"Cubic-High m-3m", "Primary", "Cubic"}})); - args.insertOrAssign(CreateEnsembleInfoFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(cellEnsembleAttributeMatrixPath)); + args.insertOrAssign(CreateEnsembleInfoFilter::k_CellEnsembleAttributeMatrixPath_Key, std::make_any(cellEnsembleAttributeMatrixPath)); args.insertOrAssign(CreateEnsembleInfoFilter::k_CrystalStructuresArrayName_Key, std::make_any(crystalStructuresName)); args.insertOrAssign(CreateEnsembleInfoFilter::k_PhaseTypesArrayName_Key, std::make_any(phaseTypesName)); args.insertOrAssign(CreateEnsembleInfoFilter::k_PhaseNamesArrayName_Key, std::make_any(phaseNamesName)); diff --git a/src/Plugins/OrientationAnalysis/test/EBSDSegmentFeaturesFilterTest.cpp b/src/Plugins/OrientationAnalysis/test/EBSDSegmentFeaturesFilterTest.cpp index 2888a97757..62bb75b624 100644 --- a/src/Plugins/OrientationAnalysis/test/EBSDSegmentFeaturesFilterTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/EBSDSegmentFeaturesFilterTest.cpp @@ -65,7 +65,7 @@ TEST_CASE("OrientationAnalysis::EBSDSegmentFeatures: Valid Execution", "[Orienta // Create default Parameters for the filter. args.insertOrAssign(EBSDSegmentFeaturesFilter::k_MisorientationTolerance_Key, std::make_any(5.0F)); args.insertOrAssign(EBSDSegmentFeaturesFilter::k_UseMask_Key, std::make_any(true)); - args.insertOrAssign(EBSDSegmentFeaturesFilter::k_GridGeomPath_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); args.insertOrAssign(EBSDSegmentFeaturesFilter::k_QuatsArrayPath_Key, std::make_any(k_QuatsArrayPath)); args.insertOrAssign(EBSDSegmentFeaturesFilter::k_CellPhasesArrayPath_Key, std::make_any(k_PhasesArrayPath)); args.insertOrAssign(EBSDSegmentFeaturesFilter::k_MaskArrayPath_Key, std::make_any(k_MaskArrayPath)); diff --git a/src/Plugins/OrientationAnalysis/test/FindAvgCAxesTest.cpp b/src/Plugins/OrientationAnalysis/test/FindAvgCAxesTest.cpp index 4d28cfff4c..53c547a6e2 100644 --- a/src/Plugins/OrientationAnalysis/test/FindAvgCAxesTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindAvgCAxesTest.cpp @@ -33,8 +33,8 @@ TEST_CASE("OrientationAnalysis::FindAvgCAxesFilter: Valid Filter Execution", "[O args.insertOrAssign(FindAvgCAxesFilter::k_FeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsArrayPath)); args.insertOrAssign(FindAvgCAxesFilter::k_CellPhasesArrayPath_Key, std::make_any(k_PhasesArrayPath)); args.insertOrAssign(FindAvgCAxesFilter::k_CrystalStructuresArrayPath_Key, std::make_any(k_CrystalStructuresArrayPath)); - args.insertOrAssign(FindAvgCAxesFilter::k_CellFeatureAttributeMatrix_Key, std::make_any(k_CellFeatureDataPath)); - args.insertOrAssign(FindAvgCAxesFilter::k_AvgCAxesArrayPath_Key, std::make_any(k_AvgCAxesComputed)); + args.insertOrAssign(FindAvgCAxesFilter::k_CellFeatureAttributeMatrixPath_Key, std::make_any(k_CellFeatureDataPath)); + args.insertOrAssign(FindAvgCAxesFilter::k_AvgCAxesArrayName_Key, std::make_any(k_AvgCAxesComputed)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -70,8 +70,8 @@ TEST_CASE("OrientationAnalysis::FindAvgCAxesFilter: Invalid Filter Execution", " args.insertOrAssign(FindAvgCAxesFilter::k_FeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsArrayPath)); args.insertOrAssign(FindAvgCAxesFilter::k_CellPhasesArrayPath_Key, std::make_any(k_PhasesArrayPath)); args.insertOrAssign(FindAvgCAxesFilter::k_CrystalStructuresArrayPath_Key, std::make_any(k_CrystalStructuresArrayPath)); - args.insertOrAssign(FindAvgCAxesFilter::k_CellFeatureAttributeMatrix_Key, std::make_any(k_CellFeatureDataPath)); - args.insertOrAssign(FindAvgCAxesFilter::k_AvgCAxesArrayPath_Key, std::make_any(k_AvgCAxesComputed)); + args.insertOrAssign(FindAvgCAxesFilter::k_CellFeatureAttributeMatrixPath_Key, std::make_any(k_CellFeatureDataPath)); + args.insertOrAssign(FindAvgCAxesFilter::k_AvgCAxesArrayName_Key, std::make_any(k_AvgCAxesComputed)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp index cabaea680d..253df16118 100644 --- a/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp @@ -45,33 +45,20 @@ namespace fs = std::filesystem; using namespace nx::core; using namespace nx::core::Constants; -namespace FindAvgOrientationsTest -{ -// These are the argument keys for the Import Text filter. We cannot use the ones from the -// header file as that would bring in a dependency on the SimplnxCorePlugin -static constexpr StringLiteral k_InputFileKey = "input_file"; -static constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; -static constexpr StringLiteral k_NTuplesKey = "n_tuples"; -static constexpr StringLiteral k_NCompKey = "n_comp"; -static constexpr StringLiteral k_NSkipLinesKey = "n_skip_lines"; -static constexpr StringLiteral k_DelimiterChoiceKey = "delimiter_choice"; -static constexpr StringLiteral k_DataArrayKey = "output_data_array"; -} // namespace FindAvgOrientationsTest - void runReadTextDataArrayFilter(const std::string k_InputFileName, nx::core::NumericType k_NumericType, const uint64 k_NumTuples, const uint64 k_NumComponents, const DataPath k_InputFileDataPath, DataStructure& dataStructure) { auto* filterList = Application::Instance()->getFilterList(); Arguments args; - args.insertOrAssign(FindAvgOrientationsTest::k_InputFileKey, + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path(fmt::format("{}/ASCIIData/{}.csv", unit_test::k_TestFilesDir, k_InputFileName)))); - args.insertOrAssign(FindAvgOrientationsTest::k_ScalarTypeKey, std::make_any(k_NumericType)); - args.insertOrAssign(FindAvgOrientationsTest::k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(k_NumTuples)}})); - args.insertOrAssign(FindAvgOrientationsTest::k_NCompKey, std::make_any(k_NumComponents)); - args.insertOrAssign(FindAvgOrientationsTest::k_NSkipLinesKey, std::make_any(0)); - args.insertOrAssign(FindAvgOrientationsTest::k_DelimiterChoiceKey, std::make_any(0)); - args.insertOrAssign(FindAvgOrientationsTest::k_DataArrayKey, std::make_any(k_InputFileDataPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(k_NumericType)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(k_NumTuples)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(k_NumComponents)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_InputFileDataPath)); auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); @@ -154,11 +141,11 @@ TEST_CASE("OrientationAnalysis::FindAvgOrientations", "[OrientationAnalysis][Fin args.insertOrAssign(FindAvgOrientationsFilter::k_CellPhasesArrayPath_Key, std::make_any(k_PhasesDataPath)); args.insertOrAssign(FindAvgOrientationsFilter::k_CellQuatsArrayPath_Key, std::make_any(k_QuatsDataPath)); args.insertOrAssign(FindAvgOrientationsFilter::k_CrystalStructuresArrayPath_Key, std::make_any(k_CrystalStructureDataPath)); - args.insertOrAssign(FindAvgOrientationsFilter::k_CellFeatureAttributeMatrix_Key, std::make_any({k_GrainDataStr})); + args.insertOrAssign(FindAvgOrientationsFilter::k_CellFeatureAttributeMatrixPath_Key, std::make_any({k_GrainDataStr})); // These are the output AvgQuats and output AvgEuler paths NOT the Exemplar AvgQuats & AvgEulers - args.insertOrAssign(FindAvgOrientationsFilter::k_AvgQuatsArrayPath_Key, std::make_any(k_AvgQuats)); - args.insertOrAssign(FindAvgOrientationsFilter::k_AvgEulerAnglesArrayPath_Key, std::make_any(k_AvgEulers)); + args.insertOrAssign(FindAvgOrientationsFilter::k_AvgQuatsArrayName_Key, std::make_any(k_AvgQuats)); + args.insertOrAssign(FindAvgOrientationsFilter::k_AvgEulerAnglesArrayName_Key, std::make_any(k_AvgEulers)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/OrientationAnalysis/test/FindGBCDMetricBasedTest.cpp b/src/Plugins/OrientationAnalysis/test/FindGBCDMetricBasedTest.cpp index 8619196eb2..0d698e06ee 100644 --- a/src/Plugins/OrientationAnalysis/test/FindGBCDMetricBasedTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindGBCDMetricBasedTest.cpp @@ -96,25 +96,19 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio // read in exemplar and computed data files for comparison { - static constexpr StringLiteral k_InputFileKey = "input_file"; - static constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; - static constexpr StringLiteral k_NTuplesKey = "n_tuples"; - static constexpr StringLiteral k_NCompKey = "n_comp"; - static constexpr StringLiteral k_NSkipLinesKey = "n_skip_lines"; - static constexpr StringLiteral k_DelimiterChoiceKey = "delimiter_choice"; - static constexpr StringLiteral k_DataArrayKey = "output_data_array"; + auto filter = filterListPtr->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); // exemplar distribution { Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(exemplarDistOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); - args.insertOrAssign(k_NCompKey, std::make_any(3)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(2)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_ExemplarDistributionPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(exemplarDistOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarDistributionPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) @@ -122,13 +116,13 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio // exemplar errors { Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(exemplarErrorsOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); - args.insertOrAssign(k_NCompKey, std::make_any(3)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(2)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_ExemplarErrorPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(exemplarErrorsOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarErrorPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) @@ -136,13 +130,13 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio // computed distribution { Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(computedDistOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); - args.insertOrAssign(k_NCompKey, std::make_any(3)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(2)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_ComputedDistributionPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedDistOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ComputedDistributionPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) @@ -150,13 +144,13 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio // computed errors { Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(computedErrorsOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); - args.insertOrAssign(k_NCompKey, std::make_any(3)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(2)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_ComputedErrorPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedErrorsOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ComputedErrorPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) diff --git a/src/Plugins/OrientationAnalysis/test/FindGBCDTest.cpp b/src/Plugins/OrientationAnalysis/test/FindGBCDTest.cpp index e8b951a7f9..b8d9fa76b9 100644 --- a/src/Plugins/OrientationAnalysis/test/FindGBCDTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindGBCDTest.cpp @@ -55,7 +55,7 @@ TEST_CASE("OrientationAnalysis::FindGBCD", "[OrientationAnalysis][FindGBCD]") // Create default Parameters for the filter. args.insertOrAssign(FindGBCDFilter::k_GBCDRes_Key, std::make_any(9.0F)); - args.insertOrAssign(FindGBCDFilter::k_TriangleGeometry_Key, std::make_any(triangleDataContainerPath)); + args.insertOrAssign(FindGBCDFilter::k_SelectedTriangleGeometryPath_Key, std::make_any(triangleDataContainerPath)); args.insertOrAssign(FindGBCDFilter::k_SurfaceMeshFaceLabelsArrayPath_Key, std::make_any(faceLabels)); args.insertOrAssign(FindGBCDFilter::k_SurfaceMeshFaceNormalsArrayPath_Key, std::make_any(faceNormals)); diff --git a/src/Plugins/OrientationAnalysis/test/FindGBPDMetricBasedTest.cpp b/src/Plugins/OrientationAnalysis/test/FindGBPDMetricBasedTest.cpp index 071b384312..dacbd6c557 100644 --- a/src/Plugins/OrientationAnalysis/test/FindGBPDMetricBasedTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindGBPDMetricBasedTest.cpp @@ -93,25 +93,18 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio // read in exemplar and computed data files for comparison { - static constexpr StringLiteral k_InputFileKey = "input_file"; - static constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; - static constexpr StringLiteral k_NTuplesKey = "n_tuples"; - static constexpr StringLiteral k_NCompKey = "n_comp"; - static constexpr StringLiteral k_NSkipLinesKey = "n_skip_lines"; - static constexpr StringLiteral k_DelimiterChoiceKey = "delimiter_choice"; - static constexpr StringLiteral k_DataArrayKey = "output_data_array"; auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); // exemplar distribution { Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(exemplarDistOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); - args.insertOrAssign(k_NCompKey, std::make_any(3)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(2)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_ExemplarDistributionPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(exemplarDistOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarDistributionPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) @@ -119,13 +112,13 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio // exemplar errors { Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(exemplarErrorsOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); - args.insertOrAssign(k_NCompKey, std::make_any(3)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(2)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_ExemplarErrorPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(exemplarErrorsOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarErrorPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) @@ -133,13 +126,13 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio // computed distribution { Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(computedDistOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); - args.insertOrAssign(k_NCompKey, std::make_any(3)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(2)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_ComputedDistributionPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedDistOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ComputedDistributionPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) @@ -147,13 +140,13 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio // computed errors { Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(computedErrorsOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); - args.insertOrAssign(k_NCompKey, std::make_any(3)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(2)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_ComputedErrorPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedErrorsOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ComputedErrorPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) diff --git a/src/Plugins/OrientationAnalysis/test/FindKernelAvgMisorientationsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindKernelAvgMisorientationsTest.cpp index ca1ba0afe6..de64fddc81 100644 --- a/src/Plugins/OrientationAnalysis/test/FindKernelAvgMisorientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindKernelAvgMisorientationsTest.cpp @@ -41,7 +41,7 @@ TEST_CASE("OrientationAnalysis::FindKernelAvgMisorientationsFilter", "[Orientati // Create default Parameters for the filter. // Parameters args.insertOrAssign(FindKernelAvgMisorientationsFilter::k_KernelSize_Key, std::make_any(std::vector{1, 1, 1})); - args.insertOrAssign(FindKernelAvgMisorientationsFilter::k_SelectedImageGeometry_Key, std::make_any(smallIn100Group)); + args.insertOrAssign(FindKernelAvgMisorientationsFilter::k_SelectedImageGeometryPath_Key, std::make_any(smallIn100Group)); // Cell Arrays args.insertOrAssign(FindKernelAvgMisorientationsFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsArrayPath)); args.insertOrAssign(FindKernelAvgMisorientationsFilter::k_CellPhasesArrayPath_Key, std::make_any(k_PhasesArrayPath)); diff --git a/src/Plugins/OrientationAnalysis/test/FindShapesFilterTest.cpp b/src/Plugins/OrientationAnalysis/test/FindShapesFilterTest.cpp index 8ab1967fe9..f860fd39f7 100644 --- a/src/Plugins/OrientationAnalysis/test/FindShapesFilterTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindShapesFilterTest.cpp @@ -58,7 +58,7 @@ TEST_CASE("OrientationAnalysis::FindShapesFilter", "[SimplnxCore][FindShapesFilt args.insertOrAssign(FindShapesFilter::k_AxisEulerAnglesArrayName_Key, std::make_any(k_AxisEulerAnglesArrayNameNX)); args.insertOrAssign(FindShapesFilter::k_AspectRatiosArrayName_Key, std::make_any(k_AspectRatiosArrayNameNX)); args.insertOrAssign(FindShapesFilter::k_VolumesArrayName_Key, std::make_any(k_VolumesArrayNameNX)); - args.insertOrAssign(FindShapesFilter::k_SelectedImageGeometry_Key, std::make_any(k_SelectedGeometryPath)); + args.insertOrAssign(FindShapesFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_SelectedGeometryPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/OrientationAnalysis/test/FindTriangleGeomShapesTest.cpp b/src/Plugins/OrientationAnalysis/test/FindTriangleGeomShapesTest.cpp index e2215e5bd0..d66342e601 100644 --- a/src/Plugins/OrientationAnalysis/test/FindTriangleGeomShapesTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindTriangleGeomShapesTest.cpp @@ -53,7 +53,7 @@ TEST_CASE("OrientationAnalysis::FindTriangleGeomShapes", "[OrientationAnalysis][ args.insertOrAssign(FindTriangleGeomShapesFilter::k_TriGeometryDataPath_Key, std::make_any(k_GeometryPath)); args.insertOrAssign(FindTriangleGeomShapesFilter::k_FaceLabelsArrayPath_Key, std::make_any(k_FaceLabelsPath)); - args.insertOrAssign(FindTriangleGeomShapesFilter::k_FeatureAttributeMatrixName_Key, std::make_any(k_FaceFeatureAttributeMatrixPath)); + args.insertOrAssign(FindTriangleGeomShapesFilter::k_FeatureAttributeMatrixPath_Key, std::make_any(k_FaceFeatureAttributeMatrixPath)); args.insertOrAssign(FindTriangleGeomShapesFilter::k_CentroidsArrayPath_Key, std::make_any(k_FaceFeatureCentroidsPath)); args.insertOrAssign(FindTriangleGeomShapesFilter::k_VolumesArrayPath_Key, std::make_any(k_FaceFeatureVolumesPath)); // Output Vars diff --git a/src/Plugins/OrientationAnalysis/test/GenerateFZQuaternionsTest.cpp b/src/Plugins/OrientationAnalysis/test/GenerateFZQuaternionsTest.cpp index a965c39c51..cf4bf85523 100644 --- a/src/Plugins/OrientationAnalysis/test/GenerateFZQuaternionsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/GenerateFZQuaternionsTest.cpp @@ -74,7 +74,7 @@ TEST_CASE("OrientationAnalysis::GenerateFZQuaternions", "[OrientationAnalysis][G // Create default Parameters for the filter. args.insertOrAssign(GenerateFZQuaternions::k_QuatsArrayPath_Key, std::make_any(scanDataPath.createChildPath(k_Quats))); - args.insertOrAssign(GenerateFZQuaternions::k_FZQuatsArrayPath_Key, std::make_any(k_FZQuats)); + args.insertOrAssign(GenerateFZQuaternions::k_FZQuatsArrayName_Key, std::make_any(k_FZQuats)); args.insertOrAssign(GenerateFZQuaternions::k_CellPhasesArrayPath_Key, std::make_any(scanDataPath.createChildPath(k_Phases))); args.insertOrAssign(GenerateFZQuaternions::k_CrystalStructuresArrayPath_Key, std::make_any(DataPath({k_SmallIN100, k_PhaseData, k_LaueClass}))); diff --git a/src/Plugins/OrientationAnalysis/test/GenerateQuaternionConjugateTest.cpp b/src/Plugins/OrientationAnalysis/test/GenerateQuaternionConjugateTest.cpp index ce97dca201..df675a652b 100644 --- a/src/Plugins/OrientationAnalysis/test/GenerateQuaternionConjugateTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/GenerateQuaternionConjugateTest.cpp @@ -60,7 +60,7 @@ TEST_CASE("OrientationAnalysis::GenerateQuaternionConjugateFilter", "[Orientatio // Create default Parameters for the filter. args.insertOrAssign(GenerateQuaternionConjugateFilter::k_CellQuatsArrayPath_Key, std::make_any(DataPath({k_QuatName}))); - args.insertOrAssign(GenerateQuaternionConjugateFilter::k_OutputDataArrayPath_Key, std::make_any(k_ConvertedName)); + args.insertOrAssign(GenerateQuaternionConjugateFilter::k_OutputDataArrayName_Key, std::make_any(k_ConvertedName)); args.insertOrAssign(GenerateQuaternionConjugateFilter::k_DeleteOriginalData_Key, std::make_any(false)); // Preflight the filter and check result diff --git a/src/Plugins/OrientationAnalysis/test/MergeTwinsTest.cpp b/src/Plugins/OrientationAnalysis/test/MergeTwinsTest.cpp index 22ae77d521..3d82050cd5 100644 --- a/src/Plugins/OrientationAnalysis/test/MergeTwinsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/MergeTwinsTest.cpp @@ -91,7 +91,7 @@ TEST_CASE("Reconstruction::MergeTwinsFilter: Valid Execution", "[Reconstruction] args.insertOrAssign(EBSDSegmentFeaturesFilter::k_RandomizeFeatures_Key, std::make_any(false)); args.insertOrAssign(EBSDSegmentFeaturesFilter::k_UseMask_Key, std::make_any(true)); args.insertOrAssign(EBSDSegmentFeaturesFilter::k_MaskArrayPath_Key, std::make_any(k_MaskArrayPath)); - args.insertOrAssign(EBSDSegmentFeaturesFilter::k_GridGeomPath_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); args.insertOrAssign(EBSDSegmentFeaturesFilter::k_QuatsArrayPath_Key, std::make_any(k_QuatsArrayPath)); args.insertOrAssign(EBSDSegmentFeaturesFilter::k_CellPhasesArrayPath_Key, std::make_any(k_PhasesArrayPath)); args.insertOrAssign(EBSDSegmentFeaturesFilter::k_CrystalStructuresArrayPath_Key, std::make_any(k_CrystalStructuresArrayPath)); @@ -141,9 +141,9 @@ TEST_CASE("Reconstruction::MergeTwinsFilter: Valid Execution", "[Reconstruction] args.insertOrAssign(FindAvgOrientationsFilter::k_CellPhasesArrayPath_Key, std::make_any(k_PhasesArrayPath)); args.insertOrAssign(FindAvgOrientationsFilter::k_CellQuatsArrayPath_Key, std::make_any(k_QuatsArrayPath)); args.insertOrAssign(FindAvgOrientationsFilter::k_CrystalStructuresArrayPath_Key, std::make_any(k_CrystalStructuresArrayPath)); - args.insertOrAssign(FindAvgOrientationsFilter::k_CellFeatureAttributeMatrix_Key, std::make_any(k_CellFeauteAttributeMatrix)); - args.insertOrAssign(FindAvgOrientationsFilter::k_AvgQuatsArrayPath_Key, std::make_any(k_AvgQuatsName)); - args.insertOrAssign(FindAvgOrientationsFilter::k_AvgEulerAnglesArrayPath_Key, std::make_any(EbsdLib::CellData::EulerAngles)); + args.insertOrAssign(FindAvgOrientationsFilter::k_CellFeatureAttributeMatrixPath_Key, std::make_any(k_CellFeauteAttributeMatrix)); + args.insertOrAssign(FindAvgOrientationsFilter::k_AvgQuatsArrayName_Key, std::make_any(k_AvgQuatsName)); + args.insertOrAssign(FindAvgOrientationsFilter::k_AvgEulerAnglesArrayName_Key, std::make_any(EbsdLib::CellData::EulerAngles)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -209,7 +209,7 @@ TEST_CASE("Reconstruction::MergeTwinsFilter: Valid Execution", "[Reconstruction] args.insertOrAssign(MergeTwinsFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsPath)); args.insertOrAssign(MergeTwinsFilter::k_CrystalStructuresArrayPath_Key, std::make_any(k_CrystalStructuresArrayPath)); args.insertOrAssign(MergeTwinsFilter::k_CellParentIdsArrayName_Key, std::make_any(k_CellParentIdsName)); - args.insertOrAssign(MergeTwinsFilter::k_NewCellFeatureAttributeMatrixName_Key, std::make_any(k_NewFeatureAttributeMatrixName)); + args.insertOrAssign(MergeTwinsFilter::k_CreatedFeatureAttributeMatrixName_Key, std::make_any(k_NewFeatureAttributeMatrixName)); args.insertOrAssign(MergeTwinsFilter::k_FeatureParentIdsArrayName_Key, std::make_any(k_FeatureParentIdsName)); args.insertOrAssign(MergeTwinsFilter::k_ActiveArrayName_Key, std::make_any(k_NewFeatureActiveName)); diff --git a/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp b/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp index cfb4246c31..52b62b73dc 100644 --- a/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp +++ b/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp @@ -2,6 +2,12 @@ #include +#include "OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp" +#include "OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp" +#include "OrientationAnalysis/Filters/ConvertOrientations.hpp" +#include "OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp" +#include "OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp" + #include "simplnx/Common/Uuid.hpp" #include "simplnx/Filter/FilterHandle.hpp" #include "simplnx/Parameters/ArrayThresholdsParameter.hpp" @@ -37,6 +43,31 @@ inline const std::string MaterialName("MaterialName"); } // namespace EnsembleData } // namespace EbsdLib +namespace AlignSectionsFeatureCentroidFilter +{ +// Parameter Keys +static inline constexpr StringLiteral k_WriteAlignmentShifts_Key = "write_alignment_shifts"; +static inline constexpr StringLiteral k_AlignmentShiftFileName_Key = "alignment_shift_file_name"; +static inline constexpr StringLiteral k_UseReferenceSlice_Key = "use_reference_slice"; +static inline constexpr StringLiteral k_ReferenceSlice_Key = "reference_slice"; +static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; +static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; +static inline constexpr StringLiteral k_SelectedCellDataGroup_Key = "selected_cell_data_path"; +} // namespace AlignSectionsFeatureCentroidFilter + +namespace ReadTextDataArrayFilter +{ +static inline constexpr StringLiteral k_InputFile_Key = "input_file"; +static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type_index"; +static inline constexpr StringLiteral k_NTuples_Key = "number_tuples"; +static inline constexpr StringLiteral k_NComp_Key = "number_comp"; +static inline constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; +static inline constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_index"; +static inline constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; +static inline constexpr StringLiteral k_DataFormat_Key = "data_format"; +static inline constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; +} // namespace ReadTextDataArrayFilter + namespace nx::core { // Make sure we can instantiate the Import Text Filter @@ -105,17 +136,11 @@ inline void ExecuteConvertOrientations(DataStructure& dataStructure, const Filte auto filter = filterList.createFilter(k_ConvertOrientationsFilterHandle); REQUIRE(nullptr != filter); - // Parameter Keys from AlignSectionsMisorientation. If those change these will need to be updated - constexpr StringLiteral k_InputType_Key = "input_type"; - constexpr StringLiteral k_OutputType_Key = "output_type"; - constexpr StringLiteral k_InputOrientationArrayPath_Key = "input_orientation_array_path"; - constexpr StringLiteral k_OutputOrientationArrayName_Key = "output_orientation_array_name"; - Arguments args; - args.insertOrAssign(k_InputType_Key, std::make_any(0)); - args.insertOrAssign(k_OutputType_Key, std::make_any(2)); - args.insertOrAssign(k_InputOrientationArrayPath_Key, std::make_any(Constants::k_EulersArrayPath)); - args.insertOrAssign(k_OutputOrientationArrayName_Key, std::make_any(Constants::k_Quats)); + args.insertOrAssign(ConvertOrientations::k_InputType_Key, std::make_any(0)); + args.insertOrAssign(ConvertOrientations::k_OutputType_Key, std::make_any(2)); + args.insertOrAssign(ConvertOrientations::k_InputOrientationArrayPath_Key, std::make_any(Constants::k_EulersArrayPath)); + args.insertOrAssign(ConvertOrientations::k_OutputOrientationArrayName_Key, std::make_any(Constants::k_Quats)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -133,33 +158,20 @@ inline void ExecuteEbsdSegmentFeatures(DataStructure& dataStructure, const Filte auto filter = filterList.createFilter(k_EbsdSegmentFeaturesFilterHandle); REQUIRE(nullptr != filter); - // Parameter Keys - constexpr StringLiteral k_GridGeomPath_Key = "grid_geometry_path"; - constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance"; - constexpr StringLiteral k_UseMask_Key = "use_mask"; - constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; - constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; - constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; - constexpr StringLiteral k_FeatureIdsArrayName_Key = "feature_ids_array_name"; - constexpr StringLiteral k_CellFeatureAttributeMatrixName_Key = "cell_feature_attribute_matrix_name"; - constexpr StringLiteral k_ActiveArrayName_Key = "active_array_name"; - constexpr StringLiteral k_RandomizeFeatures_Key = "randomize_features"; - Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(k_MisorientationTolerance_Key, std::make_any(5.0F)); - args.insertOrAssign(k_UseMask_Key, std::make_any(true)); - args.insertOrAssign(k_GridGeomPath_Key, std::make_any(Constants::k_DataContainerPath)); - args.insertOrAssign(k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); - args.insertOrAssign(k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); - args.insertOrAssign(k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); - args.insertOrAssign(k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); - args.insertOrAssign(k_FeatureIdsArrayName_Key, std::make_any(Constants::k_FeatureIds)); - args.insertOrAssign(k_CellFeatureAttributeMatrixName_Key, std::make_any(Constants::k_Grain_Data)); - args.insertOrAssign(k_ActiveArrayName_Key, std::make_any(Constants::k_ActiveName)); - args.insertOrAssign(k_RandomizeFeatures_Key, std::make_any(false)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_MisorientationTolerance_Key, std::make_any(5.0F)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_UseMask_Key, std::make_any(true)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_SelectedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_FeatureIdsArrayName_Key, std::make_any(Constants::k_FeatureIds)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_CellFeatureAttributeMatrixName_Key, std::make_any(Constants::k_Grain_Data)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_ActiveArrayName_Key, std::make_any(Constants::k_ActiveName)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_RandomizeFeatures_Key, std::make_any(false)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -177,38 +189,23 @@ inline void ExecuteAlignSectionsMisorientation(DataStructure& dataStructure, con auto filter = filterList.createFilter(k_AlignSectionMisorientationFilterHandle); REQUIRE(nullptr != filter); - // Parameter Keys - constexpr StringLiteral k_WriteAlignmentShifts_Key = "write_alignment_shifts"; - constexpr StringLiteral k_AlignmentShiftFileName_Key = "alignment_shift_file_name"; - - constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance"; - - constexpr StringLiteral k_UseMask_Key = "use_mask"; - constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - - constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; - constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; - constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; - - constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry_path"; - Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(k_WriteAlignmentShifts_Key, std::make_any(true)); - args.insertOrAssign(k_AlignmentShiftFileName_Key, std::make_any(shiftsFile)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_WriteAlignmentShifts_Key, std::make_any(true)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_AlignmentShiftFileName_Key, std::make_any(shiftsFile)); - args.insertOrAssign(k_MisorientationTolerance_Key, std::make_any(5.0F)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_MisorientationTolerance_Key, std::make_any(5.0F)); - args.insertOrAssign(k_UseMask_Key, std::make_any(true)); - args.insertOrAssign(k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_UseMask_Key, std::make_any(true)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); - args.insertOrAssign(k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); - args.insertOrAssign(k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); - args.insertOrAssign(k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); - args.insertOrAssign(k_SelectedImageGeometry_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_SelectedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -226,24 +223,15 @@ inline void ExecuteAlignSectionsFeatureCentroid(DataStructure& dataStructure, co auto filter = filterList.createFilter(k_AlignSectionsFeatureCentroidFilterHandle); REQUIRE(nullptr != filter); - // Parameter Keys - constexpr StringLiteral k_WriteAlignmentShifts_Key = "write_alignment_shifts"; - constexpr StringLiteral k_AlignmentShiftFileName_Key = "alignment_shift_file_name"; - constexpr StringLiteral k_UseReferenceSlice_Key = "use_reference_slice"; - constexpr StringLiteral k_ReferenceSlice_Key = "reference_slice"; - constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry_path"; - constexpr StringLiteral k_SelectedCellDataGroup_Key = "selected_cell_data_path"; - Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(k_WriteAlignmentShifts_Key, std::make_any(true)); - args.insertOrAssign(k_AlignmentShiftFileName_Key, std::make_any(shiftsFile)); - args.insertOrAssign(k_UseReferenceSlice_Key, std::make_any(true)); - args.insertOrAssign(k_ReferenceSlice_Key, std::make_any(0)); - args.insertOrAssign(k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); - args.insertOrAssign(k_SelectedImageGeometry_Key, std::make_any(Constants::k_DataContainerPath)); - args.insertOrAssign(k_SelectedCellDataGroup_Key, std::make_any(Constants::k_CellAttributeMatrix)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_WriteAlignmentShifts_Key, std::make_any(true)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_AlignmentShiftFileName_Key, std::make_any(shiftsFile)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_UseReferenceSlice_Key, std::make_any(true)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_ReferenceSlice_Key, std::make_any(0)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_SelectedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_SelectedCellDataGroup_Key, std::make_any(Constants::k_CellAttributeMatrix)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -261,24 +249,16 @@ inline void ExecuteBadDataNeighborOrientationCheck(DataStructure& dataStructure, INFO(fmt::format("Error creating Filter '{}' ", k_BadDataNeighborOrientationCheckFilterHandle.getFilterName())); auto filter = filterList.createFilter(k_BadDataNeighborOrientationCheckFilterHandle); REQUIRE(nullptr != filter); - // Parameter Keys - constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance"; - constexpr StringLiteral k_NumberOfNeighbors_Key = "number_of_neighbors"; - constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; - constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; - constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; - constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(k_MisorientationTolerance_Key, std::make_any(5.0f)); - args.insertOrAssign(k_NumberOfNeighbors_Key, std::make_any(4)); - args.insertOrAssign(k_ImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); - args.insertOrAssign(k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); - args.insertOrAssign(k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); - args.insertOrAssign(k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); - args.insertOrAssign(k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_MisorientationTolerance_Key, std::make_any(5.0f)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_NumberOfNeighbors_Key, std::make_any(4)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_ImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -296,28 +276,17 @@ inline void ExecuteNeighborOrientationCorrelation(DataStructure& dataStructure, auto filter = filterList.createFilter(k_NeighborOrientationCorrelationFilterHandle); REQUIRE(nullptr != filter); - // Parameter Keys - constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; - constexpr StringLiteral k_MinConfidence_Key = "min_confidence"; - constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance"; - constexpr StringLiteral k_Level_Key = "level"; - constexpr StringLiteral k_CorrelationArrayPath_Key = "correlation_array_path"; - constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; - constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; - constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; - constexpr StringLiteral k_IgnoredDataArrayPaths_Key = "ignored_data_array_paths"; - Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(k_ImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); - args.insertOrAssign(k_MinConfidence_Key, std::make_any(0.2f)); - args.insertOrAssign(k_MisorientationTolerance_Key, std::make_any(5.0f)); - args.insertOrAssign(k_Level_Key, std::make_any(2)); - args.insertOrAssign(k_CorrelationArrayPath_Key, std::make_any(Constants::k_ConfidenceIndexArrayPath)); - args.insertOrAssign(k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); - args.insertOrAssign(k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); - args.insertOrAssign(k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); - args.insertOrAssign(k_IgnoredDataArrayPaths_Key, std::make_any>()); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_ImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_MinConfidence_Key, std::make_any(0.2f)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_MisorientationTolerance_Key, std::make_any(5.0f)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_Level_Key, std::make_any(2)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_CorrelationArrayPath_Key, std::make_any(Constants::k_ConfidenceIndexArrayPath)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_IgnoredDataArrayPaths_Key, std::make_any>()); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); diff --git a/src/Plugins/OrientationAnalysis/test/ReadAngDataTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadAngDataTest.cpp index b4e1a84350..2f59a60f63 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadAngDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadAngDataTest.cpp @@ -33,7 +33,7 @@ TEST_CASE("OrientationAnalysis::ReadAngData: Valid Execution", "[OrientationAnal // Create default Parameters for the filter. args.insertOrAssign(ReadAngDataFilter::k_InputFile_Key, std::make_any(inputAngFile)); - args.insertOrAssign(ReadAngDataFilter::k_DataContainerName_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(ReadAngDataFilter::k_CreatedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); args.insertOrAssign(ReadAngDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); args.insertOrAssign(ReadAngDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_EnsembleAttributeMatrix)); diff --git a/src/Plugins/OrientationAnalysis/test/ReadCtfDataTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadCtfDataTest.cpp index f5d6bf4f89..689138f6e7 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadCtfDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadCtfDataTest.cpp @@ -35,7 +35,7 @@ TEST_CASE("OrientationAnalysis::ReadCtfData: Valid Execution", "[OrientationAnal args.insertOrAssign(ReadCtfDataFilter::k_InputFile_Key, std::make_any(inputCtfFile)); args.insertOrAssign(ReadCtfDataFilter::k_DegreesToRadians_Key, std::make_any(true)); args.insertOrAssign(ReadCtfDataFilter::k_EdaxHexagonalAlignment_Key, std::make_any(true)); - args.insertOrAssign(ReadCtfDataFilter::k_DataContainerName_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(ReadCtfDataFilter::k_CreatedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); args.insertOrAssign(ReadCtfDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); args.insertOrAssign(ReadCtfDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_EnsembleAttributeMatrix)); diff --git a/src/Plugins/OrientationAnalysis/test/ReadEnsembleInfoTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadEnsembleInfoTest.cpp index 3ac7a55c3c..bf2d3278c7 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadEnsembleInfoTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadEnsembleInfoTest.cpp @@ -39,7 +39,7 @@ TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: Valid Filter Execution", DataStructure ds; DataGroup* topLevelGroup = DataGroup::Create(ds, Constants::k_DataContainer); Arguments args; - args.insertOrAssign(ReadEnsembleInfoFilter::k_DataContainerName_Key, std::make_any(DataPath({Constants::k_DataContainer}))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_ParentGroupPath_Key, std::make_any(DataPath({Constants::k_DataContainer}))); args.insertOrAssign(ReadEnsembleInfoFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(Constants::k_EnsembleAttributeMatrix)); args.insertOrAssign(ReadEnsembleInfoFilter::k_CrystalStructuresArrayName_Key, std::make_any(Constants::k_CrystalStructures)); args.insertOrAssign(ReadEnsembleInfoFilter::k_PhaseTypesArrayName_Key, std::make_any(Constants::k_Phases)); @@ -91,7 +91,7 @@ TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: InValid Filter Execution DataStructure ds; DataGroup* topLevelGroup = DataGroup::Create(ds, Constants::k_DataContainer); Arguments args; - args.insertOrAssign(ReadEnsembleInfoFilter::k_DataContainerName_Key, std::make_any(DataPath({Constants::k_DataContainer}))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_ParentGroupPath_Key, std::make_any(DataPath({Constants::k_DataContainer}))); args.insertOrAssign(ReadEnsembleInfoFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(Constants::k_EnsembleAttributeMatrix)); args.insertOrAssign(ReadEnsembleInfoFilter::k_CrystalStructuresArrayName_Key, std::make_any(Constants::k_CrystalStructures)); args.insertOrAssign(ReadEnsembleInfoFilter::k_PhaseTypesArrayName_Key, std::make_any(Constants::k_Phases)); diff --git a/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp index b91892f7ca..fb127d4935 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp @@ -20,7 +20,7 @@ TEST_CASE("OrientationAnalysis::ReadH5Ebsd: Valid filter execution", "[Orientati { const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_h5ebsd.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_h5ebsd.tar.gz", "Small_IN100.h5ebsd"); Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); auto* filterList = Application::Instance()->getFilterList(); @@ -44,7 +44,7 @@ TEST_CASE("OrientationAnalysis::ReadH5Ebsd: Valid filter execution", "[Orientati h5ebsdParamVal.useRecommendedTransform = true; args.insertOrAssign(ReadH5EbsdFilter::k_ReadH5EbsdParameter_Key, std::make_any(h5ebsdParamVal)); - args.insertOrAssign(ReadH5EbsdFilter::k_DataContainerName_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(ReadH5EbsdFilter::k_CreatedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); args.insertOrAssign(ReadH5EbsdFilter::k_CellAttributeMatrixName_Key, std::make_any(Constants::k_CellData)); args.insertOrAssign(ReadH5EbsdFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(Constants::k_EnsembleAttributeMatrix)); @@ -57,6 +57,10 @@ TEST_CASE("OrientationAnalysis::ReadH5Ebsd: Valid filter execution", "[Orientati SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } + // #ifdef SIMPLNX_WRITE_TEST_OUTPUT + WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/read_h5ebsd_test.dream3d", unit_test::k_BinaryTestOutputDir))); + // #endif + // Loop and compare each array from the 'Exemplar Data / CellData' to the 'Data Container / CellData' group { auto& cellDataGroup = dataStructure.getDataRefAs(Constants::k_CellAttributeMatrix); diff --git a/src/Plugins/OrientationAnalysis/test/ReadH5OimDataTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadH5OimDataTest.cpp index 61129dba87..e1e1f3a76a 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadH5OimDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadH5OimDataTest.cpp @@ -46,7 +46,7 @@ TEST_CASE("OrientationAnalysis::ReadH5OimDataFilter: Valid Filter Execution", "[ args.insertOrAssign(ReadH5OimDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); args.insertOrAssign(ReadH5OimDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); args.insertOrAssign(ReadH5OimDataFilter::k_ReadPatternData_Key, std::make_any(true)); - args.insertOrAssign(ReadH5OimDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); + args.insertOrAssign(ReadH5OimDataFilter::k_CreatedImageGeometryPath_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); args.insertOrAssign(ReadH5OimDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); args.insertOrAssign(ReadH5OimDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); @@ -91,7 +91,7 @@ TEST_CASE("OrientationAnalysis::ReadH5OimDataFilter: InValid Filter Execution", DataStructure dataStructure; Arguments args; args.insertOrAssign(ReadH5OimDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); - args.insertOrAssign(ReadH5OimDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); + args.insertOrAssign(ReadH5OimDataFilter::k_CreatedImageGeometryPath_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); args.insertOrAssign(ReadH5OimDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); args.insertOrAssign(ReadH5OimDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); diff --git a/src/Plugins/OrientationAnalysis/test/ReadH5OinaDataTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadH5OinaDataTest.cpp index 83fc9e45a8..e120c47a42 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadH5OinaDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadH5OinaDataTest.cpp @@ -46,7 +46,7 @@ TEST_CASE("OrientationAnalysis::ReadH5OinaDataFilter: Valid Filter Execution", " args.insertOrAssign(ReadH5OinaDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); args.insertOrAssign(ReadH5OinaDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); args.insertOrAssign(ReadH5OinaDataFilter::k_ReadPatternData_Key, std::make_any(false)); - args.insertOrAssign(ReadH5OinaDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); + args.insertOrAssign(ReadH5OinaDataFilter::k_CreatedImageGeometryPath_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); args.insertOrAssign(ReadH5OinaDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); args.insertOrAssign(ReadH5OinaDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); @@ -91,7 +91,7 @@ TEST_CASE("OrientationAnalysis::ReadH5OinaDataFilter: InValid Filter Execution", DataStructure dataStructure; Arguments args; args.insertOrAssign(ReadH5OinaDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); - args.insertOrAssign(ReadH5OinaDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); + args.insertOrAssign(ReadH5OinaDataFilter::k_CreatedImageGeometryPath_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); args.insertOrAssign(ReadH5OinaDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); args.insertOrAssign(ReadH5OinaDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); diff --git a/src/Plugins/OrientationAnalysis/test/RodriguesConvertorTest.cpp b/src/Plugins/OrientationAnalysis/test/RodriguesConvertorTest.cpp index de066c7bb9..c44ba30437 100644 --- a/src/Plugins/OrientationAnalysis/test/RodriguesConvertorTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/RodriguesConvertorTest.cpp @@ -52,7 +52,7 @@ TEST_CASE("OrientationAnalysis::RodriguesConvertorFilter", "[OrientationAnalysis // Create default Parameters for the filter. args.insertOrAssign(RodriguesConvertorFilter::k_RodriguesDataArrayPath_Key, std::make_any(DataPath({k_InputArrayName}))); - args.insertOrAssign(RodriguesConvertorFilter::k_OutputDataArrayPath_Key, std::make_any(k_ConvertedName)); + args.insertOrAssign(RodriguesConvertorFilter::k_OutputDataArrayName_Key, std::make_any(k_ConvertedName)); args.insertOrAssign(RodriguesConvertorFilter::k_DeleteOriginalData_Key, std::make_any(false)); // Preflight the filter and check result diff --git a/src/Plugins/OrientationAnalysis/test/RotateEulerRefFrameTest.cpp b/src/Plugins/OrientationAnalysis/test/RotateEulerRefFrameTest.cpp index d45074c58e..662128d78a 100644 --- a/src/Plugins/OrientationAnalysis/test/RotateEulerRefFrameTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/RotateEulerRefFrameTest.cpp @@ -38,16 +38,6 @@ TEST_CASE("OrientationAnalysis::RotateEulerRefFrame", "[OrientationAnalysis]") std::string inputFile = fmt::format("{}/ASCIIData/EulerAngles.csv", unit_test::k_TestFilesDir.view()); std::string comparisonDataFile = fmt::format("{}/ASCIIData/EulersRotated.csv", unit_test::k_TestFilesDir.view()); - // These are the argument keys for the Import Text filter. We cannot use the ones from the - // header file as that would bring in a dependency on the SimplnxCorePlugin - static constexpr StringLiteral k_InputFileKey = "input_file"; - static constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; - static constexpr StringLiteral k_NTuplesKey = "n_tuples"; - static constexpr StringLiteral k_NCompKey = "n_comp"; - static constexpr StringLiteral k_NSkipLinesKey = "n_skip_lines"; - static constexpr StringLiteral k_DelimiterChoiceKey = "delimiter_choice"; - static constexpr StringLiteral k_DataArrayKey = "output_data_array"; - // Make sure we can load the "Import Text Filter" filter from the plugin auto* filterList = Application::Instance()->getFilterList(); // Make sure we can instantiate the Import Text Filter @@ -57,13 +47,13 @@ TEST_CASE("OrientationAnalysis::RotateEulerRefFrame", "[OrientationAnalysis]") // Run the "Import Text" Filter to import the data for the EulerAngles and EulersRotated { Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(fs::path(inputFile))); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(k_NumericType)); - args.insertOrAssign(k_NTuplesKey, std::make_any(k_NumTuples)); - args.insertOrAssign(k_NCompKey, std::make_any(k_NumComponents)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(0)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(0)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_EulerAnglesDataPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path(inputFile))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(k_NumericType)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_NumTuples)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(k_NumComponents)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_EulerAnglesDataPath)); auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); @@ -79,13 +69,13 @@ TEST_CASE("OrientationAnalysis::RotateEulerRefFrame", "[OrientationAnalysis]") { Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(fs::path(comparisonDataFile))); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(k_NumericType)); - args.insertOrAssign(k_NTuplesKey, std::make_any(k_NumTuples)); - args.insertOrAssign(k_NCompKey, std::make_any(k_NumComponents)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(0)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(0)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_EulersRotatedDataPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path(comparisonDataFile))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(k_NumericType)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_NumTuples)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(k_NumComponents)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_EulersRotatedDataPath)); auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); diff --git a/src/Plugins/OrientationAnalysis/test/WriteGBCDGMTFileTest.cpp b/src/Plugins/OrientationAnalysis/test/WriteGBCDGMTFileTest.cpp index 784bd54cdc..48cee5a539 100644 --- a/src/Plugins/OrientationAnalysis/test/WriteGBCDGMTFileTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/WriteGBCDGMTFileTest.cpp @@ -24,11 +24,11 @@ namespace { inline constexpr StringLiteral k_FaceEnsembleDataPath("FaceEnsembleData [NX]"); -inline constexpr StringLiteral k_ReadCSVData_Key = "read_csv_data"; +inline constexpr StringLiteral k_ReadCSVData_Key = "read_csv_data_object"; inline constexpr StringLiteral k_TupleDims_Key = "tuple_dimensions"; inline constexpr StringLiteral k_UseExistingGroup_Key = "use_existing_group"; -inline constexpr StringLiteral k_SelectedDataGroup_Key = "selected_data_group"; -inline constexpr StringLiteral k_CreatedDataGroup_Key = "created_data_group"; +inline constexpr StringLiteral k_SelectedDataGroup_Key = "selected_attribute_matrix_path"; +inline constexpr StringLiteral k_CreatedDataGroup_Key = "created_data_group_path"; inline constexpr StringLiteral k_ExemplarGMT1("ExemplarGMT1"); inline constexpr StringLiteral k_ExemplarGMT2("ExemplarGMT2"); diff --git a/src/Plugins/OrientationAnalysis/test/WriteGBCDTriangleDataTest.cpp b/src/Plugins/OrientationAnalysis/test/WriteGBCDTriangleDataTest.cpp index 4f20815fd5..18baf2111d 100644 --- a/src/Plugins/OrientationAnalysis/test/WriteGBCDTriangleDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/WriteGBCDTriangleDataTest.cpp @@ -17,11 +17,11 @@ using namespace nx::core::UnitTest; namespace { -inline constexpr StringLiteral k_ReadCSVData_Key = "read_csv_data"; +inline constexpr StringLiteral k_ReadCSVData_Key = "read_csv_data_object"; inline constexpr StringLiteral k_TupleDims_Key = "tuple_dimensions"; inline constexpr StringLiteral k_UseExistingGroup_Key = "use_existing_group"; -inline constexpr StringLiteral k_SelectedDataGroup_Key = "selected_data_group"; -inline constexpr StringLiteral k_CreatedDataGroup_Key = "created_data_group"; +inline constexpr StringLiteral k_SelectedDataGroup_Key = "selected_attribute_matrix_path"; +inline constexpr StringLiteral k_CreatedDataGroup_Key = "created_data_group_path"; inline constexpr StringLiteral k_Phi1Right("Phi1Right"); inline constexpr StringLiteral k_PhiRight("PhiRight"); diff --git a/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline index c1446d2ea3..1fab3c951e 100644 --- a/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline @@ -32,17 +32,17 @@ }, { "args": { - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/ConfidenceIndex.csv", - "n_comp": 1, - "n_skip_lines": 0, + "number_tuples": 1, + "skip_line_count": 0, "n_tuples": [ [ 480000 ] ], - "output_data_array": "[Image Geometry]/Cell Data/Confidence Index", - "scalar_type": 8 + "output_array_path": "[Image Geometry]/Cell Data/Confidence Index", + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -53,17 +53,17 @@ }, { "args": { - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/FeatureIds.csv", - "n_comp": 1, - "n_skip_lines": 0, + "number_tuples": 1, + "skip_line_count": 0, "n_tuples": [ [ 480000 ] ], - "output_data_array": "[Image Geometry]/Cell Data/FeatureIds", - "scalar_type": 4 + "output_array_path": "[Image Geometry]/Cell Data/FeatureIds", + "scalar_type_index": 4 }, "comments": "", "filter": { @@ -74,17 +74,17 @@ }, { "args": { - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/ImageQuality.csv", - "n_comp": 1, - "n_skip_lines": 0, + "number_tuples": 1, + "skip_line_count": 0, "n_tuples": [ [ 480000 ] ], - "output_data_array": "[Image Geometry]/Cell Data/Image Quality", - "scalar_type": 8 + "output_array_path": "[Image Geometry]/Cell Data/Image Quality", + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -95,17 +95,17 @@ }, { "args": { - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/IPFColor.csv", - "n_comp": 3, - "n_skip_lines": 0, + "number_tuples": 3, + "skip_line_count": 0, "n_tuples": [ [ 480000 ] ], - "output_data_array": "[Image Geometry]/Cell Data/IPFColors", - "scalar_type": 1 + "output_array_path": "[Image Geometry]/Cell Data/IPFColors", + "scalar_type_index": 1 }, "comments": "", "filter": { @@ -117,7 +117,7 @@ { "args": { "cell_feature_attribute_matrix": "CellFeatureData", - "created_image_geometry": "CroppedBottomHalf", + "output_image_geometry_path": "CroppedBottomHalf", "feature_ids": "", "max_voxel": [ 59, @@ -131,7 +131,7 @@ ], "remove_original_geometry": false, "renumber_features": false, - "selected_image_geometry": "[Image Geometry]", + "input_image_geometry_path": "[Image Geometry]", "update_origin": false }, "comments": "", @@ -144,7 +144,7 @@ { "args": { "cell_feature_attribute_matrix": "CellFeatureData", - "created_image_geometry": "CroppedTopHalf", + "output_image_geometry_path": "CroppedTopHalf", "feature_ids": "", "max_voxel": [ 59, @@ -158,7 +158,7 @@ ], "remove_original_geometry": false, "renumber_features": false, - "selected_image_geometry": "[Image Geometry]", + "input_image_geometry_path": "[Image Geometry]", "update_origin": true }, "comments": "", @@ -172,7 +172,7 @@ "args": { "check_resolution": true, "destination_geometry": "CroppedBottomHalf", - "input_geometry": "CroppedTopHalf", + "input_triangle_geometry_path": "CroppedTopHalf", "new_geometry": "AppendedImageGeom", "save_as_new_geometry": true }, diff --git a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline index f7f2866dad..ba6cc70eb0 100644 --- a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline @@ -27,7 +27,7 @@ }, { "args": { - "array_handling": 0, + "array_handling_index": 0, "cell_attribute_matrix_name": "Cell Data", "dimensions": [ 10, @@ -70,9 +70,9 @@ { "args": { "component_count": 1, - "initialization_value": "2", + "initialization_value_str": "2", "numeric_type": 4, - "output_data_array": "Group 1/Group 2/[Geometry]/Cell Data/Data", + "output_array_path": "Group 1/Group 2/[Geometry]/Cell Data/Data", "tuple_dimensions": [ [ 2.0, @@ -130,7 +130,7 @@ 2.0, 2.0 ], - "selected_image_geometry": "Group 1/Group 2/[Geometry]", + "input_image_geometry_path": "Group 1/Group 2/[Geometry]", "transformation_type": 5, "translation": [ 0.0, diff --git a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline index 4e7e94a66a..32fbde4323 100644 --- a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline @@ -7,7 +7,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "Small IN100", + "output_image_geometry_path": "Small IN100", "input_file": "Data/Small_IN100/Slice_1.ang" }, "comments": "", @@ -21,7 +21,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "Transform [Rotate]", + "output_image_geometry_path": "Transform [Rotate]", "input_file": "Data/Small_IN100/Slice_1.ang" }, "comments": "", @@ -73,7 +73,7 @@ 1.0, 1.0 ], - "selected_image_geometry": "Transform [Rotate]", + "input_image_geometry_path": "Transform [Rotate]", "transformation_type": 3, "translation": [ 10.0, @@ -92,7 +92,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "Transform [Scale]", + "output_image_geometry_path": "Transform [Scale]", "input_file": "Data/Small_IN100/Slice_1.ang" }, "comments": "", @@ -144,7 +144,7 @@ 2.0, 1.0 ], - "selected_image_geometry": "Transform [Scale]", + "input_image_geometry_path": "Transform [Scale]", "transformation_type": 5, "translation": [ 10.0, @@ -163,7 +163,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "Transform [Translate]", + "output_image_geometry_path": "Transform [Translate]", "input_file": "Data/Small_IN100/Slice_1.ang" }, "comments": "", @@ -215,7 +215,7 @@ 1.0, 1.0 ], - "selected_image_geometry": "Transform [Translate]", + "input_image_geometry_path": "Transform [Translate]", "transformation_type": 4, "translation": [ 50.0, @@ -234,7 +234,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "Transform [Rotation-Interpolation]", + "output_image_geometry_path": "Transform [Rotation-Interpolation]", "input_file": "Data/Small_IN100/Slice_1.ang" }, "comments": "", @@ -286,7 +286,7 @@ 1.0, 1.0 ], - "selected_image_geometry": "Transform [Rotation-Interpolation]", + "input_image_geometry_path": "Transform [Rotation-Interpolation]", "transformation_type": 3, "translation": [ 10.0, @@ -305,7 +305,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "Transform [Scale-Interpolation]", + "output_image_geometry_path": "Transform [Scale-Interpolation]", "input_file": "Data/Small_IN100/Slice_1.ang" }, "comments": "", @@ -357,7 +357,7 @@ 3.0, 1.0 ], - "selected_image_geometry": "Transform [Scale-Interpolation]", + "input_image_geometry_path": "Transform [Scale-Interpolation]", "transformation_type": 5, "translation": [ 10.0, diff --git a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline index b85226870c..7fdedfa9b8 100644 --- a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "triangle_geometry_name": "Blade", + "output_triangle_geometry_path": "Blade", "scale_factor": 1.0, "scale_output": false, "stl_file_path": "Data/STL_Models/ASTMD638_specimen.stl" @@ -19,7 +19,7 @@ }, { "args": { - "triangle_geometry_name": "Blade [Rotation]", + "output_triangle_geometry_path": "Blade [Rotation]", "scale_factor": 1.0, "scale_output": false, "stl_file_path": "Data/STL_Models/ASTMD638_specimen.stl" @@ -73,7 +73,7 @@ 1.0, 1.0 ], - "selected_image_geometry": "Blade [Rotation]", + "input_image_geometry_path": "Blade [Rotation]", "transformation_type": 3, "translation": [ 0.0, @@ -90,7 +90,7 @@ }, { "args": { - "triangle_geometry_name": "Blade [Translation]", + "output_triangle_geometry_path": "Blade [Translation]", "scale_factor": 1.0, "scale_output": false, "stl_file_path": "Data/STL_Models/ASTMD638_specimen.stl" @@ -144,7 +144,7 @@ 1.0, 1.0 ], - "selected_image_geometry": "Blade [Translation]", + "input_image_geometry_path": "Blade [Translation]", "transformation_type": 4, "translation": [ 10.0, @@ -161,7 +161,7 @@ }, { "args": { - "triangle_geometry_name": "Blade [Scale]", + "output_triangle_geometry_path": "Blade [Scale]", "scale_factor": 1.0, "scale_output": false, "stl_file_path": "Data/STL_Models/ASTMD638_specimen.stl" @@ -215,7 +215,7 @@ 0.5, 1.0 ], - "selected_image_geometry": "Blade [Scale]", + "input_image_geometry_path": "Blade [Scale]", "transformation_type": 5, "translation": [ 10.0, diff --git a/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline index f3ecea0b9b..776f98bbb4 100644 --- a/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline @@ -5,9 +5,9 @@ { "args": { "component_count": 1, - "initialization_value": "2", + "initialization_value_str": "2", "numeric_type": 4, - "output_data_array": "TestArray", + "output_array_path": "TestArray", "tuple_dimensions": [ [ 10.0 @@ -24,9 +24,9 @@ { "args": { "component_count": 1, - "initialization_value": "1.23878", + "initialization_value_str": "1.23878", "numeric_type": 8, - "output_data_array": "Confidence Index", + "output_array_path": "Confidence Index", "tuple_dimensions": [ [ 10.0 @@ -43,9 +43,9 @@ { "args": { "component_count": 3, - "initialization_value": "1.23878", + "initialization_value_str": "1.23878", "numeric_type": 8, - "output_data_array": "EulerAngles", + "output_array_path": "EulerAngles", "tuple_dimensions": [ [ 10.0 @@ -61,13 +61,13 @@ }, { "args": { - "calculated_array": "Caclulated_TestArray", + "calculated_array_path": "Caclulated_TestArray", "calculator_parameter": { "equation": "TestArray+TestArray", "selected_group": "", "units": 0 }, - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -78,13 +78,13 @@ }, { "args": { - "calculated_array": "Caclulated_TestArray 2", + "calculated_array_path": "Caclulated_TestArray 2", "calculator_parameter": { "equation": "TestArray+TestArray", "selected_group": "", "units": 0 }, - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -95,13 +95,13 @@ }, { "args": { - "calculated_array": "Caclulated_TestArray 3", + "calculated_array_path": "Caclulated_TestArray 3", "calculator_parameter": { "equation": "TestArray+TestArray", "selected_group": "", "units": 0 }, - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -112,13 +112,13 @@ }, { "args": { - "calculated_array": "Caclulated_ConfidenceIndex", + "calculated_array_path": "Caclulated_ConfidenceIndex", "calculator_parameter": { "equation": "Confidence Index*100", "selected_group": "", "units": 0 }, - "scalar_type": 9 + "scalar_type_index": 9 }, "comments": "", "filter": { @@ -129,13 +129,13 @@ }, { "args": { - "calculated_array": "Caclulated_EulerAngles", + "calculated_array_path": "Caclulated_EulerAngles", "calculator_parameter": { "equation": "EulerAngles/2", "selected_group": "", "units": 0 }, - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -146,13 +146,13 @@ }, { "args": { - "calculated_array": "Caclulated_EulerAngles2", + "calculated_array_path": "Caclulated_EulerAngles2", "calculator_parameter": { "equation": "EulerAngles[0]+EulerAngles[1]", "selected_group": "", "units": 0 }, - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { diff --git a/src/Plugins/SimplnxCore/pipelines/AvizoWriters.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/AvizoWriters.d3dpipeline index 98c8dc3a0f..64dfe1d154 100644 --- a/src/Plugins/SimplnxCore/pipelines/AvizoWriters.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/AvizoWriters.d3dpipeline @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -52,7 +52,7 @@ { "args": { "feature_ids_array_path": "DataContainer/CellData/FeatureIds", - "geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "output_file": "Data/Output/Examples/SmallIN100_AvizoUniform.am", "units": "meters", "write_binary_file": false @@ -67,7 +67,7 @@ { "args": { "feature_ids_array_path": "DataContainer/CellData/FeatureIds", - "geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "output_file": "Data/Output/Examples/SmallIN100_AvizoRectilinear.am", "units": "meters", "write_binary_file": false diff --git a/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline index 45b775f493..85f6c437ae 100644 --- a/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline @@ -6,7 +6,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "DataContainer", + "output_image_geometry_path": "DataContainer", "input_file": "Data/Small_IN100/Slice_1.ang" }, "comments": "", @@ -19,7 +19,7 @@ { "args": { "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -35,10 +35,10 @@ }, { "args": { - "created_image_geometry": "DataContainer", + "output_image_geometry_path": "DataContainer", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -62,7 +62,7 @@ ] ], "rotation_representation": 0, - "selected_image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -73,7 +73,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -88,7 +88,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask", + "output_data_array_name": "Mask", "created_mask_type": 10, "custom_false_value": 0.0, "custom_true_value": 1.0, @@ -125,7 +125,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -140,7 +140,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask Y Pos", + "output_data_array_name": "Mask Y Pos", "created_mask_type": 10, "custom_false_value": 0.0, "custom_true_value": 1.0, @@ -156,7 +156,7 @@ }, { "args": { - "array_handling": 0, + "array_handling_index": 0, "included_data_array_paths": [ "DataContainer/Cell Data/Confidence Index", "DataContainer/Cell Data/EulerAngles", @@ -169,7 +169,7 @@ "DataContainer/Cell Data/Y Position", "DataContainer/Cell Data/Mask" ], - "input_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "mask_array_path": "DataContainer/Cell Data/Mask Y Pos", "output_shared_vertex_list_name": "SharedVertexList", "output_vertex_attr_matrix_name": "VertexData", diff --git a/src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline index 711e4feb87..aa1bba302b 100644 --- a/src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -57,16 +57,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList", - "number_of_neighbors": "NumNeighbors", - "shared_surface_area_list": "SharedSurfaceAreaList", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "comments": "", "filter": { @@ -77,10 +77,10 @@ }, { "args": { - "centroids_array_path": "Centroids", - "feature_attribute_matrix": "DataContainer/CellFeatureData", + "centroids_array_name": "Centroids", + "feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "selected_image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -91,7 +91,7 @@ }, { "args": { - "feature_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "feature_ids_path": "DataContainer/CellData/FeatureIds", "mark_feature_0_neighbors": true, "feature_attribute_matrix_path": "DataContainer/CellFeatureData", @@ -109,7 +109,7 @@ "biased_features_array_name": "BiasedFeatures", "calc_by_phase": true, "centroids_array_path": "DataContainer/CellFeatureData/Centroids", - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "phases_array_path": "DataContainer/CellFeatureData/Phases", "surface_features_array_path": "DataContainer/CellFeatureData/SurfaceFeatures" }, diff --git a/src/Plugins/SimplnxCore/pipelines/FindBoundaryCells.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/FindBoundaryCells.d3dpipeline index 0fe093ab87..75b057b81e 100644 --- a/src/Plugins/SimplnxCore/pipelines/FindBoundaryCells.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/FindBoundaryCells.d3dpipeline @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -59,7 +59,7 @@ "boundary_cells_array_name": "BoundaryCells", "feature_ids_array_path": "DataContainer/CellData/FeatureIds", "ignore_feature_zero": true, - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "include_volume_boundary": true }, "comments": "", diff --git a/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline index 087d6c0a1b..590199bc45 100644 --- a/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline @@ -7,8 +7,8 @@ "args": { "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "DataContainer", - "read_h5_ebsd_parameter": { + "output_image_geometry_path": "DataContainer", + "read_h5_ebsd_object": { "end_slice": 117, "euler_representation": 0, "hdf5_data_paths": [ @@ -35,7 +35,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -58,7 +58,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -70,9 +70,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -89,7 +89,7 @@ "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "feature_ids_array_name": "FeatureIds", "mask_array_path": "DataContainer/CellData/Mask", - "grid_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "misorientation_tolerance": 5.0, "quats_array_path": "DataContainer/CellData/Quats", "randomize_features": true, @@ -106,7 +106,7 @@ "args": { "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_array_path": "DataContainer/CellData/FeatureIds", - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "largest_cross_sections_array_path": "LargestCrossSections", "plane": 0 }, diff --git a/src/Plugins/SimplnxCore/pipelines/Import_ASCII.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_ASCII.d3dpipeline index e617e62cdb..e844607f53 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_ASCII.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_ASCII.d3dpipeline @@ -75,12 +75,12 @@ "args": { "move_values": true, "normalize_data": false, - "selected_data_array_paths": [ + "input_data_array_paths": [ "[Image Geometry]/CellData/phi1", "[Image Geometry]/CellData/Phi", "[Image Geometry]/CellData/phi2" ], - "stacked_data_array_name": "Eulers" + "output_data_array_name": "Eulers" }, "comments": "", "filter": { @@ -112,12 +112,12 @@ }, { "args": { - "advanced_options": true, + "set_tuple_dimensions": true, "component_count": 1, "data_format": "", - "initialization_value": "1", + "initialization_value_str": "1", "numeric_type": 4, - "output_data_array": "[Image Geometry]/CellData/Phases", + "output_array_path": "[Image Geometry]/CellData/Phases", "tuple_dimensions": [ [ 0.0 @@ -156,7 +156,7 @@ "args": { "file_name": "Data/Output/Import_ASCII_IPF.png", "image_array_path": "[Image Geometry]/CellData/IPFColors", - "image_geom_path": "[Image Geometry]", + "input_image_geometry_path": "[Image Geometry]", "index_offset": 0, "plane": 0 }, diff --git a/src/Plugins/SimplnxCore/pipelines/Import_ASCII_Data.d3dworkflow b/src/Plugins/SimplnxCore/pipelines/Import_ASCII_Data.d3dworkflow index a7607835df..6455d435a3 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_ASCII_Data.d3dworkflow +++ b/src/Plugins/SimplnxCore/pipelines/Import_ASCII_Data.d3dworkflow @@ -32,18 +32,18 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "data_format": "", "delimiter_choice": 0, "input_file": "Data/ASCIIData/FeatureIds.csv", - "n_comp": 1, - "n_skip_lines": 0, + "number_tuples": 1, + "skip_line_count": 0, "n_tuples": [ [ 1000000.0 ] ], - "output_data_array": "[Image Geometry]/Cell Data/Feature Ids", + "output_array_path": "[Image Geometry]/Cell Data/Feature Ids", "scalar_type": 4 }, "comments": "", @@ -77,7 +77,7 @@ "filterIndex": 1, "filterUuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4", "paramUuid": "36d91b23-5500-4ed4-bdf3-d680f54ee5d1", - "paramName": "n_comp" + "paramName": "number_tuples" } ] } diff --git a/src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline index 3c4580d25f..33d675b7e9 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline @@ -32,19 +32,19 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/ConfidenceIndex.csv", - "n_comp": 1, - "n_skip_lines": 0, - "n_tuples": [ + "number_comp": 1, + "skip_line_count": 0, + "number_tuples": [ [ 480000.0 ] ], - "output_data_array": "[Image Geometry]/Cell Data/Confidence Index", - "scalar_type": 8 + "output_data_array_path": "[Image Geometry]/Cell Data/Confidence Index", + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -55,19 +55,19 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/FeatureIds.csv", - "n_comp": 1, - "n_skip_lines": 0, - "n_tuples": [ + "number_comp": 1, + "skip_line_count": 0, + "number_tuples": [ [ 480000.0 ] ], - "output_data_array": "[Image Geometry]/Cell Data/FeatureIds", - "scalar_type": 4 + "output_data_array_path": "[Image Geometry]/Cell Data/FeatureIds", + "scalar_type_index": 4 }, "comments": "", "filter": { @@ -78,19 +78,19 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/ImageQuality.csv", - "n_comp": 1, - "n_skip_lines": 0, - "n_tuples": [ + "number_comp": 1, + "skip_line_count": 0, + "number_tuples": [ [ 480000.0 ] ], - "output_data_array": "[Image Geometry]/Cell Data/Image Quality", - "scalar_type": 8 + "output_data_array_path": "[Image Geometry]/Cell Data/Image Quality", + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -101,19 +101,19 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/IPFColor.csv", - "n_comp": 3, - "n_skip_lines": 0, - "n_tuples": [ + "number_comp": 3, + "skip_line_count": 0, + "number_tuples": [ [ 480000.0 ] ], - "output_data_array": "[Image Geometry]/Cell Data/IPFColors", - "scalar_type": 1 + "output_data_array_path": "[Image Geometry]/Cell Data/IPFColors", + "scalar_type_index": 1 }, "comments": "", "filter": { diff --git a/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline index 69b655be51..97a48260f8 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "triangle_geometry_name": "[Triangle Geometry]", + "output_triangle_geometry_path": "[Triangle Geometry]", "scale_factor": 1.0, "scale_output": false, "stl_file_path": "Data/STL_Models/Cylinder.stl" @@ -19,8 +19,8 @@ }, { "args": { - "triangle_areas_array_path": "Areas", - "triangle_geometry_data_path": "[Triangle Geometry]" + "triangle_areas_array_name": "Areas", + "input_triangle_geometry_path": "[Triangle Geometry]" }, "comments": "", "filter": { @@ -32,9 +32,9 @@ { "args": { "component_count": 1, - "initialization_value": "0", + "initialization_value_str": "0", "numeric_type": 8, - "output_data_array": "[Triangle Geometry]/Vertex Data/Node Type", + "output_array_path": "[Triangle Geometry]/Vertex Data/Node Type", "tuple_dimensions": [ [ 1.0 diff --git a/src/Plugins/SimplnxCore/pipelines/Remove_Triangles.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Remove_Triangles.d3dpipeline index 628b9c2f8e..e22f445da2 100644 --- a/src/Plugins/SimplnxCore/pipelines/Remove_Triangles.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Remove_Triangles.d3dpipeline @@ -4,13 +4,13 @@ "pipeline": [ { "args": { - "face_attribute_matrix": "Face Data", - "face_normals_data_path": "Face Normals", + "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", - "triangle_geometry_name": "TriangleDataContainer", - "vertex_attribute_matrix": "Vertex Data" + "output_triangle_geometry_path": "TriangleDataContainer", + "vertex_attribute_matrix_name": "Vertex Data" }, "comments": "", "filter": { @@ -24,7 +24,7 @@ "created_region_ids_path": "TriangleDataContainer/Face Data/Region Ids", "num_triangles_name": "NumTriangles", "triangle_attribute_matrix_name": "CAD Part Data", - "triangle_geom_path": "TriangleDataContainer" + "input_triangle_geometry_path": "TriangleDataContainer" }, "comments": "", "filter": { @@ -35,7 +35,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -50,7 +50,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask", + "output_data_array_name": "Mask", "created_mask_type": 1, "custom_false_value": 0.0, "custom_true_value": 1.0, @@ -66,7 +66,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -81,7 +81,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask2", + "output_data_array_name": "Mask2", "created_mask_type": 10, "custom_false_value": 0.0, "custom_true_value": 1.0, @@ -97,9 +97,9 @@ }, { "args": { - "input_geometry": "TriangleDataContainer", + "input_triangle_geometry_path": "TriangleDataContainer", "mask_array_path": "TriangleDataContainer/Face Data/Mask2", - "output_geometry": "Part 10" + "output_triangle_geometry_path": "Part 10" }, "comments": "", "filter": { diff --git a/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline index a9ebb46c51..5cc647cf09 100644 --- a/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline @@ -20,7 +20,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "DataContainer", + "output_image_geometry_path": "DataContainer", "input_file": "Data/Small_IN100/Slice_1.ang" }, "comments": "", @@ -32,7 +32,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -55,7 +55,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -66,10 +66,10 @@ }, { "args": { - "created_image_geometry": "", + "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -93,7 +93,7 @@ ] ], "rotation_representation": 0, - "selected_image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { @@ -105,7 +105,7 @@ { "args": { "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -145,7 +145,7 @@ { "args": { "cell_feature_attribute_matrix": "CellFeatureData", - "created_image_geometry": "", + "output_image_geometry_path": "", "feature_ids": "", "max_voxel": [ 160, @@ -159,7 +159,7 @@ ], "remove_original_geometry": true, "renumber_features": false, - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "update_origin": false }, "comments": "", @@ -196,7 +196,7 @@ "loop": true, "min_confidence": 0.10000000149011612, "selected_comparison": 0, - "selected_image_geometry": "DataContainer" + "input_image_geometry_path": "DataContainer" }, "comments": "", "filter": { diff --git a/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline index 07e2ae6f50..09ec985e5a 100644 --- a/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline @@ -7,9 +7,9 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "image_data_array_name": "ImageData", - "image_geometry_path": "Porosity_Image", + "output_image_geometry_path": "Porosity_Image", "image_transform_choice": 0, - "input_file_list_info": { + "input_file_list_object": { "end_index": 174, "file_extension": ".tif", "file_prefix": "slice_", @@ -56,7 +56,7 @@ 50.7400016784668, 68.12000274658203 ], - "selected_image_geometry": "Porosity_Image", + "input_image_geometry_path": "Porosity_Image", "spacing": [ 2.0, 2.0, @@ -88,7 +88,7 @@ 50.0, 50.0 ], - "selected_image_geometry": "Porosity_Image", + "input_image_geometry_path": "Porosity_Image", "spacing": [ 0.25, 0.699999988079071, @@ -120,7 +120,7 @@ 50.7400016784668, 68.12000274658203 ], - "selected_image_geometry": "Porosity_Image", + "input_image_geometry_path": "Porosity_Image", "spacing": [ 0.25, 0.699999988079071, diff --git a/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline index a5500820ff..95141560d0 100644 --- a/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline @@ -42,7 +42,7 @@ }, { "args": { - "array_handling": 1, + "array_handling_index": 1, "cell_attribute_matrix_name": "CellData", "dimensions": [ 20, @@ -55,7 +55,7 @@ "geometry_name": "RectGridGeometry", "geometry_type": 1, "hexahedral_list_name": "", - "length_unit_type": 7, + "length_unit_index": 7, "origin": [ 0.0, 0.0, @@ -85,19 +85,19 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/ConfidenceIndex.csv", - "n_comp": 1, - "n_skip_lines": 0, + "number_tuples": 1, + "skip_line_count": 0, "n_tuples": [ [ 0.0 ] ], - "output_data_array": "RectGridGeometry/CellData/ConfidenceIndex", - "scalar_type": 8 + "output_array_path": "RectGridGeometry/CellData/ConfidenceIndex", + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -108,19 +108,19 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/ImageQuality.csv", - "n_comp": 1, - "n_skip_lines": 0, + "number_tuples": 1, + "skip_line_count": 0, "n_tuples": [ [ 0.0 ] ], - "output_data_array": "RectGridGeometry/CellData/ImageQuality", - "scalar_type": 8 + "output_array_path": "RectGridGeometry/CellData/ImageQuality", + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -131,19 +131,19 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/SEM Signal.csv", - "n_comp": 1, - "n_skip_lines": 0, + "number_tuples": 1, + "skip_line_count": 0, "n_tuples": [ [ 0.0 ] ], - "output_data_array": "RectGridGeometry/CellData/SEM Signal", - "scalar_type": 8 + "output_array_path": "RectGridGeometry/CellData/SEM Signal", + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -154,19 +154,19 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/Fit.csv", - "n_comp": 1, - "n_skip_lines": 0, + "number_tuples": 1, + "skip_line_count": 0, "n_tuples": [ [ 0.0 ] ], - "output_data_array": "RectGridGeometry/CellData/Fit", - "scalar_type": 8 + "output_array_path": "RectGridGeometry/CellData/Fit", + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -177,19 +177,19 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/EulerAngles.csv", - "n_comp": 3, - "n_skip_lines": 0, + "number_tuples": 3, + "skip_line_count": 0, "n_tuples": [ [ 0.0 ] ], - "output_data_array": "RectGridGeometry/CellData/EulerAngles", - "scalar_type": 8 + "output_array_path": "RectGridGeometry/CellData/EulerAngles", + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -200,19 +200,19 @@ }, { "args": { - "advanced_options": false, + "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/Phases.csv", - "n_comp": 1, - "n_skip_lines": 0, + "number_tuples": 1, + "skip_line_count": 0, "n_tuples": [ [ 0.0 ] ], - "output_data_array": "RectGridGeometry/CellData/Phases", - "scalar_type": 4 + "output_array_path": "RectGridGeometry/CellData/Phases", + "scalar_type_index": 4 }, "comments": "", "filter": { @@ -229,9 +229,9 @@ 20 ], "image_geom_cell_attribute_matrix": "CellData", - "image_geometry_path": "Image Geometry", + "input_image_geometry_path": "Image Geometry", "rectilinear_grid_path": "RectGridGeometry", - "selected_data_array_paths": [ + "input_data_array_paths": [ "RectGridGeometry/CellData/ConfidenceIndex", "RectGridGeometry/CellData/EulerAngles", "RectGridGeometry/CellData/Fit", diff --git a/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline index 1014716cf6..55e0b54b6f 100644 --- a/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline @@ -7,9 +7,9 @@ "args": { "cell_attribute_matrix_name": "Optical Data", "image_data_array_name": "ImageData", - "image_geometry_path": "RoboMet.3D Image Stack", + "output_image_geometry_path": "RoboMet.3D Image Stack", "image_transform_choice": 0, - "input_file_list_info": { + "input_file_list_object": { "end_index": 174, "file_extension": ".tif", "file_prefix": "slice_", @@ -40,7 +40,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -55,7 +55,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask", + "output_data_array_name": "Mask", "created_mask_type": 10, "custom_false_value": 0.0, "custom_true_value": 1.0, @@ -71,10 +71,10 @@ }, { "args": { - "active_array_path": "Active", - "cell_feature_group_path": "Pore Data", + "active_array_name": "Active", + "cell_feature_group_name": "Pore Data", "feature_ids_path": "FeatureIds", - "grid_geometry_path": "RoboMet.3D Image Stack", + "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, @@ -95,13 +95,13 @@ "face_feature_attribute_matrix_name": "Face Feature Data", "face_labels_array_name": "FaceLabels", "feature_ids_path": "RoboMet.3D Image Stack/Optical Data/FeatureIds", - "grid_geometry_data_path": "RoboMet.3D Image Stack", + "input_grid_geometry_path": "RoboMet.3D Image Stack", "max_distance_from_voxel": 1.0, "node_types_array_name": "NodeTypes", "relaxation_factor": 0.5, - "selected_data_array_paths": [], + "input_data_array_paths": [], "smoothing_iterations": 20, - "triangle_geometry_name": "TriangleDataContainer", + "output_triangle_geometry_path": "TriangleDataContainer", "vertex_data_group_name": "Vertex Data" }, "comments": "", diff --git a/src/Plugins/SimplnxCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline index cf0a8a38a2..02a751a155 100644 --- a/src/Plugins/SimplnxCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "triangle_geometry_name": "[Triangle Geometry]", + "output_triangle_geometry_path": "[Triangle Geometry]", "scale_factor": 1.0, "scale_output": false, "stl_file_path": "Data/STL_Models/ASTMD638_specimen.stl" @@ -19,8 +19,8 @@ }, { "args": { - "triangle_areas_array_path": "Face Areas", - "triangle_geometry_data_path": "[Triangle Geometry]" + "triangle_areas_array_name": "Face Areas", + "input_triangle_geometry_path": "[Triangle Geometry]" }, "comments": "", "filter": { @@ -31,8 +31,8 @@ }, { "args": { - "surface_mesh_triangle_normals_array_path": "Face Normals (Calculated)", - "tri_geometry_data_path": "[Triangle Geometry]" + "output_normals_array_name": "Face Normals (Calculated)", + "input_triangle_geometry_path": "[Triangle Geometry]" }, "comments": "", "filter": { @@ -44,7 +44,7 @@ { "args": { "surface_mesh_triangle_dihedral_angles_array_name": "Dihedral Angles", - "tri_geometry_data_path": "[Triangle Geometry]" + "input_triangle_geometry_path": "[Triangle Geometry]" }, "comments": "", "filter": { @@ -56,7 +56,7 @@ { "args": { "centroids_array_name": "Centroids", - "triangle_geometry_path": "[Triangle Geometry]" + "input_triangle_geometry_path": "[Triangle Geometry]" }, "comments": "", "filter": { diff --git a/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline index 0eeddcf8cb..beb7d7c12f 100644 --- a/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline @@ -5,7 +5,7 @@ "pipeline": [ { "args": { - "import_file_data": { + "import_data_object": { "data_paths": [ "DataContainer", "DataContainer/CellData", @@ -49,8 +49,8 @@ "args": { "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "data_container_name": "DataContainer", - "read_h5_ebsd_parameter": { + "output_image_geometry_path": "DataContainer", + "read_h5_ebsd_object": { "end_slice": 117, "euler_representation": 0, "hdf5_data_paths": [ @@ -77,7 +77,7 @@ }, { "args": { - "array_thresholds": { + "array_thresholds_object": { "inverted": false, "thresholds": [ { @@ -100,7 +100,7 @@ "type": "collection", "union": 0 }, - "created_data_path": "Mask" + "output_data_array_name": "Mask" }, "comments": "", "filter": { @@ -112,9 +112,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -131,7 +131,7 @@ "mask_array_path": "DataContainer/CellData/Mask", "misorientation_tolerance": 5.0, "quats_array_path": "DataContainer/CellData/Quats", - "selected_image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "use_mask": true, "write_alignment_shifts": false }, @@ -161,7 +161,7 @@ "mask_array_path": "DataContainer/CellData/Mask", "reference_slice": 0, "selected_cell_data_path": "DataContainer/CellData", - "selected_image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "use_reference_slice": true, "write_alignment_shifts": false }, @@ -177,7 +177,7 @@ "cell_phases_array_path": "DataContainer/CellData/Phases", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "mask_array_path": "DataContainer/CellData/Mask", - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "misorientation_tolerance": 5.0, "number_of_neighbors": 4, "quats_array_path": "DataContainer/CellData/Quats" @@ -195,7 +195,7 @@ "correlation_array_path": "DataContainer/CellData/Confidence Index", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "ignored_data_array_paths": [], - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "level": 2, "min_confidence": 0.20000000298023224, "misorientation_tolerance": 5.0, @@ -216,7 +216,7 @@ "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "feature_ids_array_name": "FeatureIds", "mask_array_path": "DataContainer/CellData/Mask", - "grid_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "misorientation_tolerance": 5.0, "quats_array_path": "DataContainer/CellData/Quats", "randomize_features": true, @@ -245,9 +245,9 @@ }, { "args": { - "avg_euler_angles_array_path": "AvgEulerAngles", - "avg_quats_array_path": "AvgQuats", - "cell_feature_attribute_matrix": "DataContainer/CellFeatureData", + "avg_euler_angles_array_name": "AvgEulerAngles", + "avg_quats_array_name": "AvgQuats", + "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_feature_ids_array_path": "DataContainer/CellData/FeatureIds", "cell_phases_array_path": "DataContainer/CellData/Phases", "cell_quats_array_path": "DataContainer/CellData/Quats", @@ -262,16 +262,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList2", - "number_of_neighbors": "NumNeighbors2", - "shared_surface_area_list": "SharedSurfaceAreaList2", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "comments": "", "filter": { @@ -292,7 +292,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "feature_parent_ids_array_name": "ParentIds", "feature_phases_array_path": "DataContainer/CellFeatureData/Phases", - "new_cell_feature_attribute_matrix_name": "NewGrain Data", + "created_feature_attribute_matrix_name": "NewGrain Data", "non_contiguous_neighbor_list_array_path": "", "use_non_contiguous_neighbors": false }, @@ -305,13 +305,13 @@ }, { "args": { - "equivalent_diameters_path": "EquivalentDiameters", - "feature_attribute_matrix": "DataContainer/CellFeatureData", + "equivalent_diameters_name": "EquivalentDiameters", + "feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "geometry_path": "DataContainer", - "num_elements_path": "NumElements", + "input_image_geometry_path": "DataContainer", + "num_elements_name": "NumElements", "save_element_sizes": false, - "volumes_path": "Volumes" + "volumes_name": "Volumes" }, "comments": "", "filter": { @@ -325,7 +325,7 @@ "apply_single_phase": false, "feature_ids_path": "DataContainer/CellData/FeatureIds", "feature_phases_path": "", - "image_geom_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "min_allowed_features_size": 16, "num_cells_path": "DataContainer/CellFeatureData/NumElements", "phase_number": 0 @@ -339,16 +339,16 @@ }, { "args": { - "boundary_cells": "BoundaryCells", - "cell_feature_arrays": "DataContainer/CellFeatureData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "image_geometry": "DataContainer", - "neighbor_list": "NeighborList", - "number_of_neighbors": "NumNeighbors", - "shared_surface_area_list": "SharedSurfaceAreaList", + "boundary_cells_name": "BoundaryCells", + "cell_feature_array_path": "DataContainer/CellFeatureData", + "feature_ids_path": "DataContainer/CellData/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": "SurfaceFeatures" + "surface_features_name": "SurfaceFeatures" }, "comments": "", "filter": { @@ -360,13 +360,13 @@ { "args": { "apply_to_single_phase": false, - "cell_attribute_matrix": "DataContainer/CellData", - "feature_ids": "DataContainer/CellData/FeatureIds", - "feature_phases": "Data Container/Feature Data/Phases", + "cell_attribute_matrix_path": "DataContainer/CellData", + "feature_ids_path": "DataContainer/CellData/FeatureIds", + "feature_phases_path": "Data Container/Feature Data/Phases", "ignored_voxel_arrays": [], "image_geom": "DataContainer", "min_num_neighbors": 2, - "num_neighbors": "DataContainer/CellFeatureData/NumNeighbors", + "num_neighbors_path": "DataContainer/CellFeatureData/NumNeighbors", "phase_number": 0 }, "comments": "", @@ -382,7 +382,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "min_allowed_defect_size": 1000, - "selected_image_geometry": "DataContainer", + "input_image_geometry_path": "DataContainer", "store_as_new_phase": false }, "comments": "", @@ -397,8 +397,8 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 0, - "selected_image_geometry": "DataContainer", + "operation_index": 0, + "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, "z_dir_on": true @@ -415,8 +415,8 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 1, - "selected_image_geometry": "DataContainer", + "operation_index": 1, + "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, "z_dir_on": true @@ -473,9 +473,9 @@ }, { "args": { - "image_geometry_path": "DataContainer", + "input_image_geometry_path": "DataContainer", "output_file": "Data/Output/Examples/SmallIN100_Final.vtk", - "selected_data_array_paths": [ + "input_data_array_paths": [ "DataContainer/CellData/Confidence Index", "DataContainer/CellData/EulerAngles", "DataContainer/CellData/FeatureIds", diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.hpp index 7dda4806cc..0e51fab103 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.hpp @@ -29,7 +29,7 @@ class SIMPLNXCORE_EXPORT AddBadDataFilter : public IFilter static inline constexpr StringLiteral k_BoundaryNoise_Key = "boundary_noise"; static inline constexpr StringLiteral k_BoundaryVolFraction_Key = "boundary_vol_fraction"; static inline constexpr StringLiteral k_GBEuclideanDistancesArrayPath_Key = "gb_euclidean_distances_array_path"; - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_UseSeed_Key = "use_seed"; static inline constexpr StringLiteral k_SeedValue_Key = "seed_value"; static inline constexpr StringLiteral k_SeedArrayName_Key = "seed_array_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineStlFiles.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineStlFiles.cpp index 51b504295b..eab5207a2f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineStlFiles.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineStlFiles.cpp @@ -95,7 +95,7 @@ Result<> CombineStlFiles::operator()() ReadStlFileFilter stlFileReader; Arguments args; args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(stlFilePath)); - args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(DataPath({stlFilePath.stem().string()}))); + args.insertOrAssign(ReadStlFileFilter::k_CreatedTriangleGeometryPath_Key, std::make_any(DataPath({stlFilePath.stem().string()}))); auto executeResult = stlFileReader.execute(tempDataStructure, args); if(executeResult.result.invalid()) { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp index cb81b924de..314bc7a124 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp @@ -211,12 +211,12 @@ class RunCropImageGeometryImpl Arguments args; args.insertOrAssign(CropImageGeometry::k_RemoveOriginalGeometry_Key, std::make_any(false)); - args.insertOrAssign(CropImageGeometry::k_SelectedImageGeometry_Key, std::make_any(m_ImageGeometryPath)); + args.insertOrAssign(CropImageGeometry::k_SelectedImageGeometryPath_Key, std::make_any(m_ImageGeometryPath)); args.insertOrAssign(CropImageGeometry::k_RenumberFeatures_Key, std::make_any(false)); args.insertOrAssign(CropImageGeometry::k_MinVoxel_Key, std::make_any>(m_MinVoxelVector)); args.insertOrAssign(CropImageGeometry::k_MaxVoxel_Key, std::make_any>(m_MaxVoxelVector)); - args.insertOrAssign(CropImageGeometry::k_CreatedImageGeometry_Key, std::make_any(m_CreatedImgGeomPath)); + args.insertOrAssign(CropImageGeometry::k_CreatedImageGeometryPath_Key, std::make_any(m_CreatedImgGeomPath)); auto preflightResult = filter.preflight(m_DataStructure, args); if(preflightResult.outputActions.invalid()) @@ -319,7 +319,7 @@ Result<> RemoveFlaggedFeatures::operator()() args.insert(ComputeFeatureRectFilter::k_FeatureIdsArrayPath_Key, std::make_any(m_InputValues->FeatureIdsArrayPath)); args.insert(ComputeFeatureRectFilter::k_FeatureDataAttributeMatrixPath_Key, std::make_any(m_InputValues->TempBoundsPath.getParent())); - args.insert(ComputeFeatureRectFilter::k_FeatureRectArrayPath_Key, std::make_any(m_InputValues->TempBoundsPath.getTargetName())); + args.insert(ComputeFeatureRectFilter::k_FeatureRectArrayName_Key, std::make_any(m_InputValues->TempBoundsPath.getTargetName())); auto preflightResult = filter.preflight(m_DataStructure, args); if(preflightResult.outputActions.invalid()) diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp index 116e0622a2..614e4e4830 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp @@ -21,9 +21,9 @@ class SIMPLNXCORE_EXPORT AlignGeometries : public IFilter AlignGeometries& operator=(AlignGeometries&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_MovingGeometry_Key = "moving_geometry"; - static inline constexpr StringLiteral k_TargetGeometry_Key = "target_geometry"; - static inline constexpr StringLiteral k_AlignmentType_Key = "alignment_type"; + static inline constexpr StringLiteral k_MovingGeometry_Key = "input_moving_geometry_path"; + static inline constexpr StringLiteral k_TargetGeometry_Key = "input_target_geometry_path"; + static inline constexpr StringLiteral k_AlignmentType_Key = "alignment_type_index"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp index f6a74bc4c8..cd09996011 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp @@ -74,7 +74,7 @@ Parameters AlignSectionsFeatureCentroidFilter::parameters() const params.linkParameters(k_UseReferenceSlice_Key, k_ReferenceSlice_Key, true); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry on which to perform the alignment", + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry on which to perform the alignment", DataPath({"Data Container"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedCellDataGroup_Key, "Cell Data Attribute Matrix", "Cell Data Attribute Matrix", DataPath{})); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Path to the DataArray Mask", DataPath({"Mask"}), @@ -104,7 +104,7 @@ IFilter::PreflightResult AlignSectionsFeatureCentroidFilter::preflightImpl(const auto pAlignmentShiftFileName = filterArgs.value(k_AlignmentShiftFileName_Key); auto pReferenceSliceValue = filterArgs.value(k_ReferenceSlice_Key); auto pGoodVoxelsArrayPath = filterArgs.value(k_MaskArrayPath_Key); - auto inputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + auto inputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); auto cellDataGroupPath = filterArgs.value(k_SelectedCellDataGroup_Key); PreflightResult preflightResult; @@ -154,7 +154,7 @@ Result<> AlignSectionsFeatureCentroidFilter::executeImpl(DataStructure& dataStru inputValues.UseReferenceSlice = filterArgs.value(k_UseReferenceSlice_Key); inputValues.ReferenceSlice = filterArgs.value(k_ReferenceSlice_Key); inputValues.MaskArrayPath = filterArgs.value(k_MaskArrayPath_Key); - inputValues.inputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.inputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); inputValues.cellDataGroupPath = filterArgs.value(k_SelectedCellDataGroup_Key); return AlignSectionsFeatureCentroid(dataStructure, messageHandler, shouldCancel, &inputValues)(); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp index d02f7d204c..f69a48c860 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp @@ -30,7 +30,7 @@ class SIMPLNXCORE_EXPORT AlignSectionsFeatureCentroidFilter : public IFilter static inline constexpr StringLiteral k_UseReferenceSlice_Key = "use_reference_slice"; static inline constexpr StringLiteral k_ReferenceSlice_Key = "reference_slice"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry_path"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedCellDataGroup_Key = "selected_cell_data_path"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp index 97c5c8df45..71a14f0ee9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp @@ -60,7 +60,7 @@ Parameters AlignSectionsListFilter::parameters() const params.insert( std::make_unique(k_DREAM3DAlignmentFile_Key, "DREAM3D Alignment File Format", "Turn this ON if the alignment file was generated by another DREAM.3D Alignment filter", false)); params.insertSeparator(Parameters::Separator{"Required Geometry"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry on which to perform the alignment", + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry on which to perform the alignment", DataPath({"Data Container"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); return params; } @@ -77,7 +77,7 @@ IFilter::PreflightResult AlignSectionsListFilter::preflightImpl(const DataStruct { auto pInputFileValue = filterArgs.value(k_InputFile_Key); auto pDREAM3DAlignmentFileValue = filterArgs.value(k_DREAM3DAlignmentFile_Key); - auto pSelectedImageGeometryPathValue = filterArgs.value(k_SelectedImageGeometry_Key); + auto pSelectedImageGeometryPathValue = filterArgs.value(k_SelectedImageGeometryPath_Key); PreflightResult preflightResult; nx::core::Result resultOutputActions; @@ -110,7 +110,7 @@ Result<> AlignSectionsListFilter::executeImpl(DataStructure& dataStructure, cons inputValues.InputFile = filterArgs.value(k_InputFile_Key); inputValues.DREAM3DAlignmentFile = filterArgs.value(k_DREAM3DAlignmentFile_Key); - inputValues.ImageGeometryPath = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.ImageGeometryPath = filterArgs.value(k_SelectedImageGeometryPath_Key); return AlignSectionsList(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -157,7 +157,7 @@ Result AlignSectionsListFilter::FromSIMPLJson(const nlohmann::json& j results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InputFileKey, k_InputFile_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DREAM3DAlignmentFileKey, k_DREAM3DAlignmentFile_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellAttributeMatrixPathKey, k_SelectedImageGeometry_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellAttributeMatrixPathKey, k_SelectedImageGeometryPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp index 124d6f3103..14646711c9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp @@ -26,7 +26,7 @@ class SIMPLNXCORE_EXPORT AlignSectionsListFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InputFile_Key = "input_file"; static inline constexpr StringLiteral k_DREAM3DAlignmentFile_Key = "dream3d_alignment_file"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.hpp index 7fe7bdc95d..6aa834bb02 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.hpp @@ -24,11 +24,11 @@ class SIMPLNXCORE_EXPORT AppendImageGeometryZSliceFilter : public IFilter AppendImageGeometryZSliceFilter& operator=(AppendImageGeometryZSliceFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_InputGeometry_Key = "input_geometry"; - static inline constexpr StringLiteral k_DestinationGeometry_Key = "destination_geometry"; + static inline constexpr StringLiteral k_InputGeometry_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_DestinationGeometry_Key = "destination_image_geometry_path"; static inline constexpr StringLiteral k_CheckResolution_Key = "check_resolution"; static inline constexpr StringLiteral k_SaveAsNewGeometry_Key = "save_as_new_geometry"; - static inline constexpr StringLiteral k_NewGeometry_Key = "new_geometry"; + static inline constexpr StringLiteral k_NewGeometry_Key = "output_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp index f16faf9112..ce02bc6b82 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp @@ -103,7 +103,7 @@ Parameters ApplyTransformationToGeometryFilter::parameters() const false)); params.insertSeparator({"Input Geometry"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Geometry", "The target geometry on which to perform the transformation", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Geometry", "The target geometry on which to perform the transformation", DataPath{}, IGeometry::GetAllGeomTypes())); params.insertSeparator(Parameters::Separator{"Image Geometry Resampling/Interpolation"}); @@ -140,7 +140,7 @@ IFilter::PreflightResult ApplyTransformationToGeometryFilter::preflightImpl(cons auto pTransformationMatrixTypeValue = filterArgs.value(k_TransformationType_Key); auto tableData = filterArgs.value(k_ManualTransformationMatrix_Key); auto pComputedTransformationMatrixPath = filterArgs.value(k_ComputedTransformationMatrix_Key); - auto pSelectedGeometryPathValue = filterArgs.value(k_SelectedImageGeometry_Key); + auto pSelectedGeometryPathValue = filterArgs.value(k_SelectedImageGeometryPath_Key); auto pCellAttributeMatrixPath = filterArgs.value(k_CellAttributeMatrixPath_Key); auto pTranslateGeometryToGlobalOrigin = filterArgs.value(k_TranslateGeometryToGlobalOrigin_Key); @@ -318,7 +318,7 @@ IFilter::PreflightResult ApplyTransformationToGeometryFilter::preflightImpl(cons { auto rotateArgs = ImageRotationUtilities::CreateRotationArgs(*imageGeomPtr, transformationMatrix); - auto srcImagePath = filterArgs.value(k_SelectedImageGeometry_Key); + auto srcImagePath = filterArgs.value(k_SelectedImageGeometryPath_Key); DataPath destImagePath = srcImagePath; // filterArgs.value(k_CreatedImageGeometry_Key); auto pRemoveOriginalGeometry = true; // filterArgs.value(k_RemoveOriginalGeometry_Key); const auto& selectedImageGeom = *imageGeomPtr; // dataStructure.getDataRefAs(srcImagePath); @@ -453,7 +453,7 @@ Result<> ApplyTransformationToGeometryFilter::executeImpl(DataStructure& dataStr inputValues.Rotation = filterArgs.value(k_Rotation_Key); inputValues.Translation = filterArgs.value(k_Translation_Key); inputValues.Scale = filterArgs.value(k_Scale_Key); - inputValues.SelectedGeometryPath = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.SelectedGeometryPath = filterArgs.value(k_SelectedImageGeometryPath_Key); inputValues.CellAttributeMatrixPath = filterArgs.value(k_CellAttributeMatrixPath_Key); inputValues.TranslateGeometryToGlobalOrigin = filterArgs.value(k_TranslateGeometryToGlobalOrigin_Key); inputValues.RemoveOriginalGeometry = true; @@ -495,7 +495,7 @@ Result ApplyTransformationToGeometryFilter::FromSIMPLJson(const nlohm results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ScaleKey, k_Scale_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ComputedTransformationMatrixKey, k_ComputedTransformationMatrix_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GeometryToTransformnKey, k_SelectedImageGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GeometryToTransformnKey, k_SelectedImageGeometryPath_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellAttributeMatrixPathKey, k_CellAttributeMatrixPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataArraySelectionKey, "@SIMPLNX_PARAMETER_KEY@")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp index 6225b03f8b..51c617d667 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp @@ -24,14 +24,14 @@ class SIMPLNXCORE_EXPORT ApplyTransformationToGeometryFilter : public IFilter ApplyTransformationToGeometryFilter& operator=(ApplyTransformationToGeometryFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; - static inline constexpr StringLiteral k_TransformationType_Key = "transformation_type"; - static inline constexpr StringLiteral k_InterpolationType_Key = "interpolation_type"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_TransformationType_Key = "transformation_type_index"; + static inline constexpr StringLiteral k_InterpolationType_Key = "interpolation_type_index"; static inline constexpr StringLiteral k_ManualTransformationMatrix_Key = "manual_transformation_matrix"; static inline constexpr StringLiteral k_Rotation_Key = "rotation"; static inline constexpr StringLiteral k_Translation_Key = "translation"; static inline constexpr StringLiteral k_Scale_Key = "scale"; - static inline constexpr StringLiteral k_ComputedTransformationMatrix_Key = "computed_transformation_matrix"; + static inline constexpr StringLiteral k_ComputedTransformationMatrix_Key = "computed_transformation_matrix_path"; static inline constexpr StringLiteral k_TranslateGeometryToGlobalOrigin_Key = "translate_geometry_to_global_origin"; static inline constexpr StringLiteral k_CellAttributeMatrixPath_Key = "cell_attribute_matrix_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHull.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHull.hpp index eacf9a9ffb..a0201125b8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHull.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHull.hpp @@ -27,8 +27,8 @@ class SIMPLNXCORE_EXPORT ApproximatePointCloudHull : public IFilter // Parameter Keys static inline constexpr StringLiteral k_GridResolution_Key = "grid_resolution"; static inline constexpr StringLiteral k_MinEmptyNeighbors_Key = "min_empty_neighbors"; - static inline constexpr StringLiteral k_VertexGeomPath_Key = "vertex_geometry"; - static inline constexpr StringLiteral k_HullVertexGeomPath_Key = "hull_vertex_geometry"; + static inline constexpr StringLiteral k_VertexGeomPath_Key = "input_vertex_geometry_path"; + static inline constexpr StringLiteral k_HullVertexGeomPath_Key = "output_vertex_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp index 7e1b070dd5..ef7c8d9ccc 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp @@ -25,8 +25,8 @@ class SIMPLNXCORE_EXPORT ArrayCalculatorFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_CalculatorParameter_Key = "calculator_parameter"; - static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type"; - static inline constexpr StringLiteral k_CalculatedArray_Key = "calculated_array"; + static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type_index"; + static inline constexpr StringLiteral k_CalculatedArray_Key = "calculated_array_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.cpp index cd1f492922..3b1a592d92 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.cpp @@ -64,16 +64,16 @@ Parameters CalculateArrayHistogramFilter::parameters() const nx::core::GetAllNumericTypes())); params.insertSeparator(Parameters::Separator{"Output Set Up"}); params.insertLinkableParameter( - std::make_unique(k_NewDataGroup_Key, "Create New DataGroup for Histograms", "Whether or not to store the calculated histogram(s) in a new DataGroup", true)); - params.insert(std::make_unique(k_NewDataGroupName_Key, "New DataGroup Path", "The path to the new DataGroup in which to store the calculated histogram(s)", DataPath{})); - params.insert(std::make_unique(k_DataGroupName_Key, "Output DataGroup Path", "The complete path to the DataGroup in which to store the calculated histogram(s)", + std::make_unique(k_CreateNewDataGroup_Key, "Create New DataGroup for Histograms", "Whether or not to store the calculated histogram(s) in a new DataGroup", true)); + params.insert(std::make_unique(k_NewDataGroupPath_Key, "New DataGroup Path", "The path to the new DataGroup in which to store the calculated histogram(s)", DataPath{})); + params.insert(std::make_unique(k_DataGroupPath_Key, "Output DataGroup Path", "The complete path to the DataGroup in which to store the calculated histogram(s)", DataPath{}, DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix, BaseGroup::GroupType::DataGroup})); params.insert(std::make_unique(k_HistoName_Key, "Suffix for created Histograms", "String appended to the end of the histogram array names", " Histogram")); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_UserDefinedRange_Key, k_MinRange_Key, true); params.linkParameters(k_UserDefinedRange_Key, k_MaxRange_Key, true); - params.linkParameters(k_NewDataGroup_Key, k_NewDataGroupName_Key, true); - params.linkParameters(k_NewDataGroup_Key, k_DataGroupName_Key, false); + params.linkParameters(k_CreateNewDataGroup_Key, k_NewDataGroupPath_Key, true); + params.linkParameters(k_CreateNewDataGroup_Key, k_DataGroupPath_Key, false); return params; } @@ -92,10 +92,10 @@ IFilter::PreflightResult CalculateArrayHistogramFilter::preflightImpl(const Data auto pUserDefinedRangeValue = filterArgs.value(k_UserDefinedRange_Key); // verify and calculate range values here if false auto pMinRangeValue = filterArgs.value(k_MinRange_Key); auto pMaxRangeValue = filterArgs.value(k_MaxRange_Key); - auto pNewDataGroupValue = filterArgs.value(k_NewDataGroup_Key); - auto pDataGroupNameValue = filterArgs.value(k_DataGroupName_Key); + auto pNewDataGroupValue = filterArgs.value(k_CreateNewDataGroup_Key); + auto pDataGroupNameValue = filterArgs.value(k_DataGroupPath_Key); auto pSelectedArrayPathsValue = filterArgs.value(k_SelectedArrayPaths_Key); - auto pNewDataGroupNameValue = filterArgs.value(k_NewDataGroupName_Key); // sanity check if is Attribute matrix after impending simplnx update + auto pNewDataGroupNameValue = filterArgs.value(k_NewDataGroupPath_Key); // sanity check if is Attribute matrix after impending simplnx update auto pHistogramSuffix = filterArgs.value(k_HistoName_Key); PreflightResult preflightResult; @@ -143,13 +143,13 @@ Result<> CalculateArrayHistogramFilter::executeImpl(DataStructure& dataStructure auto histogramSuffix = filterArgs.value(k_HistoName_Key); DataPath dataGroupPath; - if(filterArgs.value(k_NewDataGroup_Key)) + if(filterArgs.value(k_CreateNewDataGroup_Key)) { - dataGroupPath = filterArgs.value(k_NewDataGroupName_Key); + dataGroupPath = filterArgs.value(k_NewDataGroupPath_Key); } else { - dataGroupPath = filterArgs.value(k_DataGroupName_Key); + dataGroupPath = filterArgs.value(k_DataGroupPath_Key); } std::vector createdDataPaths; for(auto& selectedArrayPath : inputValues.SelectedArrayPaths) // regenerate based on preflight @@ -190,11 +190,11 @@ Result CalculateArrayHistogramFilter::FromSIMPLJson(const nlohmann::j results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UserDefinedRangeKey, k_UserDefinedRange_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MinRangeKey, k_MinRange_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaxRangeKey, k_MaxRange_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewDataContainerKey, k_NewDataGroup_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewDataContainerKey, k_CreateNewDataGroup_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedArrayPathKey, k_SelectedArrayPaths_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewDataContainerNameKey, k_NewDataGroupName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewDataContainerNameKey, k_NewDataGroupPath_Key)); results.push_back(SIMPLConversion::Convert2Parameters(args, json, SIMPL::k_NewDataContainerNameKey, SIMPL::k_NewAttributeMatrixNameKey, - k_DataGroupName_Key)); + k_DataGroupPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewDataArrayNameKey, k_HistoName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.hpp index 83d06ff868..8a882158ea 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.hpp @@ -28,10 +28,10 @@ class SIMPLNXCORE_EXPORT CalculateArrayHistogramFilter : public IFilter static inline constexpr StringLiteral k_UserDefinedRange_Key = "user_defined_range"; static inline constexpr StringLiteral k_MinRange_Key = "min_range"; static inline constexpr StringLiteral k_MaxRange_Key = "max_range"; - static inline constexpr StringLiteral k_NewDataGroup_Key = "new_data_group"; + static inline constexpr StringLiteral k_CreateNewDataGroup_Key = "create_new_data_group"; static inline constexpr StringLiteral k_SelectedArrayPaths_Key = "selected_array_paths"; - static inline constexpr StringLiteral k_NewDataGroupName_Key = "new_data_group_name"; - static inline constexpr StringLiteral k_DataGroupName_Key = "data_group_name"; + static inline constexpr StringLiteral k_NewDataGroupPath_Key = "new_data_group_path"; + static inline constexpr StringLiteral k_DataGroupPath_Key = "output_data_group_path"; static inline constexpr StringLiteral k_HistoName_Key = "histogram_suffix"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.cpp index 212bb045e6..9906a49b01 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.cpp @@ -69,9 +69,9 @@ Parameters CalculateFeatureSizesFilter::parameters() const DataPath({"CellFeatureData"}))); params.insertSeparator(Parameters::Separator{"Created Feature Data"}); - params.insert(std::make_unique(k_EquivalentDiametersPath_Key, "Equivalent Diameters", "DataPath to equivalent diameters array", "EquivalentDiameters")); - params.insert(std::make_unique(k_NumElementsPath_Key, "Number of Elements", "DataPath to Num Elements array", "NumElements")); - params.insert(std::make_unique(k_VolumesPath_Key, "Volumes", "DataPath to volumes array", "Volumes")); + params.insert(std::make_unique(k_EquivalentDiametersName_Key, "Equivalent Diameters", "DataPath to equivalent diameters array", "EquivalentDiameters")); + params.insert(std::make_unique(k_NumElementsName_Key, "Number of Elements", "DataPath to Num Elements array", "NumElements")); + params.insert(std::make_unique(k_VolumesName_Key, "Volumes", "DataPath to volumes array", "Volumes")); return params; } @@ -87,9 +87,9 @@ IFilter::PreflightResult CalculateFeatureSizesFilter::preflightImpl(const DataSt auto featureIdsPath = args.value(k_CellFeatureIdsArrayPath_Key); auto featureAttributeMatrixPath = args.value(k_CellFeatureAttributeMatrixPath_Key); - auto volumesName = args.value(k_VolumesPath_Key); - auto equivalentDiametersName = args.value(k_EquivalentDiametersPath_Key); - auto numElementsName = args.value(k_NumElementsPath_Key); + auto volumesName = args.value(k_VolumesName_Key); + auto equivalentDiametersName = args.value(k_EquivalentDiametersName_Key); + auto numElementsName = args.value(k_NumElementsName_Key); DataPath volumesPath = featureAttributeMatrixPath.createChildPath(volumesName); DataPath equivalentDiametersPath = featureAttributeMatrixPath.createChildPath(equivalentDiametersName); DataPath numElementsPath = featureAttributeMatrixPath.createChildPath(numElementsName); @@ -150,9 +150,9 @@ Result<> CalculateFeatureSizesFilter::executeImpl(DataStructure& data, const Arg if(nullptr != imageGeom) { auto featureAttributeMatrixPath = args.value(k_CellFeatureAttributeMatrixPath_Key); - auto volumesName = args.value(k_VolumesPath_Key); - auto equivalentDiametersName = args.value(k_EquivalentDiametersPath_Key); - auto numElementsName = args.value(k_NumElementsPath_Key); + auto volumesName = args.value(k_VolumesName_Key); + auto equivalentDiametersName = args.value(k_EquivalentDiametersName_Key); + auto numElementsName = args.value(k_NumElementsName_Key); DataPath volumesPath = featureAttributeMatrixPath.createChildPath(volumesName); DataPath equivalentDiametersPath = featureAttributeMatrixPath.createChildPath(equivalentDiametersName); @@ -243,9 +243,9 @@ Result<> CalculateFeatureSizesFilter::executeImpl(DataStructure& data, const Arg } else { - auto volumesPath = args.value(k_VolumesPath_Key); - auto equivalentDiametersPath = args.value(k_EquivalentDiametersPath_Key); - auto numElementsPath = args.value(k_NumElementsPath_Key); + auto volumesPath = args.value(k_VolumesName_Key); + auto equivalentDiametersPath = args.value(k_EquivalentDiametersName_Key); + auto numElementsPath = args.value(k_NumElementsName_Key); auto& volumes = data.getDataRefAs(volumesPath); auto& equivalentDiameters = data.getDataRefAs(equivalentDiametersPath); @@ -318,9 +318,9 @@ Result CalculateFeatureSizesFilter::FromSIMPLJson(const nlohmann::jso results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureAttributeMatrixNameKey, k_CellFeatureAttributeMatrixPath_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_EquivalentDiametersArrayNameKey, k_EquivalentDiametersPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NumElementsArrayNameKey, k_NumElementsPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VolumesArrayNameKey, k_VolumesPath_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_EquivalentDiametersArrayNameKey, k_EquivalentDiametersName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NumElementsArrayNameKey, k_NumElementsName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VolumesArrayNameKey, k_VolumesName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.hpp index 62c59fd399..80d430afd6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.hpp @@ -27,12 +27,12 @@ class SIMPLNXCORE_EXPORT CalculateFeatureSizesFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_SaveElementSizes_Key = "save_element_sizes"; - static inline constexpr StringLiteral k_GeometryPath_Key = "geometry_path"; + static inline constexpr StringLiteral k_GeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; - static inline constexpr StringLiteral k_CellFeatureAttributeMatrixPath_Key = "feature_attribute_matrix"; - static inline constexpr StringLiteral k_VolumesPath_Key = "volumes_path"; - static inline constexpr StringLiteral k_EquivalentDiametersPath_Key = "equivalent_diameters_path"; - static inline constexpr StringLiteral k_NumElementsPath_Key = "num_elements_path"; + static inline constexpr StringLiteral k_CellFeatureAttributeMatrixPath_Key = "feature_attribute_matrix_path"; + static inline constexpr StringLiteral k_VolumesName_Key = "volumes_name"; + static inline constexpr StringLiteral k_EquivalentDiametersName_Key = "equivalent_diameters_name"; + static inline constexpr StringLiteral k_NumElementsName_Key = "num_elements_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.cpp index e44b14f6e6..f5a95d97ef 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.cpp @@ -109,7 +109,7 @@ Parameters CalculateTriangleAreasFilter::parameters() const params.insert(std::make_unique(k_TriangleGeometryDataPath_Key, "Triangle Geometry", "The complete path to the Geometry for which to calculate the face areas", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insertSeparator(Parameters::Separator{"Created Face Data"}); - params.insert(std::make_unique(k_CalculatedAreasDataPath_Key, "Created Face Areas", "The complete path to the array storing the calculated face areas", "Face Areas")); + params.insert(std::make_unique(k_CalculatedAreasDataName_Key, "Created Face Areas", "The complete path to the array storing the calculated face areas", "Face Areas")); return params; } @@ -125,7 +125,7 @@ IFilter::PreflightResult CalculateTriangleAreasFilter::preflightImpl(const DataS const std::atomic_bool& shouldCancel) const { auto pTriangleGeometryDataPath = filterArgs.value(k_TriangleGeometryDataPath_Key); - auto pCalculatedAreasName = filterArgs.value(k_CalculatedAreasDataPath_Key); + auto pCalculatedAreasName = filterArgs.value(k_CalculatedAreasDataName_Key); std::vector preflightUpdatedValues; @@ -157,7 +157,7 @@ IFilter::PreflightResult CalculateTriangleAreasFilter::preflightImpl(const DataS Result<> CalculateTriangleAreasFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto pCalculatedAreasName = filterArgs.value(k_CalculatedAreasDataPath_Key); + auto pCalculatedAreasName = filterArgs.value(k_CalculatedAreasDataName_Key); auto pTriangleGeometryDataPath = filterArgs.value(k_TriangleGeometryDataPath_Key); const TriangleGeom* triangleGeom = dataStructure.getDataAs(pTriangleGeometryDataPath); @@ -191,7 +191,7 @@ Result CalculateTriangleAreasFilter::FromSIMPLJson(const nlohmann::js results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceMeshTriangleAreasArrayPathKey, k_TriangleGeometryDataPath_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceMeshTriangleAreasArrayPathKey, k_CalculatedAreasDataPath_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceMeshTriangleAreasArrayPathKey, k_CalculatedAreasDataName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.hpp index 17a9f3bc0e..0fc51b6c55 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.hpp @@ -24,8 +24,8 @@ class SIMPLNXCORE_EXPORT CalculateTriangleAreasFilter : public IFilter CalculateTriangleAreasFilter& operator=(CalculateTriangleAreasFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_TriangleGeometryDataPath_Key = "triangle_geometry_data_path"; - static inline constexpr StringLiteral k_CalculatedAreasDataPath_Key = "triangle_areas_array_path"; + static inline constexpr StringLiteral k_TriangleGeometryDataPath_Key = "input_triangle_geometry_path"; + static inline constexpr StringLiteral k_CalculatedAreasDataName_Key = "triangle_areas_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.hpp index 846a1207b2..7379d8ffda 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT ChangeAngleRepresentation : public IFilter ChangeAngleRepresentation& operator=(ChangeAngleRepresentation&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ConversionType_Key = "conversion_type"; + static inline constexpr StringLiteral k_ConversionType_Key = "conversion_type_index"; static inline constexpr StringLiteral k_AnglesArrayPath_Key = "angles_array_path"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.hpp index e0df493f9d..cf65b9a8fa 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.hpp @@ -26,8 +26,8 @@ class SIMPLNXCORE_EXPORT CombineAttributeArraysFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_NormalizeData_Key = "normalize_data"; static inline constexpr StringLiteral k_MoveValues_Key = "move_values"; - static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "selected_data_array_paths"; - static inline constexpr StringLiteral k_StackedDataArrayName_Key = "stacked_data_array_name"; + static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "input_data_array_paths"; + static inline constexpr StringLiteral k_StackedDataArrayName_Key = "output_data_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp index 54eadb2881..7a7afafdb4 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp @@ -70,7 +70,7 @@ Parameters CombineStlFilesFilter::parameters() const params.linkParameters(k_LabelVertices_Key, k_VertexLabelName_Key, true); params.insertSeparator(Parameters::Separator{"Created Data"}); - params.insert(std::make_unique(k_TriangleDataContainerName_Key, "Triangle Geometry", "The path to the triangle geometry to be created from the combined STL files", + params.insert(std::make_unique(k_TriangleGeometryPath_Key, "Triangle Geometry", "The path to the triangle geometry to be created from the combined STL files", DataPath({"TriangleGeometry"}))); params.insertSeparator(Parameters::Separator{"Created Face Data"}); params.insert(std::make_unique(k_FaceAttributeMatrixName_Key, "Face Attribute Matrix", "The name of the face level attribute matrix to be created with the geometry", @@ -95,7 +95,7 @@ IFilter::PreflightResult CombineStlFilesFilter::preflightImpl(const DataStructur const std::atomic_bool& shouldCancel) const { auto pStlFilesPathValue = filterArgs.value(k_StlFilesPath_Key); - auto pTriangleDataContainerNameValue = filterArgs.value(k_TriangleDataContainerName_Key); + auto pTriangleDataContainerNameValue = filterArgs.value(k_TriangleGeometryPath_Key); auto pFaceAttributeMatrixNameValue = filterArgs.value(k_FaceAttributeMatrixName_Key); auto pFaceNormalsArrayNameValue = filterArgs.value(k_FaceNormalsArrayName_Key); auto pVertexAttributeMatrixNameValue = filterArgs.value(k_VertexAttributeMatrixName_Key); @@ -164,7 +164,7 @@ Result<> CombineStlFilesFilter::executeImpl(DataStructure& dataStructure, const CombineStlFilesInputValues inputValues; inputValues.StlFilesPath = filterArgs.value(k_StlFilesPath_Key); - inputValues.TriangleDataContainerName = filterArgs.value(k_TriangleDataContainerName_Key); + inputValues.TriangleDataContainerName = filterArgs.value(k_TriangleGeometryPath_Key); inputValues.FaceAttributeMatrixName = inputValues.TriangleDataContainerName.createChildPath(filterArgs.value(k_FaceAttributeMatrixName_Key)); inputValues.FaceNormalsArrayName = inputValues.FaceAttributeMatrixName.createChildPath(filterArgs.value(k_FaceNormalsArrayName_Key)); @@ -195,7 +195,7 @@ Result CombineStlFilesFilter::FromSIMPLJson(const nlohmann::json& jso std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_StlFilesPathKey, k_StlFilesPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_TriangleDataContainerNameKey, k_TriangleDataContainerName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_TriangleDataContainerNameKey, k_TriangleGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FaceAttributeMatrixNameKey, k_FaceAttributeMatrixName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FaceNormalsArrayNameKey, k_FaceNormalsArrayName_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.hpp index 8f38951a3c..ba6f5aaaf7 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT CombineStlFilesFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_StlFilesPath_Key = "stl_files_path"; - static inline constexpr StringLiteral k_TriangleDataContainerName_Key = "triangle_data_container_name"; + static inline constexpr StringLiteral k_TriangleGeometryPath_Key = "output_triangle_geometry_path"; static inline constexpr StringLiteral k_FaceAttributeMatrixName_Key = "face_attribute_matrix_name"; static inline constexpr StringLiteral k_FaceNormalsArrayName_Key = "face_normals_array_name"; static inline constexpr StringLiteral k_VertexAttributeMatrixName_Key = "vertex_attribute_matrix_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp index 3c2edc399c..b58ad7f135 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp @@ -57,7 +57,7 @@ Parameters ComputeFeatureRectFilter::parameters() const "The path to the feature data attribute matrix associated with the input feature ids array", DataPath{}, DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); - params.insert(std::make_unique(k_FeatureRectArrayPath_Key, "Feature Rect", "The feature rect calculated from the feature ids", "FeatureRect")); + params.insert(std::make_unique(k_FeatureRectArrayName_Key, "Feature Rect", "The feature rect calculated from the feature ids", "FeatureRect")); return params; } @@ -74,7 +74,7 @@ IFilter::PreflightResult ComputeFeatureRectFilter::preflightImpl(const DataStruc { auto pFeatureIdsArrayPathValue = filterArgs.value(k_FeatureIdsArrayPath_Key); auto pFeatureDataAttributeMatrixPathValue = filterArgs.value(k_FeatureDataAttributeMatrixPath_Key); - auto pFeatureRectArrayNameValue = filterArgs.value(k_FeatureRectArrayPath_Key); + auto pFeatureRectArrayNameValue = filterArgs.value(k_FeatureRectArrayName_Key); DataPath featureRectArrayPath = pFeatureDataAttributeMatrixPathValue.createChildPath(pFeatureRectArrayNameValue); @@ -113,7 +113,7 @@ Result<> ComputeFeatureRectFilter::executeImpl(DataStructure& dataStructure, con inputValues.FeatureIdsArrayPath = filterArgs.value(k_FeatureIdsArrayPath_Key); inputValues.FeatureDataAttributeMatrixPath = filterArgs.value(k_FeatureDataAttributeMatrixPath_Key); - inputValues.FeatureRectArrayPath = inputValues.FeatureDataAttributeMatrixPath.createChildPath(filterArgs.value(k_FeatureRectArrayPath_Key)); + inputValues.FeatureRectArrayPath = inputValues.FeatureDataAttributeMatrixPath.createChildPath(filterArgs.value(k_FeatureRectArrayName_Key)); return ComputeFeatureRect(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -136,7 +136,7 @@ Result ComputeFeatureRectFilter::FromSIMPLJson(const nlohmann::json& results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureRectArrayPathKey, k_FeatureDataAttributeMatrixPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_FeatureIdsArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureRectArrayPathKey, k_FeatureRectArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureRectArrayPathKey, k_FeatureRectArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.hpp index 92aff32df1..2109bc66d3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.hpp @@ -27,7 +27,7 @@ class SIMPLNXCORE_EXPORT ComputeFeatureRectFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_FeatureIdsArrayPath_Key = "feature_ids_array_path"; - static inline constexpr StringLiteral k_FeatureRectArrayPath_Key = "feature_rect_array_path"; + static inline constexpr StringLiteral k_FeatureRectArrayName_Key = "feature_rect_array_name"; static inline constexpr StringLiteral k_FeatureDataAttributeMatrixPath_Key = "feature_data_attribute_matrix_path"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp index 247184edfc..e260e78f98 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp @@ -65,12 +65,12 @@ Parameters ComputeMomentInvariants2DFilter::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", "The path to the cell feature attribute matrix where the created data arrays will be stored", DataPath{})); - params.insert(std::make_unique(k_Omega1ArrayPath_Key, "Omega 1", "Omega1 value", "Omega1")); - params.insert(std::make_unique(k_Omega2ArrayPath_Key, "Omega 2", "Omega2 value", "Omega2")); + params.insert(std::make_unique(k_Omega1ArrayName_Key, "Omega 1", "Omega1 value", "Omega1")); + params.insert(std::make_unique(k_Omega2ArrayName_Key, "Omega 2", "Omega2 value", "Omega2")); params.insertLinkableParameter(std::make_unique(k_SaveCentralMoments_Key, "Save Central Moments", "Write the Central Moments to a new Data Array", false)); - params.insert(std::make_unique(k_CentralMomentsArrayPath_Key, "Central Moments", "Central Moments value", "CentralMoments")); + params.insert(std::make_unique(k_CentralMomentsArrayName_Key, "Central Moments", "Central Moments value", "CentralMoments")); // Associate the Linkable Parameter(s) to the children parameters that they control - params.linkParameters(k_SaveCentralMoments_Key, k_CentralMomentsArrayPath_Key, true); + params.linkParameters(k_SaveCentralMoments_Key, k_CentralMomentsArrayName_Key, true); return params; } @@ -89,8 +89,8 @@ IFilter::PreflightResult ComputeMomentInvariants2DFilter::preflightImpl(const Da auto pFeatureIdsArrayPathValue = filterArgs.value(k_FeatureIdsArrayPath_Key); auto pFeatureRectArrayPathValue = filterArgs.value(k_FeatureRectArrayPath_Key); auto pFeatureAttributeMatrixPathValue = filterArgs.value(k_FeatureAttributeMatrixPath_Key); - auto pOmega1ArrayNameValue = filterArgs.value(k_Omega1ArrayPath_Key); - auto pOmega2ArrayNameValue = filterArgs.value(k_Omega2ArrayPath_Key); + auto pOmega1ArrayNameValue = filterArgs.value(k_Omega1ArrayName_Key); + auto pOmega2ArrayNameValue = filterArgs.value(k_Omega2ArrayName_Key); auto pSaveCentralMomentsValue = filterArgs.value(k_SaveCentralMoments_Key); const DataPath omega1Path = pFeatureAttributeMatrixPathValue.createChildPath(pOmega1ArrayNameValue); @@ -124,7 +124,7 @@ IFilter::PreflightResult ComputeMomentInvariants2DFilter::preflightImpl(const Da if(pSaveCentralMomentsValue) { - auto pCentralMomentsArrayNameValue = filterArgs.value(k_CentralMomentsArrayPath_Key); + auto pCentralMomentsArrayNameValue = filterArgs.value(k_CentralMomentsArrayName_Key); const DataPath centralMomentsPath = pFeatureAttributeMatrixPathValue.createChildPath(pCentralMomentsArrayNameValue); componentDims = {3, 3}; auto createArrayAction = std::make_unique(DataType::float32, tupleDims, componentDims, centralMomentsPath); @@ -145,12 +145,12 @@ Result<> ComputeMomentInvariants2DFilter::executeImpl(DataStructure& dataStructu inputValues.FeatureRectArrayPath = filterArgs.value(k_FeatureRectArrayPath_Key); inputValues.NormalizeMomentInvariants = filterArgs.value(k_NormalizeMomentInvariants_Key); const auto pFeatureAttributeMatrixPathValue = filterArgs.value(k_FeatureAttributeMatrixPath_Key); - inputValues.Omega1ArrayPath = pFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_Omega1ArrayPath_Key)); - inputValues.Omega2ArrayPath = pFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_Omega2ArrayPath_Key)); + inputValues.Omega1ArrayPath = pFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_Omega1ArrayName_Key)); + inputValues.Omega2ArrayPath = pFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_Omega2ArrayName_Key)); inputValues.SaveCentralMoments = filterArgs.value(k_SaveCentralMoments_Key); if(inputValues.SaveCentralMoments) { - inputValues.CentralMomentsArrayPath = pFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_CentralMomentsArrayPath_Key)); + inputValues.CentralMomentsArrayPath = pFeatureAttributeMatrixPathValue.createChildPath(filterArgs.value(k_CentralMomentsArrayName_Key)); } return ComputeMomentInvariants2D(dataStructure, messageHandler, shouldCancel, &inputValues)(); @@ -181,10 +181,10 @@ Result ComputeMomentInvariants2DFilter::FromSIMPLJson(const nlohmann: results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureRectArrayPathKey, k_FeatureRectArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NormalizeMomentInvariantsKey, k_NormalizeMomentInvariants_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_Omega1ArrayPathKey, k_FeatureAttributeMatrixPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_Omega1ArrayPathKey, k_Omega1ArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_Omega2ArrayPathKey, k_Omega2ArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_Omega1ArrayPathKey, k_Omega1ArrayName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_Omega2ArrayPathKey, k_Omega2ArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SaveCentralMomentsKey, k_SaveCentralMoments_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CentralMomentsArrayPathKey, k_CentralMomentsArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CentralMomentsArrayPathKey, k_CentralMomentsArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp index 3aed8c1d40..5b8e6d779d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp @@ -25,15 +25,15 @@ class SIMPLNXCORE_EXPORT ComputeMomentInvariants2DFilter : public IFilter ComputeMomentInvariants2DFilter& operator=(ComputeMomentInvariants2DFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_FeatureAttributeMatrixPath_Key = "feature_attribute_matrix_path"; static inline constexpr StringLiteral k_FeatureIdsArrayPath_Key = "feature_ids_array_path"; static inline constexpr StringLiteral k_FeatureRectArrayPath_Key = "feature_rect_array_path"; static inline constexpr StringLiteral k_NormalizeMomentInvariants_Key = "normalize_moment_invariants"; - static inline constexpr StringLiteral k_Omega1ArrayPath_Key = "omega1_array_path"; - static inline constexpr StringLiteral k_Omega2ArrayPath_Key = "omega2_array_path"; + static inline constexpr StringLiteral k_Omega1ArrayName_Key = "omega1_array_name"; + static inline constexpr StringLiteral k_Omega2ArrayName_Key = "omega2_array_name"; static inline constexpr StringLiteral k_SaveCentralMoments_Key = "save_central_moments"; - static inline constexpr StringLiteral k_CentralMomentsArrayPath_Key = "central_moments_array_path"; + static inline constexpr StringLiteral k_CentralMomentsArrayName_Key = "central_moments_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp index b91fc16454..bcde00e9c9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp @@ -66,7 +66,7 @@ Parameters ConvertColorToGrayScaleFilter::parameters() const params.linkParameters(k_ConversionAlgorithm_Key, k_ColorWeights_Key, std::make_any(0)); params.linkParameters(k_ConversionAlgorithm_Key, k_ColorChannel_Key, std::make_any(3)); - params.insert(std::make_unique(k_InputDataArrayVector_Key, "Input Data Arrays", "Select all DataArrays that need to be converted to GrayScale", + params.insert(std::make_unique(k_InputDataArrayPath_Key, "Input Data Arrays", "Select all DataArrays that need to be converted to GrayScale", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, MultiArraySelectionParameter::AllowedDataTypes{DataType::uint8})); params.insertSeparator(Parameters::Separator{"Output Parameters"}); @@ -89,7 +89,7 @@ IFilter::PreflightResult ConvertColorToGrayScaleFilter::preflightImpl(const Data auto pConversionAlgorithmValue = filterArgs.value(k_ConversionAlgorithm_Key); auto pColorWeightsValue = filterArgs.value(k_ColorWeights_Key); auto pColorChannelValue = filterArgs.value(k_ColorChannel_Key); - auto inputDataArrayPaths = filterArgs.value(k_InputDataArrayVector_Key); + auto inputDataArrayPaths = filterArgs.value(k_InputDataArrayPath_Key); auto outputArrayPrefix = filterArgs.value(k_OutputArrayPrefix_Key); PreflightResult preflightResult; @@ -158,7 +158,7 @@ Result<> ConvertColorToGrayScaleFilter::executeImpl(DataStructure& dataStructure inputValues.ConversionAlgorithm = filterArgs.value(k_ConversionAlgorithm_Key); inputValues.ColorWeights = filterArgs.value(k_ColorWeights_Key); inputValues.ColorChannel = filterArgs.value(k_ColorChannel_Key); - inputValues.InputDataArrayPaths = filterArgs.value(k_InputDataArrayVector_Key); + inputValues.InputDataArrayPaths = filterArgs.value(k_InputDataArrayPath_Key); inputValues.OutputArrayPrefix = filterArgs.value(k_OutputArrayPrefix_Key); for(const auto& inputDataArrayPath : inputValues.InputDataArrayPaths) @@ -199,7 +199,7 @@ Result ConvertColorToGrayScaleFilter::FromSIMPLJson(const nlohmann::j results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ConversionAlgorithmKey, k_ConversionAlgorithm_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ColorWeightsKey, k_ColorWeights_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_ColorChannelKey, k_ColorChannel_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InputDataArrayVectorKey, k_InputDataArrayVector_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InputDataArrayVectorKey, k_InputDataArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputArrayPrefixKey, k_OutputArrayPrefix_Key)); // Create new attribute matrix and output attribute matrix name parameters are not applicable to NX diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp index 779c677273..2b8e7a6f8b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp @@ -24,10 +24,10 @@ class SIMPLNXCORE_EXPORT ConvertColorToGrayScaleFilter : public IFilter ConvertColorToGrayScaleFilter& operator=(ConvertColorToGrayScaleFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ConversionAlgorithm_Key = "conversion_algorithm"; + static inline constexpr StringLiteral k_ConversionAlgorithm_Key = "conversion_algorithm_index"; static inline constexpr StringLiteral k_ColorWeights_Key = "color_weights"; static inline constexpr StringLiteral k_ColorChannel_Key = "color_channel"; - static inline constexpr StringLiteral k_InputDataArrayVector_Key = "input_data_array_vector"; + static inline constexpr StringLiteral k_InputDataArrayPath_Key = "input_data_array_paths"; static inline constexpr StringLiteral k_OutputArrayPrefix_Key = "output_array_prefix"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp index 392695b5b3..edb107b497 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp @@ -56,11 +56,11 @@ Parameters ConvertDataFilter::parameters() const params.insertSeparator(Parameters::Separator{"Input Parameters"}); params.insert(std::make_unique(k_ScalarType_Key, "Scalar Type", "Convert to this data type", 0, GetAllDataTypesAsStrings())); - params.insert(std::make_unique(k_ArrayToConvert_Key, "Data Array to Convert", "The complete path to the Data Array to Convert", DataPath{}, GetAllDataTypes())); + params.insert(std::make_unique(k_ArrayToConvertPath_Key, "Data Array to Convert", "The complete path to the Data Array to Convert", DataPath{}, GetAllDataTypes())); params.insert(std::make_unique(k_DeleteOriginal_Key, "Remove Original Array", "Whether or not to remove the original array after conversion", false)); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); - params.insert(std::make_unique(k_ConvertedArray_Key, "Converted Data Array", "The name of the converted Data Array", "Converted_")); + params.insert(std::make_unique(k_ConvertedArrayName_Key, "Converted Data Array", "The name of the converted Data Array", "Converted_")); return params; } @@ -76,8 +76,8 @@ IFilter::PreflightResult ConvertDataFilter::preflightImpl(const DataStructure& d const std::atomic_bool& shouldCancel) const { auto pScalarTypeIndex = filterArgs.value(k_ScalarType_Key); - auto pInputArrayPath = filterArgs.value(k_ArrayToConvert_Key); - auto pConvertedArrayName = filterArgs.value(k_ConvertedArray_Key); + auto pInputArrayPath = filterArgs.value(k_ArrayToConvertPath_Key); + auto pConvertedArrayName = filterArgs.value(k_ConvertedArrayName_Key); auto pRemoveOriginal = filterArgs.value(k_DeleteOriginal_Key); DataPath const convertedArrayPath = pInputArrayPath.getParent().createChildPath(pConvertedArrayName); @@ -114,8 +114,8 @@ Result<> ConvertDataFilter::executeImpl(DataStructure& dataStructure, const Argu ConvertDataInputValues inputValues; uint64 scalarTypeIndex = filterArgs.value(k_ScalarType_Key); inputValues.ScalarType = StringToDataType(GetAllDataTypesAsStrings()[scalarTypeIndex]); - inputValues.SelectedArrayPath = filterArgs.value(k_ArrayToConvert_Key); - auto pConvertedArrayName = filterArgs.value(k_ConvertedArray_Key); + inputValues.SelectedArrayPath = filterArgs.value(k_ArrayToConvertPath_Key); + auto pConvertedArrayName = filterArgs.value(k_ConvertedArrayName_Key); inputValues.OutputArrayName = inputValues.SelectedArrayPath.getParent().createChildPath(pConvertedArrayName); return ConvertData(dataStructure, messageHandler, shouldCancel, &inputValues)(); @@ -158,8 +158,8 @@ Result ConvertDataFilter::FromSIMPLJson(const nlohmann::json& json) std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ScalarTypeKey, k_ScalarType_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_ArrayToConvert_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputArrayNameKey, k_ConvertedArray_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_ArrayToConvertPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputArrayNameKey, k_ConvertedArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp index 859b966f41..496ddd3468 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp @@ -24,9 +24,9 @@ class SIMPLNXCORE_EXPORT ConvertDataFilter : public IFilter ConvertDataFilter& operator=(ConvertDataFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type"; - static inline constexpr StringLiteral k_ArrayToConvert_Key = "array_to_convert"; - static inline constexpr StringLiteral k_ConvertedArray_Key = "converted_array"; + static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type_index"; + static inline constexpr StringLiteral k_ArrayToConvertPath_Key = "array_to_convert_path"; + static inline constexpr StringLiteral k_ConvertedArrayName_Key = "converted_array_name"; static inline constexpr StringLiteral k_DeleteOriginal_Key = "delete_original_array"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArray.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArray.hpp index 0b2f40b4f6..402325876b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArray.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArray.hpp @@ -27,7 +27,7 @@ class SIMPLNXCORE_EXPORT CopyFeatureArrayToElementArray : public IFilter CopyFeatureArrayToElementArray& operator=(CopyFeatureArrayToElementArray&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedFeatureArrayPath_Key = "selected_feature_array_path"; + static inline constexpr StringLiteral k_SelectedFeatureArrayPath_Key = "selected_feature_array_paths"; static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_CreatedArraySuffix_Key = "created_array_suffix"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.cpp index 8928662852..ffa6439728 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.cpp @@ -70,7 +70,7 @@ Parameters CreateDataArray::parameters() const params.insertSeparator(Parameters::Separator{"Input Parameters"}); params.insert(std::make_unique(k_NumericType_Key, "Output Numeric Type", "Numeric Type of data to create", NumericType::int32)); - params.insert(std::make_unique(k_InitilizationValue_Key, "Initialization Value", "This value will be used to fill the new array", "0")); + params.insert(std::make_unique(k_InitializationValue_Key, "Initialization Value", "This value will be used to fill the new array", "0")); params.insert(std::make_unique(k_NumComps_Key, "Number of Components", "Number of components", 1)); params.insertSeparator(Parameters::Separator{"Created DataArray"}); @@ -109,7 +109,7 @@ IFilter::PreflightResult CreateDataArray::preflightImpl(const DataStructure& dat auto numericType = filterArgs.value(k_NumericType_Key); auto numComponents = filterArgs.value(k_NumComps_Key); auto dataArrayPath = filterArgs.value(k_DataPath_Key); - auto initValue = filterArgs.value(k_InitilizationValue_Key); + auto initValue = filterArgs.value(k_InitializationValue_Key); auto tableData = filterArgs.value(k_TupleDims_Key); auto dataFormat = filterArgs.value(k_DataFormat_Key); @@ -176,7 +176,7 @@ Result<> CreateDataArray::executeImpl(DataStructure& data, const Arguments& args { auto numericType = args.value(k_NumericType_Key); auto path = args.value(k_DataPath_Key); - auto initValue = args.value(k_InitilizationValue_Key); + auto initValue = args.value(k_InitializationValue_Key); switch(numericType) { @@ -252,7 +252,7 @@ Result CreateDataArray::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ScalarTypeKey, k_NumericType_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_NumberOfComponentsKey, k_NumComps_Key)); // Initialize Type parameter is not applicable in NX - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InitializationValueKey, k_InitilizationValue_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InitializationValueKey, k_InitializationValue_Key)); // Initialization Range parameter is not applicable in NX // Starting Index value parameter is not applicable in NX results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewArrayKey, k_DataPath_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp index e45e7dc3ac..b8cfa07f5f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp @@ -21,12 +21,12 @@ class SIMPLNXCORE_EXPORT CreateDataArray : public IFilter CreateDataArray& operator=(CreateDataArray&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_NumericType_Key = "numeric_type"; - static inline constexpr StringLiteral k_AdvancedOptions_Key = "advanced_options"; + static inline constexpr StringLiteral k_NumericType_Key = "numeric_type_index"; + static inline constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; static inline constexpr StringLiteral k_NumComps_Key = "component_count"; static inline constexpr StringLiteral k_TupleDims_Key = "tuple_dimensions"; - static inline constexpr StringLiteral k_DataPath_Key = "output_data_array"; - static inline constexpr StringLiteral k_InitilizationValue_Key = "initialization_value"; + static inline constexpr StringLiteral k_DataPath_Key = "output_array_path"; + static inline constexpr StringLiteral k_InitializationValue_Key = "initialization_value_str"; static inline constexpr StringLiteral k_DataFormat_Key = "data_format"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp index af21ddb265..2aaa144894 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp @@ -130,28 +130,28 @@ Parameters CreateGeometryFilter::parameters() const params.insert( std::make_unique(k_Spacing_Key, "Spacing", "The length scale of each voxel/pixel", std::vector{1.0F, 1.0F, 1.0F}, std::vector{"X"s, "Y"s, "Z"s})); - params.insert(std::make_unique(k_XBounds_Key, "X Bounds", "The spatial locations of the planes along the x direction", DataPath{}, + params.insert(std::make_unique(k_XBoundsPath_Key, "X Bounds", "The spatial locations of the planes along the x direction", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_YBounds_Key, "Y Bounds", "The spatial locations of the planes along the y direction", DataPath{}, + params.insert(std::make_unique(k_YBoundsPath_Key, "Y Bounds", "The spatial locations of the planes along the y direction", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_ZBounds_Key, "Z Bounds", "The spatial locations of the planes along the z direction", DataPath{}, + params.insert(std::make_unique(k_ZBoundsPath_Key, "Z Bounds", "The spatial locations of the planes along the z direction", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_VertexListName_Key, "Shared Vertex List", "The complete path to the data array defining the point coordinates for the geometry", DataPath{}, + params.insert(std::make_unique(k_VertexListPath_Key, "Shared Vertex List", "The complete path to the data array defining the point coordinates for the geometry", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); - params.insert(std::make_unique(k_EdgeListName_Key, "Edge List", "The complete path to the data array defining the edges for the geometry", DataPath{}, + params.insert(std::make_unique(k_EdgeListPath_Key, "Edge List", "The complete path to the data array defining the edges for the geometry", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint64}, ArraySelectionParameter::AllowedComponentShapes{{2}})); - params.insert(std::make_unique(k_TriangleListName_Key, "Triangle List", "The complete path to the data array defining the (triangular) faces for the geometry", DataPath{}, + params.insert(std::make_unique(k_TriangleListPath_Key, "Triangle List", "The complete path to the data array defining the (triangular) faces for the geometry", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint64}, ArraySelectionParameter::AllowedComponentShapes{{3}})); - params.insert(std::make_unique(k_QuadrilateralListName_Key, "Quadrilateral List", "The complete path to the data array defining the (quad) faces for the geometry", + params.insert(std::make_unique(k_QuadrilateralListPath_Key, "Quadrilateral List", "The complete path to the data array defining the (quad) faces for the geometry", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint64}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insert(std::make_unique(k_TetrahedralListName_Key, "Tetrahedral List", "The complete path to the data array defining the tetrahedral elements for the geometry", + params.insert(std::make_unique(k_TetrahedralListPath_Key, "Tetrahedral List", "The complete path to the data array defining the tetrahedral elements for the geometry", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint64}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insert(std::make_unique(k_HexahedralListName_Key, "Hexahedral List", "The complete path to the data array defining the hexahedral elements for the geometry", + params.insert(std::make_unique(k_HexahedralListPath_Key, "Hexahedral List", "The complete path to the data array defining the hexahedral elements for the geometry", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint64}, ArraySelectionParameter::AllowedComponentShapes{{8}})); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); - params.insert(std::make_unique(k_GeometryName_Key, "Geometry Name", "The complete path to the geometry to be created", DataPath({"Geometry"}))); + params.insert(std::make_unique(k_GeometryPath_Key, "Geometry Name", "The complete path to the geometry to be created", DataPath({"Geometry"}))); params.insert(std::make_unique(k_VertexAttributeMatrixName_Key, "Vertex Attribute Matrix", "The name of the vertex attribute matrix to be created with the geometry", INodeGeometry0D::k_VertexDataName)); params.insert(std::make_unique(k_EdgeAttributeMatrixName_Key, "Edge Attribute Matrix", "The name of the edge attribute matrix to be created with the geometry", @@ -168,36 +168,36 @@ Parameters CreateGeometryFilter::parameters() const params.linkParameters(k_GeometryType_Key, k_Spacing_Key, std::make_any(0)); params.linkParameters(k_GeometryType_Key, k_CellAttributeMatrixName_Key, std::make_any(0)); // rect grid - params.linkParameters(k_GeometryType_Key, k_XBounds_Key, std::make_any(1)); - params.linkParameters(k_GeometryType_Key, k_YBounds_Key, std::make_any(1)); - params.linkParameters(k_GeometryType_Key, k_ZBounds_Key, std::make_any(1)); + params.linkParameters(k_GeometryType_Key, k_XBoundsPath_Key, std::make_any(1)); + params.linkParameters(k_GeometryType_Key, k_YBoundsPath_Key, std::make_any(1)); + params.linkParameters(k_GeometryType_Key, k_ZBoundsPath_Key, std::make_any(1)); params.linkParameters(k_GeometryType_Key, k_CellAttributeMatrixName_Key, std::make_any(1)); // vertex - params.linkParameters(k_GeometryType_Key, k_VertexListName_Key, std::make_any(2)); + params.linkParameters(k_GeometryType_Key, k_VertexListPath_Key, std::make_any(2)); params.linkParameters(k_GeometryType_Key, k_VertexAttributeMatrixName_Key, std::make_any(2)); // edge - params.linkParameters(k_GeometryType_Key, k_VertexListName_Key, std::make_any(3)); - params.linkParameters(k_GeometryType_Key, k_EdgeListName_Key, std::make_any(3)); + params.linkParameters(k_GeometryType_Key, k_VertexListPath_Key, std::make_any(3)); + params.linkParameters(k_GeometryType_Key, k_EdgeListPath_Key, std::make_any(3)); params.linkParameters(k_GeometryType_Key, k_VertexAttributeMatrixName_Key, std::make_any(3)); params.linkParameters(k_GeometryType_Key, k_EdgeAttributeMatrixName_Key, std::make_any(3)); // triangle - params.linkParameters(k_GeometryType_Key, k_VertexListName_Key, std::make_any(4)); - params.linkParameters(k_GeometryType_Key, k_TriangleListName_Key, std::make_any(4)); + params.linkParameters(k_GeometryType_Key, k_VertexListPath_Key, std::make_any(4)); + params.linkParameters(k_GeometryType_Key, k_TriangleListPath_Key, std::make_any(4)); params.linkParameters(k_GeometryType_Key, k_VertexAttributeMatrixName_Key, std::make_any(4)); params.linkParameters(k_GeometryType_Key, k_FaceAttributeMatrixName_Key, std::make_any(4)); // quad - params.linkParameters(k_GeometryType_Key, k_VertexListName_Key, std::make_any(5)); - params.linkParameters(k_GeometryType_Key, k_QuadrilateralListName_Key, std::make_any(5)); + params.linkParameters(k_GeometryType_Key, k_VertexListPath_Key, std::make_any(5)); + params.linkParameters(k_GeometryType_Key, k_QuadrilateralListPath_Key, std::make_any(5)); params.linkParameters(k_GeometryType_Key, k_VertexAttributeMatrixName_Key, std::make_any(5)); params.linkParameters(k_GeometryType_Key, k_FaceAttributeMatrixName_Key, std::make_any(5)); // tet - params.linkParameters(k_GeometryType_Key, k_VertexListName_Key, std::make_any(6)); - params.linkParameters(k_GeometryType_Key, k_TetrahedralListName_Key, std::make_any(6)); + params.linkParameters(k_GeometryType_Key, k_VertexListPath_Key, std::make_any(6)); + params.linkParameters(k_GeometryType_Key, k_TetrahedralListPath_Key, std::make_any(6)); params.linkParameters(k_GeometryType_Key, k_VertexAttributeMatrixName_Key, std::make_any(6)); params.linkParameters(k_GeometryType_Key, k_CellAttributeMatrixName_Key, std::make_any(6)); // hex - params.linkParameters(k_GeometryType_Key, k_VertexListName_Key, std::make_any(7)); - params.linkParameters(k_GeometryType_Key, k_HexahedralListName_Key, std::make_any(7)); + params.linkParameters(k_GeometryType_Key, k_VertexListPath_Key, std::make_any(7)); + params.linkParameters(k_GeometryType_Key, k_HexahedralListPath_Key, std::make_any(7)); params.linkParameters(k_GeometryType_Key, k_VertexAttributeMatrixName_Key, std::make_any(7)); params.linkParameters(k_GeometryType_Key, k_CellAttributeMatrixName_Key, std::make_any(7)); @@ -214,7 +214,7 @@ IFilter::UniquePointer CreateGeometryFilter::clone() const IFilter::PreflightResult CreateGeometryFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto pGeometryPath = filterArgs.value(k_GeometryName_Key); + auto pGeometryPath = filterArgs.value(k_GeometryPath_Key); auto pGeometryType = filterArgs.value(k_GeometryType_Key); auto pWarningsAsErrors = filterArgs.value(k_WarningsAsErrors_Key); auto pArrayHandling = filterArgs.value(k_ArrayHandling_Key); @@ -231,7 +231,7 @@ IFilter::PreflightResult CreateGeometryFilter::preflightImpl(const DataStructure if(pGeometryType == k_VertexGeometry || pGeometryType == k_EdgeGeometry || pGeometryType == k_TriangleGeometry || pGeometryType == k_QuadGeometry || pGeometryType == k_TetGeometry || pGeometryType == k_HexGeometry) { - pVertexListPath = filterArgs.value(k_VertexListName_Key); + pVertexListPath = filterArgs.value(k_VertexListPath_Key); pVertexAMName = filterArgs.value(k_VertexAttributeMatrixName_Key); if(dataStructure.getDataAs(pVertexListPath) == nullptr) @@ -277,9 +277,9 @@ IFilter::PreflightResult CreateGeometryFilter::preflightImpl(const DataStructure } if(pGeometryType == k_RectGridGeometry) // RectGridGeom { - auto pXBoundsPath = filterArgs.value(k_XBounds_Key); - auto pYBoundsPath = filterArgs.value(k_YBounds_Key); - auto pZBoundsPath = filterArgs.value(k_ZBounds_Key); + auto pXBoundsPath = filterArgs.value(k_XBoundsPath_Key); + auto pYBoundsPath = filterArgs.value(k_YBoundsPath_Key); + auto pZBoundsPath = filterArgs.value(k_ZBoundsPath_Key); const auto xBounds = dataStructure.getDataAs(pXBoundsPath); if(xBounds == nullptr) { @@ -316,7 +316,7 @@ IFilter::PreflightResult CreateGeometryFilter::preflightImpl(const DataStructure } if(pGeometryType == k_EdgeGeometry) // EdgeGeom { - auto pEdgeListPath = filterArgs.value(k_EdgeListName_Key); + auto pEdgeListPath = filterArgs.value(k_EdgeListPath_Key); auto pEdgeAMName = filterArgs.value(k_EdgeAttributeMatrixName_Key); if(const auto edgeList = dataStructure.getDataAs(pEdgeListPath); edgeList == nullptr) { @@ -329,7 +329,7 @@ IFilter::PreflightResult CreateGeometryFilter::preflightImpl(const DataStructure } if(pGeometryType == k_TriangleGeometry) // TriangleGeom { - auto pTriangleListPath = filterArgs.value(k_TriangleListName_Key); + auto pTriangleListPath = filterArgs.value(k_TriangleListPath_Key); if(const auto triangleList = dataStructure.getDataAs(pTriangleListPath); triangleList == nullptr) { return {nonstd::make_unexpected(std::vector{Error{-9846, fmt::format("Cannot find selected triangle list at path '{}'", pTriangleListPath.toString())}})}; @@ -341,7 +341,7 @@ IFilter::PreflightResult CreateGeometryFilter::preflightImpl(const DataStructure } if(pGeometryType == k_QuadGeometry) // QuadGeom { - auto pQuadListPath = filterArgs.value(k_QuadrilateralListName_Key); + auto pQuadListPath = filterArgs.value(k_QuadrilateralListPath_Key); if(const auto quadList = dataStructure.getDataAs(pQuadListPath); quadList == nullptr) { return {nonstd::make_unexpected(std::vector{Error{-9847, fmt::format("Cannot find selected quadrilateral list at path '{}'", pQuadListPath.toString())}})}; @@ -353,7 +353,7 @@ IFilter::PreflightResult CreateGeometryFilter::preflightImpl(const DataStructure } if(pGeometryType == k_TetGeometry) // TetrahedralGeom { - auto pTetListPath = filterArgs.value(k_TetrahedralListName_Key); + auto pTetListPath = filterArgs.value(k_TetrahedralListPath_Key); if(const auto tetList = dataStructure.getDataAs(pTetListPath); tetList == nullptr) { return {nonstd::make_unexpected(std::vector{Error{-9848, fmt::format("Cannot find selected quadrilateral list at path '{}'", pTetListPath.toString())}})}; @@ -365,7 +365,7 @@ IFilter::PreflightResult CreateGeometryFilter::preflightImpl(const DataStructure } if(pGeometryType == k_HexGeometry) // HexahedralGeom { - auto pHexListPath = filterArgs.value(k_HexahedralListName_Key); + auto pHexListPath = filterArgs.value(k_HexahedralListPath_Key); if(const auto hexList = dataStructure.getDataAs(pHexListPath); hexList == nullptr) { return {nonstd::make_unexpected(std::vector{Error{-9849, fmt::format("Cannot find selected quadrilateral list at path '{}'", pHexListPath.toString())}})}; @@ -384,7 +384,7 @@ IFilter::PreflightResult CreateGeometryFilter::preflightImpl(const DataStructure Result<> CreateGeometryFilter::executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto geometryPath = filterArgs.value(k_GeometryName_Key); + auto geometryPath = filterArgs.value(k_GeometryPath_Key); auto geometryType = filterArgs.value(k_GeometryType_Key); auto treatWarningsAsErrors = filterArgs.value(k_WarningsAsErrors_Key); auto moveArrays = filterArgs.value(k_ArrayHandling_Key) == k_MoveArray; @@ -399,23 +399,23 @@ Result<> CreateGeometryFilter::executeImpl(DataStructure& data, const Arguments& if(geometryType == k_VertexGeometry || geometryType == k_EdgeGeometry || geometryType == k_TriangleGeometry || geometryType == k_QuadGeometry || geometryType == k_TetGeometry || geometryType == 7) { - sharedVertexListArrayPath = filterArgs.value(k_VertexListName_Key); + sharedVertexListArrayPath = filterArgs.value(k_VertexListPath_Key); } if(geometryType == k_TriangleGeometry) { - sharedFaceListArrayPath = filterArgs.value(k_TriangleListName_Key); + sharedFaceListArrayPath = filterArgs.value(k_TriangleListPath_Key); } if(geometryType == k_QuadGeometry) { - sharedFaceListArrayPath = filterArgs.value(k_QuadrilateralListName_Key); + sharedFaceListArrayPath = filterArgs.value(k_QuadrilateralListPath_Key); } if(geometryType == k_TetGeometry) { - sharedCellListArrayPath = filterArgs.value(k_TetrahedralListName_Key); + sharedCellListArrayPath = filterArgs.value(k_TetrahedralListPath_Key); } if(geometryType == k_HexGeometry) { - sharedCellListArrayPath = filterArgs.value(k_HexahedralListName_Key); + sharedCellListArrayPath = filterArgs.value(k_HexahedralListPath_Key); } Result<> warningResults; @@ -423,7 +423,7 @@ Result<> CreateGeometryFilter::executeImpl(DataStructure& data, const Arguments& // These checks must be done in execute since we are accessing the array values! if(geometryType == k_EdgeGeometry) { - auto sharedEdgeListArrayPath = filterArgs.value(k_EdgeListName_Key); + auto sharedEdgeListArrayPath = filterArgs.value(k_EdgeListPath_Key); const DataPath destEdgeListPath = geometryPath.createChildPath(sharedEdgeListArrayPath.getTargetName()); const auto& edgesList = data.getDataRefAs(destEdgeListPath); const auto& vertexList = data.getDataRefAs(geometryPath.createChildPath(sharedVertexListArrayPath.getTargetName())); @@ -460,9 +460,9 @@ Result<> CreateGeometryFilter::executeImpl(DataStructure& data, const Arguments& } if(geometryType == k_RectGridGeometry) { - auto xBoundsArrayPath = filterArgs.value(k_XBounds_Key); - auto yBoundsArrayPath = filterArgs.value(k_YBounds_Key); - auto zBoundsArrayPath = filterArgs.value(k_ZBounds_Key); + auto xBoundsArrayPath = filterArgs.value(k_XBoundsPath_Key); + auto yBoundsArrayPath = filterArgs.value(k_YBoundsPath_Key); + auto zBoundsArrayPath = filterArgs.value(k_ZBoundsPath_Key); const auto& srcXBounds = data.getDataRefAs(geometryPath.createChildPath(xBoundsArrayPath.getTargetName())); const auto& srcYBounds = data.getDataRefAs(geometryPath.createChildPath(yBoundsArrayPath.getTargetName())); const auto& srcZBounds = data.getDataRefAs(geometryPath.createChildPath(zBoundsArrayPath.getTargetName())); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp index c6347fe0a2..2ef6faaabb 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp @@ -24,35 +24,35 @@ class SIMPLNXCORE_EXPORT CreateGeometryFilter : public IFilter CreateGeometryFilter& operator=(CreateGeometryFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_GeometryType_Key = "geometry_type"; - static inline constexpr StringLiteral k_LengthUnitType_Key = "length_unit_type"; - static inline constexpr StringLiteral k_GeometryName_Key = "geometry_name"; + static inline constexpr StringLiteral k_GeometryType_Key = "geometry_type_index"; + static inline constexpr StringLiteral k_LengthUnitType_Key = "length_unit_index"; + static inline constexpr StringLiteral k_GeometryPath_Key = "output_geometry_path"; static inline constexpr StringLiteral k_WarningsAsErrors_Key = "warnings_as_errors"; - static inline constexpr StringLiteral k_ArrayHandling_Key = "array_handling"; + static inline constexpr StringLiteral k_ArrayHandling_Key = "array_handling_index"; // Image Geometry static inline constexpr StringLiteral k_Dimensions_Key = "dimensions"; static inline constexpr StringLiteral k_Origin_Key = "origin"; static inline constexpr StringLiteral k_Spacing_Key = "spacing"; // RectilinearGrid Geometry - static inline constexpr StringLiteral k_XBounds_Key = "x_bounds"; - static inline constexpr StringLiteral k_YBounds_Key = "y_bounds"; - static inline constexpr StringLiteral k_ZBounds_Key = "z_bounds"; + static inline constexpr StringLiteral k_XBoundsPath_Key = "x_bounds_path"; + static inline constexpr StringLiteral k_YBoundsPath_Key = "y_bounds_path"; + static inline constexpr StringLiteral k_ZBoundsPath_Key = "z_bounds_path"; // Vertex, Edge, Triangle, Quadrilateral, Tetrahedral, & Hexahedral Geometry - static inline constexpr StringLiteral k_VertexListName_Key = "vertex_list_name"; + static inline constexpr StringLiteral k_VertexListPath_Key = "vertex_list_path"; static inline constexpr StringLiteral k_VertexAttributeMatrixName_Key = "vertex_attribute_matrix_name"; // Edge Geometry - static inline constexpr StringLiteral k_EdgeListName_Key = "edge_list_name"; + static inline constexpr StringLiteral k_EdgeListPath_Key = "edge_list_path"; static inline constexpr StringLiteral k_EdgeAttributeMatrixName_Key = "edge_attribute_matrix_name"; // Triangle Geometry - static inline constexpr StringLiteral k_TriangleListName_Key = "triangle_list_name"; + static inline constexpr StringLiteral k_TriangleListPath_Key = "triangle_list_path"; // Quadrilateral Geometry - static inline constexpr StringLiteral k_QuadrilateralListName_Key = "quadrilateral_list_name"; + static inline constexpr StringLiteral k_QuadrilateralListPath_Key = "quadrilateral_list_path"; // Triangle & Quadrilateral Geometry static inline constexpr StringLiteral k_FaceAttributeMatrixName_Key = "face_attribute_matrix_name"; // Tetrahedral Geometry - static inline constexpr StringLiteral k_TetrahedralListName_Key = "tetrahedral_list_name"; + static inline constexpr StringLiteral k_TetrahedralListPath_Key = "tetrahedral_list_path"; // Hexahedral Geometry - static inline constexpr StringLiteral k_HexahedralListName_Key = "hexahedral_list_name"; + static inline constexpr StringLiteral k_HexahedralListPath_Key = "hexahedral_list_path"; // Image, RectilinearGrid, Tetrahedral, & Hexahedral Geometry static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometry.hpp index 1892f826a6..fe6927e500 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometry.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT CreateImageGeometry : public IFilter CreateImageGeometry& operator=(CreateImageGeometry&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_GeometryDataPath_Key = "geometry_data_path"; + static inline constexpr StringLiteral k_GeometryDataPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_Dimensions_Key = "dimensions"; static inline constexpr StringLiteral k_Origin_Key = "origin"; static inline constexpr StringLiteral k_Spacing_Key = "spacing"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.cpp index fee7682326..f0c2ffe45c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.cpp @@ -198,17 +198,17 @@ Parameters CropImageGeometry::parameters() const params.insertSeparator({"Input Geometry and Data"}); params.insert( - std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "DataPath to the source Image Geometry", DataPath(), std::set{IGeometry::Type::Image})); + std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "DataPath to the source Image Geometry", DataPath(), std::set{IGeometry::Type::Image})); params.insertSeparator(Parameters::Separator{"Renumber Features Input Parameters"}); params.insertLinkableParameter(std::make_unique(k_RenumberFeatures_Key, "Renumber Features", "Specifies if the feature IDs should be renumbered", false)); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature IDs", "DataPath to Cell Feature IDs array", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert( - std::make_unique(k_FeatureAttributeMatrix_Key, "Cell Feature Attribute Matrix", "DataPath to the feature Attribute Matrix", DataPath({"CellFeatureData"}))); + params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", "DataPath to the feature Attribute Matrix", + DataPath({"CellFeatureData"}))); params.insertSeparator({"Output Image Geometry"}); - params.insert(std::make_unique(k_CreatedImageGeometry_Key, "Created Image Geometry", "The DataPath to store the created Image Geometry", DataPath())); + params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Created Image Geometry", "The DataPath to store the created Image Geometry", DataPath())); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_UsePhysicalBounds_Key, k_MinVoxel_Key, false); @@ -218,8 +218,8 @@ Parameters CropImageGeometry::parameters() const params.linkParameters(k_UsePhysicalBounds_Key, k_MaxCoord_Key, true); params.linkParameters(k_RenumberFeatures_Key, k_CellFeatureIdsArrayPath_Key, true); - params.linkParameters(k_RenumberFeatures_Key, k_FeatureAttributeMatrix_Key, true); - params.linkParameters(k_RemoveOriginalGeometry_Key, k_CreatedImageGeometry_Key, false); + params.linkParameters(k_RenumberFeatures_Key, k_FeatureAttributeMatrixPath_Key, true); + params.linkParameters(k_RemoveOriginalGeometry_Key, k_CreatedImageGeometryPath_Key, false); return params; } @@ -232,13 +232,13 @@ IFilter::UniquePointer CropImageGeometry::clone() const IFilter::PreflightResult CropImageGeometry::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto srcImagePath = filterArgs.value(k_SelectedImageGeometry_Key); - auto destImagePath = filterArgs.value(k_CreatedImageGeometry_Key); + auto srcImagePath = filterArgs.value(k_SelectedImageGeometryPath_Key); + auto destImagePath = filterArgs.value(k_CreatedImageGeometryPath_Key); auto featureIdsArrayPath = filterArgs.value(k_CellFeatureIdsArrayPath_Key); auto minVoxels = filterArgs.value>(k_MinVoxel_Key); auto maxVoxels = filterArgs.value>(k_MaxVoxel_Key); auto shouldRenumberFeatures = filterArgs.value(k_RenumberFeatures_Key); - auto cellFeatureAmPath = filterArgs.value(k_FeatureAttributeMatrix_Key); + auto cellFeatureAmPath = filterArgs.value(k_FeatureAttributeMatrixPath_Key); auto pRemoveOriginalGeometry = filterArgs.value(k_RemoveOriginalGeometry_Key); auto pUsePhysicalBounds = filterArgs.value(k_UsePhysicalBounds_Key); @@ -528,13 +528,13 @@ IFilter::PreflightResult CropImageGeometry::preflightImpl(const DataStructure& d Result<> CropImageGeometry::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto srcImagePath = filterArgs.value(k_SelectedImageGeometry_Key); - auto destImagePath = filterArgs.value(k_CreatedImageGeometry_Key); + auto srcImagePath = filterArgs.value(k_SelectedImageGeometryPath_Key); + auto destImagePath = filterArgs.value(k_CreatedImageGeometryPath_Key); const auto featureIdsArrayPath = filterArgs.value(k_CellFeatureIdsArrayPath_Key); auto minVoxels = filterArgs.value>(k_MinVoxel_Key); auto maxVoxels = filterArgs.value>(k_MaxVoxel_Key); auto shouldRenumberFeatures = filterArgs.value(k_RenumberFeatures_Key); - auto cellFeatureAMPath = filterArgs.value(k_FeatureAttributeMatrix_Key); + auto cellFeatureAMPath = filterArgs.value(k_FeatureAttributeMatrixPath_Key); auto removeOriginalGeometry = filterArgs.value(k_RemoveOriginalGeometry_Key); uint64 xMin = s_HeaderCache[m_InstanceId].xMin; @@ -713,13 +713,13 @@ Result CropImageGeometry::FromSIMPLJson(const nlohmann::json& json) // k_UpdateOrigin_Key currently disabled in NX. // results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UpdateOriginKey, k_UpdateOrigin_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SaveAsNewDataContainerKey, k_RemoveOriginalGeometry_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewDataContainerNameKey, k_CreatedImageGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewDataContainerNameKey, k_CreatedImageGeometryPath_Key)); // Cell attribute matrix parameter is not applicable in NX results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_RenumberFeaturesKey, k_RenumberFeatures_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellFeatureAttributeMatrixPathKey, k_FeatureAttributeMatrix_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellFeatureAttributeMatrixPathKey, k_FeatureAttributeMatrixPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.hpp index 6643d0d984..392c32f2c9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.hpp @@ -27,11 +27,11 @@ class SIMPLNXCORE_EXPORT CropImageGeometry : public IFilter static inline constexpr StringLiteral k_MinCoord_Key = "min_coord"; static inline constexpr StringLiteral k_MaxCoord_Key = "max_coord"; // static inline constexpr StringLiteral k_UpdateOrigin_Key = "update_origin"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; - static inline constexpr StringLiteral k_CreatedImageGeometry_Key = "created_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_RenumberFeatures_Key = "renumber_features"; - static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids"; - static inline constexpr StringLiteral k_FeatureAttributeMatrix_Key = "cell_feature_attribute_matrix"; + static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; + static inline constexpr StringLiteral k_FeatureAttributeMatrixPath_Key = "cell_feature_attribute_matrix_path"; static inline constexpr StringLiteral k_RemoveOriginalGeometry_Key = "remove_original_geometry"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.cpp index e41cb1e158..f2dcb7a821 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.cpp @@ -79,10 +79,10 @@ Parameters CropVertexGeometry::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_VertexGeom_Key, "Vertex Geometry to Crop", "DataPath to target VertexGeom", DataPath{}, + params.insert(std::make_unique(k_SelectedVertexGeometryPath_Key, "Vertex Geometry to Crop", "DataPath to target VertexGeom", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); - params.insert(std::make_unique(k_CroppedGeom_Key, "Cropped Vertex Geometry", "Created VertexGeom path", DataPath{})); - params.insert(std::make_unique(k_VertexDataName_Key, "Vertex Data Name", "Name of the vertex data AttributeMatrix", INodeGeometry0D::k_VertexDataName)); + params.insert(std::make_unique(k_CreatedVertexGeometryPath_Key, "Cropped Vertex Geometry", "Created VertexGeom path", DataPath{})); + params.insert(std::make_unique(k_VertexAttributeMatrixName_Key, "Vertex Data Name", "Name of the vertex data AttributeMatrix", INodeGeometry0D::k_VertexDataName)); params.insert(std::make_unique(k_MinPos_Key, "Min Pos", "Minimum vertex position", std::vector{0.0f, 0.0f, 0.0f}, std::vector{"X", "Y", "Z"})); params.insert(std::make_unique(k_MaxPos_Key, "Max Pos", "Maximum vertex position", std::vector{0.0f, 0.0f, 0.0f}, std::vector{"X", "Y", "Z"})); params.insert(std::make_unique(k_TargetArrayPaths_Key, "Vertex Data Arrays to crop", "The complete path to all the vertex data arrays to crop", std::vector(), @@ -99,12 +99,12 @@ IFilter::UniquePointer CropVertexGeometry::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult CropVertexGeometry::preflightImpl(const DataStructure& dataStructure, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto vertexGeomPath = args.value(k_VertexGeom_Key); - auto croppedGeomPath = args.value(k_CroppedGeom_Key); + auto vertexGeomPath = args.value(k_SelectedVertexGeometryPath_Key); + auto croppedGeomPath = args.value(k_CreatedVertexGeometryPath_Key); auto posMin = args.value>(k_MinPos_Key); auto posMax = args.value>(k_MaxPos_Key); auto targetArrays = args.value>(k_TargetArrayPaths_Key); - auto vertexDataName = args.value(k_VertexDataName_Key); + auto vertexDataName = args.value(k_VertexAttributeMatrixName_Key); auto xMin = posMin[0]; auto yMin = posMin[1]; @@ -198,12 +198,12 @@ IFilter::PreflightResult CropVertexGeometry::preflightImpl(const DataStructure& Result<> CropVertexGeometry::executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto vertexGeomPath = args.value(k_VertexGeom_Key); - auto croppedGeomPath = args.value(k_CroppedGeom_Key); + auto vertexGeomPath = args.value(k_SelectedVertexGeometryPath_Key); + auto croppedGeomPath = args.value(k_CreatedVertexGeometryPath_Key); auto posMin = args.value>(k_MinPos_Key); auto posMax = args.value>(k_MaxPos_Key); auto targetArrays = args.value>(k_TargetArrayPaths_Key); - auto vertexDataName = args.value(k_VertexDataName_Key); + auto vertexDataName = args.value(k_VertexAttributeMatrixName_Key); auto xMin = posMin[0]; auto yMin = posMin[1]; @@ -289,8 +289,9 @@ Result CropVertexGeometry::FromSIMPLJson(const nlohmann::json& json) // Convert 3 numeric inputs into Vec3 inputs results.push_back(SIMPLConversion::Convert3Parameters(args, json, SIMPL::k_XMinKey, SIMPL::k_YMinKey, SIMPL::k_ZMinKey, k_MinPos_Key)); results.push_back(SIMPLConversion::Convert3Parameters(args, json, SIMPL::k_XMaxKey, SIMPL::k_YMaxKey, SIMPL::k_ZMaxKey, k_MaxPos_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_VertexGeom_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CroppedDataContainerNameKey, k_CroppedGeom_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_SelectedVertexGeometryPath_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CroppedDataContainerNameKey, k_CreatedVertexGeometryPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.hpp index aee15add58..c821fbdb91 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.hpp @@ -21,12 +21,12 @@ class SIMPLNXCORE_EXPORT CropVertexGeometry : public IFilter CropVertexGeometry& operator=(CropVertexGeometry&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_VertexGeom_Key = "vertex_geom"; - static inline constexpr StringLiteral k_CroppedGeom_Key = "cropped_geom"; + static inline constexpr StringLiteral k_SelectedVertexGeometryPath_Key = "input_vertex_geometry_path"; + static inline constexpr StringLiteral k_CreatedVertexGeometryPath_Key = "output_vertex_geometry_path"; static inline constexpr StringLiteral k_MinPos_Key = "min_pos"; static inline constexpr StringLiteral k_MaxPos_Key = "max_pos"; - static inline constexpr StringLiteral k_TargetArrayPaths_Key = "target_arrays"; - static inline constexpr StringLiteral k_VertexDataName_Key = "vertex_data_name"; + static inline constexpr StringLiteral k_TargetArrayPaths_Key = "target_array_paths"; + static inline constexpr StringLiteral k_VertexAttributeMatrixName_Key = "vertex_attribute_matrix_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp index 2e6b793d13..341254c2cf 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp @@ -66,7 +66,7 @@ Parameters ErodeDilateBadDataFilter::parameters() const params.insert(std::make_unique(k_ZDirOn_Key, "Z Direction", "Whether to erode/dilate in the Z direction", true)); params.insertSeparator(Parameters::Separator{"Required Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Cell belongs", DataPath({"FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); @@ -128,7 +128,7 @@ Result<> ErodeDilateBadDataFilter::executeImpl(DataStructure& dataStructure, con inputValues.ZDirOn = filterArgs.value(k_ZDirOn_Key); inputValues.FeatureIdsArrayPath = filterArgs.value(k_CellFeatureIdsArrayPath_Key); inputValues.IgnoredDataArrayPaths = filterArgs.value(k_IgnoredDataArrayPaths_Key); - inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); return ErodeDilateBadData(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -158,7 +158,7 @@ Result ErodeDilateBadDataFilter::FromSIMPLJson(const nlohmann::json& results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_XDirOnKey, k_XDirOn_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_YDirOnKey, k_YDirOn_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ZDirOnKey, k_ZDirOn_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_IgnoredDataArrayPathsKey, k_IgnoredDataArrayPaths_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp index 044e32bae3..5adc6126b8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp @@ -26,14 +26,14 @@ class SIMPLNXCORE_EXPORT ErodeDilateBadDataFilter : public IFilter ErodeDilateBadDataFilter& operator=(ErodeDilateBadDataFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_Operation_Key = "operation"; + static inline constexpr StringLiteral k_Operation_Key = "operation_index"; static inline constexpr StringLiteral k_NumIterations_Key = "num_iterations"; static inline constexpr StringLiteral k_XDirOn_Key = "x_dir_on"; static inline constexpr StringLiteral k_YDirOn_Key = "y_dir_on"; static inline constexpr StringLiteral k_ZDirOn_Key = "z_dir_on"; static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_IgnoredDataArrayPaths_Key = "ignored_data_array_paths"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp index 1883cdfc14..7486b56ca3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp @@ -58,7 +58,7 @@ Parameters ErodeDilateCoordinationNumberFilter::parameters() const params.insert(std::make_unique(k_Loop_Key, "Loop Until Gone", "Keep looping until all criteria is met", false)); params.insertSeparator(Parameters::Separator{"Required Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Cell belongs", DataPath({"FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); @@ -110,7 +110,7 @@ Result<> ErodeDilateCoordinationNumberFilter::executeImpl(DataStructure& dataStr inputValues.Loop = filterArgs.value(k_Loop_Key); inputValues.FeatureIdsArrayPath = filterArgs.value(k_CellFeatureIdsArrayPath_Key); inputValues.IgnoredDataArrayPaths = filterArgs.value(k_IgnoredDataArrayPaths_Key); - inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); return ErodeDilateCoordinationNumber(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -134,7 +134,7 @@ Result ErodeDilateCoordinationNumberFilter::FromSIMPLJson(const nlohm results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_CoordinationNumberKey, k_CoordinationNumber_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_LoopKey, k_Loop_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_IgnoredDataArrayPathsKey, k_IgnoredDataArrayPaths_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp index 0d4eb400fc..3a615a1d2f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp @@ -28,7 +28,7 @@ class SIMPLNXCORE_EXPORT ErodeDilateCoordinationNumberFilter : public IFilter static inline constexpr StringLiteral k_Loop_Key = "loop"; static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_IgnoredDataArrayPaths_Key = "ignored_data_array_paths"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp index d740e91fe6..20e9b53925 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp @@ -62,7 +62,7 @@ Parameters ErodeDilateMaskFilter::parameters() const params.insert(std::make_unique(k_ZDirOn_Key, "Z Direction", "Whether to erode/dilate in the Z direction", true)); params.insertSeparator(Parameters::Separator{"Required Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array Path", "Boolean array where true voxels are used. False voxels are ignored.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); @@ -109,7 +109,7 @@ Result<> ErodeDilateMaskFilter::executeImpl(DataStructure& dataStructure, const inputValues.YDirOn = filterArgs.value(k_YDirOn_Key); inputValues.ZDirOn = filterArgs.value(k_ZDirOn_Key); inputValues.MaskArrayPath = filterArgs.value(k_MaskArrayPath_Key); - inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); return ErodeDilateMask(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -139,7 +139,7 @@ Result ErodeDilateMaskFilter::FromSIMPLJson(const nlohmann::json& jso results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_YDirOnKey, k_YDirOn_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ZDirOnKey, k_ZDirOn_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_MaskArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_SelectedImageGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_SelectedImageGeometryPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp index e722fc16e5..40c4e95e32 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp @@ -26,13 +26,13 @@ class SIMPLNXCORE_EXPORT ErodeDilateMaskFilter : public IFilter ErodeDilateMaskFilter& operator=(ErodeDilateMaskFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_Operation_Key = "operation"; + static inline constexpr StringLiteral k_Operation_Key = "operation_index"; static inline constexpr StringLiteral k_NumIterations_Key = "num_iterations"; static inline constexpr StringLiteral k_XDirOn_Key = "x_dir_on"; static inline constexpr StringLiteral k_YDirOn_Key = "y_dir_on"; static inline constexpr StringLiteral k_ZDirOn_Key = "z_dir_on"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp index cd05555076..651d113909 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp @@ -66,9 +66,9 @@ Parameters ExtractComponentAsArrayFilter::parameters() const std::make_unique(k_SelectedArrayPath_Key, "Multicomponent Attribute Array", "The array to extract componenets from", DataPath{}, nx::core::GetAllNumericTypes())); params.insertSeparator(Parameters::Separator{"Created DataArray"}); - params.insert(std::make_unique(k_NewArrayPath_Key, "Scalar Attribute Array", "The DataArray to store the extracted components", "Extracted Component")); + params.insert(std::make_unique(k_NewArrayName_Key, "Scalar Attribute Array", "The DataArray to store the extracted components", "Extracted Component")); - params.linkParameters(k_MoveComponentsToNewArray_Key, k_NewArrayPath_Key, true); + params.linkParameters(k_MoveComponentsToNewArray_Key, k_NewArrayName_Key, true); params.linkParameters(k_MoveComponentsToNewArray_Key, k_RemoveComponentsFromArray_Key, true); return params; @@ -88,7 +88,7 @@ IFilter::PreflightResult ExtractComponentAsArrayFilter::preflightImpl(const Data auto pRemoveComponentsFromArrayValue = filterArgs.value(k_RemoveComponentsFromArray_Key); auto pCompNumberValue = filterArgs.value(k_CompNumber_Key); auto pSelectedArrayPathValue = filterArgs.value(k_SelectedArrayPath_Key); - auto pNewArrayPathValue = pSelectedArrayPathValue.getParent().createChildPath(filterArgs.value(k_NewArrayPath_Key)); + auto pNewArrayPathValue = pSelectedArrayPathValue.getParent().createChildPath(filterArgs.value(k_NewArrayName_Key)); PreflightResult preflightResult; nx::core::Result resultOutputActions; @@ -154,7 +154,7 @@ Result<> ExtractComponentAsArrayFilter::executeImpl(DataStructure& dataStructure // This is the array on the original array path whether its removed or not inputValues.BaseArrayPath = filterArgs.value(k_SelectedArrayPath_Key); // If move components to new array is true this is a valid path - inputValues.NewArrayPath = inputValues.BaseArrayPath.getParent().createChildPath(filterArgs.value(k_NewArrayPath_Key)); + inputValues.NewArrayPath = inputValues.BaseArrayPath.getParent().createChildPath(filterArgs.value(k_NewArrayName_Key)); return ExtractComponentAsArray(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -179,7 +179,7 @@ Result ExtractComponentAsArrayFilter::FromSIMPLJson(const nlohmann::j results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_CompNumberKey, k_CompNumber_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedArrayPathKey, k_SelectedArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewArrayArrayNameKey, k_NewArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewArrayArrayNameKey, k_NewArrayName_Key)); if(json.contains(SIMPL::k_ReducedArrayArrayNameKey.str())) { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp index cc658f27b8..b0e8fea3c4 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp @@ -29,7 +29,7 @@ class SIMPLNXCORE_EXPORT ExtractComponentAsArrayFilter : public IFilter static inline constexpr StringLiteral k_MoveComponentsToNewArray_Key = "move_components_to_new_array"; static inline constexpr StringLiteral k_CompNumber_Key = "comp_number"; static inline constexpr StringLiteral k_SelectedArrayPath_Key = "selected_array_path"; - static inline constexpr StringLiteral k_NewArrayPath_Key = "new_array_path"; + static inline constexpr StringLiteral k_NewArrayName_Key = "new_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.cpp index 77ec42b684..4ad101cd11 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.cpp @@ -130,7 +130,7 @@ Parameters ExtractInternalSurfacesFromTriangleGeometry::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Geometry"}); - params.insert(std::make_unique(k_TriangleGeom_Key, "Triangle Geometry", "Path to the existing Triangle Geometry", DataPath(), + params.insert(std::make_unique(k_SelectedTriangleGeometryPath_Key, "Triangle Geometry", "Path to the existing Triangle Geometry", DataPath(), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insertSeparator(Parameters::Separator{"Input Vertex Data"}); params.insert(std::make_unique(k_NodeTypesPath_Key, "Node Types Array", "Path to the Node Types array", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::int8}, @@ -140,9 +140,10 @@ Parameters ExtractInternalSurfacesFromTriangleGeometry::parameters() const std::vector{"Min", "Max"})); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); - params.insert(std::make_unique(k_InternalTriangleGeom_Key, "Created Triangle Geometry Path", "Path to create the new Triangle Geometry", DataPath())); - params.insert(std::make_unique(k_VertexDataName_Key, "Vertex Data Attribute Matrix", "Created vertex data AttributeMatrix name", INodeGeometry0D::k_VertexDataName)); - params.insert(std::make_unique(k_FaceDataName_Key, "Face Data Attribute Matrix", "Created face data AttributeMatrix name", INodeGeometry2D::k_FaceDataName)); + params.insert(std::make_unique(k_CreatedTriangleGeometryPath_Key, "Created Triangle Geometry Path", "Path to create the new Triangle Geometry", DataPath())); + params.insert( + std::make_unique(k_VertexAttributeMatrixName_Key, "Vertex Data Attribute Matrix", "Created vertex data AttributeMatrix name", INodeGeometry0D::k_VertexDataName)); + params.insert(std::make_unique(k_TriangleAttributeMatrixName_Key, "Face Data Attribute Matrix", "Created face data AttributeMatrix name", INodeGeometry2D::k_FaceDataName)); params.insertSeparator(Parameters::Separator{"Optional Transferred Data"}); params.insert(std::make_unique(k_CopyVertexPaths_Key, "Copy Vertex Arrays", "Paths to vertex-related DataArrays that should be copied to the new geometry", @@ -162,13 +163,13 @@ IFilter::UniquePointer ExtractInternalSurfacesFromTriangleGeometry::clone() cons IFilter::PreflightResult ExtractInternalSurfacesFromTriangleGeometry::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto triangleGeomPath = filterArgs.value(k_TriangleGeom_Key); - auto internalTrianglesGeomPath = filterArgs.value(k_InternalTriangleGeom_Key); + auto triangleGeomPath = filterArgs.value(k_SelectedTriangleGeometryPath_Key); + auto internalTrianglesGeomPath = filterArgs.value(k_CreatedTriangleGeometryPath_Key); auto nodeTypesArrayPath = filterArgs.value(k_NodeTypesPath_Key); auto copyVertexPaths = filterArgs.value>(k_CopyVertexPaths_Key); auto copyTrianglePaths = filterArgs.value>(k_CopyTrianglePaths_Key); - auto vertexDataName = filterArgs.value(k_VertexDataName_Key); - auto faceDataName = filterArgs.value(k_FaceDataName_Key); + auto vertexDataName = filterArgs.value(k_VertexAttributeMatrixName_Key); + auto faceDataName = filterArgs.value(k_TriangleAttributeMatrixName_Key); std::vector arrays; OutputActions actions; @@ -259,12 +260,12 @@ Result<> ExtractInternalSurfacesFromTriangleGeometry::executeImpl(DataStructure& const std::atomic_bool& shouldCancel) const { auto nodeTypesArrayPath = args.value(k_NodeTypesPath_Key); - auto triangleGeomPath = args.value(k_TriangleGeom_Key); - auto internalTrianglesPath = args.value(k_InternalTriangleGeom_Key); + auto triangleGeomPath = args.value(k_SelectedTriangleGeometryPath_Key); + auto internalTrianglesPath = args.value(k_CreatedTriangleGeometryPath_Key); auto copyVertexPaths = args.value>(k_CopyVertexPaths_Key); auto copyTrianglePaths = args.value>(k_CopyTrianglePaths_Key); - auto vertexDataName = args.value(k_VertexDataName_Key); - auto faceDataName = args.value(k_FaceDataName_Key); + auto vertexDataName = args.value(k_VertexAttributeMatrixName_Key); + auto faceDataName = args.value(k_TriangleAttributeMatrixName_Key); auto minMaxNodeValues = args.value(k_NodeTypeRange_Key); @@ -419,7 +420,8 @@ Result ExtractInternalSurfacesFromTriangleGeometry::FromSIMPLJson(con std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_TriangleDataContainerNameKey, k_TriangleGeom_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_TriangleDataContainerNameKey, k_SelectedTriangleGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NodeTypesArrayPathKey, k_NodeTypesPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp index 1475a679b6..f6c16e9a4a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp @@ -21,13 +21,13 @@ class SIMPLNXCORE_EXPORT ExtractInternalSurfacesFromTriangleGeometry : public IF ExtractInternalSurfacesFromTriangleGeometry& operator=(ExtractInternalSurfacesFromTriangleGeometry&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_TriangleGeom_Key = "triangle_geom"; - static inline constexpr StringLiteral k_InternalTriangleGeom_Key = "internal_triangle_geom"; - static inline constexpr StringLiteral k_NodeTypesPath_Key = "node_types"; + static inline constexpr StringLiteral k_SelectedTriangleGeometryPath_Key = "input_triangle_geometry_path"; + static inline constexpr StringLiteral k_CreatedTriangleGeometryPath_Key = "output_triangle_geometry_path"; + static inline constexpr StringLiteral k_NodeTypesPath_Key = "node_types_path"; static inline constexpr StringLiteral k_CopyVertexPaths_Key = "copy_vertex_array_paths"; static inline constexpr StringLiteral k_CopyTrianglePaths_Key = "copy_triangle_array_paths"; - static inline constexpr StringLiteral k_VertexDataName_Key = "vertex_data_name"; - static inline constexpr StringLiteral k_FaceDataName_Key = "face_data_name"; + static inline constexpr StringLiteral k_VertexAttributeMatrixName_Key = "vertex_attribute_matrix_name"; + static inline constexpr StringLiteral k_TriangleAttributeMatrixName_Key = "triangle_attribute_matrix_name"; static inline constexpr StringLiteral k_NodeTypeRange_Key = "node_type_range"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp index 74d383974e..fa106722ee 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp @@ -26,10 +26,10 @@ class SIMPLNXCORE_EXPORT ExtractVertexGeometryFilter : public IFilter ExtractVertexGeometryFilter& operator=(ExtractVertexGeometryFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ArrayHandling_Key = "array_handling"; + static inline constexpr StringLiteral k_ArrayHandling_Key = "array_handling_index"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - static inline constexpr StringLiteral k_InputGeometryPath_Key = "input_geometry_path"; + static inline constexpr StringLiteral k_InputGeometryPath_Key = "input_grid_geometry_path"; static inline constexpr StringLiteral k_IncludedDataArrayPaths_Key = "included_data_array_paths"; static inline constexpr StringLiteral k_VertexGeometryPath_Key = "output_vertex_geometry_path"; static inline constexpr StringLiteral k_VertexAttrMatrixName_Key = "output_vertex_attr_matrix_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp index e3ca7326e4..78259f0157 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp @@ -53,7 +53,7 @@ Parameters FeatureFaceCurvatureFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_TriangleGeom_Key, "Triangle Geometry", "The input Triangle Geometry to compute the curvature values", DataPath(), + params.insert(std::make_unique(k_TriangleGeomPath_Key, "Triangle Geometry", "The input Triangle Geometry to compute the curvature values", DataPath(), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insert(std::make_unique(k_NeighborhoodRing_Key, "Neighborhood Ring Count", "The number of ring neighbors to use", 1)); @@ -61,41 +61,41 @@ Parameters FeatureFaceCurvatureFilter::parameters() const params.insertLinkableParameter(std::make_unique(k_ComputeGaussianCurvature_Key, "Compute Gaussian Curvature", "Compute the Gaussian Curvature values", true)); - params.insertLinkableParameter(std::make_unique(k_ComputeMeanCurvature_Key, "Compute Mean Curvature", "Compute the Mean Curvature values", true)); + params.insertLinkableParameter(std::make_unique(k_ComputeMeanCurvaturePath_Key, "Compute Mean Curvature", "Compute the Mean Curvature values", true)); params.insertLinkableParameter(std::make_unique(k_ComputeWeingartenMatrix_Key, "Compute Weingarten Matrix", "Compute the Weingarten Matrix values", true)); params.insertLinkableParameter(std::make_unique(k_UseFaceNormals_Key, "Use Face Normals for Curve Fitting", "Use the face normals for curve fitting.", true)); params.insertSeparator(Parameters::Separator{"Required Face Data"}); - params.insert(std::make_unique(k_FaceAttribMatrix_Key, "Face Attribute Matrix", "The AttributeMatrix that holds the triangle face data.", DataPath())); - params.insert(std::make_unique(k_FaceLabels_Key, "Face Labels", "The DataPath to the 'Face Labels' DataArray", DataPath(), + params.insert(std::make_unique(k_FaceAttribMatrixPath_Key, "Face Attribute Matrix", "The AttributeMatrix that holds the triangle face data.", DataPath())); + params.insert(std::make_unique(k_FaceLabelsPath_Key, "Face Labels", "The DataPath to the 'Face Labels' DataArray", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{IArray::ShapeType{2}})); - params.insert(std::make_unique(k_FeatureFaceIds_Key, "Feature Face IDs", "The DataPath to the 'FeatureIds' DataArray", DataPath(), + params.insert(std::make_unique(k_FeatureFaceIdsPath_Key, "Feature Face IDs", "The DataPath to the 'FeatureIds' DataArray", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{IArray::ShapeType{1}})); - params.insert(std::make_unique(k_FaceNormals_Key, "Face Normals", "The DataPath to the 'Feature Normals' DataArray", DataPath(), + params.insert(std::make_unique(k_FaceNormalsPath_Key, "Face Normals", "The DataPath to the 'Feature Normals' DataArray", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::float64}, ArraySelectionParameter::AllowedComponentShapes{IArray::ShapeType{3}})); - params.insert(std::make_unique(k_FaceCentroids_Key, "Face Centroids", "The DataPath to the 'Face Centroids' DataArray", DataPath(), + params.insert(std::make_unique(k_FaceCentroidsPath_Key, "Face Centroids", "The DataPath to the 'Face Centroids' DataArray", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::float64}, ArraySelectionParameter::AllowedComponentShapes{IArray::ShapeType{3}})); params.insertSeparator(Parameters::Separator{"Created Face Data"}); - params.insert(std::make_unique(k_PrincipalCurvature1_Key, "Principal Curvature 1", "Output DataPath to hold the 'Principal Curvature 1' values", DataPath())); - params.insert(std::make_unique(k_PrincipalCurvature2_Key, "Principal Curvature 2", "Output DataPath to hold the 'Principal Curvature 2' values", DataPath())); - params.insert(std::make_unique(k_PrincipalDirection1_Key, "Principal Direction 1", "Output DataPath to hold the 'Principal Direction 1' values", DataPath())); - params.insert(std::make_unique(k_PrincipalDirection2_Key, "Principal Direction 2", "Output DataPath to hold the 'Principal Direction 2' values", DataPath())); - params.insert(std::make_unique(k_GaussianCurvature_Key, "Gaussian Curvature", "Output DataPath to hold the 'Gaussian Curvature' values", DataPath())); - params.insert(std::make_unique(k_MeanCurvature_Key, "Mean Curvature", "Output DataPath to hold the 'Mean Curvature' values", DataPath())); - params.insert(std::make_unique(k_WeingartenMatrix_Key, "Weingarten Matrix", "Output DataPath to hold the 'Weingarten Matrix' values", DataPath())); + params.insert(std::make_unique(k_PrincipalCurvature1Path_Key, "Principal Curvature 1", "Output DataPath to hold the 'Principal Curvature 1' values", DataPath())); + params.insert(std::make_unique(k_PrincipalCurvature2Path_Key, "Principal Curvature 2", "Output DataPath to hold the 'Principal Curvature 2' values", DataPath())); + params.insert(std::make_unique(k_PrincipalDirection1Path_Key, "Principal Direction 1", "Output DataPath to hold the 'Principal Direction 1' values", DataPath())); + params.insert(std::make_unique(k_PrincipalDirection2Path_Key, "Principal Direction 2", "Output DataPath to hold the 'Principal Direction 2' values", DataPath())); + params.insert(std::make_unique(k_GaussianCurvaturePath_Key, "Gaussian Curvature", "Output DataPath to hold the 'Gaussian Curvature' values", DataPath())); + params.insert(std::make_unique(k_MeanCurvaturePath_Key, "Mean Curvature", "Output DataPath to hold the 'Mean Curvature' values", DataPath())); + params.insert(std::make_unique(k_WeingartenMatrixPath_Key, "Weingarten Matrix", "Output DataPath to hold the 'Weingarten Matrix' values", DataPath())); // Associate the Linkable Parameter(s) to the children parameters that they control - params.linkParameters(k_ComputePrincipalDirection_Key, k_PrincipalCurvature1_Key, true); - params.linkParameters(k_ComputePrincipalDirection_Key, k_PrincipalCurvature2_Key, true); - params.linkParameters(k_ComputePrincipalDirection_Key, k_PrincipalDirection1_Key, true); - params.linkParameters(k_ComputePrincipalDirection_Key, k_PrincipalDirection2_Key, true); - params.linkParameters(k_ComputeGaussianCurvature_Key, k_GaussianCurvature_Key, true); - params.linkParameters(k_ComputeMeanCurvature_Key, k_MeanCurvature_Key, true); - params.linkParameters(k_ComputeWeingartenMatrix_Key, k_WeingartenMatrix_Key, true); - params.linkParameters(k_UseFaceNormals_Key, k_FaceNormals_Key, true); + params.linkParameters(k_ComputePrincipalDirection_Key, k_PrincipalCurvature1Path_Key, true); + params.linkParameters(k_ComputePrincipalDirection_Key, k_PrincipalCurvature2Path_Key, true); + params.linkParameters(k_ComputePrincipalDirection_Key, k_PrincipalDirection1Path_Key, true); + params.linkParameters(k_ComputePrincipalDirection_Key, k_PrincipalDirection2Path_Key, true); + params.linkParameters(k_ComputeGaussianCurvature_Key, k_GaussianCurvaturePath_Key, true); + params.linkParameters(k_ComputeMeanCurvaturePath_Key, k_MeanCurvaturePath_Key, true); + params.linkParameters(k_ComputeWeingartenMatrix_Key, k_WeingartenMatrixPath_Key, true); + params.linkParameters(k_UseFaceNormals_Key, k_FaceNormalsPath_Key, true); return params; } @@ -110,26 +110,26 @@ IFilter::UniquePointer FeatureFaceCurvatureFilter::clone() const IFilter::PreflightResult FeatureFaceCurvatureFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto triangleGeomPath = filterArgs.value(k_TriangleGeom_Key); - auto surfaceMeshPrincipalCurvature1Path = filterArgs.value(k_PrincipalCurvature1_Key); - auto surfaceMeshFeatureFaceIdsPath = filterArgs.value(k_FeatureFaceIds_Key); - auto surfaceMeshFaceLabelsPath = filterArgs.value(k_FaceLabels_Key); - auto surfaceMeshFaceNormalsPath = filterArgs.value(k_FaceNormals_Key); - auto surfaceMeshTriangleCentroidsPath = filterArgs.value(k_FaceCentroids_Key); + auto triangleGeomPath = filterArgs.value(k_TriangleGeomPath_Key); + auto surfaceMeshPrincipalCurvature1Path = filterArgs.value(k_PrincipalCurvature1Path_Key); + auto surfaceMeshFeatureFaceIdsPath = filterArgs.value(k_FeatureFaceIdsPath_Key); + auto surfaceMeshFaceLabelsPath = filterArgs.value(k_FaceLabelsPath_Key); + auto surfaceMeshFaceNormalsPath = filterArgs.value(k_FaceNormalsPath_Key); + auto surfaceMeshTriangleCentroidsPath = filterArgs.value(k_FaceCentroidsPath_Key); auto computePrincipalCurvature = filterArgs.value(k_ComputePrincipalDirection_Key); auto computePrincipalDirection = filterArgs.value(k_ComputePrincipalDirection_Key); auto computeGaussianCurvature = filterArgs.value(k_ComputeGaussianCurvature_Key); - auto computeMeanCurvature = filterArgs.value(k_ComputeMeanCurvature_Key); + auto computeMeanCurvature = filterArgs.value(k_ComputeMeanCurvaturePath_Key); auto computeWeingartenMatrix = filterArgs.value(k_ComputeWeingartenMatrix_Key); - auto surfaceMeshPrincipalCurvature1sPath = filterArgs.value(k_PrincipalCurvature1_Key); - auto surfaceMeshPrincipalCurvature2sPath = filterArgs.value(k_PrincipalCurvature2_Key); - auto surfaceMeshPrincipalDirection1sPath = filterArgs.value(k_PrincipalDirection1_Key); - auto surfaceMeshPrincipalDirection2sPath = filterArgs.value(k_PrincipalDirection2_Key); - auto surfaceMeshMeanCurvaturesPath = filterArgs.value(k_MeanCurvature_Key); - auto surfaceMeshGaussianCurvaturesPath = filterArgs.value(k_GaussianCurvature_Key); - auto surfaceMeshWeingartenMatrixPath = filterArgs.value(k_WeingartenMatrix_Key); + auto surfaceMeshPrincipalCurvature1sPath = filterArgs.value(k_PrincipalCurvature1Path_Key); + auto surfaceMeshPrincipalCurvature2sPath = filterArgs.value(k_PrincipalCurvature2Path_Key); + auto surfaceMeshPrincipalDirection1sPath = filterArgs.value(k_PrincipalDirection1Path_Key); + auto surfaceMeshPrincipalDirection2sPath = filterArgs.value(k_PrincipalDirection2Path_Key); + auto surfaceMeshMeanCurvaturesPath = filterArgs.value(k_MeanCurvaturePath_Key); + auto surfaceMeshGaussianCurvaturesPath = filterArgs.value(k_GaussianCurvaturePath_Key); + auto surfaceMeshWeingartenMatrixPath = filterArgs.value(k_WeingartenMatrixPath_Key); std::vector dataArrays; @@ -207,21 +207,21 @@ Result<> FeatureFaceCurvatureFilter::executeImpl(DataStructure& dataStructure, c FeatureFaceCurvatureInputValues inputValues; inputValues.NRingCount = filterArgs.value(k_NeighborhoodRing_Key); - inputValues.triangleGeomPath = filterArgs.value(k_TriangleGeom_Key); - inputValues.surfaceMeshPrincipalCurvature1Path = filterArgs.value(k_PrincipalCurvature1_Key); - inputValues.surfaceMeshFeatureFaceIdsPath = filterArgs.value(k_FeatureFaceIds_Key); - inputValues.surfaceMeshFaceLabelsPath = filterArgs.value(k_FaceLabels_Key); - inputValues.surfaceMeshFaceNormalsPath = filterArgs.value(k_FaceNormals_Key); - inputValues.surfaceMeshTriangleCentroidsPath = filterArgs.value(k_FaceCentroids_Key); + inputValues.triangleGeomPath = filterArgs.value(k_TriangleGeomPath_Key); + inputValues.surfaceMeshPrincipalCurvature1Path = filterArgs.value(k_PrincipalCurvature1Path_Key); + inputValues.surfaceMeshFeatureFaceIdsPath = filterArgs.value(k_FeatureFaceIdsPath_Key); + inputValues.surfaceMeshFaceLabelsPath = filterArgs.value(k_FaceLabelsPath_Key); + inputValues.surfaceMeshFaceNormalsPath = filterArgs.value(k_FaceNormalsPath_Key); + inputValues.surfaceMeshTriangleCentroidsPath = filterArgs.value(k_FaceCentroidsPath_Key); inputValues.useNormalsForCurveFitting = filterArgs.value(k_UseFaceNormals_Key); - inputValues.surfaceMeshPrincipalCurvature1sPath = filterArgs.value(k_PrincipalCurvature1_Key); - inputValues.surfaceMeshPrincipalCurvature2sPath = filterArgs.value(k_PrincipalCurvature2_Key); - inputValues.surfaceMeshPrincipalDirection1sPath = filterArgs.value(k_PrincipalDirection1_Key); - inputValues.surfaceMeshPrincipalDirection2sPath = filterArgs.value(k_PrincipalDirection2_Key); - inputValues.surfaceMeshMeanCurvaturesPath = filterArgs.value(k_MeanCurvature_Key); - inputValues.surfaceMeshGaussianCurvaturesPath = filterArgs.value(k_GaussianCurvature_Key); - inputValues.surfaceMeshWeingartenMatrixPath = filterArgs.value(k_WeingartenMatrix_Key); + inputValues.surfaceMeshPrincipalCurvature1sPath = filterArgs.value(k_PrincipalCurvature1Path_Key); + inputValues.surfaceMeshPrincipalCurvature2sPath = filterArgs.value(k_PrincipalCurvature2Path_Key); + inputValues.surfaceMeshPrincipalDirection1sPath = filterArgs.value(k_PrincipalDirection1Path_Key); + inputValues.surfaceMeshPrincipalDirection2sPath = filterArgs.value(k_PrincipalDirection2Path_Key); + inputValues.surfaceMeshMeanCurvaturesPath = filterArgs.value(k_MeanCurvaturePath_Key); + inputValues.surfaceMeshGaussianCurvaturesPath = filterArgs.value(k_GaussianCurvaturePath_Key); + inputValues.surfaceMeshWeingartenMatrixPath = filterArgs.value(k_WeingartenMatrixPath_Key); return FeatureFaceCurvature(dataStructure, messageHandler, shouldCancel, &inputValues)(); } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp index 131c8fdc74..816c53e794 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp @@ -25,25 +25,25 @@ class SIMPLNXCORE_EXPORT FeatureFaceCurvatureFilter : public IFilter FeatureFaceCurvatureFilter& operator=(FeatureFaceCurvatureFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_TriangleGeom_Key = "triangle_geom"; + static inline constexpr StringLiteral k_TriangleGeomPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_NeighborhoodRing_Key = "neighborhood_ring"; static inline constexpr StringLiteral k_ComputePrincipalDirection_Key = "compute_principal_direction"; static inline constexpr StringLiteral k_ComputeGaussianCurvature_Key = "compute_gaussian_curvature"; - static inline constexpr StringLiteral k_ComputeMeanCurvature_Key = "compute_mean_curvature"; + static inline constexpr StringLiteral k_ComputeMeanCurvaturePath_Key = "compute_mean_curvature_path"; static inline constexpr StringLiteral k_ComputeWeingartenMatrix_Key = "compute_weingarten_matrix"; static inline constexpr StringLiteral k_UseFaceNormals_Key = "use_normals"; - static inline constexpr StringLiteral k_FaceAttribMatrix_Key = "face_attribute_matrix"; - static inline constexpr StringLiteral k_FaceLabels_Key = "face_labels"; - static inline constexpr StringLiteral k_FeatureFaceIds_Key = "feature_face_ids"; - static inline constexpr StringLiteral k_FaceNormals_Key = "face_normals"; - static inline constexpr StringLiteral k_FaceCentroids_Key = "face_centroids"; - static inline constexpr StringLiteral k_PrincipalCurvature1_Key = "principal_curvature_1"; - static inline constexpr StringLiteral k_PrincipalCurvature2_Key = "principal_curvature_2"; - static inline constexpr StringLiteral k_PrincipalDirection1_Key = "principal_direction_1"; - static inline constexpr StringLiteral k_PrincipalDirection2_Key = "principal_direction_2"; - static inline constexpr StringLiteral k_GaussianCurvature_Key = "gaussian_curvature"; - static inline constexpr StringLiteral k_MeanCurvature_Key = "mean_curvature"; - static inline constexpr StringLiteral k_WeingartenMatrix_Key = "weingarten_matrix"; + static inline constexpr StringLiteral k_FaceAttribMatrixPath_Key = "face_attribute_matrix_path"; + static inline constexpr StringLiteral k_FaceLabelsPath_Key = "face_labels_path"; + static inline constexpr StringLiteral k_FeatureFaceIdsPath_Key = "feature_face_ids_path"; + static inline constexpr StringLiteral k_FaceNormalsPath_Key = "face_normals_path"; + static inline constexpr StringLiteral k_FaceCentroidsPath_Key = "face_centroids_path"; + static inline constexpr StringLiteral k_PrincipalCurvature1Path_Key = "principal_curvature_1_path"; + static inline constexpr StringLiteral k_PrincipalCurvature2Path_Key = "principal_curvature_2_path"; + static inline constexpr StringLiteral k_PrincipalDirection1Path_Key = "principal_direction_1_path"; + static inline constexpr StringLiteral k_PrincipalDirection2Path_Key = "principal_direction_2_path"; + static inline constexpr StringLiteral k_GaussianCurvaturePath_Key = "gaussian_curvature_path"; + static inline constexpr StringLiteral k_MeanCurvaturePath_Key = "mean_curvature_path"; + static inline constexpr StringLiteral k_WeingartenMatrixPath_Key = "weingarten_matrix_path"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp index 85a52e8b5f..710dcc1ba0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp @@ -59,7 +59,7 @@ Parameters FillBadDataFilter::parameters() const std::make_unique(k_StoreAsNewPhase_Key, "Store Defects as New Phase", "Whether to change the phase of 'defect' larger than the minimum allowed size above", false)); params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); // params.insert(std::make_unique(k_SelectedCellDataGroup_Key, "Cell Data Attribute Matrix", "Cell data Attribute Matrix", DataPath{})); @@ -130,7 +130,7 @@ Result<> FillBadDataFilter::executeImpl(DataStructure& dataStructure, const Argu inputValues.featureIdsArrayPath = filterArgs.value(k_CellFeatureIdsArrayPath_Key); inputValues.cellPhasesArrayPath = filterArgs.value(k_CellPhasesArrayPath_Key); inputValues.ignoredDataArrayPaths = filterArgs.value(k_IgnoredDataArrayPaths_Key); - inputValues.inputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.inputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); return FillBadData(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -155,7 +155,7 @@ Result FillBadDataFilter::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_MinAllowedDefectSizeKey, k_MinAllowedDefectSize_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_StoreAsNewPhaseKey, k_StoreAsNewPhase_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedCellDataGroup_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellPhasesArrayPathKey, k_CellPhasesArrayPath_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.hpp index ec43bb4afd..ea77eeeaab 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.hpp @@ -30,7 +30,7 @@ class SIMPLNXCORE_EXPORT FillBadDataFilter : public IFilter static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; static inline constexpr StringLiteral k_IgnoredDataArrayPaths_Key = "ignored_data_array_paths"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_SelectedCellDataGroup_Key = "selected_cell_data_group"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.cpp index 927336f747..9f91474fed 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.cpp @@ -49,7 +49,7 @@ OutputActions CreateCompatibleArrays(const DataStructure& data, const Arguments& auto standardizeDataValue = args.value(FindArrayStatisticsFilter::k_StandardizeData_Key); auto inputArrayPath = args.value(FindArrayStatisticsFilter::k_SelectedArrayPath_Key); auto* inputArray = data.getDataAs(inputArrayPath); - auto destinationAttributeMatrixValue = args.value(FindArrayStatisticsFilter::k_DestinationAttributeMatrix_Key); + auto destinationAttributeMatrixValue = args.value(FindArrayStatisticsFilter::k_DestinationAttributeMatrixPath_Key); DataType dataType = inputArray->getDataType(); size_t tupleSize = std::accumulate(tupleDims.begin(), tupleDims.end(), static_cast(1), std::multiplies<>()); @@ -142,7 +142,7 @@ OutputActions CreateCompatibleArrays(const DataStructure& data, const Arguments& } if(pFindNumUniqueValuesValue) { - auto arrayPath = args.value(FindArrayStatisticsFilter::k_NumUniqueValues_Key); + auto arrayPath = args.value(FindArrayStatisticsFilter::k_NumUniqueValuesName_Key); auto action = std::make_unique(DataType::int32, tupleDims, std::vector{1}, destinationAttributeMatrixValue.createChildPath(arrayPath)); actions.appendAction(std::move(action)); } @@ -194,7 +194,7 @@ Parameters FindArrayStatisticsFilter::parameters() const params.insert(std::make_unique(k_SelectedArrayPath_Key, "Attribute Array to Compute Statistics", "Input Attribute Array for which to compute statistics", DataPath{}, nx::core::GetAllDataTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert( - std::make_unique(k_DestinationAttributeMatrix_Key, "Destination Attribute Matrix", "Attribute Matrix in which to store the computed statistics", DataPath{})); + std::make_unique(k_DestinationAttributeMatrixPath_Key, "Destination Attribute Matrix", "Attribute Matrix in which to store the computed statistics", DataPath{})); params.insertSeparator(Parameters::Separator{"Histogram Options"}); params.insertLinkableParameter(std::make_unique(k_FindHistogram_Key, "Find Histogram", "Whether to compute the histogram of the input array", false)); @@ -254,7 +254,7 @@ Parameters FindArrayStatisticsFilter::parameters() const params.insert(std::make_unique(k_StandardizedArrayName_Key, "Standardized Data Array Name", "The name of the standardized data array", "Standardized")); params.insertLinkableParameter(std::make_unique(k_FindUniqueValues_Key, "Find Number of Unique Values", "Whether to compute the number of unique values in the input array", false)); - params.insert(std::make_unique(k_NumUniqueValues_Key, "Number of Unique Values Array Name", "The name of the array which stores the calculated number of unique values", + params.insert(std::make_unique(k_NumUniqueValuesName_Key, "Number of Unique Values Array Name", "The name of the array which stores the calculated number of unique values", "NumUniqueValues")); // Associate the Linkable Parameter(s) to the children parameters that they control @@ -278,7 +278,7 @@ Parameters FindArrayStatisticsFilter::parameters() const params.linkParameters(k_ComputeByIndex_Key, k_CellFeatureIdsArrayPath_Key, true); params.linkParameters(k_ComputeByIndex_Key, k_FeatureHasDataArrayName_Key, true); params.linkParameters(k_StandardizeData_Key, k_StandardizedArrayName_Key, true); - params.linkParameters(k_FindUniqueValues_Key, k_NumUniqueValues_Key, true); + params.linkParameters(k_FindUniqueValues_Key, k_NumUniqueValuesName_Key, true); return params; } @@ -310,7 +310,7 @@ IFilter::PreflightResult FindArrayStatisticsFilter::preflightImpl(const DataStru auto pStandardizeDataValue = filterArgs.value(k_StandardizeData_Key); auto pSelectedArrayPathValue = filterArgs.value(k_SelectedArrayPath_Key); auto pMaskArrayPathValue = filterArgs.value(k_MaskArrayPath_Key); - auto pDestinationAttributeMatrixValue = filterArgs.value(k_DestinationAttributeMatrix_Key); + auto pDestinationAttributeMatrixValue = filterArgs.value(k_DestinationAttributeMatrixPath_Key); PreflightResult preflightResult; Result resultOutputActions; @@ -440,7 +440,7 @@ Result<> FindArrayStatisticsFilter::executeImpl(DataStructure& dataStructure, co inputValues.SelectedArrayPath = filterArgs.value(k_SelectedArrayPath_Key); inputValues.FeatureIdsArrayPath = filterArgs.value(k_CellFeatureIdsArrayPath_Key); inputValues.MaskArrayPath = filterArgs.value(k_MaskArrayPath_Key); - inputValues.DestinationAttributeMatrix = filterArgs.value(k_DestinationAttributeMatrix_Key); + inputValues.DestinationAttributeMatrix = filterArgs.value(k_DestinationAttributeMatrixPath_Key); inputValues.FeatureHasDataArrayName = inputValues.DestinationAttributeMatrix.createChildPath(filterArgs.value(k_FeatureHasDataArrayName_Key)); inputValues.HistogramArrayName = inputValues.DestinationAttributeMatrix.createChildPath(filterArgs.value(k_HistogramArrayName_Key)); inputValues.MostPopulatedBinArrayName = inputValues.DestinationAttributeMatrix.createChildPath(filterArgs.value(k_MostPopulatedBinArrayName_Key)); @@ -454,7 +454,7 @@ Result<> FindArrayStatisticsFilter::executeImpl(DataStructure& dataStructure, co inputValues.StdDeviationArrayName = inputValues.DestinationAttributeMatrix.createChildPath(filterArgs.value(k_StdDeviationArrayName_Key)); inputValues.SummationArrayName = inputValues.DestinationAttributeMatrix.createChildPath(filterArgs.value(k_SummationArrayName_Key)); inputValues.StandardizedArrayName = inputValues.SelectedArrayPath.getParent().createChildPath(filterArgs.value(k_StandardizedArrayName_Key)); - inputValues.NumUniqueValuesName = inputValues.DestinationAttributeMatrix.createChildPath(filterArgs.value(k_NumUniqueValues_Key)); + inputValues.NumUniqueValuesName = inputValues.DestinationAttributeMatrix.createChildPath(filterArgs.value(k_NumUniqueValuesName_Key)); return FindArrayStatistics(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -519,7 +519,7 @@ Result FindArrayStatisticsFilter::FromSIMPLJson(const nlohmann::json& results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_MaskArrayPath_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DestinationAttributeMatrixKey, k_DestinationAttributeMatrix_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DestinationAttributeMatrixKey, k_DestinationAttributeMatrixPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_HistogramArrayNameKey, k_HistogramArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_LengthArrayNameKey, k_LengthArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MinimumArrayNameKey, k_MinimumArrayName_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.hpp index ca8b9c112f..b63ca6c34a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.hpp @@ -47,7 +47,7 @@ class SIMPLNXCORE_EXPORT FindArrayStatisticsFilter : public IFilter static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_FeatureHasDataArrayName_Key = "feature_has_data_array_name"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - static inline constexpr StringLiteral k_DestinationAttributeMatrix_Key = "destination_attribute_matrix"; + static inline constexpr StringLiteral k_DestinationAttributeMatrixPath_Key = "destination_attribute_matrix_path"; static inline constexpr StringLiteral k_HistogramArrayName_Key = "histogram_array_name"; static inline constexpr StringLiteral k_MostPopulatedBinArrayName_Key = "most_populated_bin_array_name"; static inline constexpr StringLiteral k_ModalBinArrayName_Key = "modal_bin_array_name"; @@ -60,7 +60,7 @@ class SIMPLNXCORE_EXPORT FindArrayStatisticsFilter : public IFilter static inline constexpr StringLiteral k_StdDeviationArrayName_Key = "std_deviation_array_name"; static inline constexpr StringLiteral k_SummationArrayName_Key = "summation_array_name"; static inline constexpr StringLiteral k_StandardizedArrayName_Key = "standardized_array_name"; - static inline constexpr StringLiteral k_NumUniqueValues_Key = "number_unique_values"; + static inline constexpr StringLiteral k_NumUniqueValuesName_Key = "number_unique_values_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.hpp index e3d7845360..d0f82a0143 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT FindBiasedFeaturesFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_CalcByPhase_Key = "calc_by_phase"; - static inline constexpr StringLiteral k_GeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_GeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_CentroidsArrayPath_Key = "centroids_array_path"; static inline constexpr StringLiteral k_SurfaceFeaturesArrayPath_Key = "surface_features_array_path"; static inline constexpr StringLiteral k_PhasesArrayPath_Key = "phases_array_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.hpp index 5e008b2911..5d6fb5d8de 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.hpp @@ -26,7 +26,7 @@ class SIMPLNXCORE_EXPORT FindBoundaryCellsFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_IgnoreFeatureZero_Key = "ignore_feature_zero"; static inline constexpr StringLiteral k_IncludeVolumeBoundary_Key = "include_volume_boundary"; - static inline constexpr StringLiteral k_GeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_GeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_FeatureIdsArrayPath_Key = "feature_ids_array_path"; static inline constexpr StringLiteral k_BoundaryCellsArrayName_Key = "boundary_cells_array_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.cpp index c13d42f075..975d2d4771 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.cpp @@ -67,7 +67,7 @@ Parameters FindEuclideanDistMapFilter::parameters() const params.insertLinkableParameter(std::make_unique(k_SaveNearestNeighbors_Key, "Store the Nearest Boundary Cells", "Whether to store the nearest neighbors of Cell", false)); params.insertSeparator(Parameters::Separator{"Required Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); @@ -191,7 +191,7 @@ Result<> FindEuclideanDistMapFilter::executeImpl(DataStructure& dataStructure, c inputValues.QPDistancesArrayName = parentGroupPath.createChildPath(filterArgs.value(k_QPDistancesArrayName_Key)); auto nearestNeighborName = filterArgs.value(k_NearestNeighborsArrayName_Key); inputValues.NearestNeighborsArrayName = inputValues.SaveNearestNeighbors ? parentGroupPath.createChildPath(nearestNeighborName) : DataPath::FromString(nearestNeighborName).value(); - inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); return FindEuclideanDistMap(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -225,7 +225,7 @@ Result FindEuclideanDistMapFilter::FromSIMPLJson(const nlohmann::json results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DoQuadPointsKey, k_DoQuadPoints_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SaveNearestNeighborsKey, k_SaveNearestNeighbors_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometry_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GBDistancesArrayNameKey, k_GBDistancesArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_TJDistancesArrayNameKey, k_TJDistancesArrayName_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.hpp index 6919956b54..26cf394efd 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.hpp @@ -42,7 +42,7 @@ class SIMPLNXCORE_EXPORT FindEuclideanDistMapFilter : public IFilter */ static Result FromSIMPLJson(const nlohmann::json& json); - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp index 91f2ad4125..b65fede5c7 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp @@ -55,15 +55,15 @@ Parameters FindFeatureCentroidsFilter::parameters() const // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry whose Features' centroids will be calculated", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry whose Features' centroids will be calculated", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_FeatureAttributeMatrix_Key, "Cell Feature Attribute Matrix", "The cell feature attribute matrix", + params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", "The cell feature attribute matrix", DataPath({"Data Container", "Feature Data"}))); params.insertSeparator(Parameters::Separator{"Created Feature Data"}); - params.insert(std::make_unique(k_CentroidsArrayPath_Key, "Centroids", "DataPath to create the 'Centroids' output array", "Centroids")); + params.insert(std::make_unique(k_CentroidsArrayName_Key, "Centroids", "DataPath to create the 'Centroids' output array", "Centroids")); return params; } @@ -79,9 +79,9 @@ IFilter::PreflightResult FindFeatureCentroidsFilter::preflightImpl(const DataStr const std::atomic_bool& shouldCancel) const { auto pFeatureIdsArrayPathValue = filterArgs.value(k_CellFeatureIdsArrayPath_Key); - auto featureAttrMatrixPath = filterArgs.value(k_FeatureAttributeMatrix_Key); + auto featureAttrMatrixPath = filterArgs.value(k_FeatureAttributeMatrixPath_Key); - auto pCentroidsArrayName = filterArgs.value(k_CentroidsArrayPath_Key); + auto pCentroidsArrayName = filterArgs.value(k_CentroidsArrayName_Key); DataPath pCentroidsArrayPath = featureAttrMatrixPath.createChildPath(pCentroidsArrayName); PreflightResult preflightResult; @@ -116,11 +116,11 @@ Result<> FindFeatureCentroidsFilter::executeImpl(DataStructure& dataStructure, c { FindFeatureCentroidsInputValues inputValues; - auto pCentroidsArrayName = filterArgs.value(k_CentroidsArrayPath_Key); + auto pCentroidsArrayName = filterArgs.value(k_CentroidsArrayName_Key); inputValues.FeatureIdsArrayPath = filterArgs.value(k_CellFeatureIdsArrayPath_Key); - inputValues.FeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrix_Key); + inputValues.FeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixPath_Key); inputValues.CentroidsArrayPath = inputValues.FeatureAttributeMatrixPath.createChildPath(pCentroidsArrayName); - inputValues.ImageGeometryPath = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.ImageGeometryPath = filterArgs.value(k_SelectedImageGeometryPath_Key); return FindFeatureCentroids(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -141,11 +141,11 @@ Result FindFeatureCentroidsFilter::FromSIMPLJson(const nlohmann::json std::vector> results; results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometry_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CentroidsArrayPathKey, k_FeatureAttributeMatrix_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CentroidsArrayPathKey, k_FeatureAttributeMatrixPath_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CentroidsArrayPathKey, k_CentroidsArrayPath_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CentroidsArrayPathKey, k_CentroidsArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.hpp index b03a4b3d4a..fa1b1cd7d5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.hpp @@ -25,8 +25,9 @@ class SIMPLNXCORE_EXPORT FindFeatureCentroidsFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; - static inline constexpr StringLiteral k_CentroidsArrayPath_Key = "centroids_array_path"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + static inline constexpr StringLiteral k_CentroidsArrayName_Key = "centroids_array_name"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_FeatureAttributeMatrixPath_Key = "feature_attribute_matrix_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. @@ -35,8 +36,6 @@ class SIMPLNXCORE_EXPORT FindFeatureCentroidsFilter : public IFilter */ static Result FromSIMPLJson(const nlohmann::json& json); - static inline constexpr StringLiteral k_FeatureAttributeMatrix_Key = "feature_attribute_matrix"; - /** * @brief Returns the name of the filter. * @return diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp index 6a313d173c..e32cc00792 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp @@ -58,7 +58,7 @@ Parameters FindFeatureClusteringFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_NumberOfBins_Key, "Number of Bins for RDF", "Number of bins to split the RDF", 1)); params.insert(std::make_unique(k_PhaseNumber_Key, "Phase Index", "Ensemble number for which to calculate the RDF and clustering list", 1)); @@ -81,7 +81,7 @@ Parameters FindFeatureClusteringFilter::parameters() const "Specifies which features are biased and therefor should be removed if the Remove Biased Features option is on", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Cell Ensemble Data"}); - params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Cell Ensemble Attribute Matrix", + params.insert(std::make_unique(k_CellEnsembleAttributeMatrixPath_Key, "Cell Ensemble Attribute Matrix", "The path to the cell ensemble attribute matrix where the RDF and RDF min and max distance arrays will be stored", DataPath{})); params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); params.insert( @@ -112,7 +112,7 @@ IFilter::PreflightResult FindFeatureClusteringFilter::preflightImpl(const DataSt auto pEquivalentDiametersArrayPathValue = filterArgs.value(k_EquivalentDiametersArrayPath_Key); auto pFeaturePhasesArrayPathValue = filterArgs.value(k_FeaturePhasesArrayPath_Key); auto pCentroidsArrayPathValue = filterArgs.value(k_CentroidsArrayPath_Key); - auto pCellEnsembleAttributeMatrixNameValue = filterArgs.value(k_CellEnsembleAttributeMatrixName_Key); + auto pCellEnsembleAttributeMatrixNameValue = filterArgs.value(k_CellEnsembleAttributeMatrixPath_Key); auto pClusteringListArrayNameValue = filterArgs.value(k_ClusteringListArrayName_Key); auto pRDFArrayNameValue = filterArgs.value(k_RDFArrayName_Key); auto pMaxMinArrayNameValue = filterArgs.value(k_MaxMinArrayName_Key); @@ -177,7 +177,7 @@ Result<> FindFeatureClusteringFilter::executeImpl(DataStructure& dataStructure, FindFeatureClusteringInputValues inputValues; - inputValues.ImageGeometryPath = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.ImageGeometryPath = filterArgs.value(k_SelectedImageGeometryPath_Key); inputValues.NumberOfBins = filterArgs.value(k_NumberOfBins_Key); inputValues.PhaseNumber = filterArgs.value(k_PhaseNumber_Key); inputValues.RemoveBiasedFeatures = filterArgs.value(k_RemoveBiasedFeatures_Key); @@ -186,7 +186,7 @@ Result<> FindFeatureClusteringFilter::executeImpl(DataStructure& dataStructure, inputValues.FeaturePhasesArrayPath = filterArgs.value(k_FeaturePhasesArrayPath_Key); inputValues.CentroidsArrayPath = filterArgs.value(k_CentroidsArrayPath_Key); inputValues.BiasedFeaturesArrayPath = filterArgs.value(k_BiasedFeaturesArrayPath_Key); - inputValues.CellEnsembleAttributeMatrixName = filterArgs.value(k_CellEnsembleAttributeMatrixName_Key); + inputValues.CellEnsembleAttributeMatrixName = filterArgs.value(k_CellEnsembleAttributeMatrixPath_Key); inputValues.ClusteringListArrayName = inputValues.FeaturePhasesArrayPath.getParent().createChildPath(filterArgs.value(k_ClusteringListArrayName_Key)); inputValues.RDFArrayName = inputValues.CellEnsembleAttributeMatrixName.createChildPath(filterArgs.value(k_RDFArrayName_Key)); inputValues.MaxMinArrayName = inputValues.CellEnsembleAttributeMatrixName.createChildPath(filterArgs.value(k_MaxMinArrayName_Key)); @@ -226,14 +226,14 @@ Result FindFeatureClusteringFilter::FromSIMPLJson(const nlohmann::jso results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseRandomSeedKey, k_SetRandomSeed_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_RandomSeedValueKey, k_SeedValue_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_EquivalentDiametersArrayPathKey, k_SelectedImageGeometry_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_EquivalentDiametersArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_EquivalentDiametersArrayPathKey, k_EquivalentDiametersArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeaturePhasesArrayPathKey, k_FeaturePhasesArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CentroidsArrayPathKey, k_CentroidsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BiasedFeaturesArrayPathKey, k_BiasedFeaturesArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellEnsembleAttributeMatrixNameKey, - k_CellEnsembleAttributeMatrixName_Key)); + k_CellEnsembleAttributeMatrixPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ClusteringListArrayNameKey, k_ClusteringListArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewEnsembleArrayArrayNameKey, "@SIMPLNX_PARAMETER_KEY@")); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaxMinArrayNameKey, k_MaxMinArrayName_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.hpp index a09294f6f7..7cda3d8e5d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT FindFeatureClusteringFilter : public IFilter FindFeatureClusteringFilter& operator=(FindFeatureClusteringFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_NumberOfBins_Key = "number_of_bins"; static inline constexpr StringLiteral k_PhaseNumber_Key = "phase_number"; static inline constexpr StringLiteral k_RemoveBiasedFeatures_Key = "remove_biased_features"; @@ -35,7 +35,7 @@ class SIMPLNXCORE_EXPORT FindFeatureClusteringFilter : public IFilter static inline constexpr StringLiteral k_FeaturePhasesArrayPath_Key = "feature_phases_array_path"; static inline constexpr StringLiteral k_CentroidsArrayPath_Key = "centroids_array_path"; static inline constexpr StringLiteral k_BiasedFeaturesArrayPath_Key = "biased_features_array_path"; - static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; + static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixPath_Key = "cell_ensemble_attribute_matrix_path"; static inline constexpr StringLiteral k_ClusteringListArrayName_Key = "clustering_list_array_name"; static inline constexpr StringLiteral k_RDFArrayName_Key = "rdf_array_name"; static inline constexpr StringLiteral k_MaxMinArrayName_Key = "max_min_array_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.cpp index ee41e4ac1f..3ea8ba5096 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.cpp @@ -65,7 +65,7 @@ Parameters FindLargestCrossSectionsFilter::parameters() const params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); params.insert( std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", "The path to the cell feature attribute matrix", DataPath{})); - params.insert(std::make_unique(k_LargestCrossSectionsArrayPath_Key, "Largest Cross Sections", + params.insert(std::make_unique(k_LargestCrossSectionsArrayName_Key, "Largest Cross Sections", "Area of largest cross-section for Feature perpendicular to the user specified direction", "LargestCrossSections")); return params; @@ -85,7 +85,7 @@ IFilter::PreflightResult FindLargestCrossSectionsFilter::preflightImpl(const Dat auto pFeatureIdsArrayPathValue = filterArgs.value(k_FeatureIdsArrayPath_Key); auto pImageGeometryPath = filterArgs.value(k_ImageGeometryPath_Key); auto pCellFeatureAttributeMatrixPath = filterArgs.value(k_CellFeatureAttributeMatrixPath_Key); - auto pLargestCrossSectionsArrayNameValue = filterArgs.value(k_LargestCrossSectionsArrayPath_Key); + auto pLargestCrossSectionsArrayNameValue = filterArgs.value(k_LargestCrossSectionsArrayName_Key); DataPath largestCrossSectionPath = pCellFeatureAttributeMatrixPath.createChildPath(pLargestCrossSectionsArrayNameValue); @@ -118,7 +118,7 @@ Result<> FindLargestCrossSectionsFilter::executeImpl(DataStructure& dataStructur inputValues.Plane = filterArgs.value(k_Plane_Key); inputValues.FeatureIdsArrayPath = filterArgs.value(k_FeatureIdsArrayPath_Key); inputValues.ImageGeometryPath = filterArgs.value(k_ImageGeometryPath_Key); - inputValues.LargestCrossSectionsArrayPath = filterArgs.value(k_CellFeatureAttributeMatrixPath_Key).createChildPath(filterArgs.value(k_LargestCrossSectionsArrayPath_Key)); + inputValues.LargestCrossSectionsArrayPath = filterArgs.value(k_CellFeatureAttributeMatrixPath_Key).createChildPath(filterArgs.value(k_LargestCrossSectionsArrayName_Key)); return FindLargestCrossSections(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -146,7 +146,7 @@ Result FindLargestCrossSectionsFilter::FromSIMPLJson(const nlohmann:: results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_LargestCrossSectionsArrayPathKey, k_CellFeatureAttributeMatrixPath_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_LargestCrossSectionsArrayPathKey, k_LargestCrossSectionsArrayPath_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_LargestCrossSectionsArrayPathKey, k_LargestCrossSectionsArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp index 95bb56fe2f..9678d53b41 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp @@ -24,10 +24,10 @@ class SIMPLNXCORE_EXPORT FindLargestCrossSectionsFilter : public IFilter FindLargestCrossSectionsFilter& operator=(FindLargestCrossSectionsFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_Plane_Key = "plane"; + static inline constexpr StringLiteral k_Plane_Key = "plane_index"; static inline constexpr StringLiteral k_FeatureIdsArrayPath_Key = "feature_ids_array_path"; - static inline constexpr StringLiteral k_LargestCrossSectionsArrayPath_Key = "largest_cross_sections_array_path"; - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_LargestCrossSectionsArrayName_Key = "largest_cross_sections_array_name"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_CellFeatureAttributeMatrixPath_Key = "cell_feature_attribute_matrix_path"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.cpp index d6881bba4a..76d1b2ee8b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.cpp @@ -166,7 +166,7 @@ OutputActions FindNeighborListStatistics::createCompatibleArrays(const DataStruc auto findStdDeviation = args.value(k_FindStandardDeviation_Key); auto findSummation = args.value(k_FindSummation_Key); - auto inputArrayPath = args.value(k_InputArray_Key); + auto inputArrayPath = args.value(k_InputNeighborListPath_Key); auto* inputArray = data.getDataAs(inputArrayPath); std::vector tupleDims{inputArray->getNumberOfTuples()}; DataType dataType = inputArray->getDataType(); @@ -175,43 +175,43 @@ OutputActions FindNeighborListStatistics::createCompatibleArrays(const DataStruc OutputActions actions; if(findLength) { - auto arrayPath = outputGroupPath.createChildPath(args.value(k_Length_Key)); + auto arrayPath = outputGroupPath.createChildPath(args.value(k_LengthName_Key)); auto action = std::make_unique(DataType::uint64, tupleDims, std::vector{1}, arrayPath); actions.appendAction(std::move(action)); } if(findMin) { - auto arrayPath = outputGroupPath.createChildPath(args.value(k_Minimum_Key)); + auto arrayPath = outputGroupPath.createChildPath(args.value(k_MinimumName_Key)); auto action = std::make_unique(dataType, tupleDims, std::vector{1}, arrayPath); actions.appendAction(std::move(action)); } if(findMax) { - auto arrayPath = outputGroupPath.createChildPath(args.value(k_Maximum_Key)); + auto arrayPath = outputGroupPath.createChildPath(args.value(k_MaximumName_Key)); auto action = std::make_unique(dataType, tupleDims, std::vector{1}, arrayPath); actions.appendAction(std::move(action)); } if(findMean) { - auto arrayPath = outputGroupPath.createChildPath(args.value(k_Mean_Key)); + auto arrayPath = outputGroupPath.createChildPath(args.value(k_MeanName_Key)); auto action = std::make_unique(DataType::float32, tupleDims, std::vector{1}, arrayPath); actions.appendAction(std::move(action)); } if(findMedian) { - auto arrayPath = outputGroupPath.createChildPath(args.value(k_Median_Key)); + auto arrayPath = outputGroupPath.createChildPath(args.value(k_MedianName_Key)); auto action = std::make_unique(DataType::float32, tupleDims, std::vector{1}, arrayPath); actions.appendAction(std::move(action)); } if(findStdDeviation) { - auto arrayPath = outputGroupPath.createChildPath(args.value(k_StandardDeviation_Key)); + auto arrayPath = outputGroupPath.createChildPath(args.value(k_StandardDeviationName_Key)); auto action = std::make_unique(DataType::float32, tupleDims, std::vector{1}, arrayPath); actions.appendAction(std::move(action)); } if(findSummation) { - auto arrayPath = outputGroupPath.createChildPath(args.value(k_Summation_Key)); + auto arrayPath = outputGroupPath.createChildPath(args.value(k_SummationName_Key)); auto action = std::make_unique(DataType::float32, tupleDims, std::vector{1}, arrayPath); actions.appendAction(std::move(action)); } @@ -265,17 +265,17 @@ Parameters FindNeighborListStatistics::parameters() const params.insert(std::make_unique(k_FindSummation_Key, "Find Summation", "Specifies whether or not the filter creates the Summation array during calculations", true)); params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert( - std::make_unique(k_InputArray_Key, "NeighborList to Compute Statistics", "Input Data Array to compute statistics", DataPath(), nx::core::GetAllDataTypes())); + params.insert(std::make_unique(k_InputNeighborListPath_Key, "NeighborList to Compute Statistics", "Input Data Array to compute statistics", DataPath(), + nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); - params.insert(std::make_unique(k_Length_Key, "Length", "Path to create the Length array during calculations", "Length")); - params.insert(std::make_unique(k_Minimum_Key, "Minimum", "Path to create the Minimum array during calculations", "Minimum")); - params.insert(std::make_unique(k_Maximum_Key, "Maximum", "Path to create the Maximum array during calculations", "Maximum")); - params.insert(std::make_unique(k_Mean_Key, "Mean", "Path to create the Mean array during calculations", "Mean")); - params.insert(std::make_unique(k_Median_Key, "Median", "Path to create the Median array during calculations", "Median")); - params.insert(std::make_unique(k_StandardDeviation_Key, "Standard Deviation", "Path to create the Standard Deviation array during calculations", "StandardDeviation")); - params.insert(std::make_unique(k_Summation_Key, "Summation", "Path to create the Summation array during calculations", "Summation")); + params.insert(std::make_unique(k_LengthName_Key, "Length", "Path to create the Length array during calculations", "Length")); + params.insert(std::make_unique(k_MinimumName_Key, "Minimum", "Path to create the Minimum array during calculations", "Minimum")); + params.insert(std::make_unique(k_MaximumName_Key, "Maximum", "Path to create the Maximum array during calculations", "Maximum")); + params.insert(std::make_unique(k_MeanName_Key, "Mean", "Path to create the Mean array during calculations", "Mean")); + params.insert(std::make_unique(k_MedianName_Key, "Median", "Path to create the Median array during calculations", "Median")); + params.insert(std::make_unique(k_StandardDeviationName_Key, "Standard Deviation", "Path to create the Standard Deviation array during calculations", "StandardDeviation")); + params.insert(std::make_unique(k_SummationName_Key, "Summation", "Path to create the Summation array during calculations", "Summation")); return params; } @@ -296,7 +296,7 @@ IFilter::PreflightResult FindNeighborListStatistics::preflightImpl(const DataStr auto findStdDeviation = args.value(k_FindStandardDeviation_Key); auto findSummation = args.value(k_FindSummation_Key); - auto inputArrayPath = args.value(k_InputArray_Key); + auto inputArrayPath = args.value(k_InputNeighborListPath_Key); // if(!findMin && !findMax && !findMean && !findMedian && !findStdDeviation && !findSummation && !findLength) @@ -336,7 +336,7 @@ Result<> FindNeighborListStatistics::executeImpl(DataStructure& data, const Argu return {}; } - auto inputArrayPath = args.value(k_InputArray_Key); + auto inputArrayPath = args.value(k_InputNeighborListPath_Key); auto& inputArray = data.getDataRefAs(inputArrayPath); const DataPath outputGroupPath = inputArrayPath.getParent(); @@ -344,37 +344,37 @@ Result<> FindNeighborListStatistics::executeImpl(DataStructure& data, const Argu if(findLength) { - auto lengthPath = outputGroupPath.createChildPath(args.value(k_Length_Key)); + auto lengthPath = outputGroupPath.createChildPath(args.value(k_LengthName_Key)); arrays[0] = data.getDataAs(lengthPath); } if(findMin) { - auto minPath = outputGroupPath.createChildPath(args.value(k_Minimum_Key)); + auto minPath = outputGroupPath.createChildPath(args.value(k_MinimumName_Key)); arrays[1] = data.getDataAs(minPath); } if(findMax) { - auto maxPath = outputGroupPath.createChildPath(args.value(k_Maximum_Key)); + auto maxPath = outputGroupPath.createChildPath(args.value(k_MaximumName_Key)); arrays[2] = data.getDataAs(maxPath); } if(findMean) { - auto meanPath = outputGroupPath.createChildPath(args.value(k_Mean_Key)); + auto meanPath = outputGroupPath.createChildPath(args.value(k_MeanName_Key)); arrays[3] = data.getDataAs(meanPath); } if(findMedian) { - auto medianPath = outputGroupPath.createChildPath(args.value(k_Median_Key)); + auto medianPath = outputGroupPath.createChildPath(args.value(k_MedianName_Key)); arrays[4] = data.getDataAs(medianPath); } if(findStdDeviation) { - auto stdDeviationPath = outputGroupPath.createChildPath(args.value(k_StandardDeviation_Key)); + auto stdDeviationPath = outputGroupPath.createChildPath(args.value(k_StandardDeviationName_Key)); arrays[5] = data.getDataAs(stdDeviationPath); } if(findSummation) { - auto summationPath = outputGroupPath.createChildPath(args.value(k_Summation_Key)); + auto summationPath = outputGroupPath.createChildPath(args.value(k_SummationName_Key)); arrays[6] = data.getDataAs(summationPath); } @@ -436,15 +436,15 @@ Result FindNeighborListStatistics::FromSIMPLJson(const nlohmann::json results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FindMedianKey, k_FindMedian_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FindStdDeviationKey, k_FindStandardDeviation_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FindSummationKey, k_FindSummation_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedArrayPathKey, k_InputArray_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedArrayPathKey, k_InputNeighborListPath_Key)); // No destination attribute matrix parameter in NX - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_LengthArrayNameKey, k_Length_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MinimumArrayNameKey, k_Minimum_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaximumArrayNameKey, k_Maximum_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MeanArrayNameKey, k_Mean_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MedianArrayNameKey, k_Median_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_StdDeviationArrayNameKey, k_StandardDeviation_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SummationArrayNameKey, k_Summation_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_LengthArrayNameKey, k_LengthName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MinimumArrayNameKey, k_MinimumName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaximumArrayNameKey, k_MaximumName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MeanArrayNameKey, k_MeanName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MedianArrayNameKey, k_MedianName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_StdDeviationArrayNameKey, k_StandardDeviationName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SummationArrayNameKey, k_SummationName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.hpp index 8f3f78d69c..ef28a46fa1 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.hpp @@ -32,14 +32,14 @@ class SIMPLNXCORE_EXPORT FindNeighborListStatistics : public IFilter static inline constexpr StringLiteral k_FindMedian_Key = "find_median"; static inline constexpr StringLiteral k_FindStandardDeviation_Key = "find_standard_deviation"; static inline constexpr StringLiteral k_FindSummation_Key = "find_summation"; - static inline constexpr StringLiteral k_InputArray_Key = "input_array"; - static inline constexpr StringLiteral k_Length_Key = "length"; - static inline constexpr StringLiteral k_Minimum_Key = "minimum"; - static inline constexpr StringLiteral k_Maximum_Key = "maximum"; - static inline constexpr StringLiteral k_Mean_Key = "mean"; - static inline constexpr StringLiteral k_Median_Key = "median"; - static inline constexpr StringLiteral k_StandardDeviation_Key = "standard_deviation"; - static inline constexpr StringLiteral k_Summation_Key = "summation"; + static inline constexpr StringLiteral k_InputNeighborListPath_Key = "input_neighbor_list_path"; + static inline constexpr StringLiteral k_LengthName_Key = "length_array_name"; + static inline constexpr StringLiteral k_MinimumName_Key = "minimum_array_name"; + static inline constexpr StringLiteral k_MaximumName_Key = "maximum_array_name"; + static inline constexpr StringLiteral k_MeanName_Key = "mean_array_name"; + static inline constexpr StringLiteral k_MedianName_Key = "median_array_name"; + static inline constexpr StringLiteral k_StandardDeviationName_Key = "standard_deviation_array_name"; + static inline constexpr StringLiteral k_SummationName_Key = "summation_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.cpp index 89d5963b60..69d25419f0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.cpp @@ -58,7 +58,7 @@ Parameters FindNeighborhoodsFilter::parameters() const params.insert(std::make_unique(k_MultiplesOfAverage_Key, "Multiples of Average Diameter", "Defines the search radius to use when looking for 'neighboring' Features", 1.0F)); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath({"Data Container"}), + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath({"Data Container"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insertSeparator(Parameters::Separator{"Required Feature Data"}); @@ -150,7 +150,7 @@ Result<> FindNeighborhoodsFilter::executeImpl(DataStructure& dataStructure, cons inputValues.CentroidsArrayPath = filterArgs.value(k_CentroidsArrayPath_Key); inputValues.NeighborhoodsArrayName = inputValues.FeaturePhasesArrayPath.getParent().createChildPath(filterArgs.value(k_NeighborhoodsArrayName_Key)); inputValues.NeighborhoodListArrayName = inputValues.FeaturePhasesArrayPath.getParent().createChildPath(filterArgs.value(k_NeighborhoodListArrayName_Key)); - inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); return FindNeighborhoods(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -175,7 +175,7 @@ Result FindNeighborhoodsFilter::FromSIMPLJson(const nlohmann::json& j std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_EquivalentDiametersArrayPathKey, - k_SelectedImageGeometry_Key)); + k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_MultiplesOfAverageKey, k_MultiplesOfAverage_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_EquivalentDiametersArrayPathKey, k_EquivalentDiametersArrayPath_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.hpp index a6215b2196..dc109c544e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.hpp @@ -38,7 +38,7 @@ class SIMPLNXCORE_EXPORT FindNeighborhoodsFilter : public IFilter */ static Result FromSIMPLJson(const nlohmann::json& json); - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry_path"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.cpp index e89d9a3619..72610bc0a6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.cpp @@ -60,30 +60,30 @@ Parameters FindNeighbors::parameters() const params.insertLinkableParameter(std::make_unique(k_StoreSurface_Key, "Store Surface Features Array", "Whether to store the surface Features array", false)); params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert(std::make_unique(k_ImageGeom_Key, "Image Geometry", "The geometry in which to identify feature neighbors", DataPath({"DataContainer"}), + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Image Geometry", "The geometry in which to identify feature neighbors", DataPath({"DataContainer"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_FeatureIds_Key, "Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), + params.insert(std::make_unique(k_FeatureIdsPath_Key, "Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_CellFeatures_Key, "Cell Feature AttributeMatrix", "Feature Attribute Matrix of the selected Feature Ids", + params.insert(std::make_unique(k_CellFeaturesPath_Key, "Cell Feature AttributeMatrix", "Feature Attribute Matrix of the selected Feature Ids", DataPath({"DataContainer", "CellFeatureData"}))); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert(std::make_unique( - k_BoundaryCells_Key, "Boundary Cells", + k_BoundaryCellsName_Key, "Boundary Cells", "The number of neighboring Cells of a given Cell that belong to a different Feature than itself. Values will range from 0 to 6. Only created if Store Boundary Cells Array is checked", "BoundaryCells")); params.insertSeparator(Parameters::Separator{"Created Feature Data"}); - params.insert(std::make_unique(k_NumNeighbors_Key, "Number of Neighbors", "Number of contiguous neighboring Features for a given Feature", "NumNeighbors")); - params.insert(std::make_unique(k_NeighborList_Key, "Neighbor List", "List of the contiguous neighboring Features for a given Feature", "NeighborList")); - params.insert(std::make_unique(k_SharedSurfaceArea_Key, "Shared Surface Area List", + params.insert(std::make_unique(k_NumNeighborsName_Key, "Number of Neighbors", "Number of contiguous neighboring Features for a given Feature", "NumNeighbors")); + params.insert(std::make_unique(k_NeighborListName_Key, "Neighbor List", "List of the contiguous neighboring Features for a given Feature", "NeighborList")); + params.insert(std::make_unique(k_SharedSurfaceAreaName_Key, "Shared Surface Area List", "List of the shared surface area for each of the contiguous neighboring Features for a given Feature", "SharedSurfaceAreaList")); - params.insert(std::make_unique(k_SurfaceFeatures_Key, "Surface Features", + params.insert(std::make_unique(k_SurfaceFeaturesName_Key, "Surface Features", "The name of the surface features data array. Flag equal to 1 if the Feature touches an outer surface of the sample and equal to 0 if it " "does not. Only created if Store Surface Features Array is checked", "SurfaceFeatures")); - params.linkParameters(k_StoreBoundary_Key, k_BoundaryCells_Key, std::make_any(true)); - params.linkParameters(k_StoreSurface_Key, k_SurfaceFeatures_Key, std::make_any(true)); + params.linkParameters(k_StoreBoundary_Key, k_BoundaryCellsName_Key, std::make_any(true)); + params.linkParameters(k_StoreSurface_Key, k_SurfaceFeaturesName_Key, std::make_any(true)); return params; } @@ -98,14 +98,14 @@ IFilter::PreflightResult FindNeighbors::preflightImpl(const DataStructure& data, { auto storeBoundaryCells = args.value(k_StoreBoundary_Key); auto storeSurfaceFeatures = args.value(k_StoreSurface_Key); - auto imageGeomPath = args.value(k_ImageGeom_Key); - auto featureIdsPath = args.value(k_FeatureIds_Key); - auto boundaryCellsName = args.value(k_BoundaryCells_Key); - auto numNeighborsName = args.value(k_NumNeighbors_Key); - auto neighborListName = args.value(k_NeighborList_Key); - auto sharedSurfaceAreaName = args.value(k_SharedSurfaceArea_Key); - auto surfaceFeaturesName = args.value(k_SurfaceFeatures_Key); - auto featureAttrMatrixPath = args.value(k_CellFeatures_Key); + auto imageGeomPath = args.value(k_SelectedImageGeometryPath_Key); + auto featureIdsPath = args.value(k_FeatureIdsPath_Key); + auto boundaryCellsName = args.value(k_BoundaryCellsName_Key); + auto numNeighborsName = args.value(k_NumNeighborsName_Key); + auto neighborListName = args.value(k_NeighborListName_Key); + auto sharedSurfaceAreaName = args.value(k_SharedSurfaceAreaName_Key); + auto surfaceFeaturesName = args.value(k_SurfaceFeaturesName_Key); + auto featureAttrMatrixPath = args.value(k_CellFeaturesPath_Key); DataPath boundaryCellsPath = featureIdsPath.getParent().createChildPath(boundaryCellsName); DataPath numNeighborsPath = featureAttrMatrixPath.createChildPath(numNeighborsName); @@ -168,14 +168,14 @@ Result<> FindNeighbors::executeImpl(DataStructure& data, const Arguments& args, { auto storeBoundaryCells = args.value(k_StoreBoundary_Key); auto storeSurfaceFeatures = args.value(k_StoreSurface_Key); - auto imageGeomPath = args.value(k_ImageGeom_Key); - auto featureIdsPath = args.value(k_FeatureIds_Key); - auto boundaryCellsName = args.value(k_BoundaryCells_Key); - auto numNeighborsName = args.value(k_NumNeighbors_Key); - auto neighborListName = args.value(k_NeighborList_Key); - auto sharedSurfaceAreaName = args.value(k_SharedSurfaceArea_Key); - auto surfaceFeaturesName = args.value(k_SurfaceFeatures_Key); - auto featureAttrMatrixPath = args.value(k_CellFeatures_Key); + auto imageGeomPath = args.value(k_SelectedImageGeometryPath_Key); + auto featureIdsPath = args.value(k_FeatureIdsPath_Key); + auto boundaryCellsName = args.value(k_BoundaryCellsName_Key); + auto numNeighborsName = args.value(k_NumNeighborsName_Key); + auto neighborListName = args.value(k_NeighborListName_Key); + auto sharedSurfaceAreaName = args.value(k_SharedSurfaceAreaName_Key); + auto surfaceFeaturesName = args.value(k_SurfaceFeaturesName_Key); + auto featureAttrMatrixPath = args.value(k_CellFeaturesPath_Key); DataPath boundaryCellsPath = featureIdsPath.getParent().createChildPath(boundaryCellsName); DataPath numNeighborsPath = featureAttrMatrixPath.createChildPath(numNeighborsName); @@ -441,14 +441,16 @@ Result FindNeighbors::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_StoreBoundaryCellsKey, k_StoreBoundary_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_StoreSurfaceFeaturesKey, k_StoreSurface_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_ImageGeom_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_FeatureIds_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellFeatureAttributeMatrixPathKey, k_CellFeatures_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BoundaryCellsArrayNameKey, k_BoundaryCells_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NumNeighborsArrayNameKey, k_NumNeighbors_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NeighborListArrayNameKey, k_NeighborList_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SharedSurfaceAreaListArrayNameKey, k_SharedSurfaceArea_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceFeaturesArrayNameKey, k_SurfaceFeatures_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometryPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_FeatureIdsPath_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellFeatureAttributeMatrixPathKey, k_CellFeaturesPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BoundaryCellsArrayNameKey, k_BoundaryCellsName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NumNeighborsArrayNameKey, k_NumNeighborsName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NeighborListArrayNameKey, k_NeighborListName_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SharedSurfaceAreaListArrayNameKey, k_SharedSurfaceAreaName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceFeaturesArrayNameKey, k_SurfaceFeaturesName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.hpp index 650d73c480..d6f2506e22 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.hpp @@ -23,14 +23,14 @@ class SIMPLNXCORE_EXPORT FindNeighbors : public IFilter // Parameter Keys static inline constexpr StringLiteral k_StoreBoundary_Key = "store_boundary_cells"; static inline constexpr StringLiteral k_StoreSurface_Key = "store_surface_features"; - static inline constexpr StringLiteral k_ImageGeom_Key = "image_geometry"; - static inline constexpr StringLiteral k_FeatureIds_Key = "feature_ids"; - static inline constexpr StringLiteral k_CellFeatures_Key = "cell_feature_arrays"; - static inline constexpr StringLiteral k_BoundaryCells_Key = "boundary_cells"; - static inline constexpr StringLiteral k_NumNeighbors_Key = "number_of_neighbors"; - static inline constexpr StringLiteral k_NeighborList_Key = "neighbor_list"; - static inline constexpr StringLiteral k_SharedSurfaceArea_Key = "shared_surface_area_list"; - static inline constexpr StringLiteral k_SurfaceFeatures_Key = "surface_features"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_FeatureIdsPath_Key = "feature_ids_path"; + static inline constexpr StringLiteral k_CellFeaturesPath_Key = "cell_feature_array_path"; + static inline constexpr StringLiteral k_BoundaryCellsName_Key = "boundary_cells_name"; + static inline constexpr StringLiteral k_NumNeighborsName_Key = "number_of_neighbors_name"; + static inline constexpr StringLiteral k_NeighborListName_Key = "neighbor_list_name"; + static inline constexpr StringLiteral k_SharedSurfaceAreaName_Key = "shared_surface_area_list_name"; + static inline constexpr StringLiteral k_SurfaceFeaturesName_Key = "surface_features_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.cpp index 6d42a88040..b5b698b54b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.cpp @@ -60,7 +60,7 @@ Parameters FindNumFeaturesFilter::parameters() const DataPath({"DataContainer", "EnsembleData"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); params.insertSeparator(Parameters::Separator{"Created Objects: Ensemble Data"}); - params.insert(std::make_unique(k_NumFeaturesArrayPath_Key, "Number of Features", "The number of Features that belong to each Ensemble", "Number of Features")); + params.insert(std::make_unique(k_NumFeaturesArrayName_Key, "Number of Features", "The number of Features that belong to each Ensemble", "Number of Features")); return params; } @@ -77,7 +77,7 @@ IFilter::PreflightResult FindNumFeaturesFilter::preflightImpl(const DataStructur { auto pFeaturePhasesArrayPathValue = filterArgs.value(k_FeaturePhasesArrayPath_Key); auto pEnsembleDataPathValue = filterArgs.value(k_EnsembleAttributeMatrixPath_Key); - auto pNumFeaturesArrayPathValue = pEnsembleDataPathValue.createChildPath(filterArgs.value(k_NumFeaturesArrayPath_Key)); + auto pNumFeaturesArrayPathValue = pEnsembleDataPathValue.createChildPath(filterArgs.value(k_NumFeaturesArrayName_Key)); PreflightResult preflightResult; nx::core::Result resultOutputActions; @@ -101,7 +101,7 @@ Result<> FindNumFeaturesFilter::executeImpl(DataStructure& dataStructure, const { auto pFeaturePhasesArrayPathValue = filterArgs.value(k_FeaturePhasesArrayPath_Key); auto pEnsembleDataPathValue = filterArgs.value(k_EnsembleAttributeMatrixPath_Key); - auto pNumFeaturesArrayPathValue = pEnsembleDataPathValue.createChildPath(filterArgs.value(k_NumFeaturesArrayPath_Key)); + auto pNumFeaturesArrayPathValue = pEnsembleDataPathValue.createChildPath(filterArgs.value(k_NumFeaturesArrayName_Key)); const auto& featurePhasesArrayRef = dataStructure.getDataRefAs(pFeaturePhasesArrayPathValue); auto& numFeaturesArrayRef = dataStructure.getDataRefAs(pNumFeaturesArrayPathValue); @@ -131,7 +131,7 @@ Result FindNumFeaturesFilter::FromSIMPLJson(const nlohmann::json& jso results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeaturePhasesArrayPathKey, k_FeaturePhasesArrayPath_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NumFeaturesArrayPathKey, k_EnsembleAttributeMatrixPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NumFeaturesArrayPathKey, k_NumFeaturesArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NumFeaturesArrayPathKey, k_NumFeaturesArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.hpp index 950ae92ef8..b822e0651e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.hpp @@ -26,7 +26,7 @@ class SIMPLNXCORE_EXPORT FindNumFeaturesFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_FeaturePhasesArrayPath_Key = "feature_phases_array_path"; static inline constexpr StringLiteral k_EnsembleAttributeMatrixPath_Key = "ensemble_attribute_matrix_path"; - static inline constexpr StringLiteral k_NumFeaturesArrayPath_Key = "num_features_array_path"; + static inline constexpr StringLiteral k_NumFeaturesArrayName_Key = "num_features_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.cpp index 5e65f13e86..7297581939 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.cpp @@ -58,7 +58,7 @@ Parameters FindSurfaceAreaToVolumeFilter::parameters() const params.insertLinkableParameter(std::make_unique(k_CalculateSphericity_Key, "Calculate Sphericity", "Whether or not to calculate the sphericity of each Feature", false)); params.insertSeparator(Parameters::Separator{"Required Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); @@ -139,7 +139,7 @@ Result<> FindSurfaceAreaToVolumeFilter::executeImpl(DataStructure& dataStructure inputValues.SurfaceAreaVolumeRatioArrayName = inputValues.NumCellsArrayPath.getParent().createChildPath(filterArgs.value(k_SurfaceAreaVolumeRatioArrayName_Key)); inputValues.CalculateSphericity = filterArgs.value(k_CalculateSphericity_Key); inputValues.SphericityArrayName = inputValues.NumCellsArrayPath.getParent().createChildPath(filterArgs.value(k_SphericityArrayName_Key)); - inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.InputImageGeometry = filterArgs.value(k_SelectedImageGeometryPath_Key); return FindSurfaceAreaToVolume(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -163,7 +163,7 @@ Result FindSurfaceAreaToVolumeFilter::FromSIMPLJson(const nlohmann::j std::vector> results; results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometry_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NumCellsArrayPathKey, k_NumCellsArrayPath_Key)); results.push_back( diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.hpp index aa2f9a3697..53c711e175 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.hpp @@ -37,7 +37,7 @@ class SIMPLNXCORE_EXPORT FindSurfaceAreaToVolumeFilter : public IFilter */ static Result FromSIMPLJson(const nlohmann::json& json); - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.cpp index 7b2373397a..ebf7f9c7ac 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.cpp @@ -243,7 +243,7 @@ Parameters FindSurfaceFeatures::parameters() const "The path to the cell feature attribute matrix associated with the input feature ids array", DataPath{}, DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); params.insertSeparator(Parameters::Separator{"Created Feature Data"}); - params.insert(std::make_unique(k_SurfaceFeaturesArrayPath_Key, "Surface Features", + params.insert(std::make_unique(k_SurfaceFeaturesArrayName_Key, "Surface Features", "The created surface features array. Flag of 1 if Feature touches an outer surface or of 0 if it does not", "SurfaceFeatures")); return params; @@ -261,7 +261,7 @@ IFilter::PreflightResult FindSurfaceFeatures::preflightImpl(const DataStructure& { auto pFeatureGeometryPathValue = filterArgs.value(k_FeatureGeometryPath_Key); auto pCellFeaturesAttributeMatrixPathValue = filterArgs.value(k_CellFeatureAttributeMatrixPath_Key); - auto pSurfaceFeaturesArrayNameValue = filterArgs.value(k_SurfaceFeaturesArrayPath_Key); + auto pSurfaceFeaturesArrayNameValue = filterArgs.value(k_SurfaceFeaturesArrayName_Key); const auto& featureGeometry = dataStructure.getDataRefAs(pFeatureGeometryPathValue); usize geometryDimensionality = featureGeometry.getDimensionality(); @@ -294,7 +294,7 @@ Result<> FindSurfaceFeatures::executeImpl(DataStructure& dataStructure, const Ar const auto pFeatureGeometryPathValue = filterArgs.value(k_FeatureGeometryPath_Key); const auto pFeatureIdsArrayPathValue = filterArgs.value(k_CellFeatureIdsArrayPath_Key); const auto pCellFeaturesAttributeMatrixPathValue = filterArgs.value(k_CellFeatureAttributeMatrixPath_Key); - const auto pSurfaceFeaturesArrayPathValue = pCellFeaturesAttributeMatrixPathValue.createChildPath(filterArgs.value(k_SurfaceFeaturesArrayPath_Key)); + const auto pSurfaceFeaturesArrayPathValue = pCellFeaturesAttributeMatrixPathValue.createChildPath(filterArgs.value(k_SurfaceFeaturesArrayName_Key)); // Resize the surface features array to the proper size const Int32Array& featureIds = dataStructure.getDataRefAs(pFeatureIdsArrayPathValue); @@ -350,7 +350,7 @@ Result FindSurfaceFeatures::FromSIMPLJson(const nlohmann::json& json) results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureAttributeMatrixPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceFeaturesArrayPathKey, k_SurfaceFeaturesArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceFeaturesArrayPathKey, k_SurfaceFeaturesArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.hpp index 77ac4f5e29..0ea25d30af 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.hpp @@ -40,10 +40,10 @@ class SIMPLNXCORE_EXPORT FindSurfaceFeatures : public IFilter // Parameter Keys static inline constexpr StringLiteral k_MarkFeature0Neighbors = "mark_feature_0_neighbors"; - static inline constexpr StringLiteral k_FeatureGeometryPath_Key = "feature_geometry_path"; + static inline constexpr StringLiteral k_FeatureGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_CellFeatureAttributeMatrixPath_Key = "feature_attribute_matrix_path"; - static inline constexpr StringLiteral k_SurfaceFeaturesArrayPath_Key = "surface_features_array_path"; + static inline constexpr StringLiteral k_SurfaceFeaturesArrayName_Key = "surface_features_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.cpp index def60e29e4..a5db3f6547 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.cpp @@ -55,7 +55,7 @@ Parameters FindTriangleGeomCentroidsFilter::parameters() const params.insert(std::make_unique(k_FaceLabelsArrayPath_Key, "Face Labels", "The DataPath to the FaceLabels values.", DataPath{}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); params.insertSeparator(Parameters::Separator{"Required Face Feature Data"}); - params.insert(std::make_unique(k_FeatureAttributeMatrixName_Key, "Face Feature Attribute Matrix", + params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Face Feature Attribute Matrix", "The DataPath to the AttributeMatrix that holds feature data for the faces", DataPath({"TriangleDataContainer", "FaceFeatureData"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); params.insertSeparator(Parameters::Separator{"Created Face Feature Data Arrays"}); @@ -75,7 +75,7 @@ IFilter::PreflightResult FindTriangleGeomCentroidsFilter::preflightImpl(const Da const std::atomic_bool& shouldCancel) const { auto pFaceLabelsArrayPath = filterArgs.value(k_FaceLabelsArrayPath_Key); - auto pFeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixName_Key); + auto pFeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixPath_Key); PreflightResult preflightResult; @@ -111,7 +111,7 @@ Result<> FindTriangleGeomCentroidsFilter::executeImpl(DataStructure& dataStructu FindTriangleGeomCentroidsInputValues inputValues; inputValues.TriangleGeometryPath = filterArgs.value(k_TriGeometryDataPath_Key); inputValues.FaceLabelsArrayPath = filterArgs.value(k_FaceLabelsArrayPath_Key); - inputValues.FeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixName_Key); + inputValues.FeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixPath_Key); auto volumesArrayNameValue = filterArgs.value(k_CentroidsArrayName_Key); inputValues.CentroidsArrayPath = inputValues.FeatureAttributeMatrixPath.createChildPath(volumesArrayNameValue); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.hpp index 88ecfe9a57..f5d71cc3bd 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.hpp @@ -25,9 +25,9 @@ class SIMPLNXCORE_EXPORT FindTriangleGeomCentroidsFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_FaceLabelsArrayPath_Key = "face_labels_array_path"; - static inline constexpr StringLiteral k_FeatureAttributeMatrixName_Key = "feature_attribute_matrix_name"; + static inline constexpr StringLiteral k_FeatureAttributeMatrixPath_Key = "feature_attribute_matrix_path"; static inline constexpr StringLiteral k_CentroidsArrayName_Key = "centroids_array_name"; - static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "triangle_geometry_path"; + static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "input_triangle_geometry_path"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.cpp index 1da3caf8e1..f0a26478f3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.cpp @@ -56,7 +56,7 @@ Parameters FindTriangleGeomSizesFilter::parameters() const params.insert(std::make_unique(k_FaceLabelsArrayPath_Key, "Face Labels", "The DataPath to the FaceLabels values.", DataPath{}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); params.insertSeparator(Parameters::Separator{"Required Face Feature Data"}); - params.insert(std::make_unique(k_FeatureAttributeMatrixName_Key, "Face Feature Attribute Matrix", + params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Face Feature Attribute Matrix", "The DataPath to the AttributeMatrix that holds feature data for the faces", DataPath({"TriangleDataContainer", "FaceFeatureData"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); params.insertSeparator(Parameters::Separator{"Created Face Feature Data Arrays"}); @@ -76,7 +76,7 @@ IFilter::PreflightResult FindTriangleGeomSizesFilter::preflightImpl(const DataSt const std::atomic_bool& shouldCancel) const { auto pFaceLabelsArrayPath = filterArgs.value(k_FaceLabelsArrayPath_Key); - auto pFeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixName_Key); + auto pFeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixPath_Key); PreflightResult preflightResult; @@ -112,7 +112,7 @@ Result<> FindTriangleGeomSizesFilter::executeImpl(DataStructure& dataStructure, FindTriangleGeomSizesInputValues inputValues; inputValues.TriangleGeometryPath = filterArgs.value(k_TriGeometryDataPath_Key); inputValues.FaceLabelsArrayPath = filterArgs.value(k_FaceLabelsArrayPath_Key); - inputValues.FeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixName_Key); + inputValues.FeatureAttributeMatrixPath = filterArgs.value(k_FeatureAttributeMatrixPath_Key); auto volumesArrayNameValue = filterArgs.value(k_VolumesArrayName_Key); inputValues.VolumesArrayPath = inputValues.FeatureAttributeMatrixPath.createChildPath(volumesArrayNameValue); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.hpp index ef32badee8..47cf26e25a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.hpp @@ -25,9 +25,9 @@ class SIMPLNXCORE_EXPORT FindTriangleGeomSizesFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_FaceLabelsArrayPath_Key = "face_labels_array_path"; - static inline constexpr StringLiteral k_FeatureAttributeMatrixName_Key = "feature_attribute_matrix_name"; + static inline constexpr StringLiteral k_FeatureAttributeMatrixPath_Key = "feature_attribute_matrix_path"; static inline constexpr StringLiteral k_VolumesArrayName_Key = "volumes_array_name"; - static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "triangle_geometry_path"; + static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "input_triangle_geometry_path"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp index faff8a2818..3801404c9d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp @@ -60,16 +60,16 @@ Parameters FindVertexToTriangleDistancesFilter::parameters() const // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Required Input Arrays"}); - params.insert(std::make_unique(k_VertexDataContainer_Key, "Source Vertex Geometry", "The Vertex Geometry point cloud to map to triangles", DataPath{}, + params.insert(std::make_unique(k_SelectedVertexGeometryPath_Key, "Source Vertex Geometry", "The Vertex Geometry point cloud to map to triangles", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); - params.insert(std::make_unique(k_TriangleDataContainer_Key, "Target Triangle Geometry", "The triangle geometry to compare against", DataPath{}, + params.insert(std::make_unique(k_SelectedTriangleGeometryPath_Key, "Target Triangle Geometry", "The triangle geometry to compare against", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insert( std::make_unique(k_TriangleNormalsArrayPath_Key, "Triangle Normals", "The triangle geometry's normals array", DataPath{}, std::set{DataType::float64})); params.insertSeparator(Parameters::Separator{"Created Output Arrays"}); - params.insert(std::make_unique(k_DistancesArrayPath_Key, "Distances Array", "The array to store distance between vertex and triangle", "")); - params.insert(std::make_unique(k_ClosestTriangleIdArrayPath_Key, "Closest Triangle Ids Array", "The array to store the ID of the closest triangle", "")); + params.insert(std::make_unique(k_DistancesArrayName_Key, "Distances Array", "The array to store distance between vertex and triangle", "")); + params.insert(std::make_unique(k_ClosestTriangleIdArrayName_Key, "Closest Triangle Ids Array", "The array to store the ID of the closest triangle", "")); return params; } @@ -84,11 +84,11 @@ IFilter::UniquePointer FindVertexToTriangleDistancesFilter::clone() const IFilter::PreflightResult FindVertexToTriangleDistancesFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto pVertexGeometryDataPath = filterArgs.value(k_VertexDataContainer_Key); - auto pTriangleGeometryDataPath = filterArgs.value(k_TriangleDataContainer_Key); + auto pVertexGeometryDataPath = filterArgs.value(k_SelectedVertexGeometryPath_Key); + auto pTriangleGeometryDataPath = filterArgs.value(k_SelectedTriangleGeometryPath_Key); auto pTriangleNormalsArrayDataPath = filterArgs.value(k_TriangleNormalsArrayPath_Key); - auto pDistancesDataName = filterArgs.value(k_DistancesArrayPath_Key); - auto pClosestTriangleIdDataName = filterArgs.value(k_ClosestTriangleIdArrayPath_Key); + auto pDistancesDataName = filterArgs.value(k_DistancesArrayName_Key); + auto pClosestTriangleIdDataName = filterArgs.value(k_ClosestTriangleIdArrayName_Key); PreflightResult preflightResult; @@ -137,14 +137,14 @@ Result<> FindVertexToTriangleDistancesFilter::executeImpl(DataStructure& dataStr { FindVertexToTriangleDistancesInputValues inputValues; - inputValues.VertexDataContainer = filterArgs.value(k_VertexDataContainer_Key); - inputValues.TriangleDataContainer = filterArgs.value(k_TriangleDataContainer_Key); + inputValues.VertexDataContainer = filterArgs.value(k_SelectedVertexGeometryPath_Key); + inputValues.TriangleDataContainer = filterArgs.value(k_SelectedTriangleGeometryPath_Key); inputValues.TriangleNormalsArrayPath = filterArgs.value(k_TriangleNormalsArrayPath_Key); auto vertexGeom = dataStructure.getDataRefAs(inputValues.VertexDataContainer); const DataPath vertexDataPath = inputValues.VertexDataContainer.createChildPath(vertexGeom.getVertexAttributeMatrix()->getName()); - inputValues.DistancesArrayPath = vertexDataPath.createChildPath(filterArgs.value(k_DistancesArrayPath_Key)); - inputValues.ClosestTriangleIdArrayPath = vertexDataPath.createChildPath(filterArgs.value(k_ClosestTriangleIdArrayPath_Key)); + inputValues.DistancesArrayPath = vertexDataPath.createChildPath(filterArgs.value(k_DistancesArrayName_Key)); + inputValues.ClosestTriangleIdArrayPath = vertexDataPath.createChildPath(filterArgs.value(k_ClosestTriangleIdArrayName_Key)); inputValues.TriBoundsDataPath = DataPath({::k_TriangleBounds}); @@ -169,11 +169,12 @@ Result FindVertexToTriangleDistancesFilter::FromSIMPLJson(const nlohm std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VertexDataContainerKey, k_VertexDataContainer_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_TriangleDataContainerKey, k_TriangleDataContainer_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VertexDataContainerKey, k_SelectedVertexGeometryPath_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_TriangleDataContainerKey, k_SelectedTriangleGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_TriangleNormalsArrayPathKey, k_TriangleNormalsArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DistancesArrayPathKey, k_DistancesArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ClosestTriangleIdArrayPathKey, k_ClosestTriangleIdArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DistancesArrayPathKey, k_DistancesArrayName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ClosestTriangleIdArrayPathKey, k_ClosestTriangleIdArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.hpp index 4867a5c174..c9650d849d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.hpp @@ -24,11 +24,11 @@ class SIMPLNXCORE_EXPORT FindVertexToTriangleDistancesFilter : public IFilter FindVertexToTriangleDistancesFilter& operator=(FindVertexToTriangleDistancesFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_VertexDataContainer_Key = "vertex_data_container"; - static inline constexpr StringLiteral k_TriangleDataContainer_Key = "triangle_data_container"; + static inline constexpr StringLiteral k_SelectedVertexGeometryPath_Key = "input_vertex_geometry_path"; + static inline constexpr StringLiteral k_SelectedTriangleGeometryPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_TriangleNormalsArrayPath_Key = "triangle_normals_array_path"; - static inline constexpr StringLiteral k_DistancesArrayPath_Key = "distances_array_path"; - static inline constexpr StringLiteral k_ClosestTriangleIdArrayPath_Key = "closest_triangle_id_array_path"; + static inline constexpr StringLiteral k_DistancesArrayName_Key = "distances_array_name"; + static inline constexpr StringLiteral k_ClosestTriangleIdArrayName_Key = "closest_triangle_id_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.cpp index 54a48f9b29..b020689fa6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.cpp @@ -60,7 +60,7 @@ Parameters FindVolFractionsFilter::parameters() const "The path to the cell ensemble attribute matrix where the output volume fractions array will be stored", DataPath({"DataContainer", "CellEnsembleData"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); params.insertSeparator(Parameters::Separator{"Created Objects: Ensemble Data"}); - params.insert(std::make_unique(k_VolFractionsArrayPath_Key, "Volume Fractions", "Fraction of volume that belongs to each Ensemble", "Volume Fractions")); + params.insert(std::make_unique(k_VolFractionsArrayName_Key, "Volume Fractions", "Fraction of volume that belongs to each Ensemble", "Volume Fractions")); return params; } @@ -77,7 +77,7 @@ IFilter::PreflightResult FindVolFractionsFilter::preflightImpl(const DataStructu { auto pCellPhasesArrayPathValue = filterArgs.value(k_CellPhasesArrayPath_Key); auto pCellEnsembleAttributeMatrixPathValue = filterArgs.value(k_CellEnsembleAttributeMatrixPath_Key); - auto pVolFractionsArrayNameValue = filterArgs.value(k_VolFractionsArrayPath_Key); + auto pVolFractionsArrayNameValue = filterArgs.value(k_VolFractionsArrayName_Key); const DataPath volFractionsArrayPath = pCellEnsembleAttributeMatrixPathValue.createChildPath(pVolFractionsArrayNameValue); const auto& cellPhasesArray = dataStructure.getDataRefAs(pCellPhasesArrayPathValue); @@ -103,7 +103,7 @@ Result<> FindVolFractionsFilter::executeImpl(DataStructure& dataStructure, const const std::atomic_bool& shouldCancel) const { auto pCellEnsembleAttributeMatrixPathValue = filterArgs.value(k_CellEnsembleAttributeMatrixPath_Key); - auto pVolFractionsArrayNameValue = filterArgs.value(k_VolFractionsArrayPath_Key); + auto pVolFractionsArrayNameValue = filterArgs.value(k_VolFractionsArrayName_Key); auto& cellPhasesArrayRef = dataStructure.getDataRefAs(filterArgs.value(k_CellPhasesArrayPath_Key)); auto& volFractionsArrayRef = dataStructure.getDataRefAs(pCellEnsembleAttributeMatrixPathValue.createChildPath(pVolFractionsArrayNameValue)); @@ -146,7 +146,7 @@ Result FindVolFractionsFilter::FromSIMPLJson(const nlohmann::json& js results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellPhasesArrayPathKey, k_CellPhasesArrayPath_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VolFractionsArrayPathKey, k_CellEnsembleAttributeMatrixPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VolFractionsArrayPathKey, k_VolFractionsArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VolFractionsArrayPathKey, k_VolFractionsArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.hpp index 31325b62ba..18b925d15e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.hpp @@ -26,7 +26,7 @@ class SIMPLNXCORE_EXPORT FindVolFractionsFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixPath_Key = "cell_ensemble_attribute_matrix_path"; - static inline constexpr StringLiteral k_VolFractionsArrayPath_Key = "vol_fractions_array_path"; + static inline constexpr StringLiteral k_VolFractionsArrayName_Key = "vol_fractions_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp index bd83847a03..bf731d993b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp @@ -7,6 +7,7 @@ #include "simplnx/Filter/Actions/CreateArrayAction.hpp" #include "simplnx/Filter/Actions/CreateGeometry2DAction.hpp" #include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" #include "simplnx/Parameters/DataObjectNameParameter.hpp" #include "simplnx/Parameters/GeometrySelectionParameter.hpp" #include "simplnx/Parameters/NumberParameter.hpp" @@ -59,14 +60,14 @@ Parameters FlyingEdges3DFilter::parameters() const params.insert(std::make_unique(k_IsoVal_Key, "Contour Value", "The value to contour on", 1.0)); params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert( - std::make_unique(k_SelectedDataArray_Key, "Data Array to Contour", "This is the data that will be checked for the contouring iso value", DataPath{}, GetAllDataTypes())); + params.insert(std::make_unique(k_SelectedDataArrayPath_Key, "Data Array to Contour", "This is the data that will be checked for the contouring iso value", DataPath{}, + GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); - params.insert( - std::make_unique(k_NewTriangleGeometryName_Key, "Name of Output Triangle Geometry", "This is where the contouring line will be stored", "Contouring Geometry")); + params.insert(std::make_unique(k_CreatedTriangleGeometryPath_Key, "Name of Output Triangle Geometry", "This is where the contouring line will be stored", + DataPath({"Contouring Geometry"}))); return params; } @@ -81,8 +82,8 @@ IFilter::UniquePointer FlyingEdges3DFilter::clone() const IFilter::PreflightResult FlyingEdges3DFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto pImageGeomPath = filterArgs.value(k_SelectedImageGeometry_Key); - auto pTriangleGeomName = filterArgs.value(k_NewTriangleGeometryName_Key); + auto pImageGeomPath = filterArgs.value(k_SelectedImageGeometryPath_Key); + auto pTriangleGeomName = filterArgs.value(k_CreatedTriangleGeometryPath_Key); PreflightResult preflightResult; nx::core::Result resultOutputActions; @@ -90,7 +91,7 @@ IFilter::PreflightResult FlyingEdges3DFilter::preflightImpl(const DataStructure& // Create the Triangle Geometry action and store it auto createTriangleGeometryAction = - std::make_unique(DataPath({pTriangleGeomName}), static_cast(1), static_cast(1), INodeGeometry0D::k_VertexDataName, INodeGeometry2D::k_FaceDataName, + std::make_unique(pTriangleGeomName, static_cast(1), static_cast(1), INodeGeometry0D::k_VertexDataName, INodeGeometry2D::k_FaceDataName, CreateTriangleGeometryAction::k_DefaultVerticesName, CreateTriangleGeometryAction::k_DefaultFacesName); auto vertexNormalsPath = createTriangleGeometryAction->getVertexDataPath().createChildPath(k_VertexNormals); resultOutputActions.value().appendAction(std::move(createTriangleGeometryAction)); @@ -108,9 +109,9 @@ Result<> FlyingEdges3DFilter::executeImpl(DataStructure& dataStructure, const Ar { FlyingEdges3DInputValues inputValues; - inputValues.imageGeomPath = filterArgs.value(k_SelectedImageGeometry_Key); - inputValues.contouringArrayPath = filterArgs.value(k_SelectedDataArray_Key); - inputValues.triangleGeomPath = DataPath({filterArgs.value(k_NewTriangleGeometryName_Key)}); + inputValues.imageGeomPath = filterArgs.value(k_SelectedImageGeometryPath_Key); + inputValues.contouringArrayPath = filterArgs.value(k_SelectedDataArrayPath_Key); + inputValues.triangleGeomPath = filterArgs.value(k_CreatedTriangleGeometryPath_Key); inputValues.isoVal = filterArgs.value(k_IsoVal_Key); inputValues.normalsArrayPath = inputValues.triangleGeomPath.createChildPath(INodeGeometry0D::k_VertexDataName).createChildPath(k_VertexNormals); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.hpp index 2a099d42f3..7be7b96008 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.hpp @@ -24,10 +24,10 @@ class SIMPLNXCORE_EXPORT FlyingEdges3DFilter : public IFilter FlyingEdges3DFilter& operator=(FlyingEdges3DFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; - static inline constexpr StringLiteral k_SelectedDataArray_Key = "selected_data_array"; - static inline constexpr StringLiteral k_NewTriangleGeometryName_Key = "new_triangle_geometry_name"; - static inline constexpr StringLiteral k_IsoVal_Key = "iso_val_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_SelectedDataArrayPath_Key = "input_data_array_path"; + static inline constexpr StringLiteral k_CreatedTriangleGeometryPath_Key = "output_triangle_geometry_path"; + static inline constexpr StringLiteral k_IsoVal_Key = "contour_value"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.hpp index 06b1e3a112..85838bb398 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.hpp @@ -27,7 +27,7 @@ class SIMPLNXCORE_EXPORT GenerateColorTableFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_SelectedPreset_Key = "selected_preset"; - static inline constexpr StringLiteral k_SelectedDataArrayPath_Key = "selected_data_array_path"; + static inline constexpr StringLiteral k_SelectedDataArrayPath_Key = "input_data_array_path"; static inline constexpr StringLiteral k_RgbArrayPath_Key = "output_rgb_array_name"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.cpp index 93c0c890c2..497792eef2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.cpp @@ -265,7 +265,7 @@ Parameters IdentifySample::parameters() const params.insertSeparator(Parameters::Separator{"Input Parameters"}); params.insert(std::make_unique(k_FillHoles_Key, "Fill Holes in Largest Feature", "Whether to fill holes within sample after it is identified", true)); - params.insert(std::make_unique(k_ImageGeom_Key, "Image Geometry", "DataPath to the target ImageGeom", DataPath(), + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Image Geometry", "DataPath to the target ImageGeom", DataPath(), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "DataPath to the mask array defining what is sample and what is not", DataPath(), ArraySelectionParameter::AllowedTypes{nx::core::DataType::boolean, nx::core::DataType::uint8}, @@ -282,7 +282,7 @@ IFilter::UniquePointer IdentifySample::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult IdentifySample::preflightImpl(const DataStructure& data, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - const auto imageGeomPath = args.value(k_ImageGeom_Key); + const auto imageGeomPath = args.value(k_SelectedImageGeometryPath_Key); const auto goodVoxelsArrayPath = args.value(k_MaskArrayPath_Key); const auto& inputData = data.getDataRefAs(goodVoxelsArrayPath); @@ -301,7 +301,7 @@ IFilter::PreflightResult IdentifySample::preflightImpl(const DataStructure& data Result<> IdentifySample::executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { const auto fillHoles = args.value(k_FillHoles_Key); - const auto imageGeomPath = args.value(k_ImageGeom_Key); + const auto imageGeomPath = args.value(k_SelectedImageGeometryPath_Key); const auto goodVoxelsArrayPath = args.value(k_MaskArrayPath_Key); const auto& inputData = data.getDataRefAs(goodVoxelsArrayPath); @@ -328,7 +328,7 @@ Result IdentifySample::FromSIMPLJson(const nlohmann::json& json) std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FillHolesKey, k_FillHoles_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GoodVoxelsArrayPathKey, k_ImageGeom_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GoodVoxelsArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GoodVoxelsArrayPathKey, k_MaskArrayPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.hpp index e41a4b3d95..14bcf531f8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.hpp @@ -22,7 +22,7 @@ class SIMPLNXCORE_EXPORT IdentifySample : public IFilter // Parameter Keys static inline constexpr StringLiteral k_FillHoles_Key = "fill_holes"; - static inline constexpr StringLiteral k_ImageGeom_Key = "image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.hpp index 8a8d8b6cb8..e92565b429 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.hpp @@ -22,10 +22,10 @@ class SIMPLNXCORE_EXPORT InitializeData : public IFilter // Parameter Keys static inline constexpr StringLiteral k_ArrayPath_Key = "array_path"; - static inline constexpr StringLiteral k_InitType_Key = "init_type"; + static inline constexpr StringLiteral k_InitType_Key = "init_type_index"; static inline constexpr StringLiteral k_InitValue_Key = "init_value"; static inline constexpr StringLiteral k_StartingFillValue_Key = "starting_fill_value"; - static inline constexpr StringLiteral k_StepOperation_Key = "step_operation"; + static inline constexpr StringLiteral k_StepOperation_Key = "step_operation_index"; static inline constexpr StringLiteral k_StepValue_Key = "step_value"; static inline constexpr StringLiteral k_UseSeed_Key = "use_seed"; static inline constexpr StringLiteral k_SeedValue_Key = "seed_value"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.hpp index 2552173f78..23635a6511 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.hpp @@ -22,10 +22,10 @@ class SIMPLNXCORE_EXPORT InitializeImageGeomCellData : public IFilter // Parameter Keys static inline constexpr StringLiteral k_CellArrayPaths_Key = "cell_arrays"; - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geom_path"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_MinPoint_Key = "min_point"; static inline constexpr StringLiteral k_MaxPoint_Key = "max_point"; - static inline constexpr StringLiteral k_InitType_Key = "init_type"; + static inline constexpr StringLiteral k_InitType_Key = "init_type_index"; static inline constexpr StringLiteral k_InitValue_Key = "init_value"; static inline constexpr StringLiteral k_InitRange_Key = "init_range"; static inline constexpr StringLiteral k_UseSeed_Key = "use_seed"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp index a25334eea3..e0a05b8037 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp @@ -189,13 +189,13 @@ Parameters InterpolatePointCloudToRegularGridFilter::parameters() const std::vector{"x", "y", "z"})); params.insertSeparator(Parameters::Separator{"Required Input Data Objects"}); - params.insert(std::make_unique(k_VertexGeom_Key, "Vertex Geometry to Interpolate", "DataPath to geometry to interpolate", DataPath{}, + params.insert(std::make_unique(k_SelectedVertexGeometryPath_Key, "Vertex Geometry to Interpolate", "DataPath to geometry to interpolate", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); - params.insert(std::make_unique(k_ImageGeom_Key, "Interpolated Image Geometry", "DataPath to interpolated geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Interpolated Image Geometry", "DataPath to interpolated geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_VoxelIndices_Key, "Voxel Indices", "DataPath to voxel indices", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint64}, + params.insert(std::make_unique(k_VoxelIndicesPath_Key, "Voxel Indices", "DataPath to voxel indices", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint64}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_Mask_Key, "Mask", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", DataPath{}, + params.insert(std::make_unique(k_InputMaskPath_Key, "Mask", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_InterpolateArrays_Key, "Attribute Arrays to Interpolate", "DataPaths to interpolate", std::vector(), MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, GetAllNumericTypes(), @@ -205,11 +205,11 @@ Parameters InterpolatePointCloudToRegularGridFilter::parameters() const MultiArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); - params.insert(std::make_unique(k_InterpolatedGroup_Key, "Interpolated Group", "DataPath to created DataGroup for interpolated data", "InterpolatedData")); - params.insert(std::make_unique(k_KernelDistancesArray_Key, "Kernel Distances Group", "DataPath to created DataGroup for kernel distances data", "KernelDistances")); + params.insert(std::make_unique(k_InterpolatedGroupName_Key, "Interpolated Group", "DataPath to created DataGroup for interpolated data", "InterpolatedData")); + params.insert(std::make_unique(k_KernelDistancesArrayName_Key, "Kernel Distances Group", "DataPath to created DataGroup for kernel distances data", "KernelDistances")); - params.linkParameters(k_UseMask_Key, k_Mask_Key, std::make_any(true)); - params.linkParameters(k_StoreKernelDistances_Key, k_KernelDistancesArray_Key, std::make_any(true)); + params.linkParameters(k_UseMask_Key, k_InputMaskPath_Key, std::make_any(true)); + params.linkParameters(k_StoreKernelDistances_Key, k_KernelDistancesArrayName_Key, std::make_any(true)); params.linkParameters(k_InterpolationTechnique_Key, k_GaussianSigmas_Key, std::make_any(k_Gaussian)); return params; @@ -228,10 +228,10 @@ IFilter::PreflightResult InterpolatePointCloudToRegularGridFilter::preflightImpl auto useMask = args.value(k_UseMask_Key); auto storeKernelDistances = args.value(k_StoreKernelDistances_Key); auto interpolationTechnique = args.value(k_InterpolationTechnique_Key); - auto vertexGeomPath = args.value(k_VertexGeom_Key); - auto imageGeomPath = args.value(k_ImageGeom_Key); - auto interpolatedGroupName = args.value(k_InterpolatedGroup_Key); - auto voxelIndicesPath = args.value(k_VoxelIndices_Key); + auto vertexGeomPath = args.value(k_SelectedVertexGeometryPath_Key); + auto imageGeomPath = args.value(k_SelectedImageGeometryPath_Key); + auto interpolatedGroupName = args.value(k_InterpolatedGroupName_Key); + auto voxelIndicesPath = args.value(k_VoxelIndicesPath_Key); auto interpolatedDataPaths = args.value>(k_InterpolateArrays_Key); auto copyDataPaths = args.value>(k_CopyArrays_Key); auto kernelSize = args.value>(k_KernelSize_Key); @@ -316,7 +316,7 @@ IFilter::PreflightResult InterpolatePointCloudToRegularGridFilter::preflightImpl // validate the input arrays have matching tuples (i.e. it should all come from the input vertex geometry's vertex data) if(useMask) { - dataArrays.push_back(args.value(k_Mask_Key)); + dataArrays.push_back(args.value(k_InputMaskPath_Key)); } auto tupleValidityCheck = dataStructure.validateNumberOfTuples(dataArrays); @@ -328,7 +328,7 @@ IFilter::PreflightResult InterpolatePointCloudToRegularGridFilter::preflightImpl // Create the neighbor list array for storing the kernel distances if(storeKernelDistances) { - auto action = std::make_unique(DataType::float32, numTuples, interpolatedGroupPath.createChildPath(args.value(k_KernelDistancesArray_Key))); + auto action = std::make_unique(DataType::float32, numTuples, interpolatedGroupPath.createChildPath(args.value(k_KernelDistancesArrayName_Key))); actions.appendAction(std::move(action)); } @@ -342,12 +342,12 @@ Result<> InterpolatePointCloudToRegularGridFilter::executeImpl(DataStructure& da auto useMask = args.value(k_UseMask_Key); auto storeKernelDistances = args.value(k_StoreKernelDistances_Key); auto interpolationTechnique = args.value(k_InterpolationTechnique_Key); - auto vertexGeomPath = args.value(k_VertexGeom_Key); - auto imageGeomPath = args.value(k_ImageGeom_Key); - auto interpolatedGroupName = args.value(k_InterpolatedGroup_Key); + auto vertexGeomPath = args.value(k_SelectedVertexGeometryPath_Key); + auto imageGeomPath = args.value(k_SelectedImageGeometryPath_Key); + auto interpolatedGroupName = args.value(k_InterpolatedGroupName_Key); auto interpolatedDataPaths = args.value>(k_InterpolateArrays_Key); auto copyDataPaths = args.value>(k_CopyArrays_Key); - auto voxelIndicesPath = args.value(k_VoxelIndices_Key); + auto voxelIndicesPath = args.value(k_VoxelIndicesPath_Key); auto kernelSize = args.value>(k_KernelSize_Key); const DataPath interpolatedGroupPath = imageGeomPath.createChildPath(interpolatedGroupName); @@ -370,7 +370,7 @@ Result<> InterpolatePointCloudToRegularGridFilter::executeImpl(DataStructure& da BoolArray::store_type* mask = nullptr; if(useMask) { - mask = data.getDataAs(args.value(k_Mask_Key))->getDataStore(); + mask = data.getDataAs(args.value(k_InputMaskPath_Key))->getDataStore(); } auto& voxelIndices = data.getDataRefAs(voxelIndicesPath); @@ -486,7 +486,7 @@ Result<> InterpolatePointCloudToRegularGridFilter::executeImpl(DataStructure& da if(storeKernelDistances) { - const DataPath kernelDistPath = interpolatedGroupPath.createChildPath(args.value(k_KernelDistancesArray_Key)); + const DataPath kernelDistPath = interpolatedGroupPath.createChildPath(args.value(k_KernelDistancesArrayName_Key)); InitializeNeighborList(data, kernelDistPath); auto* kernelDistances = data.getDataAs(kernelDistPath); mapKernelDistances(kernelDistances, kernelValDistances, kernel, kernelNumVoxels, dims.data(), x, y, z); @@ -537,13 +537,15 @@ Result InterpolatePointCloudToRegularGridFilter::FromSIMPLJson(const results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelSizeKey, k_KernelSize_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SigmasKey, k_GaussianSigmas_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, "@SIMPLNX_PARAMETER_KEY@")); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InterpolatedDataContainerNameKey, k_InterpolatedGroup_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VoxelIndicesArrayPathKey, k_VoxelIndices_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_Mask_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InterpolatedDataContainerNameKey, k_InterpolatedGroupName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VoxelIndicesArrayPathKey, k_VoxelIndicesPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_InputMaskPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ArraysToInterpolateKey, k_InterpolateArrays_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ArraysToCopyKey, k_CopyArrays_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InterpolatedAttributeMatrixNameKey, k_InterpolatedGroup_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelDistancesArrayNameKey, k_KernelDistancesArray_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InterpolatedAttributeMatrixNameKey, k_InterpolatedGroupName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelDistancesArrayNameKey, k_KernelDistancesArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InterpolatedSuffixKey, "@SIMPLNX_PARAMETER_KEY@")); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CopySuffixKey, "@SIMPLNX_PARAMETER_KEY@")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp index 11d4e3dd30..90485c4ab9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp @@ -27,17 +27,17 @@ class SIMPLNXCORE_EXPORT InterpolatePointCloudToRegularGridFilter : public IFilt // Parameter Keys static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_StoreKernelDistances_Key = "store_kernel_distances"; - static inline constexpr StringLiteral k_InterpolationTechnique_Key = "interpolation_technique"; + static inline constexpr StringLiteral k_InterpolationTechnique_Key = "interpolation_index"; static inline constexpr StringLiteral k_KernelSize_Key = "kernel_size"; - static inline constexpr StringLiteral k_GaussianSigmas_Key = "guassian_sigmas"; - static inline constexpr StringLiteral k_VertexGeom_Key = "vertex_geom"; - static inline constexpr StringLiteral k_ImageGeom_Key = "image_geom"; - static inline constexpr StringLiteral k_VoxelIndices_Key = "voxel_indices"; - static inline constexpr StringLiteral k_Mask_Key = "mask"; + static inline constexpr StringLiteral k_GaussianSigmas_Key = "gaussian_sigmas"; + static inline constexpr StringLiteral k_SelectedVertexGeometryPath_Key = "input_vertex_geometry_path"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_VoxelIndicesPath_Key = "voxel_indices_path"; + static inline constexpr StringLiteral k_InputMaskPath_Key = "input_mask_path"; static inline constexpr StringLiteral k_InterpolateArrays_Key = "interpolate_arrays"; static inline constexpr StringLiteral k_CopyArrays_Key = "copy_arrays"; - static inline constexpr StringLiteral k_InterpolatedGroup_Key = "interpolated_group"; - static inline constexpr StringLiteral k_KernelDistancesArray_Key = "kernel_distances_array"; + static inline constexpr StringLiteral k_InterpolatedGroupName_Key = "interpolated_group_name"; + static inline constexpr StringLiteral k_KernelDistancesArrayName_Key = "kernel_distances_array_name"; static inline constexpr uint64 k_Uniform = 0; static inline constexpr uint64 k_Gaussian = 1; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.hpp index 9cfbce254b..4767a92775 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.hpp @@ -21,11 +21,11 @@ class SIMPLNXCORE_EXPORT IterativeClosestPointFilter : public IFilter IterativeClosestPointFilter& operator=(IterativeClosestPointFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_MovingVertexPath_Key = "moving_vertex"; - static inline constexpr StringLiteral k_TargetVertexPath_Key = "target_vertex"; + static inline constexpr StringLiteral k_MovingVertexPath_Key = "input_moving_vertex_geometry_path"; + static inline constexpr StringLiteral k_TargetVertexPath_Key = "input_target_vertex_geometry_path"; static inline constexpr StringLiteral k_NumIterations_Key = "num_iterations"; static inline constexpr StringLiteral k_ApplyTransformation_Key = "apply_transformation"; - static inline constexpr StringLiteral k_TransformArrayPath_Key = "transform_array"; + static inline constexpr StringLiteral k_TransformArrayPath_Key = "transform_array_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.hpp index 24a352dce0..69d48cbc61 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT KMeansFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InitClusters_Key = "init_clusters"; - static inline constexpr StringLiteral k_DistanceMetric_Key = "distance_metric"; + static inline constexpr StringLiteral k_DistanceMetric_Key = "distance_metric_index"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_SelectedArrayPath_Key = "selected_array_path"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.hpp index 67abba935f..25f494209f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT KMedoidsFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InitClusters_Key = "init_clusters"; - static inline constexpr StringLiteral k_DistanceMetric_Key = "distance_metric"; + static inline constexpr StringLiteral k_DistanceMetric_Key = "distance_metric_index"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_SelectedArrayPath_Key = "selected_array_path"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.hpp index e90ba2db5f..12441f2142 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT LabelTriangleGeometryFilter : public IFilter LabelTriangleGeometryFilter& operator=(LabelTriangleGeometryFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_TriangleGeomPath_Key = "triangle_geom_path"; + static inline constexpr StringLiteral k_TriangleGeomPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_CreatedRegionIdsPath_Key = "created_region_ids_path"; static inline constexpr StringLiteral k_TriangleAttributeMatrixName_Key = "triangle_attribute_matrix_name"; static inline constexpr StringLiteral k_NumTrianglesName_Key = "num_triangles_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.hpp index 8bab0d4e79..192d3af71d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT LaplacianSmoothingFilter : public IFilter LaplacianSmoothingFilter& operator=(LaplacianSmoothingFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_TriangleGeometryDataPath_Key = "triangle_geometry_data_path"; + static inline constexpr StringLiteral k_TriangleGeometryDataPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_IterationSteps_Key = "iteration_steps"; static inline constexpr StringLiteral k_Lambda_Key = "lambda_value"; static inline constexpr StringLiteral k_UseTaubinSmoothing_Key = "use_taubin_smoothing"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp index 3a043c00f6..392382d96f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp @@ -29,10 +29,10 @@ constexpr int64 k_IncompatibleMaskVoxelArrays = -2603; void createRegularGrid(DataStructure& data, const Arguments& args) { const auto samplingGridType = args.value(MapPointCloudToRegularGridFilter::k_SamplingGridType_Key); - const auto vertexGeomPath = args.value(MapPointCloudToRegularGridFilter::k_VertexGeometry_Key); - const auto newImageGeomPath = args.value(MapPointCloudToRegularGridFilter::k_NewImageGeometry_Key); + const auto vertexGeomPath = args.value(MapPointCloudToRegularGridFilter::k_SelectedVertexGeometryPath_Key); + const auto newImageGeomPath = args.value(MapPointCloudToRegularGridFilter::k_CreatedImageGeometryPath_Key); const auto useMask = args.value(MapPointCloudToRegularGridFilter::k_UseMask_Key); - const auto maskArrayPath = args.value(MapPointCloudToRegularGridFilter::k_MaskPath_Key); + const auto maskArrayPath = args.value(MapPointCloudToRegularGridFilter::k_InputMaskPath_Key); if(samplingGridType == 1) { @@ -222,30 +222,30 @@ Parameters MapPointCloudToRegularGridFilter::parameters() const params.insertLinkableParameter(std::make_unique(k_SamplingGridType_Key, "Sampling Grid Type", "Specifies how data is saved or accessed", 0, std::vector{"Manual", "Use Existing Image Geometry"})); params.insert(std::make_unique(k_GridDimensions_Key, "Grid Dimensions", "Target grid size", std::vector{0, 0, 0}, std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_NewImageGeometry_Key, "Created Image Geometry", "Path to create the Image Geometry", DataPath())); - params.insert(std::make_unique(k_ExistingImageGeometry_Key, "Existing Image Geometry", "Path to the existing Image Geometry", DataPath{}, + params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Created Image Geometry", "Path to create the Image Geometry", DataPath())); + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Existing Image Geometry", "Path to the existing Image Geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insertSeparator(Parameters::Separator{"Input Vertex Geometry Information"}); - params.insert(std::make_unique(k_VertexGeometry_Key, "Vertex Geometry", "Path to the target Vertex Geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedVertexGeometryPath_Key, "Vertex Geometry", "Path to the target Vertex Geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); params.insertSeparator(Parameters::Separator{"Input Vertex Mask Selection"}); params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask", "Specifies whether or not to use a mask array", false)); - params.insert(std::make_unique(k_MaskPath_Key, "Mask", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", DataPath(), + params.insert(std::make_unique(k_InputMaskPath_Key, "Mask", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); - params.insert(std::make_unique(k_VoxelIndices_Key, "Created Voxel Indices", "Path to the created Voxel Indices array", "Voxel Indices")); + params.insert(std::make_unique(k_VoxelIndicesName_Key, "Created Voxel Indices", "Path to the created Voxel Indices array", "Voxel Indices")); params.insert(std::make_unique(k_CellDataName_Key, "Created Cell Data Name", "The name of the cell data attribute matrix to be created within the created Image Geometry", ImageGeom::k_CellDataName)); - params.linkParameters(k_UseMask_Key, k_MaskPath_Key, std::make_any(true)); + params.linkParameters(k_UseMask_Key, k_InputMaskPath_Key, std::make_any(true)); params.linkParameters(k_SamplingGridType_Key, k_GridDimensions_Key, std::make_any(0)); - params.linkParameters(k_SamplingGridType_Key, k_NewImageGeometry_Key, std::make_any(0)); + params.linkParameters(k_SamplingGridType_Key, k_CreatedImageGeometryPath_Key, std::make_any(0)); params.linkParameters(k_SamplingGridType_Key, k_CellDataName_Key, std::make_any(0)); - params.linkParameters(k_SamplingGridType_Key, k_ExistingImageGeometry_Key, std::make_any(1)); + params.linkParameters(k_SamplingGridType_Key, k_SelectedImageGeometryPath_Key, std::make_any(1)); return params; } @@ -260,15 +260,15 @@ IFilter::PreflightResult MapPointCloudToRegularGridFilter::preflightImpl(const D const std::atomic_bool& shouldCancel) const { auto samplingGridType = args.value(k_SamplingGridType_Key); - auto vertexGeomPath = args.value(k_VertexGeometry_Key); + auto vertexGeomPath = args.value(k_SelectedVertexGeometryPath_Key); auto useMask = args.value(k_UseMask_Key); - auto voxelIndicesName = args.value(k_VoxelIndices_Key); + auto voxelIndicesName = args.value(k_VoxelIndicesName_Key); OutputActions actions; if(samplingGridType == 0) { - auto newImageGeomPath = args.value(k_NewImageGeometry_Key); + auto newImageGeomPath = args.value(k_CreatedImageGeometryPath_Key); auto cellDataName = args.value(k_CellDataName_Key); auto gridDimensions = args.value>(k_GridDimensions_Key); @@ -297,7 +297,7 @@ IFilter::PreflightResult MapPointCloudToRegularGridFilter::preflightImpl(const D if(useMask) { - auto maskArrayPath = args.value(k_MaskPath_Key); + auto maskArrayPath = args.value(k_InputMaskPath_Key); const auto numMaskTuples = data.getDataRefAs(maskArrayPath).getNumberOfTuples(); const auto numVoxelTuples = vertexData->getNumTuples(); if(numMaskTuples != numVoxelTuples) @@ -319,10 +319,10 @@ Result<> MapPointCloudToRegularGridFilter::executeImpl(DataStructure& data, cons const std::atomic_bool& shouldCancel) const { const auto samplingGridType = args.value(k_SamplingGridType_Key); - const auto vertexGeomPath = args.value(k_VertexGeometry_Key); + const auto vertexGeomPath = args.value(k_SelectedVertexGeometryPath_Key); const auto useMask = args.value(k_UseMask_Key); - const auto maskArrayPath = args.value(k_MaskPath_Key); - const auto voxelIndicesName = args.value(k_VoxelIndices_Key); + const auto maskArrayPath = args.value(k_InputMaskPath_Key); + const auto voxelIndicesName = args.value(k_VoxelIndicesName_Key); const ImageGeom* image = nullptr; if(samplingGridType == 0) @@ -330,11 +330,11 @@ Result<> MapPointCloudToRegularGridFilter::executeImpl(DataStructure& data, cons // Create the regular grid messageHandler("Creating Regular Grid"); createRegularGrid(data, args); - image = data.getDataAs(args.value(k_NewImageGeometry_Key)); + image = data.getDataAs(args.value(k_CreatedImageGeometryPath_Key)); } else if(samplingGridType == 1) { - image = data.getDataAs(args.value(k_ExistingImageGeometry_Key)); + image = data.getDataAs(args.value(k_SelectedImageGeometryPath_Key)); } const auto& vertices = data.getDataRefAs(vertexGeomPath); @@ -403,12 +403,14 @@ Result MapPointCloudToRegularGridFilter::FromSIMPLJson(const nlohmann results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SamplingGridTypeKey, k_SamplingGridType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GridDimensionsKey, k_GridDimensions_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ImageDataContainerPathKey, k_ExistingImageGeometry_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ImageDataContainerPathKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, "@SIMPLNX_PARAMETER_KEY@")); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseMaskKey, k_UseMask_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_MaskPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VoxelIndicesArrayPathKey, k_VoxelIndices_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CreatedImageDataContainerNameKey, k_NewImageGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_InputMaskPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VoxelIndicesArrayPathKey, k_VoxelIndicesName_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CreatedImageDataContainerNameKey, k_CreatedImageGeometryPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp index e923855397..10a1bfc270 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp @@ -25,14 +25,14 @@ class SIMPLNXCORE_EXPORT MapPointCloudToRegularGridFilter : public IFilter MapPointCloudToRegularGridFilter& operator=(MapPointCloudToRegularGridFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SamplingGridType_Key = "sampling_grid_type"; + static inline constexpr StringLiteral k_SamplingGridType_Key = "sampling_grid_index"; static inline constexpr StringLiteral k_GridDimensions_Key = "grid_dimensions"; - static inline constexpr StringLiteral k_VertexGeometry_Key = "vertex_geometry"; - static inline constexpr StringLiteral k_NewImageGeometry_Key = "new_image_geometry"; - static inline constexpr StringLiteral k_ExistingImageGeometry_Key = "existing_image_geometry"; + static inline constexpr StringLiteral k_SelectedVertexGeometryPath_Key = "input_vertex_geometry_path"; + static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; - static inline constexpr StringLiteral k_MaskPath_Key = "mask"; - static inline constexpr StringLiteral k_VoxelIndices_Key = "voxel_indices"; + static inline constexpr StringLiteral k_InputMaskPath_Key = "mask_path"; + static inline constexpr StringLiteral k_VoxelIndicesName_Key = "voxel_indices_name"; static inline constexpr StringLiteral k_CellDataName_Key = "cell_data_name"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.cpp index 06851a8e36..266db27d02 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.cpp @@ -24,11 +24,11 @@ constexpr int32 k_InconsistentTupleCount = -252; void assignBadPoints(DataStructure& data, const Arguments& args, const std::atomic_bool& shouldCancel) { - auto imageGeomPath = args.value(MinNeighbors::k_ImageGeom_Key); - auto featureIdsPath = args.value(MinNeighbors::k_FeatureIds_Key); - auto numNeighborsPath = args.value(MinNeighbors::k_NumNeighbors_Key); + auto imageGeomPath = args.value(MinNeighbors::k_SelectedImageGeometryPath_Key); + auto featureIdsPath = args.value(MinNeighbors::k_FeatureIdsPath_Key); + auto numNeighborsPath = args.value(MinNeighbors::k_NumNeighborsPath_Key); auto ignoredVoxelArrayPaths = args.value>(MinNeighbors::k_IgnoredVoxelArrays_Key); - auto cellDataAttrMatrix = args.value(MinNeighbors::k_CellDataAttributeMatrix_Key); + auto cellDataAttrMatrix = args.value(MinNeighbors::k_CellDataAttributeMatrixPath_Key); auto& featureIdsArray = data.getDataRefAs(featureIdsPath); auto& numNeighborsArray = data.getDataRefAs(numNeighborsPath); @@ -39,7 +39,7 @@ void assignBadPoints(DataStructure& data, const Arguments& args, const std::atom Int32Array* featurePhasesArray = nullptr; if(applyToSinglePhase) { - auto featurePhasesPath = args.value(MinNeighbors::k_FeaturePhases_Key); + auto featurePhasesPath = args.value(MinNeighbors::k_FeaturePhasesPath_Key); featurePhasesArray = data.getDataAs(featurePhasesPath); } @@ -209,9 +209,9 @@ void assignBadPoints(DataStructure& data, const Arguments& args, const std::atom nonstd::expected, Error> mergeContainedFeatures(DataStructure& data, const Arguments& args, const std::atomic_bool& shouldCancel) { - auto imageGeomPath = args.value(MinNeighbors::k_ImageGeom_Key); - auto featureIdsPath = args.value(MinNeighbors::k_FeatureIds_Key); - auto numNeighborsPath = args.value(MinNeighbors::k_NumNeighbors_Key); + auto imageGeomPath = args.value(MinNeighbors::k_SelectedImageGeometryPath_Key); + auto featureIdsPath = args.value(MinNeighbors::k_FeatureIdsPath_Key); + auto numNeighborsPath = args.value(MinNeighbors::k_NumNeighborsPath_Key); auto minNumNeighbors = args.value(MinNeighbors::k_MinNumNeighbors_Key); auto phaseNumber = args.value(MinNeighbors::k_PhaseNumber_Key); @@ -226,7 +226,7 @@ nonstd::expected, Error> mergeContainedFeatures(DataStructure& Int32Array* featurePhasesArray = nullptr; if(applyToSinglePhase) { - auto featurePhasesPath = args.value(MinNeighbors::k_FeaturePhases_Key); + auto featurePhasesPath = args.value(MinNeighbors::k_FeaturePhasesPath_Key); featurePhasesArray = data.getDataAs(featurePhasesPath); } @@ -322,19 +322,20 @@ Parameters MinNeighbors::parameters() const params.insert(std::make_unique(k_PhaseNumber_Key, "Phase Index", "Which Ensemble to apply minimum to. Only needed if Apply to Single Phase Only is checked", 0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_ImageGeom_Key, "Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_CellDataAttributeMatrix_Key, "Cell Attribute Matrix", + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Image Geometry", "The target geometry", DataPath{}, + GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); + params.insert(std::make_unique(k_CellDataAttributeMatrixPath_Key, "Cell Attribute Matrix", "The cell data attribute matrix in which to apply the minimum neighbors algorithm", DataPath({"Data Container", "CellData"}))); - params.insert(std::make_unique(k_FeatureIds_Key, "Feature Ids", "Specifies to which Feature each Element belongs", DataPath{}, + params.insert(std::make_unique(k_FeatureIdsPath_Key, "Feature Ids", "Specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Required Input Feature Data"}); - params.insert(std::make_unique(k_NumNeighbors_Key, "Number of Neighbors", "Number of contiguous neighboring Features for each Feature", + params.insert(std::make_unique(k_NumNeighborsPath_Key, "Number of Neighbors", "Number of contiguous neighboring Features for each Feature", DataPath({"Data Container", "Feature Data", "NumNeighbors"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique( - k_FeaturePhases_Key, "Feature Phases", "Specifies to which Ensemble each Feature belongs. Only required if Apply to Single Phase Only is checked", + k_FeaturePhasesPath_Key, "Feature Phases", "Specifies to which Ensemble each Feature belongs. Only required if Apply to Single Phase Only is checked", DataPath({"Data Container", "Feature Data", "Phases"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); // Attribute Arrays to Ignore params.insert(std::make_unique(k_IgnoredVoxelArrays_Key, "Cell Arrays to Ignore", "The arrays to ignore when applying the minimum neighbors algorithm", @@ -342,7 +343,7 @@ Parameters MinNeighbors::parameters() const MultiArraySelectionParameter::AllowedDataTypes{})); params.linkParameters(k_ApplyToSinglePhase_Key, k_PhaseNumber_Key, std::make_any(true)); - params.linkParameters(k_ApplyToSinglePhase_Key, k_FeaturePhases_Key, std::make_any(true)); + params.linkParameters(k_ApplyToSinglePhase_Key, k_FeaturePhasesPath_Key, std::make_any(true)); return params; } @@ -355,12 +356,12 @@ IFilter::UniquePointer MinNeighbors::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult MinNeighbors::preflightImpl(const DataStructure& dataStructure, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = args.value(k_ImageGeom_Key); + auto imageGeomPath = args.value(k_SelectedImageGeometryPath_Key); auto applyToSinglePhase = args.value(k_ApplyToSinglePhase_Key); auto phaseNumber = args.value(k_PhaseNumber_Key); - auto featureIdsPath = args.value(k_FeatureIds_Key); - auto featurePhasesPath = args.value(k_FeaturePhases_Key); - auto numNeighborsPath = args.value(k_NumNeighbors_Key); + auto featureIdsPath = args.value(k_FeatureIdsPath_Key); + auto featurePhasesPath = args.value(k_FeaturePhasesPath_Key); + auto numNeighborsPath = args.value(k_NumNeighborsPath_Key); auto minNumNeighbors = args.value(k_MinNumNeighbors_Key); nx::core::Result resultOutputActions; @@ -407,7 +408,7 @@ IFilter::PreflightResult MinNeighbors::preflightImpl(const DataStructure& dataSt //------------------------------------------------------------------------------ Result<> MinNeighbors::executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto featurePhasesPath = args.value(k_FeaturePhases_Key); + auto featurePhasesPath = args.value(k_FeaturePhasesPath_Key); auto applyToSinglePhase = args.value(k_ApplyToSinglePhase_Key); auto phaseNumber = args.value(k_PhaseNumber_Key); @@ -444,7 +445,7 @@ Result<> MinNeighbors::executeImpl(DataStructure& data, const Arguments& args, c return {nonstd::make_unexpected(std::vector{activeObjectsResult.error()})}; } - auto cellDataAttrMatrix = args.value(MinNeighbors::k_CellDataAttributeMatrix_Key); + auto cellDataAttrMatrix = args.value(MinNeighbors::k_CellDataAttributeMatrixPath_Key); auto result = nx::core::GetAllChildDataPaths(data, cellDataAttrMatrix, DataObject::Type::DataArray); if(!result.has_value()) { @@ -454,10 +455,10 @@ Result<> MinNeighbors::executeImpl(DataStructure& data, const Arguments& args, c // Run the algorithm. assignBadPoints(data, args, shouldCancel); - auto featureIdsPath = args.value(MinNeighbors::k_FeatureIds_Key); + auto featureIdsPath = args.value(MinNeighbors::k_FeatureIdsPath_Key); auto& featureIdsArray = data.getDataRefAs(featureIdsPath); - auto numNeighborsPath = args.value(MinNeighbors::k_NumNeighbors_Key); + auto numNeighborsPath = args.value(MinNeighbors::k_NumNeighborsPath_Key); auto& numNeighborsArray = data.getDataRefAs(numNeighborsPath); DataPath cellFeatureGroupPath = numNeighborsPath.getParent(); @@ -500,11 +501,12 @@ Result MinNeighbors::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_MinNumNeighborsKey, k_MinNumNeighbors_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ApplyToSinglePhaseKey, k_ApplyToSinglePhase_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_PhaseNumberKey, k_PhaseNumber_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_ImageGeom_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellDataAttributeMatrix_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_FeatureIds_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeaturePhasesArrayPathKey, k_FeaturePhases_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NumNeighborsArrayPathKey, k_NumNeighbors_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometryPath_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellDataAttributeMatrixPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_FeatureIdsPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeaturePhasesArrayPathKey, k_FeaturePhasesPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NumNeighborsArrayPathKey, k_NumNeighborsPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_IgnoredDataArrayPathsKey, k_IgnoredVoxelArrays_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.hpp index f0c6fae4c6..c31f0e8399 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.hpp @@ -21,15 +21,15 @@ class SIMPLNXCORE_EXPORT MinNeighbors : public IFilter MinNeighbors& operator=(MinNeighbors&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ImageGeom_Key = "image_geom"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_ApplyToSinglePhase_Key = "apply_to_single_phase"; static inline constexpr StringLiteral k_PhaseNumber_Key = "phase_number"; - static inline constexpr StringLiteral k_FeatureIds_Key = "feature_ids"; - static inline constexpr StringLiteral k_FeaturePhases_Key = "feature_phases"; - static inline constexpr StringLiteral k_NumNeighbors_Key = "num_neighbors"; + static inline constexpr StringLiteral k_FeatureIdsPath_Key = "feature_ids_path"; + static inline constexpr StringLiteral k_FeaturePhasesPath_Key = "feature_phases_path"; + static inline constexpr StringLiteral k_NumNeighborsPath_Key = "num_neighbors_path"; static inline constexpr StringLiteral k_MinNumNeighbors_Key = "min_num_neighbors"; static inline constexpr StringLiteral k_IgnoredVoxelArrays_Key = "ignored_voxel_arrays"; - static inline constexpr StringLiteral k_CellDataAttributeMatrix_Key = "cell_attribute_matrix"; + static inline constexpr StringLiteral k_CellDataAttributeMatrixPath_Key = "cell_attribute_matrix_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.cpp index bef5c64ad8..2f54aaa04e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.cpp @@ -47,8 +47,8 @@ Parameters MoveData::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_Data_Key, "Data to Move", "The complete paths to the data object(s) to be moved", MultiPathSelectionParameter::ValueType{})); - params.insert(std::make_unique(k_NewParent_Key, "New Parent", "The complete path to the parent data object to which the data will be moved", DataPath(), + params.insert(std::make_unique(k_SourceDataPaths_Key, "Data to Move", "The complete paths to the data object(s) to be moved", MultiPathSelectionParameter::ValueType{})); + params.insert(std::make_unique(k_DestinationParentPath_Key, "New Parent", "The complete path to the parent data object to which the data will be moved", DataPath(), BaseGroup::GetAllGroupTypes())); return params; } @@ -62,8 +62,8 @@ IFilter::UniquePointer MoveData::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult MoveData::preflightImpl(const DataStructure& data, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto dataPaths = args.value(k_Data_Key); - auto newParentPath = args.value(k_NewParent_Key); + auto dataPaths = args.value(k_SourceDataPaths_Key); + auto newParentPath = args.value(k_DestinationParentPath_Key); Result resultOutputActions; std::vector preflightUpdatedValues; @@ -124,13 +124,15 @@ Result MoveData::FromSIMPLJson(const nlohmann::json& json) if(json[SIMPL::k_WhatToMoveKey].get() == 0) { - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_AttributeMatrixSourceKey, k_Data_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerDestinationKey, k_NewParent_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_AttributeMatrixSourceKey, k_SourceDataPaths_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerDestinationKey, k_DestinationParentPath_Key)); } else { - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataArraySourceKey, k_Data_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_AttributeMatrixDestinationKey, k_NewParent_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataArraySourceKey, k_SourceDataPaths_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_AttributeMatrixDestinationKey, k_DestinationParentPath_Key)); } Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.hpp index 212ffdebd9..15147a3152 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.hpp @@ -21,8 +21,8 @@ class SIMPLNXCORE_EXPORT MoveData : public IFilter MoveData& operator=(MoveData&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_Data_Key = "data"; - static inline constexpr StringLiteral k_NewParent_Key = "new_parent"; + static inline constexpr StringLiteral k_SourceDataPaths_Key = "source_data_paths"; + static inline constexpr StringLiteral k_DestinationParentPath_Key = "destination_parent_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.cpp index 4399609232..9db79e1b2a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.cpp @@ -409,14 +409,14 @@ Parameters MultiThresholdObjects::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert( - std::make_unique(k_ArrayThresholds_Key, "Data Thresholds", "DataArray thresholds to mask", ArrayThresholdSet{}, ArrayThresholdsParameter::AllowedComponentShapes{{1}})); + params.insert(std::make_unique(k_ArrayThresholdsObject_Key, "Data Thresholds", "DataArray thresholds to mask", ArrayThresholdSet{}, + ArrayThresholdsParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_CreatedMaskType_Key, "Mask Type", "DataType used for the created Mask Array", DataType::boolean)); params.insertLinkableParameter(std::make_unique(k_UseCustomTrueValue, "Use Custom TRUE Value", "Specifies whether to output a custom TRUE value (the default value is 1)", false)); params.insert(std::make_unique>(k_CustomTrueValue, "Custom TRUE Value", "This is the custom TRUE value that will be output to the mask array", 1.0)); params.insertLinkableParameter(std::make_unique(k_UseCustomFalseValue, "Use Custom FALSE Value", "Specifies whether to output a custom FALSE value (the default value is 0)", false)); params.insert(std::make_unique>(k_CustomFalseValue, "Custom FALSE Value", "This is the custom FALSE value that will be output to the mask array", 0.0)); - params.insert(std::make_unique(k_CreatedDataPath_Key, "Mask Array", "DataPath to the created Mask Array", "Mask")); + params.insert(std::make_unique(k_CreatedDataName_Key, "Mask Array", "DataPath to the created Mask Array", "Mask")); params.linkParameters(k_UseCustomTrueValue, k_CustomTrueValue, true); params.linkParameters(k_UseCustomFalseValue, k_CustomFalseValue, true); @@ -433,8 +433,8 @@ IFilter::UniquePointer MultiThresholdObjects::clone() const // ----------------------------------------------------------------------------- IFilter::PreflightResult MultiThresholdObjects::preflightImpl(const DataStructure& data, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto thresholdsObject = args.value(k_ArrayThresholds_Key); - auto maskArrayName = args.value(k_CreatedDataPath_Key); + auto thresholdsObject = args.value(k_ArrayThresholdsObject_Key); + auto maskArrayName = args.value(k_CreatedDataName_Key); auto maskArrayType = args.value(k_CreatedMaskType_Key); auto useCustomTrueValue = args.value(k_UseCustomTrueValue); auto useCustomFalseValue = args.value(k_UseCustomFalseValue); @@ -531,8 +531,8 @@ IFilter::PreflightResult MultiThresholdObjects::preflightImpl(const DataStructur Result<> MultiThresholdObjects::executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto thresholdsObject = args.value(k_ArrayThresholds_Key); - auto maskArrayName = args.value(k_CreatedDataPath_Key); + auto thresholdsObject = args.value(k_ArrayThresholdsObject_Key); + auto maskArrayName = args.value(k_CreatedDataName_Key); auto maskArrayType = args.value(k_CreatedMaskType_Key); auto useCustomTrueValue = args.value(k_UseCustomTrueValue); auto useCustomFalseValue = args.value(k_UseCustomFalseValue); @@ -587,14 +587,14 @@ Result MultiThresholdObjects::FromSIMPLJson(const nlohmann::json& jso if(isAdvanced) { - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedThresholdsKey, k_ArrayThresholds_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedThresholdsKey, k_ArrayThresholdsObject_Key)); } else { - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedThresholdsKey, k_ArrayThresholds_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedThresholdsKey, k_ArrayThresholdsObject_Key)); } results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ScalarTypeKey, k_CreatedMaskType_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DestinationArrayNameKey, k_CreatedDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DestinationArrayNameKey, k_CreatedDataName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.hpp index aefd6655ba..15d88709bf 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.hpp @@ -20,12 +20,12 @@ class SIMPLNXCORE_EXPORT MultiThresholdObjects : public IFilter MultiThresholdObjects& operator=(const MultiThresholdObjects&) = delete; MultiThresholdObjects& operator=(MultiThresholdObjects&&) noexcept = delete; - static inline constexpr StringLiteral k_ArrayThresholds_Key = "array_thresholds"; + static inline constexpr StringLiteral k_ArrayThresholdsObject_Key = "array_thresholds_object"; static inline constexpr StringLiteral k_UseCustomTrueValue = "use_custom_true_value"; static inline constexpr StringLiteral k_UseCustomFalseValue = "use_custom_false_value"; static inline constexpr StringLiteral k_CustomTrueValue = "custom_true_value"; static inline constexpr StringLiteral k_CustomFalseValue = "custom_false_value"; - static inline constexpr StringLiteral k_CreatedDataPath_Key = "created_data_path"; + static inline constexpr StringLiteral k_CreatedDataName_Key = "output_data_array_name"; static inline constexpr StringLiteral k_CreatedMaskType_Key = "created_mask_type"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp index 2ba55bebd3..56b2d64764 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp @@ -24,8 +24,8 @@ class SIMPLNXCORE_EXPORT NearestPointFuseRegularGridsFilter : public IFilter NearestPointFuseRegularGridsFilter& operator=(NearestPointFuseRegularGridsFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ReferenceGeometryPath_Key = "reference_geometry_path"; - static inline constexpr StringLiteral k_SamplingGeometryPath_Key = "sampling_geometry_path"; + static inline constexpr StringLiteral k_ReferenceGeometryPath_Key = "input_reference_image_geometry__path"; + static inline constexpr StringLiteral k_SamplingGeometryPath_Key = "input_sampling_image_geometry_path"; static inline constexpr StringLiteral k_ReferenceCellAttributeMatrixPath_Key = "reference_cell_attribute_matrix_path"; static inline constexpr StringLiteral k_SamplingCellAttributeMatrixPath_Key = "sampling_cell_attribute_matrix_path"; static inline constexpr StringLiteral k_UseFill_Key = "use_fill"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp index 9d7685011a..bbc7ffdf0f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp @@ -52,7 +52,7 @@ class SIMPLNXCORE_EXPORT PartitionGeometryFilter : public IFilter }; // Parameter Keys - static inline constexpr StringLiteral k_PartitioningMode_Key = "partitioning_mode"; + static inline constexpr StringLiteral k_PartitioningMode_Key = "partitioning_mode_index"; static inline constexpr StringLiteral k_StartingFeatureID_Key = "starting_partition_id"; static inline constexpr StringLiteral k_OutOfBoundsFeatureID_Key = "out_of_bounds_value"; static inline constexpr StringLiteral k_NumberOfCellsPerAxis_Key = "number_of_partitions_per_axis"; @@ -60,11 +60,11 @@ class SIMPLNXCORE_EXPORT PartitionGeometryFilter : public IFilter static inline constexpr StringLiteral k_CellLength_Key = "length_per_partition"; static inline constexpr StringLiteral k_MinGridCoord_Key = "lower_left_coord"; static inline constexpr StringLiteral k_MaxGridCoord_Key = "upper_right_coord"; - static inline constexpr StringLiteral k_InputGeometryCellAttributeMatrixPath_Key = "ps_attribute_matrix_path"; - static inline constexpr StringLiteral k_PartitionGridGeometry_Key = "ps_geometry"; - static inline constexpr StringLiteral k_PartitionGridCellAMName_Key = "ps_geometry_am_name"; - static inline constexpr StringLiteral k_PartitionGridFeatureIDsName_Key = "ps_geometry_data_name"; - static inline constexpr StringLiteral k_InputGeometryToPartition_Key = "geometry_to_partition"; + static inline constexpr StringLiteral k_InputGeometryCellAttributeMatrixPath_Key = "input_geometry_attribute_matrix_path"; + static inline constexpr StringLiteral k_PartitionGridGeometry_Key = "output_image_geometry_path"; + static inline constexpr StringLiteral k_PartitionGridCellAMName_Key = "created_attribute_matrix_name"; + static inline constexpr StringLiteral k_PartitionGridFeatureIDsName_Key = "created_feature_ids_name"; + static inline constexpr StringLiteral k_InputGeometryToPartition_Key = "input_geometry_path"; static inline constexpr StringLiteral k_ExistingPartitionGridPath_Key = "existing_partitioning_scheme_path"; static inline constexpr StringLiteral k_UseVertexMask_Key = "use_vertex_mask"; static inline constexpr StringLiteral k_VertexMaskPath_Key = "vertex_mask_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp index 10ae8bb537..2460d4a4c1 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp @@ -86,7 +86,7 @@ Parameters PointSampleTriangleGeometryFilter::parameters() const params.insert(std::make_unique(k_VertexGeometryPath_Key, "Vertex Geometry Name", "The complete path to the DataGroup holding the Vertex Geometry that represents the sampling points", DataPath({"[Vertex Geometry]"}))); params.insert( - std::make_unique(k_VertexDataGroupPath_Key, "Vertex Data", "The complete path to the vertex data arrays for the Vertex Geometry", INodeGeometry0D::k_VertexDataName)); + std::make_unique(k_VertexDataGroupName_Key, "Vertex Data", "The complete path to the vertex data arrays for the Vertex Geometry", INodeGeometry0D::k_VertexDataName)); // Associate the Linkable Parameter(s) to the children parameters that they control // params.linkParameters(k_SamplesNumberType_Key, k_NumberOfSamples_Key, 0); @@ -113,7 +113,7 @@ IFilter::PreflightResult PointSampleTriangleGeometryFilter::preflightImpl(const auto pMaskArrayPath = filterArgs.value(k_MaskArrayPath_Key); auto pSelectedDataArrayPaths = filterArgs.value(k_SelectedDataArrayPaths_Key); auto pVertexGeometryDataPath = filterArgs.value(k_VertexGeometryPath_Key); - auto pVertexGroupDataName = filterArgs.value(k_VertexDataGroupPath_Key); + auto pVertexGroupDataName = filterArgs.value(k_VertexDataGroupName_Key); DataPath pVertexGroupDataPath = pVertexGeometryDataPath.createChildPath(pVertexGroupDataName); auto pSeedArrayNameValue = filterArgs.value(k_SeedArrayName_Key); @@ -193,7 +193,7 @@ Result<> PointSampleTriangleGeometryFilter::executeImpl(DataStructure& dataStruc inputs.pMaskArrayPath = filterArgs.value(k_MaskArrayPath_Key); inputs.pSelectedDataArrayPaths = filterArgs.value(k_SelectedDataArrayPaths_Key); inputs.pVertexGeometryPath = filterArgs.value(k_VertexGeometryPath_Key); - auto pVertexGroupDataName = filterArgs.value(k_VertexDataGroupPath_Key); + auto pVertexGroupDataName = filterArgs.value(k_VertexDataGroupName_Key); inputs.pVertexGroupDataPath = inputs.pVertexGeometryPath.createChildPath(pVertexGroupDataName); inputs.Seed = seed; @@ -240,7 +240,7 @@ Result PointSampleTriangleGeometryFilter::FromSIMPLJson(const nlohman results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_MaskArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedDataArrayPathsKey, k_SelectedDataArrayPaths_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VertexGeometryKey, k_VertexGeometryPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VertexAttributeMatrixNameKey, k_VertexDataGroupPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VertexAttributeMatrixNameKey, k_VertexDataGroupName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp index 85eea5b10d..7e96fd1b94 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp @@ -28,13 +28,13 @@ class SIMPLNXCORE_EXPORT PointSampleTriangleGeometryFilter : public IFilter // static inline constexpr StringLiteral k_SamplesNumberType_Key = "samples_number_type"; static inline constexpr StringLiteral k_NumberOfSamples_Key = "number_of_samples"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; - static inline constexpr StringLiteral k_TriangleGeometry_Key = "triangle_geometry_path"; + static inline constexpr StringLiteral k_TriangleGeometry_Key = "input_triangle_geometry_path"; // static inline constexpr StringLiteral k_ParentGeometry_Key = "parent_geometry"; static inline constexpr StringLiteral k_TriangleAreasArrayPath_Key = "triangle_areas_array_path"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "selected_data_array_paths"; - static inline constexpr StringLiteral k_VertexGeometryPath_Key = "vertex_geometry_path"; - static inline constexpr StringLiteral k_VertexDataGroupPath_Key = "vertex_data_group_path"; + static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "input_data_array_paths"; + static inline constexpr StringLiteral k_VertexGeometryPath_Key = "output_vertex_geometry_path"; + static inline constexpr StringLiteral k_VertexDataGroupName_Key = "vertex_data_group_name"; static inline constexpr StringLiteral k_UseSeed_Key = "use_seed"; static inline constexpr StringLiteral k_SeedValue_Key = "seed_value"; static inline constexpr StringLiteral k_SeedArrayName_Key = "seed_array_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp index f561b42e2c..51f3c317e8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp @@ -75,7 +75,7 @@ Parameters QuickSurfaceMeshFilter::parameters() const params.insertSeparator(Parameters::Separator{"Created Triangle Geometry"}); params.insert( - std::make_unique(k_TriangleGeometryName_Key, "Created Triangle Geometry", "The name of the created Triangle Geometry", DataPath({"TriangleDataContainer"}))); + std::make_unique(k_CreatedTriangleGeometryPath_Key, "Created Triangle Geometry", "The name of the created Triangle Geometry", DataPath({"TriangleDataContainer"}))); params.insertSeparator(Parameters::Separator{"Created Vertex Data"}); params.insert(std::make_unique(k_VertexDataGroupName_Key, "Vertex Data [AttributeMatrix]", @@ -110,7 +110,7 @@ IFilter::PreflightResult QuickSurfaceMeshFilter::preflightImpl(const DataStructu auto pFeatureIdsArrayPathValue = filterArgs.value(k_CellFeatureIdsArrayPath_Key); auto pSelectedDataArrayPaths = filterArgs.value(k_SelectedDataArrayPaths_Key); - auto pTriangleGeometryPath = filterArgs.value(k_TriangleGeometryName_Key); + auto pTriangleGeometryPath = filterArgs.value(k_CreatedTriangleGeometryPath_Key); auto pVertexGroupDataName = filterArgs.value(k_VertexDataGroupName_Key); auto pNodeTypesName = filterArgs.value(k_NodeTypesArrayName_Key); auto pFaceGroupDataName = filterArgs.value(k_FaceDataGroupName_Key); @@ -187,7 +187,7 @@ Result<> QuickSurfaceMeshFilter::executeImpl(DataStructure& dataStructure, const inputValues.GridGeomDataPath = filterArgs.value(k_GridGeometryDataPath_Key); inputValues.FeatureIdsArrayPath = filterArgs.value(k_CellFeatureIdsArrayPath_Key); inputValues.SelectedDataArrayPaths = filterArgs.value(k_SelectedDataArrayPaths_Key); - inputValues.TriangleGeometryPath = filterArgs.value(k_TriangleGeometryName_Key); + inputValues.TriangleGeometryPath = filterArgs.value(k_CreatedTriangleGeometryPath_Key); inputValues.VertexGroupDataPath = inputValues.TriangleGeometryPath.createChildPath(filterArgs.value(k_VertexDataGroupName_Key)); inputValues.NodeTypesDataPath = inputValues.VertexGroupDataPath.createChildPath(filterArgs.value(k_NodeTypesArrayName_Key)); inputValues.FaceGroupDataPath = inputValues.TriangleGeometryPath.createChildPath(filterArgs.value(k_FaceDataGroupName_Key)); @@ -230,7 +230,8 @@ Result QuickSurfaceMeshFilter::FromSIMPLJson(const nlohmann::json& js results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_GridGeometryDataPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedDataArrayPathsKey, k_SelectedDataArrayPaths_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceDataContainerNameKey, k_TriangleGeometryName_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceDataContainerNameKey, k_CreatedTriangleGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VertexAttributeMatrixNameKey, k_VertexDataGroupName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NodeTypesArrayNameKey, k_NodeTypesArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FaceAttributeMatrixNameKey, k_FaceDataGroupName_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp index 71681fc84f..6143b29724 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp @@ -27,11 +27,11 @@ class SIMPLNXCORE_EXPORT QuickSurfaceMeshFilter : public IFilter static inline constexpr StringLiteral k_GenerateTripleLines_Key = "generate_triple_lines"; static inline constexpr StringLiteral k_FixProblemVoxels_Key = "fix_problem_voxels"; - static inline constexpr StringLiteral k_GridGeometryDataPath_Key = "grid_geometry_data_path"; + static inline constexpr StringLiteral k_GridGeometryDataPath_Key = "input_grid_geometry_path"; static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; - static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "selected_data_array_paths"; + static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "input_data_array_paths"; - static inline constexpr StringLiteral k_TriangleGeometryName_Key = "triangle_geometry_name"; + static inline constexpr StringLiteral k_CreatedTriangleGeometryPath_Key = "output_triangle_geometry_path"; static inline constexpr StringLiteral k_VertexDataGroupName_Key = "vertex_data_group_name"; static inline constexpr StringLiteral k_NodeTypesArrayName_Key = "node_types_array_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp index 33b3fbc568..fbf9594c04 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp @@ -34,10 +34,10 @@ class SIMPLNXCORE_EXPORT ReadBinaryCTNorthstarFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InputHeaderFile_Key = "input_header_file"; - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_DensityArrayName_Key = "density_array_name"; - static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit"; + static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit_index"; static inline constexpr StringLiteral k_ImportSubvolume_Key = "import_subvolume"; static inline constexpr StringLiteral k_StartVoxelCoord_Key = "start_voxel_coord"; static inline constexpr StringLiteral k_EndVoxelCoord_Key = "end_voxel_coord"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp index 411769f6ec..f33f6fa851 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp @@ -372,15 +372,15 @@ Parameters ReadCSVFileFilter::parameters() const params.insertSeparator(Parameters::Separator{"Existing Attribute Matrix"}); params.insertLinkableParameter( std::make_unique(k_UseExistingGroup_Key, "Use Existing Attribute Matrix", "Store the imported CSV data arrays in an existing attribute matrix.", false)); - params.insert( - std::make_unique(k_SelectedDataGroup_Key, "Existing Attribute Matrix", "Store the imported CSV data arrays in this existing attribute matrix.", DataPath{})); + params.insert(std::make_unique(k_SelectedAttributeMatrixPath_Key, "Existing Attribute Matrix", + "Store the imported CSV data arrays in this existing attribute matrix.", DataPath{})); params.insertSeparator(Parameters::Separator{"Created AttributeMatrix"}); params.insert(std::make_unique(k_CreatedDataGroup_Key, "New Attribute Matrix", "Store the imported CSV data arrays in a newly created attribute matrix.", DataPath{{"Imported Data"}})); // Associate the Linkable Parameter(s) to the children parameters that they control - params.linkParameters(k_UseExistingGroup_Key, k_SelectedDataGroup_Key, true); + params.linkParameters(k_UseExistingGroup_Key, k_SelectedAttributeMatrixPath_Key, true); params.linkParameters(k_UseExistingGroup_Key, k_CreatedDataGroup_Key, false); return params; @@ -398,7 +398,7 @@ IFilter::PreflightResult ReadCSVFileFilter::preflightImpl(const DataStructure& d { ReadCSVData readCSVData = filterArgs.value(k_ReadCSVData_Key); bool useExistingAM = filterArgs.value(k_UseExistingGroup_Key); - DataPath selectedAM = filterArgs.value(k_SelectedDataGroup_Key); + DataPath selectedAM = filterArgs.value(k_SelectedAttributeMatrixPath_Key); DataPath createdDataAM = filterArgs.value(k_CreatedDataGroup_Key); std::string inputFilePath = readCSVData.inputFilePath; @@ -638,7 +638,7 @@ Result<> ReadCSVFileFilter::executeImpl(DataStructure& dataStructure, const Argu { ReadCSVData readCSVData = filterArgs.value(k_ReadCSVData_Key); bool useExistingGroup = filterArgs.value(k_UseExistingGroup_Key); - DataPath selectedDataGroup = filterArgs.value(k_SelectedDataGroup_Key); + DataPath selectedDataGroup = filterArgs.value(k_SelectedAttributeMatrixPath_Key); DataPath createdDataGroup = filterArgs.value(k_CreatedDataGroup_Key); std::string inputFilePath = readCSVData.inputFilePath; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp index 465c0d816a..3278f89102 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp @@ -34,10 +34,10 @@ class SIMPLNXCORE_EXPORT ReadCSVFileFilter : public IFilter ReadCSVFileFilter& operator=(ReadCSVFileFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ReadCSVData_Key = "read_csv_data"; + static inline constexpr StringLiteral k_ReadCSVData_Key = "read_csv_data_object"; static inline constexpr StringLiteral k_UseExistingGroup_Key = "use_existing_group"; - static inline constexpr StringLiteral k_SelectedDataGroup_Key = "selected_data_group"; - static inline constexpr StringLiteral k_CreatedDataGroup_Key = "created_data_group"; + static inline constexpr StringLiteral k_SelectedAttributeMatrixPath_Key = "selected_attribute_matrix_path"; + static inline constexpr StringLiteral k_CreatedDataGroup_Key = "created_data_group_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.hpp index e9f9b94050..aafd882b65 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.hpp @@ -27,7 +27,7 @@ class SIMPLNXCORE_EXPORT ReadDREAM3DFilter : public IFilter ReadDREAM3DFilter& operator=(ReadDREAM3DFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ImportFileData = "import_file_data"; + static inline constexpr StringLiteral k_ImportFileData = "import_data_object"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp index 0569fa4314..eea82bfb05 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp @@ -30,7 +30,7 @@ class SIMPLNXCORE_EXPORT ReadDeformKeyFileV12Filter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InputFilePath_Key = "input_file_path"; - static inline constexpr StringLiteral k_QuadGeomPath_Key = "quad_geom_path"; + static inline constexpr StringLiteral k_QuadGeomPath_Key = "output_quad_geometry_path"; static inline constexpr StringLiteral k_VertexAMName_Key = "vertex_attribute_matrix_name"; static inline constexpr StringLiteral k_CellAMName_Key = "cell_attribute_matrix_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp index 7ddd253f7b..b20a91afa3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp @@ -30,10 +30,10 @@ class SIMPLNXCORE_EXPORT ReadRawBinaryFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InputFile_Key = "input_file"; - static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type"; + static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type_index"; static inline constexpr StringLiteral k_TupleDims_Key = "tuple_dimensions"; static inline constexpr StringLiteral k_NumberOfComponents_Key = "number_of_components"; - static inline constexpr StringLiteral k_Endian_Key = "endian"; + static inline constexpr StringLiteral k_Endian_Key = "endian_index"; static inline constexpr StringLiteral k_SkipHeaderBytes_Key = "skip_header_bytes"; static inline constexpr StringLiteral k_CreatedAttributeArrayPath_Key = "created_attribute_array_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp index e8ef45faca..dec90dc579 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp @@ -71,14 +71,14 @@ Parameters ReadStlFileFilter::parameters() const params.insertSeparator(Parameters::Separator{"Created Triangle Geometry"}); params.insert( - std::make_unique(k_TriangleGeometryName_Key, "Created Triangle Geometry", "The name of the created Triangle Geometry", DataPath({"TriangleDataContainer"}))); + std::make_unique(k_CreatedTriangleGeometryPath_Key, "Created Triangle Geometry", "The name of the created Triangle Geometry", DataPath({"TriangleDataContainer"}))); params.insertSeparator(Parameters::Separator{"Created Vertex Data"}); - params.insert(std::make_unique(k_VertexAttributeMatrix_Key, "Vertex Data [AttributeMatrix]", + params.insert(std::make_unique(k_VertexAttributeMatrixName_Key, "Vertex Data [AttributeMatrix]", "The name of the AttributeMatrix where the Vertex Data of the Triangle Geometry will be created", INodeGeometry0D::k_VertexDataName)); params.insertSeparator(Parameters::Separator{"Created Face Data"}); - params.insert(std::make_unique(k_FaceAttributeMatrix_Key, "Face Data [AttributeMatrix]", + params.insert(std::make_unique(k_FaceAttributeMatrixName_Key, "Face Data [AttributeMatrix]", "The name of the AttributeMatrix where the Face Data of the Triangle Geometry will be created", INodeGeometry2D::k_FaceDataName)); params.insert(std::make_unique(k_FaceNormalsName_Key, "Face Labels", "The name of the triangle normals data array", "Face Normals")); @@ -101,9 +101,9 @@ IFilter::PreflightResult ReadStlFileFilter::preflightImpl(const DataStructure& d const std::atomic_bool& shouldCancel) const { auto pStlFilePathValue = filterArgs.value(k_StlFilePath_Key); - auto pTriangleGeometryPath = filterArgs.value(k_TriangleGeometryName_Key); - auto vertexMatrixName = filterArgs.value(k_VertexAttributeMatrix_Key); - auto faceMatrixName = filterArgs.value(k_FaceAttributeMatrix_Key); + auto pTriangleGeometryPath = filterArgs.value(k_CreatedTriangleGeometryPath_Key); + auto vertexMatrixName = filterArgs.value(k_VertexAttributeMatrixName_Key); + auto faceMatrixName = filterArgs.value(k_FaceAttributeMatrixName_Key); auto faceNormalsName = filterArgs.value(k_FaceNormalsName_Key); PreflightResult preflightResult; @@ -169,9 +169,9 @@ Result<> ReadStlFileFilter::executeImpl(DataStructure& data, const Arguments& fi const std::atomic_bool& shouldCancel) const { auto pStlFilePathValue = filterArgs.value(k_StlFilePath_Key); - auto pTriangleGeometryPath = filterArgs.value(k_TriangleGeometryName_Key); - auto vertexMatrixName = filterArgs.value(k_VertexAttributeMatrix_Key); - auto faceMatrixName = filterArgs.value(k_FaceAttributeMatrix_Key); + auto pTriangleGeometryPath = filterArgs.value(k_CreatedTriangleGeometryPath_Key); + auto vertexMatrixName = filterArgs.value(k_VertexAttributeMatrixName_Key); + auto faceMatrixName = filterArgs.value(k_FaceAttributeMatrixName_Key); auto faceNormalsName = filterArgs.value(k_FaceNormalsName_Key); auto pFaceDataGroupPath = pTriangleGeometryPath.createChildPath(faceMatrixName); @@ -210,9 +210,9 @@ Result ReadStlFileFilter::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_ScaleFactorKey, k_ScaleFactor)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_StlFilePathKey, k_StlFilePath_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceMeshDataContainerNameKey, k_TriangleGeometryName_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VertexAttributeMatrixNameKey, k_VertexAttributeMatrix_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FaceAttributeMatrixNameKey, k_FaceAttributeMatrix_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceMeshDataContainerNameKey, k_CreatedTriangleGeometryPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VertexAttributeMatrixNameKey, k_VertexAttributeMatrixName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FaceAttributeMatrixNameKey, k_FaceAttributeMatrixName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FaceNormalsArrayNameKey, k_FaceNormalsName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp index 13d5ac0761..b9a0f0d553 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp @@ -30,11 +30,11 @@ class SIMPLNXCORE_EXPORT ReadStlFileFilter : public IFilter static inline constexpr StringLiteral k_ScaleFactor = "scale_factor"; static inline constexpr StringLiteral k_StlFilePath_Key = "stl_file_path"; - static inline constexpr StringLiteral k_TriangleGeometryName_Key = "triangle_geometry_name"; + static inline constexpr StringLiteral k_CreatedTriangleGeometryPath_Key = "output_triangle_geometry_path"; - static inline constexpr StringLiteral k_VertexAttributeMatrix_Key = "vertex_attribute_matrix"; - static inline constexpr StringLiteral k_FaceAttributeMatrix_Key = "face_attribute_matrix"; - static inline constexpr StringLiteral k_FaceNormalsName_Key = "face_normals_data_path"; + static inline constexpr StringLiteral k_VertexAttributeMatrixName_Key = "vertex_attribute_matrix_name"; + static inline constexpr StringLiteral k_FaceAttributeMatrixName_Key = "face_attribute_matrix_name"; + static inline constexpr StringLiteral k_FaceNormalsName_Key = "face_normals_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp index d5c9c27128..709e41e6f3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp @@ -54,16 +54,16 @@ Parameters ReadTextDataArrayFilter::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_InputFileKey, "Input File", "File path that points to the imported file", fs::path(""), + params.insert(std::make_unique(k_InputFile_Key, "Input File", "File path that points to the imported file", fs::path(""), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::InputFile)); - params.insert(std::make_unique(k_ScalarTypeKey, "Input Numeric Type", "Data Type to interpret and store data into.", NumericType::int8)); - params.insert(std::make_unique(k_NCompKey, "Number of Components", "Number of columns", 1)); - params.insert(std::make_unique(k_NSkipLinesKey, "Skip Header Lines", "Number of lines at the start of the file to skip", 0)); - params.insert(std::make_unique(k_DelimiterChoiceKey, "Delimiter", "Delimiter for values on a line", 0, + params.insert(std::make_unique(k_ScalarType_Key, "Input Numeric Type", "Data Type to interpret and store data into.", NumericType::int8)); + params.insert(std::make_unique(k_NComp_Key, "Number of Components", "Number of columns", 1)); + params.insert(std::make_unique(k_NSkipLines_Key, "Skip Header Lines", "Number of lines at the start of the file to skip", 0)); + params.insert(std::make_unique(k_DelimiterChoice_Key, "Delimiter", "Delimiter for values on a line", 0, ChoicesParameter::Choices{", (comma)", "; (semicolon)", " (space)", ": (colon)", "\\t (Tab)"})); params.insertSeparator(Parameters::Separator{"Created DataArray"}); - params.insert(std::make_unique(k_DataArrayKey, "Created Array Path", "DataPath or Name for the underlying Data Array", DataPath{})); + params.insert(std::make_unique(k_DataArrayPath_Key, "Created Array Path", "DataPath or Name for the underlying Data Array", DataPath{})); params.insert(std::make_unique(k_DataFormat_Key, "Data Format", "This value will specify which data format is used by the array's data store. An empty string results in in-memory data store.", "")); @@ -75,10 +75,10 @@ Parameters ReadTextDataArrayFilter::parameters() const DynamicTableInfo tableInfo; tableInfo.setRowsInfo(DynamicTableInfo::StaticVectorInfo(1)); tableInfo.setColsInfo(DynamicTableInfo::DynamicVectorInfo(1, "DIM {}")); - params.insert(std::make_unique(k_NTuplesKey, "Data Array Dimensions (Slowest to Fastest Dimensions)", + params.insert(std::make_unique(k_NTuples_Key, "Data Array Dimensions (Slowest to Fastest Dimensions)", "Slowest to Fastest Dimensions. Note this might be opposite displayed by an image geometry.", tableInfo)); - params.linkParameters(k_AdvancedOptions_Key, k_NTuplesKey, true); + params.linkParameters(k_AdvancedOptions_Key, k_NTuples_Key, true); return params; } @@ -90,12 +90,12 @@ IFilter::UniquePointer ReadTextDataArrayFilter::clone() const IFilter::PreflightResult ReadTextDataArrayFilter::preflightImpl(const DataStructure& data, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto numericType = args.value(k_ScalarTypeKey); - auto arrayPath = args.value(k_DataArrayKey); - auto nComp = args.value(k_NCompKey); + auto numericType = args.value(k_ScalarType_Key); + auto arrayPath = args.value(k_DataArrayPath_Key); + auto nComp = args.value(k_NComp_Key); auto useDims = args.value(k_AdvancedOptions_Key); - auto tableData = args.value(k_NTuplesKey); + auto tableData = args.value(k_NTuples_Key); auto dataFormat = args.value(k_DataFormat_Key); nx::core::Result resultOutputActions; @@ -147,11 +147,11 @@ IFilter::PreflightResult ReadTextDataArrayFilter::preflightImpl(const DataStruct Result<> ReadTextDataArrayFilter::executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto inputFilePath = args.value(k_InputFileKey); - auto numericType = args.value(k_ScalarTypeKey); - auto skipLines = args.value(k_NSkipLinesKey); - auto choiceIndex = args.value(k_DelimiterChoiceKey); - auto path = args.value(k_DataArrayKey); + auto inputFilePath = args.value(k_InputFile_Key); + auto numericType = args.value(k_ScalarType_Key); + auto skipLines = args.value(k_NSkipLines_Key); + auto choiceIndex = args.value(k_DelimiterChoice_Key); + auto path = args.value(k_DataArrayPath_Key); char delimiter = nx::core::CsvParser::IndexToDelimiter(choiceIndex); @@ -222,12 +222,12 @@ Result ReadTextDataArrayFilter::FromSIMPLJson(const nlohmann::json& j std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InputFileKey, k_InputFileKey)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ScalarTypeKey, k_ScalarTypeKey)); - results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_NumberOfComponentsKey, k_NCompKey)); - results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_SkipHeaderLinesKey, k_NSkipLinesKey)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DelimiterKey, k_DelimiterChoiceKey)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CreatedAttributeArrayPathKey, k_DataArrayKey)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InputFileKey, k_InputFile_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ScalarTypeKey, k_ScalarType_Key)); + results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_NumberOfComponentsKey, k_NComp_Key)); + results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_SkipHeaderLinesKey, k_NSkipLines_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DelimiterKey, k_DelimiterChoice_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CreatedAttributeArrayPathKey, k_DataArrayPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp index 5fb0c8e55f..305fbc15a8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp @@ -19,15 +19,15 @@ class SIMPLNXCORE_EXPORT ReadTextDataArrayFilter : public IFilter ReadTextDataArrayFilter& operator=(const ReadTextDataArrayFilter&) = delete; ReadTextDataArrayFilter& operator=(ReadTextDataArrayFilter&&) noexcept = delete; - static inline constexpr StringLiteral k_InputFileKey = "input_file"; - static inline constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; - static inline constexpr StringLiteral k_NTuplesKey = "n_tuples"; - static inline constexpr StringLiteral k_NCompKey = "n_comp"; - static inline constexpr StringLiteral k_NSkipLinesKey = "n_skip_lines"; - static inline constexpr StringLiteral k_DelimiterChoiceKey = "delimiter_choice"; - static inline constexpr StringLiteral k_DataArrayKey = "output_data_array"; + static inline constexpr StringLiteral k_InputFile_Key = "input_file"; + static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type_index"; + static inline constexpr StringLiteral k_NTuples_Key = "number_tuples"; + static inline constexpr StringLiteral k_NComp_Key = "number_comp"; + static inline constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; + static inline constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_index"; + static inline constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; static inline constexpr StringLiteral k_DataFormat_Key = "data_format"; - static inline constexpr StringLiteral k_AdvancedOptions_Key = "advanced_options"; + static inline constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp index 17ca7b7143..87818d3566 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp @@ -393,7 +393,7 @@ Parameters ReadVolumeGraphicsFileFilter::parameters() const params.insert(std::make_unique(k_VGHeaderFile_Key, "VolumeGraphics .vgi File", "The input VolumeGraphics file", fs::path("DefaultInputFileName"), FileSystemPathParameter::ExtensionsType{".vgi"}, FileSystemPathParameter::PathType::InputFile)); params.insertSeparator(Parameters::Separator{"Created Data"}); - params.insert(std::make_unique(k_NewImageGeometry_Key, "Image Geometry", "Path to create the Image Geometry", DataPath({"VolumeGraphics"}))); + params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "Path to create the Image Geometry", DataPath({"VolumeGraphics"}))); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The attribute matrix created as a child of the image geometry", "CT Data")); params.insert(std::make_unique(k_DensityArrayName_Key, "Density", "The data array created as a child of the attribute matrix", "Density")); @@ -411,7 +411,7 @@ IFilter::PreflightResult ReadVolumeGraphicsFileFilter::preflightImpl(const DataS const std::atomic_bool& shouldCancel) const { auto pVGHeaderFileValue = filterArgs.value(k_VGHeaderFile_Key); - auto pNewImageGeometryPathValue = filterArgs.value(k_NewImageGeometry_Key); + auto pNewImageGeometryPathValue = filterArgs.value(k_CreatedImageGeometryPath_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); auto pDensityArrayNameValue = filterArgs.value(k_DensityArrayName_Key); @@ -453,7 +453,7 @@ Result<> ReadVolumeGraphicsFileFilter::executeImpl(DataStructure& dataStructure, ReadVolumeGraphicsFileInputValues inputValues; - inputValues.ImageGeometryPath = filterArgs.value(k_NewImageGeometry_Key); + inputValues.ImageGeometryPath = filterArgs.value(k_CreatedImageGeometryPath_Key); inputValues.CellAttributeMatrixName = filterArgs.value(k_CellAttributeMatrixName_Key); inputValues.DensityArrayName = filterArgs.value(k_DensityArrayName_Key); inputValues.VGDataFile = s_HeaderCache[m_InstanceId].VgiDataFilePath; @@ -479,7 +479,7 @@ Result ReadVolumeGraphicsFileFilter::FromSIMPLJson(const nlohmann::js std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VGHeaderFileKey, k_VGHeaderFile_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_NewImageGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_CreatedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellAttributeMatrixNameKey, k_CellAttributeMatrixName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DensityArrayNameKey, k_DensityArrayName_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp index 4399f8e22f..eb7a94e66d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp @@ -30,7 +30,7 @@ class SIMPLNXCORE_EXPORT ReadVolumeGraphicsFileFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_VGHeaderFile_Key = "vg_header_file"; - static inline constexpr StringLiteral k_NewImageGeometry_Key = "new_image_geometry"; + static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_DensityArrayName_Key = "density_array_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.cpp index 16dbc73bef..e96b8fdd11 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.cpp @@ -67,17 +67,17 @@ Parameters ReadVtkStructuredPointsFilter::parameters() const params.insertLinkableParameter(std::make_unique(k_ReadCellData_Key, "Read Cell Data", "Determines whether or not the Cell Data will be read.", false)); params.insertSeparator(Parameters::Separator{"Created Point Data"}); - params.insert(std::make_unique(k_VertexDataContainerName_Key, "Data Container [Point Data]", "The data container for the Point Data.", DataPath({"VTK Point Data"}))); + params.insert(std::make_unique(k_CreatedVertexGeometryPath_Key, "Data Container [Point Data]", "The data container for the Point Data.", DataPath({"VTK Point Data"}))); params.insert(std::make_unique(k_VertexAttributeMatrixName_Key, "Attribute Matrix Name [Point Data]", "The attribute matrix for the Point Data.", "Vertex Data")); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_VolumeDataContainerName_Key, "Data Container [Cell Data]", "The data container for the Cell Data.", DataPath({"VTK Cell Data"}))); + params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Data Container [Cell Data]", "The data container for the Cell Data.", DataPath({"VTK Cell Data"}))); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Attribute Matrix Name [Cell Data]", "The attribute matrix for the Cell Data.", "Cell Data")); // Associate the Linkable Parameter(s) to the children parameters that they control - params.linkParameters(k_ReadPointData_Key, k_VertexDataContainerName_Key, true); + params.linkParameters(k_ReadPointData_Key, k_CreatedVertexGeometryPath_Key, true); params.linkParameters(k_ReadPointData_Key, k_VertexAttributeMatrixName_Key, true); - params.linkParameters(k_ReadCellData_Key, k_VolumeDataContainerName_Key, true); + params.linkParameters(k_ReadCellData_Key, k_CreatedImageGeometryPath_Key, true); params.linkParameters(k_ReadCellData_Key, k_CellAttributeMatrixName_Key, true); return params; @@ -96,8 +96,8 @@ IFilter::PreflightResult ReadVtkStructuredPointsFilter::preflightImpl(const Data auto pInputFileValue = filterArgs.value(k_InputFile_Key); auto pReadPointDataValue = filterArgs.value(k_ReadPointData_Key); auto pReadCellDataValue = filterArgs.value(k_ReadCellData_Key); - auto pVertexGeometryPath = filterArgs.value(k_VertexDataContainerName_Key); - auto pImageGeometryPath = filterArgs.value(k_VolumeDataContainerName_Key); + auto pVertexGeometryPath = filterArgs.value(k_CreatedVertexGeometryPath_Key); + auto pImageGeometryPath = filterArgs.value(k_CreatedImageGeometryPath_Key); auto pVertexAttributeMatrixNameValue = filterArgs.value(k_VertexAttributeMatrixName_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); @@ -112,8 +112,8 @@ IFilter::PreflightResult ReadVtkStructuredPointsFilter::preflightImpl(const Data inputValues.InputFile = filterArgs.value(k_InputFile_Key); inputValues.ReadPointData = filterArgs.value(k_ReadPointData_Key); inputValues.ReadCellData = filterArgs.value(k_ReadCellData_Key); - inputValues.PointGeomPath = filterArgs.value(k_VertexDataContainerName_Key); - inputValues.ImageGeomPath = filterArgs.value(k_VolumeDataContainerName_Key); + inputValues.PointGeomPath = filterArgs.value(k_CreatedVertexGeometryPath_Key); + inputValues.ImageGeomPath = filterArgs.value(k_CreatedImageGeometryPath_Key); inputValues.PointAttributeMatrixName = filterArgs.value(k_VertexAttributeMatrixName_Key); inputValues.CellAttributeMatrixName = filterArgs.value(k_CellAttributeMatrixName_Key); @@ -136,8 +136,8 @@ Result<> ReadVtkStructuredPointsFilter::executeImpl(DataStructure& dataStructure inputValues.InputFile = filterArgs.value(k_InputFile_Key); inputValues.ReadPointData = filterArgs.value(k_ReadPointData_Key); inputValues.ReadCellData = filterArgs.value(k_ReadCellData_Key); - inputValues.PointGeomPath = filterArgs.value(k_VertexDataContainerName_Key); - inputValues.ImageGeomPath = filterArgs.value(k_VolumeDataContainerName_Key); + inputValues.PointGeomPath = filterArgs.value(k_CreatedVertexGeometryPath_Key); + inputValues.ImageGeomPath = filterArgs.value(k_CreatedImageGeometryPath_Key); inputValues.PointAttributeMatrixName = filterArgs.value(k_VertexAttributeMatrixName_Key); inputValues.CellAttributeMatrixName = filterArgs.value(k_CellAttributeMatrixName_Key); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.hpp index 2372b4ec80..33d5572b4c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.hpp @@ -27,8 +27,8 @@ class SIMPLNXCORE_EXPORT ReadVtkStructuredPointsFilter : public IFilter static inline constexpr StringLiteral k_InputFile_Key = "input_file"; static inline constexpr StringLiteral k_ReadPointData_Key = "read_point_data"; static inline constexpr StringLiteral k_ReadCellData_Key = "read_cell_data"; - static inline constexpr StringLiteral k_VertexDataContainerName_Key = "vertex_data_container_name"; - static inline constexpr StringLiteral k_VolumeDataContainerName_Key = "volume_data_container_name"; + static inline constexpr StringLiteral k_CreatedVertexGeometryPath_Key = "output_vertex_geometry_path"; + static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_VertexAttributeMatrixName_Key = "vertex_attribute_matrix_name"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp index e0c54f74ff..db984b0389 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp @@ -28,9 +28,9 @@ class SIMPLNXCORE_EXPORT RegularGridSampleSurfaceMeshFilter : public IFilter static inline constexpr StringLiteral k_Dimensions_Key = "dimensions"; static inline constexpr StringLiteral k_Spacing_Key = "spacing"; static inline constexpr StringLiteral k_Origin_Key = "origin"; - static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit"; - static inline constexpr StringLiteral k_ImageGeomPath_Key = "image_geom_path"; - static inline constexpr StringLiteral k_TriangleGeometryPath_Key = "triangle_geometry_path"; + static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit_index"; + static inline constexpr StringLiteral k_ImageGeomPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_TriangleGeometryPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_FeatureIdsArrayName_Key = "feature_ids_array_name"; static inline constexpr StringLiteral k_CellAMName_Key = "cell_attribute_matrix_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp index ba4747c782..40d6f96110 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp @@ -70,7 +70,7 @@ Parameters RemoveFlaggedFeaturesFilter::parameters() const params.insert(std::make_unique(k_FillRemovedFeatures_Key, "Fill-in Removed Features", "Whether or not to fill in the gaps left by the removed Features", false)); params.insertSeparator(Parameters::Separator{"Geometry"}); - params.insert(std::make_unique(k_ImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); @@ -187,7 +187,7 @@ Result<> RemoveFlaggedFeaturesFilter::executeImpl(DataStructure& dataStructure, inputValues.FeatureIdsArrayPath = filterArgs.value(k_CellFeatureIdsArrayPath_Key); inputValues.FlaggedFeaturesArrayPath = filterArgs.value(k_FlaggedFeaturesArrayPath_Key); inputValues.IgnoredDataArrayPaths = filterArgs.value(k_IgnoredDataArrayPaths_Key); - inputValues.ImageGeometryPath = filterArgs.value(k_ImageGeometry_Key); + inputValues.ImageGeometryPath = filterArgs.value(k_SelectedImageGeometryPath_Key); inputValues.CreatedImageGeometryPrefix = filterArgs.value(k_CreatedImageGeometryPrefix_Key); inputValues.TempBoundsPath = inputValues.FlaggedFeaturesArrayPath.getParent().createChildPath(k_boundsName); @@ -216,7 +216,7 @@ Result RemoveFlaggedFeaturesFilter::FromSIMPLJson(const nlohmann::jso results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FillRemovedFeaturesKey, k_FillRemovedFeatures_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_IgnoredDataArrayPathsKey, k_IgnoredDataArrayPaths_Key)); } - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_ImageGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellFeatureIdsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FlaggedFeaturesArrayPathKey, k_FlaggedFeaturesArrayPath_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp index 281d6947f7..d0fa45b971 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp @@ -24,10 +24,10 @@ class SIMPLNXCORE_EXPORT RemoveFlaggedFeaturesFilter : public IFilter RemoveFlaggedFeaturesFilter& operator=(RemoveFlaggedFeaturesFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ImageGeometry_Key = "image_geometry"; - static inline constexpr StringLiteral k_CreatedImageGeometryPrefix_Key = "created_image_geometry_prefix"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_CreatedImageGeometryPrefix_Key = "output_image_geometry_prefix"; static inline constexpr StringLiteral k_FillRemovedFeatures_Key = "fill_removed_features"; - static inline constexpr StringLiteral k_Functionality_Key = "functionality"; + static inline constexpr StringLiteral k_Functionality_Key = "operation_type_index"; static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_FlaggedFeaturesArrayPath_Key = "flagged_features_array_path"; static inline constexpr StringLiteral k_IgnoredDataArrayPaths_Key = "ignored_data_array_paths"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.cpp index 9aae7d45cf..3504997b41 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.cpp @@ -52,13 +52,13 @@ Parameters RemoveFlaggedTrianglesFilter::parameters() const // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Required Input Data Objects"}); - params.insert(std::make_unique(k_InputGeometry_Key, "Triangle|Quad Geometry", "The Triangle|Quad Geometry that will be processed.", DataPath(), + params.insert(std::make_unique(k_SelectedTriangleGeometryPath_Key, "Triangle|Quad Geometry", "The Triangle|Quad Geometry that will be processed.", DataPath(), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle, IGeometry::Type::Quad})); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask", "The DataArrayPath to the mask array that marks each face as either true (remove) or false(keep).", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Created Geometry"}); - params.insert(std::make_unique(k_OutputGeometry_Key, "Created Geometry", "The name of the created Triangle Geometry", DataPath({"ReducedGeometry"}))); + params.insert(std::make_unique(k_CreatedTriangleGeometryPath_Key, "Created Geometry", "The name of the created Triangle Geometry", DataPath({"ReducedGeometry"}))); return params; } @@ -72,8 +72,8 @@ IFilter::UniquePointer RemoveFlaggedTrianglesFilter::clone() const IFilter::PreflightResult RemoveFlaggedTrianglesFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto pInitialGeometryPathValue = filterArgs.value(k_InputGeometry_Key); - auto pReducedGeometryPathValue = filterArgs.value(k_OutputGeometry_Key); + auto pInitialGeometryPathValue = filterArgs.value(k_SelectedTriangleGeometryPath_Key); + auto pReducedGeometryPathValue = filterArgs.value(k_CreatedTriangleGeometryPath_Key); PreflightResult preflightResult; Result resultOutputActions; @@ -109,9 +109,9 @@ Result<> RemoveFlaggedTrianglesFilter::executeImpl(DataStructure& dataStructure, { RemoveFlaggedTrianglesInputValues inputValues; - inputValues.TriangleGeometry = filterArgs.value(k_InputGeometry_Key); + inputValues.TriangleGeometry = filterArgs.value(k_SelectedTriangleGeometryPath_Key); inputValues.MaskArrayPath = filterArgs.value(k_MaskArrayPath_Key); - inputValues.ReducedTriangleGeometry = filterArgs.value(k_OutputGeometry_Key); + inputValues.ReducedTriangleGeometry = filterArgs.value(k_CreatedTriangleGeometryPath_Key); return RemoveFlaggedTriangles(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -132,9 +132,9 @@ Result RemoveFlaggedTrianglesFilter::FromSIMPLJson(const nlohmann::js std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_TriangleGeometryKey, k_InputGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_TriangleGeometryKey, k_SelectedTriangleGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_MaskArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ReducedTriangleGeometryKey, k_OutputGeometry_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ReducedTriangleGeometryKey, k_CreatedTriangleGeometryPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.hpp index 5b03c04202..5c64ce64f1 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.hpp @@ -24,9 +24,9 @@ class SIMPLNXCORE_EXPORT RemoveFlaggedTrianglesFilter : public IFilter RemoveFlaggedTrianglesFilter& operator=(RemoveFlaggedTrianglesFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_InputGeometry_Key = "input_geometry"; + static inline constexpr StringLiteral k_SelectedTriangleGeometryPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - static inline constexpr StringLiteral k_OutputGeometry_Key = "output_geometry"; + static inline constexpr StringLiteral k_CreatedTriangleGeometryPath_Key = "output_triangle_geometry_path"; /** * @brief Reads SIMPL json and converts it complex Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.cpp index cde3a0faef..ee83d55952 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.cpp @@ -90,12 +90,12 @@ Parameters RemoveFlaggedVertices::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_VertexGeomPath_Key, "Vertex Geometry", "Path to the target Vertex Geometry", DataPath(), + params.insert(std::make_unique(k_SelectedVertexGeometryPath_Key, "Vertex Geometry", "Path to the target Vertex Geometry", DataPath(), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); - params.insert(std::make_unique(k_MaskPath_Key, "Flagged Vertex Array", "DataPath to the conditional array that will be used to decide which vertices are removed.", + params.insert(std::make_unique(k_InputMaskPath_Key, "Flagged Vertex Array", "DataPath to the conditional array that will be used to decide which vertices are removed.", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Newly Reduced Geometry"}); - params.insert(std::make_unique(k_ReducedVertexGeometryPath_Key, "Reduced Vertex Geometry", "Created Vertex Geometry DataPath. This will be created during the filter.", + params.insert(std::make_unique(k_CreatedVertexGeometryPath_Key, "Reduced Vertex Geometry", "Created Vertex Geometry DataPath. This will be created during the filter.", DataPath())); return params; } @@ -108,9 +108,9 @@ IFilter::UniquePointer RemoveFlaggedVertices::clone() const IFilter::PreflightResult RemoveFlaggedVertices::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto vertexGeomPath = filterArgs.value(k_VertexGeomPath_Key); - auto maskArrayPath = filterArgs.value(k_MaskPath_Key); - auto reducedVertexPath = filterArgs.value(k_ReducedVertexGeometryPath_Key); + auto vertexGeomPath = filterArgs.value(k_SelectedVertexGeometryPath_Key); + auto maskArrayPath = filterArgs.value(k_InputMaskPath_Key); + auto reducedVertexPath = filterArgs.value(k_CreatedVertexGeometryPath_Key); nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -215,9 +215,9 @@ IFilter::PreflightResult RemoveFlaggedVertices::preflightImpl(const DataStructur Result<> RemoveFlaggedVertices::executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto vertexGeomPath = args.value(k_VertexGeomPath_Key); - auto maskArrayPath = args.value(k_MaskPath_Key); - auto reducedVertexPath = args.value(k_ReducedVertexGeometryPath_Key); + auto vertexGeomPath = args.value(k_SelectedVertexGeometryPath_Key); + auto maskArrayPath = args.value(k_InputMaskPath_Key); + auto reducedVertexPath = args.value(k_CreatedVertexGeometryPath_Key); const VertexGeom& vertexGeom = data.getDataRefAs(vertexGeomPath); const std::string vertexDataName = vertexGeom.getVertexAttributeMatrixDataPath().getTargetName(); @@ -285,9 +285,9 @@ Result RemoveFlaggedVertices::FromSIMPLJson(const nlohmann::json& jso std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VertexGeometryKey, k_VertexGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_MaskPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ReducedVertexGeometryKey, k_ReducedVertexGeometryPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VertexGeometryKey, k_SelectedVertexGeometryPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_InputMaskPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ReducedVertexGeometryKey, k_CreatedVertexGeometryPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.hpp index 594ddd2305..9d589ffdc5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.hpp @@ -24,9 +24,9 @@ class SIMPLNXCORE_EXPORT RemoveFlaggedVertices : public IFilter RemoveFlaggedVertices& operator=(RemoveFlaggedVertices&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_VertexGeomPath_Key = "vertex_geom"; - static inline constexpr StringLiteral k_MaskPath_Key = "mask"; - static inline constexpr StringLiteral k_ReducedVertexGeometryPath_Key = "reduced_vertex"; + static inline constexpr StringLiteral k_SelectedVertexGeometryPath_Key = "input_vertex_geometry_path"; + static inline constexpr StringLiteral k_InputMaskPath_Key = "mask_path"; + static inline constexpr StringLiteral k_CreatedVertexGeometryPath_Key = "output_vertex_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp index 0c1feb237e..189623f884 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp @@ -27,7 +27,7 @@ class SIMPLNXCORE_EXPORT RemoveMinimumSizeFeaturesFilter : public IFilter static inline constexpr StringLiteral k_FeaturePhasesPath_Key = "feature_phases_path"; static inline constexpr StringLiteral k_NumCellsPath_Key = "num_cells_path"; static inline constexpr StringLiteral k_FeatureIdsPath_Key = "feature_ids_path"; - static inline constexpr StringLiteral k_ImageGeomPath_Key = "image_geom_path"; + static inline constexpr StringLiteral k_ImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_ApplySinglePhase_Key = "apply_single_phase"; static inline constexpr StringLiteral k_MinAllowedFeaturesSize_Key = "min_allowed_features_size"; static inline constexpr StringLiteral k_PhaseNumber_Key = "phase_number"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.cpp index b2454fa2a2..26a2be6af5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.cpp @@ -56,7 +56,7 @@ Parameters RenameDataObject::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_DataObject_Key, "DataObject to Rename", "DataPath pointing to the target DataObject", DataPath())); + params.insert(std::make_unique(k_SourceDataObjectPath_Key, "DataObject to Rename", "DataPath pointing to the target DataObject", DataPath())); params.insert(std::make_unique(k_NewName_Key, "New Name", "Target DataObject name", "")); return params; } @@ -71,7 +71,7 @@ IFilter::UniquePointer RenameDataObject::clone() const IFilter::PreflightResult RenameDataObject::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto dataGroupPath = filterArgs.value(k_DataObject_Key); + auto dataGroupPath = filterArgs.value(k_SourceDataObjectPath_Key); auto newName = filterArgs.value(k_NewName_Key); auto action = std::make_unique(dataGroupPath, newName); @@ -108,17 +108,19 @@ Result RenameDataObject::FromSIMPLJson(const nlohmann::json& json) if(json.contains(SIMPL::k_SelectedArrayPathKey.str())) { - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedArrayPathKey, k_DataObject_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedArrayPathKey, k_SourceDataObjectPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewArrayNameKey, k_NewName_Key)); } else if(json.contains(SIMPL::k_SelectedAttributeMatrixPathKey)) { - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedAttributeMatrixPathKey, k_DataObject_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedAttributeMatrixPathKey, k_SourceDataObjectPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewAttributeMatrixKey, k_NewName_Key)); } else { - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedDataContainerNameKey, k_DataObject_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedDataContainerNameKey, k_SourceDataObjectPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewDataContainerNameKey, k_NewName_Key)); } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.hpp index 0712195f54..23d38dd7a8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT RenameDataObject : public IFilter RenameDataObject& operator=(RenameDataObject&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_DataObject_Key = "data_object"; + static inline constexpr StringLiteral k_SourceDataObjectPath_Key = "source_data_object_path"; static inline constexpr StringLiteral k_NewName_Key = "new_name"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp index f65fc37b7b..fff06c9383 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp @@ -60,7 +60,7 @@ Parameters ReplaceElementAttributesWithNeighborValuesFilter::parameters() const params.insert(std::make_unique(k_Loop_Key, "Loop Until Gone", "The algorithm will keep looping until all pixels have been evaluated", false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_ComparisonDataPath, "Input Comparison Array", "The DataPath to the input array to use for comparison", DataPath{}, nx::core::GetAllDataTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); @@ -102,7 +102,7 @@ Result<> ReplaceElementAttributesWithNeighborValuesFilter::executeImpl(DataStruc inputValues.SelectedComparison = filterArgs.value(k_SelectedComparison_Key); inputValues.Loop = filterArgs.value(k_Loop_Key); inputValues.InputArrayPath = filterArgs.value(k_ComparisonDataPath); - inputValues.SelectedImageGeometryPath = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.SelectedImageGeometryPath = filterArgs.value(k_SelectedImageGeometryPath_Key); return ReplaceElementAttributesWithNeighborValues(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -128,7 +128,8 @@ Result ReplaceElementAttributesWithNeighborValuesFilter::FromSIMPLJso results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedComparisonKey, k_SelectedComparison_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_LoopKey, k_Loop_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ConfidenceIndexArrayPathKey, k_ComparisonDataPath)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ConfidenceIndexArrayPathKey, k_SelectedImageGeometry_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ConfidenceIndexArrayPathKey, k_SelectedImageGeometryPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp index e47e52c755..52d988d5a7 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp @@ -26,10 +26,10 @@ class SIMPLNXCORE_EXPORT ReplaceElementAttributesWithNeighborValuesFilter : publ // Parameter Keys static inline constexpr StringLiteral k_MinConfidence_Key = "min_confidence"; - static inline constexpr StringLiteral k_SelectedComparison_Key = "selected_comparison"; + static inline constexpr StringLiteral k_SelectedComparison_Key = "comparison_index"; static inline constexpr StringLiteral k_Loop_Key = "loop"; static inline constexpr StringLiteral k_ComparisonDataPath = "comparison_data_path"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp index 475e6c6716..2d236db440 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp @@ -100,7 +100,7 @@ Parameters ResampleImageGeomFilter::parameters() const params.insertLinkableParameter(std::make_unique(k_RemoveOriginalGeometry_Key, "Perform In Place", "Removes the original Image Geometry after filter is completed", true)); params.insertSeparator({"Input Image Geometry"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry to resample", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry to resample", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insertSeparator(Parameters::Separator{"Renumber Features (Optional)"}); @@ -142,7 +142,7 @@ IFilter::PreflightResult ResampleImageGeomFilter::preflightImpl(const DataStruct auto shouldRenumberFeatures = filterArgs.value(k_RenumberFeatures_Key); auto featureIdsArrayPath = filterArgs.value(k_CellFeatureIdsArrayPath_Key); auto cellFeatureAmPath = filterArgs.value(k_FeatureAttributeMatrix_Key); - auto srcImagePath = filterArgs.value(k_SelectedImageGeometry_Key); + auto srcImagePath = filterArgs.value(k_SelectedImageGeometryPath_Key); nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -348,7 +348,7 @@ Result<> ResampleImageGeomFilter::executeImpl(DataStructure& dataStructure, cons { ResampleImageGeomInputValues inputValues; - inputValues.SelectedImageGeometryPath = filterArgs.value(k_SelectedImageGeometry_Key); + inputValues.SelectedImageGeometryPath = filterArgs.value(k_SelectedImageGeometryPath_Key); inputValues.Spacing = filterArgs.value(k_Spacing_Key); if(filterArgs.value(k_ResamplingMode_Key) == k_ScalingModeIndex) diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp index 14d70fd5e1..1bac3cbd47 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT ResampleImageGeomFilter : public IFilter ResampleImageGeomFilter& operator=(ResampleImageGeomFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ResamplingMode_Key = "resampling_mode"; + static inline constexpr StringLiteral k_ResamplingMode_Key = "resampling_mode_index"; static inline constexpr StringLiteral k_Spacing_Key = "spacing"; static inline constexpr StringLiteral k_Scaling_Key = "scaling"; static inline constexpr StringLiteral k_ExactDimensions_Key = "exact_dimensions"; @@ -33,7 +33,7 @@ class SIMPLNXCORE_EXPORT ResampleImageGeomFilter : public IFilter static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_FeatureAttributeMatrix_Key = "cell_feature_attribute_matrix_path"; static inline constexpr StringLiteral k_CreatedImageGeometry_Key = "new_data_container_path"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp index 463d31d096..2a626cb8b8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp @@ -71,7 +71,7 @@ Parameters ResampleRectGridToImageGeomFilter::parameters() const params.insert(std::make_unique(k_Dimensions_Key, "Dimensions (Voxels)", "The image geometry voxel dimensions in which to re-sample the rectilinear grid geometry", std::vector{128, 128, 128}, std::vector{"x", "y", "z"})); params.insert(std::make_unique(k_ImageGeometryPath_Key, "Created Image Geometry", "Path to the created Image Geometry", DataPath({"Image Geometry"}))); - params.insert(std::make_unique(k_ImageGeomCellAttributeMatrix_Key, "Cell Attribute Matrix", "The name of the cell data Attribute Matrix created with the Image Geometry", + params.insert(std::make_unique(k_ImageGeomCellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data Attribute Matrix created with the Image Geometry", ImageGeom::k_CellDataName)); return params; @@ -91,7 +91,7 @@ IFilter::PreflightResult ResampleRectGridToImageGeomFilter::preflightImpl(const auto pSelectedDataArrayPathsValue = filterArgs.value(k_SelectedDataArrayPaths_Key); auto pDimensionsValue = filterArgs.value(k_Dimensions_Key); auto pImageGeometryPathValue = filterArgs.value(k_ImageGeometryPath_Key); - auto pImageGeomCellAttributeMatrixNameValue = filterArgs.value(k_ImageGeomCellAttributeMatrix_Key); + auto pImageGeomCellAttributeMatrixNameValue = filterArgs.value(k_ImageGeomCellAttributeMatrixName_Key); PreflightResult preflightResult; Result resultOutputActions; @@ -208,7 +208,7 @@ Result<> ResampleRectGridToImageGeomFilter::executeImpl(DataStructure& dataStruc inputValues.SelectedDataArrayPaths = filterArgs.value(k_SelectedDataArrayPaths_Key); inputValues.Dimensions = filterArgs.value(k_Dimensions_Key); inputValues.ImageGeometryPath = filterArgs.value(k_ImageGeometryPath_Key); - inputValues.ImageGeomCellAttributeMatrixName = filterArgs.value(k_ImageGeomCellAttributeMatrix_Key); + inputValues.ImageGeomCellAttributeMatrixName = filterArgs.value(k_ImageGeomCellAttributeMatrixName_Key); return ResampleRectGridToImageGeom(dataStructure, messageHandler, shouldCancel, &inputValues)(); } @@ -240,7 +240,7 @@ Result ResampleRectGridToImageGeomFilter::FromSIMPLJson(const nlohman // Created Geometry description is not applicable in NX results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ImageGeometryPathKey, k_ImageGeometryPath_Key)); results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ImageGeomCellAttributeMatrixKey, k_ImageGeomCellAttributeMatrix_Key)); + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ImageGeomCellAttributeMatrixKey, k_ImageGeomCellAttributeMatrixName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp index ecb8a9f567..13faa11dd2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp @@ -25,10 +25,10 @@ class SIMPLNXCORE_EXPORT ResampleRectGridToImageGeomFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_RectilinearGridPath_Key = "rectilinear_grid_path"; - static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "selected_data_array_paths"; + static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "input_data_array_paths"; static inline constexpr StringLiteral k_Dimensions_Key = "dimensions"; - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; - static inline constexpr StringLiteral k_ImageGeomCellAttributeMatrix_Key = "image_geom_cell_attribute_matrix"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_ImageGeomCellAttributeMatrixName_Key = "image_geom_cell_attribute_matrix_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp index 07d6ec0382..5aaceb52b6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp @@ -32,7 +32,7 @@ class SIMPLNXCORE_EXPORT ReverseTriangleWindingFilter : public IFilter */ static Result FromSIMPLJson(const nlohmann::json& json); - static inline constexpr StringLiteral k_TriGeomPath_Key = "triangle_geometry_path"; + static inline constexpr StringLiteral k_TriGeomPath_Key = "input_triangle_geometry_path"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.cpp index b4d634162c..0a1060fe66 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.cpp @@ -130,11 +130,11 @@ Parameters RobustAutomaticThreshold::parameters() const params.insertSeparator(Parameters::Separator{"Input Parameters"}); // Input cannot be bool array - params.insert(std::make_unique(k_InputArrayPath, "Input Array", "DataArray to Threshold", DataPath(), nx::core::GetAllNumericTypes(), + params.insert(std::make_unique(k_InputArrayPath_Key, "Input Array", "DataArray to Threshold", DataPath(), nx::core::GetAllNumericTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_GradientMagnitudePath, "Gradient Magnitude Data", "The complete path to the Array specifying the gradient magnitude of the Input Array", + params.insert(std::make_unique(k_GradientMagnitudePath_Key, "Gradient Magnitude Data", "The complete path to the Array specifying the gradient magnitude of the Input Array", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_ArrayCreationPath, "Mask", "Created mask based on Input Array and Gradient Magnitude", "mask")); + params.insert(std::make_unique(k_ArrayCreationName_Key, "Mask", "Created mask based on Input Array and Gradient Magnitude", "mask")); return params; } @@ -147,9 +147,9 @@ IFilter::UniquePointer RobustAutomaticThreshold::clone() const IFilter::PreflightResult RobustAutomaticThreshold::preflightImpl(const DataStructure& dataStructure, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto inputArrayPath = args.value(k_InputArrayPath); - auto gradientArrayPath = args.value(k_GradientMagnitudePath); - auto createdMaskName = args.value(k_ArrayCreationPath); + auto inputArrayPath = args.value(k_InputArrayPath_Key); + auto gradientArrayPath = args.value(k_GradientMagnitudePath_Key); + auto createdMaskName = args.value(k_ArrayCreationName_Key); const DataPath createdMaskPath = inputArrayPath.getParent().createChildPath(createdMaskName); @@ -193,9 +193,9 @@ IFilter::PreflightResult RobustAutomaticThreshold::preflightImpl(const DataStruc Result<> RobustAutomaticThreshold::executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto inputArrayPath = args.value(k_InputArrayPath); - auto gradientArrayPath = args.value(k_GradientMagnitudePath); - auto createdMaskName = args.value(k_ArrayCreationPath); + auto inputArrayPath = args.value(k_InputArrayPath_Key); + auto gradientArrayPath = args.value(k_GradientMagnitudePath_Key); + auto createdMaskName = args.value(k_ArrayCreationName_Key); const auto& inputArray = data.getDataRefAs(inputArrayPath); const auto& gradientArray = data.getDataRefAs(gradientArrayPath); @@ -222,9 +222,9 @@ Result RobustAutomaticThreshold::FromSIMPLJson(const nlohmann::json& std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InputArrayPathKey, k_InputArrayPath)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GradientMagnitudeArrayPathKey, k_GradientMagnitudePath)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_ArrayCreationPath)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InputArrayPathKey, k_InputArrayPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GradientMagnitudeArrayPathKey, k_GradientMagnitudePath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_ArrayCreationName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.hpp index 25ce1af8b7..8c713cf126 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.hpp @@ -19,9 +19,9 @@ class SIMPLNXCORE_EXPORT RobustAutomaticThreshold : public IFilter RobustAutomaticThreshold& operator=(const RobustAutomaticThreshold&) = delete; RobustAutomaticThreshold& operator=(RobustAutomaticThreshold&&) noexcept = delete; - static inline constexpr StringLiteral k_InputArrayPath = "array_to_threshold"; - static inline constexpr StringLiteral k_GradientMagnitudePath = "gradient_array"; - static inline constexpr StringLiteral k_ArrayCreationPath = "created_mask_path"; + static inline constexpr StringLiteral k_InputArrayPath_Key = "input_array_path"; + static inline constexpr StringLiteral k_GradientMagnitudePath_Key = "gradient_array_path"; + static inline constexpr StringLiteral k_ArrayCreationName_Key = "created_mask_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp index 13e2e5d94d..f91da92fb5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp @@ -344,13 +344,13 @@ Parameters RotateSampleRefFrameFilter::parameters() const params.linkParameters(k_RotationRepresentation_Key, k_RotationMatrix_Key, std::make_any(to_underlying(RotationRepresentation::RotationMatrix))); params.insertSeparator({"Input Geometry and Data"}); - params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry on which to perform the rotation", DataPath{}, + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry on which to perform the rotation", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insertSeparator({"Output Geometry and Data"}); - params.insert(std::make_unique(k_CreatedImageGeometry_Key, "Created Image Geometry", "The location of the rotated geometry", DataPath{})); + params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Created Image Geometry", "The location of the rotated geometry", DataPath{})); - params.linkParameters(k_RemoveOriginalGeometry_Key, k_CreatedImageGeometry_Key, false); + params.linkParameters(k_RemoveOriginalGeometry_Key, k_CreatedImageGeometryPath_Key, false); return params; } @@ -365,8 +365,8 @@ IFilter::UniquePointer RotateSampleRefFrameFilter::clone() const IFilter::PreflightResult RotateSampleRefFrameFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler&, const std::atomic_bool&) const { - auto srcImagePath = filterArgs.value(k_SelectedImageGeometry_Key); - auto destImagePath = filterArgs.value(k_CreatedImageGeometry_Key); + auto srcImagePath = filterArgs.value(k_SelectedImageGeometryPath_Key); + auto destImagePath = filterArgs.value(k_CreatedImageGeometryPath_Key); auto pRemoveOriginalGeometry = filterArgs.value(k_RemoveOriginalGeometry_Key); nx::core::Result resultOutputActions; @@ -496,8 +496,8 @@ IFilter::PreflightResult RotateSampleRefFrameFilter::preflightImpl(const DataStr Result<> RotateSampleRefFrameFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto srcImagePath = filterArgs.value(k_SelectedImageGeometry_Key); - auto destImagePath = filterArgs.value(k_CreatedImageGeometry_Key); + auto srcImagePath = filterArgs.value(k_SelectedImageGeometryPath_Key); + auto destImagePath = filterArgs.value(k_CreatedImageGeometryPath_Key); auto sliceBySlice = filterArgs.value(k_RotateSliceBySlice_Key); auto removeOriginalGeometry = filterArgs.value(k_RemoveOriginalGeometry_Key); @@ -589,7 +589,8 @@ Result RotateSampleRefFrameFilter::FromSIMPLJson(const nlohmann::json results.push_back( SIMPLConversion::Convert2Parameters(args, json, SIMPL::k_RotationAxisKey, SIMPL::k_RotationAngleKey, k_RotationAxisAngle_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_RotationTableKey, k_RotationMatrix_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellAttributeMatrixPathKey, k_SelectedImageGeometry_Key)); + results.push_back( + SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellAttributeMatrixPathKey, k_SelectedImageGeometryPath_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp index 3b1e636749..c185b3ea8f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp @@ -31,11 +31,11 @@ class SIMPLNXCORE_EXPORT RotateSampleRefFrameFilter : public IFilter }; // Parameter Keys - static inline constexpr StringLiteral k_RotationRepresentation_Key = "rotation_representation"; - static inline constexpr StringLiteral k_RotationAxisAngle_Key = "rotation_axis"; + static inline constexpr StringLiteral k_RotationRepresentation_Key = "rotation_representation_index"; + static inline constexpr StringLiteral k_RotationAxisAngle_Key = "rotation_axis_angle"; static inline constexpr StringLiteral k_RotationMatrix_Key = "rotation_matrix"; - static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; - static inline constexpr StringLiteral k_CreatedImageGeometry_Key = "created_image_geometry"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_RotateSliceBySlice_Key = "rotate_slice_by_slice"; static inline constexpr StringLiteral k_RemoveOriginalGeometry_Key = "remove_original_geometry"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp index 65b4acc082..21dfc3030c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp @@ -82,11 +82,11 @@ Parameters ScalarSegmentFeaturesFilter::parameters() const ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_FeatureIdsPathKey, "Cell Feature IDs", "Path to the created Feature IDs path", "FeatureIds")); + params.insert(std::make_unique(k_FeatureIdsName_Key, "Cell Feature IDs", "Path to the created Feature IDs path", "FeatureIds")); params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); - params.insert(std::make_unique(k_CellFeaturePathKey, "Cell Feature Attribute Matrix", "Created Cell Feature Attribute Matrix", "CellFeatureData")); - params.insert(std::make_unique(k_ActiveArrayPathKey, "Active", "Created array", "Active")); + params.insert(std::make_unique(k_CellFeatureName_Key, "Cell Feature Attribute Matrix", "Created Cell Feature Attribute Matrix", "CellFeatureData")); + params.insert(std::make_unique(k_ActiveArrayName_Key, "Active", "Created array", "Active")); return params; } @@ -101,9 +101,9 @@ IFilter::PreflightResult ScalarSegmentFeaturesFilter::preflightImpl(const DataSt { auto inputDataPath = args.value(k_InputArrayPathKey); int scalarTolerance = args.value(k_ScalarToleranceKey); - auto featureIdsName = args.value(k_FeatureIdsPathKey); - auto cellFeaturesName = args.value(k_CellFeaturePathKey); - auto activeArrayName = args.value(k_ActiveArrayPathKey); + auto featureIdsName = args.value(k_FeatureIdsName_Key); + auto cellFeaturesName = args.value(k_CellFeatureName_Key); + auto activeArrayName = args.value(k_ActiveArrayName_Key); DataPath featureIdsPath = inputDataPath.getParent().createChildPath(featureIdsName); bool useGoodVoxels = args.value(k_UseMask_Key); @@ -195,12 +195,12 @@ Result<> ScalarSegmentFeaturesFilter::executeImpl(DataStructure& data, const Arg inputValues.pInputDataPath = args.value(k_InputArrayPathKey); inputValues.pScalarTolerance = args.value(k_ScalarToleranceKey); inputValues.pShouldRandomizeFeatureIds = args.value(k_RandomizeFeatures_Key); - inputValues.pFeatureIdsPath = inputValues.pInputDataPath.getParent().createChildPath(args.value(k_FeatureIdsPathKey)); + inputValues.pFeatureIdsPath = inputValues.pInputDataPath.getParent().createChildPath(args.value(k_FeatureIdsName_Key)); inputValues.pUseGoodVoxels = args.value(k_UseMask_Key); inputValues.pGoodVoxelsPath = args.value(k_MaskArrayPath_Key); inputValues.pGridGeomPath = args.value(k_GridGeomPath_Key); - inputValues.pCellFeaturesPath = inputValues.pGridGeomPath.createChildPath(args.value(k_CellFeaturePathKey)); - inputValues.pActiveArrayPath = inputValues.pCellFeaturesPath.createChildPath(args.value(k_ActiveArrayPathKey)); + inputValues.pCellFeaturesPath = inputValues.pGridGeomPath.createChildPath(args.value(k_CellFeatureName_Key)); + inputValues.pActiveArrayPath = inputValues.pCellFeaturesPath.createChildPath(args.value(k_ActiveArrayName_Key)); nx::core::ScalarSegmentFeatures filterAlgorithm(data, &inputValues, shouldCancel, messageHandler); Result<> result = filterAlgorithm(); @@ -233,10 +233,10 @@ Result ScalarSegmentFeaturesFilter::FromSIMPLJson(const nlohmann::jso results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_RandomizeFeatureIdsKey, k_RandomizeFeatures_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ScalarArrayPathKey, k_InputArrayPathKey)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GoodVoxelsArrayPathKey, k_MaskArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayNameKey, k_FeatureIdsPathKey)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellFeatureAttributeMatrixNameKey, k_CellFeaturePathKey)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayNameKey, k_FeatureIdsName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellFeatureAttributeMatrixNameKey, k_CellFeatureName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ScalarArrayPathKey, k_GridGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ActiveArrayNameKey, k_ActiveArrayPathKey)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ActiveArrayNameKey, k_ActiveArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp index e11fcad848..e18590122f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp @@ -28,14 +28,14 @@ class SIMPLNXCORE_EXPORT ScalarSegmentFeaturesFilter : public IFilter ScalarSegmentFeaturesFilter& operator=(ScalarSegmentFeaturesFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_GridGeomPath_Key = "grid_geometry_path"; + static inline constexpr StringLiteral k_GridGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_ScalarToleranceKey = "scalar_tolerance"; static inline constexpr StringLiteral k_InputArrayPathKey = "input_array_path"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_path"; - static inline constexpr StringLiteral k_FeatureIdsPathKey = "feature_ids_path"; - static inline constexpr StringLiteral k_CellFeaturePathKey = "cell_feature_group_path"; - static inline constexpr StringLiteral k_ActiveArrayPathKey = "active_array_path"; + static inline constexpr StringLiteral k_FeatureIdsName_Key = "feature_ids_name"; + static inline constexpr StringLiteral k_CellFeatureName_Key = "cell_feature_group_name"; + static inline constexpr StringLiteral k_ActiveArrayName_Key = "active_array_name"; static inline constexpr StringLiteral k_RandomizeFeatures_Key = "randomize_features"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp index 2b16ae6e3e..6ee3dbce85 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp @@ -52,7 +52,7 @@ Parameters SetImageGeomOriginScalingFilter::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_ImageGeomPath_Key, "Image Geometry", "Path to the target ImageGeom", DataPath(), std::set{IGeometry::Type::Image})); + params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Image Geometry", "Path to the target ImageGeom", DataPath(), std::set{IGeometry::Type::Image})); params.insertLinkableParameter(std::make_unique(k_ChangeOrigin_Key, "Set Origin", "Specifies if the origin should be changed", true)); params.insert( std::make_unique(k_CenterOrigin_Key, "Put Input Origin at the Center of Geometry", "Specifies if the origin should be aligned with the corner (false) or center (true)", false)); @@ -79,7 +79,7 @@ IFilter::UniquePointer SetImageGeomOriginScalingFilter::clone() const IFilter::PreflightResult SetImageGeomOriginScalingFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_ImageGeomPath_Key); + auto imageGeomPath = filterArgs.value(k_SelectedImageGeometryPath_Key); auto shouldChangeOrigin = filterArgs.value(k_ChangeOrigin_Key); auto shouldCenterOrigin = filterArgs.value(k_CenterOrigin_Key); auto shouldChangeSpacing = filterArgs.value(k_ChangeSpacing_Key); @@ -148,7 +148,7 @@ Result SetImageGeomOriginScalingFilter::FromSIMPLJson(const nlohmann: std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_ImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_SelectedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ChangeOriginKey, k_ChangeOrigin_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OriginKey, k_Origin_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ChangeResolutionKey, k_ChangeSpacing_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp index 5c520a9cb7..ba50394287 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT SetImageGeomOriginScalingFilter : public IFilter SetImageGeomOriginScalingFilter& operator=(SetImageGeomOriginScalingFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ImageGeomPath_Key = "image_geom"; + static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_ChangeOrigin_Key = "change_origin"; static inline constexpr StringLiteral k_CenterOrigin_Key = "center_origin"; static inline constexpr StringLiteral k_ChangeSpacing_Key = "change_spacing"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.hpp index 752e7b3273..c0622684b0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT SharedFeatureFaceFilter : public IFilter SharedFeatureFaceFilter& operator=(SharedFeatureFaceFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "triangle_geometry_path"; + static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_FaceLabelsArrayPath_Key = "face_labels_array_path"; static inline constexpr StringLiteral k_RandomizeFeatures_Key = "randomize_features"; static inline constexpr StringLiteral k_FeatureFaceIdsArrayName_Key = "feature_face_ids_array_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp index 40eabfd2db..dd102cd39c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT SilhouetteFilter : public IFilter SilhouetteFilter& operator=(SilhouetteFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_DistanceMetric_Key = "distance_metric"; + static inline constexpr StringLiteral k_DistanceMetric_Key = "distance_metric_index"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_SelectedArrayPath_Key = "selected_array_path"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp index b1a41c4c79..f93841cc8d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp @@ -55,7 +55,7 @@ Parameters SplitAttributeArrayFilter::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_MultiCompArray_Key, "Multicomponent Attribute Array", "The multicomponent Attribute Array to split", DataPath{}, GetAllDataTypes())); + params.insert(std::make_unique(k_MultiCompArrayPath_Key, "Multicomponent Attribute Array", "The multicomponent Attribute Array to split", DataPath{}, GetAllDataTypes())); params.insert(std::make_unique(k_Postfix_Key, "Postfix", "Postfix to add to the end of the split Attribute Arrays", "_Component")); params.insert(std::make_unique(k_DeleteOriginal_Key, "Remove Original Array", "Whether or not to remove the original multicomponent array after splitting", false)); @@ -80,7 +80,7 @@ IFilter::UniquePointer SplitAttributeArrayFilter::clone() const IFilter::PreflightResult SplitAttributeArrayFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto pInputArrayPath = filterArgs.value(k_MultiCompArray_Key); + auto pInputArrayPath = filterArgs.value(k_MultiCompArrayPath_Key); auto pPostfix = filterArgs.value(k_Postfix_Key); auto pRemoveOriginal = filterArgs.value(k_DeleteOriginal_Key); auto pSelectComponents = filterArgs.value(k_SelectComponents_Key); @@ -143,7 +143,7 @@ Result<> SplitAttributeArrayFilter::executeImpl(DataStructure& dataStructure, co const std::atomic_bool& shouldCancel) const { SplitAttributeArrayInputValues inputValues; - inputValues.InputArrayPath = filterArgs.value(k_MultiCompArray_Key); + inputValues.InputArrayPath = filterArgs.value(k_MultiCompArrayPath_Key); inputValues.SplitArraysSuffix = filterArgs.value(k_Postfix_Key); if(filterArgs.value(k_SelectComponents_Key)) { @@ -183,7 +183,7 @@ Result SplitAttributeArrayFilter::FromSIMPLJson(const nlohmann::json& std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InputArrayPathKey, k_MultiCompArray_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InputArrayPathKey, k_MultiCompArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SplitArraysSuffixKey, k_Postfix_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.hpp index b8e9dff3d6..b7d354dc9d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT SplitAttributeArrayFilter : public IFilter SplitAttributeArrayFilter& operator=(SplitAttributeArrayFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_MultiCompArray_Key = "multicomponent_array"; + static inline constexpr StringLiteral k_MultiCompArrayPath_Key = "multicomponent_array_path"; static inline constexpr StringLiteral k_Postfix_Key = "postfix"; static inline constexpr StringLiteral k_DeleteOriginal_Key = "delete_original_array"; static inline constexpr StringLiteral k_SelectComponents_Key = "select_components_to_extract"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp index d7d9cb69a4..2832869343 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp @@ -78,7 +78,7 @@ Parameters SurfaceNetsFilter::parameters() const params.insertSeparator(Parameters::Separator{"Created Triangle Geometry"}); params.insert( - std::make_unique(k_TriangleGeometryName_Key, "Created Triangle Geometry", "The name of the created Triangle Geometry", DataPath({"TriangleDataContainer"}))); + std::make_unique(k_CreatedTriangleGeometryPath_Key, "Created Triangle Geometry", "The name of the created Triangle Geometry", DataPath({"TriangleDataContainer"}))); params.insertSeparator(Parameters::Separator{"Created Vertex Data"}); params.insert(std::make_unique(k_VertexDataGroupName_Key, "Vertex Data [AttributeMatrix]", @@ -116,7 +116,7 @@ IFilter::PreflightResult SurfaceNetsFilter::preflightImpl(const DataStructure& d auto pFeatureIdsArrayPathValue = filterArgs.value(k_CellFeatureIdsArrayPath_Key); auto pSelectedDataArrayPaths = filterArgs.value(k_SelectedDataArrayPaths_Key); - auto pTriangleGeometryPath = filterArgs.value(k_TriangleGeometryName_Key); + auto pTriangleGeometryPath = filterArgs.value(k_CreatedTriangleGeometryPath_Key); auto pVertexGroupDataName = filterArgs.value(k_VertexDataGroupName_Key); auto pNodeTypesName = filterArgs.value(k_NodeTypesArrayName_Key); auto pFaceGroupDataName = filterArgs.value(k_FaceDataGroupName_Key); @@ -195,7 +195,7 @@ Result<> SurfaceNetsFilter::executeImpl(DataStructure& dataStructure, const Argu inputValues.GridGeomDataPath = filterArgs.value(k_GridGeometryDataPath_Key); inputValues.FeatureIdsArrayPath = filterArgs.value(k_CellFeatureIdsArrayPath_Key); inputValues.SelectedDataArrayPaths = filterArgs.value(k_SelectedDataArrayPaths_Key); - inputValues.TriangleGeometryPath = filterArgs.value(k_TriangleGeometryName_Key); + inputValues.TriangleGeometryPath = filterArgs.value(k_CreatedTriangleGeometryPath_Key); inputValues.VertexGroupDataPath = inputValues.TriangleGeometryPath.createChildPath(filterArgs.value(k_VertexDataGroupName_Key)); inputValues.NodeTypesDataPath = inputValues.VertexGroupDataPath.createChildPath(filterArgs.value(k_NodeTypesArrayName_Key)); inputValues.FaceGroupDataPath = inputValues.TriangleGeometryPath.createChildPath(filterArgs.value(k_FaceDataGroupName_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.hpp index c4aec7a2a5..cee31f856b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.hpp @@ -24,11 +24,11 @@ class SIMPLNXCORE_EXPORT SurfaceNetsFilter : public IFilter SurfaceNetsFilter& operator=(SurfaceNetsFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_GridGeometryDataPath_Key = "grid_geometry_data_path"; + static inline constexpr StringLiteral k_GridGeometryDataPath_Key = "input_grid_geometry_path"; static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; - static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "selected_data_array_paths"; + static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "input_data_array_paths"; - static inline constexpr StringLiteral k_TriangleGeometryName_Key = "triangle_geometry_name"; + static inline constexpr StringLiteral k_CreatedTriangleGeometryPath_Key = "output_triangle_geometry_path"; static inline constexpr StringLiteral k_VertexDataGroupName_Key = "vertex_data_group_name"; static inline constexpr StringLiteral k_NodeTypesArrayName_Key = "node_types_array_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.hpp index 9a95f3b487..e2d5ec6e9e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT TriangleCentroidFilter : public IFilter TriangleCentroidFilter& operator=(TriangleCentroidFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "triangle_geometry_path"; + static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_CentroidsArrayName_Key = "centroids_array_name"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp index 0bea85acaf..525a872a96 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT TriangleDihedralAngleFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_SurfaceMeshTriangleDihedralAnglesArrayName_Key = "surface_mesh_triangle_dihedral_angles_array_name"; - static inline constexpr StringLiteral k_TGeometryDataPath_Key = "tri_geometry_data_path"; + static inline constexpr StringLiteral k_TGeometryDataPath_Key = "input_triangle_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp index 01e77cbd0e..79e5c02b06 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp @@ -113,7 +113,7 @@ Parameters TriangleNormalFilter::parameters() const GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insertSeparator(Parameters::Separator{"Created Face Data"}); params.insert( - std::make_unique(k_SurfaceMeshTriangleNormalsArrayPath_Key, "Created Face Normals", "The complete path to the array storing the calculated normals", "Face Normals")); + std::make_unique(k_SurfaceMeshTriangleNormalsArrayName_Key, "Created Face Normals", "The complete path to the array storing the calculated normals", "Face Normals")); return params; } @@ -129,7 +129,7 @@ IFilter::PreflightResult TriangleNormalFilter::preflightImpl(const DataStructure const std::atomic_bool& shouldCancel) const { auto pTriangleGeometryDataPath = filterArgs.value(k_TriGeometryDataPath_Key); - auto pNormalsArrayName = filterArgs.value(k_SurfaceMeshTriangleNormalsArrayPath_Key); + auto pNormalsArrayName = filterArgs.value(k_SurfaceMeshTriangleNormalsArrayName_Key); std::vector preflightUpdatedValues; @@ -160,7 +160,7 @@ Result<> TriangleNormalFilter::executeImpl(DataStructure& dataStructure, const A const std::atomic_bool& shouldCancel) const { auto pTriangleGeometryDataPath = filterArgs.value(k_TriGeometryDataPath_Key); - auto pNormalsName = filterArgs.value(k_SurfaceMeshTriangleNormalsArrayPath_Key); + auto pNormalsName = filterArgs.value(k_SurfaceMeshTriangleNormalsArrayName_Key); const TriangleGeom* triangleGeom = dataStructure.getDataAs(pTriangleGeometryDataPath); const AttributeMatrix* faceAttributeMatrix = triangleGeom->getFaceAttributeMatrix(); @@ -193,7 +193,7 @@ Result TriangleNormalFilter::FromSIMPLJson(const nlohmann::json& json results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceMeshTriangleNormalsArrayPathKey, k_TriGeometryDataPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SurfaceMeshTriangleNormalsArrayPathKey, - k_SurfaceMeshTriangleNormalsArrayPath_Key)); + k_SurfaceMeshTriangleNormalsArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp index 687b1394f3..33f008914d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp @@ -24,8 +24,8 @@ class SIMPLNXCORE_EXPORT TriangleNormalFilter : public IFilter TriangleNormalFilter& operator=(TriangleNormalFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SurfaceMeshTriangleNormalsArrayPath_Key = "surface_mesh_triangle_normals_array_path"; - static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "tri_geometry_data_path"; + static inline constexpr StringLiteral k_SurfaceMeshTriangleNormalsArrayName_Key = "output_normals_array_name"; + static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "input_triangle_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp index a4dba729ce..4ec42ea567 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp @@ -24,12 +24,12 @@ class SIMPLNXCORE_EXPORT UncertainRegularGridSampleSurfaceMeshFilter : public IF UncertainRegularGridSampleSurfaceMeshFilter& operator=(UncertainRegularGridSampleSurfaceMeshFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_TriangleGeometryPath_Key = "triangle_geometry_path"; + static inline constexpr StringLiteral k_TriangleGeometryPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_SurfaceMeshFaceLabelsArrayPath_Key = "surface_mesh_face_labels_array_path"; static inline constexpr StringLiteral k_Spacing_Key = "spacing"; static inline constexpr StringLiteral k_Origin_Key = "origin"; static inline constexpr StringLiteral k_Uncertainty_Key = "uncertainty"; - static inline constexpr StringLiteral k_ImageGeomPath_Key = "image_geom_path"; + static inline constexpr StringLiteral k_ImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_CellAMName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_FeatureIdsArrayName_Key = "feature_ids_array_name"; static inline constexpr StringLiteral k_UseSeed_Key = "use_seed"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp index 9d0c4d34dd..50e2a42ebd 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp @@ -38,14 +38,14 @@ class SIMPLNXCORE_EXPORT WriteASCIIDataFilter : public IFilter }; // Parameter Keys - static inline constexpr StringLiteral k_OutputStyle_Key = "output_style"; + static inline constexpr StringLiteral k_OutputStyle_Key = "output_style_index"; static inline constexpr StringLiteral k_OutputPath_Key = "output_path"; static inline constexpr StringLiteral k_OutputDir_Key = "output_dir"; static inline constexpr StringLiteral k_FileExtension_Key = "file_extension"; static inline constexpr StringLiteral k_MaxValPerLine_Key = "max_val_per_line"; - static inline constexpr StringLiteral k_Delimiter_Key = "delimiter"; - static inline constexpr StringLiteral k_Includes_Key = "includes"; - static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "selected_data_array_paths"; + static inline constexpr StringLiteral k_Delimiter_Key = "delimiter_index"; + static inline constexpr StringLiteral k_Includes_Key = "header_option_index"; + static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "input_data_array_paths"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp index f3b7ff4e1c..f9864082f6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT WriteAbaqusHexahedronFilter : public IFilter WriteAbaqusHexahedronFilter& operator=(WriteAbaqusHexahedronFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_HourglassStiffness_Key = "hourglass_stiffness"; static inline constexpr StringLiteral k_JobName_Key = "job_name"; static inline constexpr StringLiteral k_OutputPath_Key = "output_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp index f60c705aa0..66032afcd4 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp @@ -26,7 +26,7 @@ class SIMPLNXCORE_EXPORT WriteAvizoRectilinearCoordinateFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_OutputFile_Key = "output_file"; static inline constexpr StringLiteral k_WriteBinaryFile_Key = "write_binary_file"; - static inline constexpr StringLiteral k_GeometryPath_Key = "geometry_path"; + static inline constexpr StringLiteral k_GeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_FeatureIdsArrayPath_Key = "feature_ids_array_path"; static inline constexpr StringLiteral k_Units_Key = "units"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp index f5688f2a67..5d0519e28b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp @@ -26,7 +26,7 @@ class SIMPLNXCORE_EXPORT WriteAvizoUniformCoordinateFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_OutputFile_Key = "output_file"; static inline constexpr StringLiteral k_WriteBinaryFile_Key = "write_binary_file"; - static inline constexpr StringLiteral k_GeometryPath_Key = "geometry_path"; + static inline constexpr StringLiteral k_GeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_FeatureIdsArrayPath_Key = "feature_ids_array_path"; static inline constexpr StringLiteral k_Units_Key = "units"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp index 3164b3bb93..2484794f49 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp @@ -31,10 +31,10 @@ class SIMPLNXCORE_EXPORT WriteBinaryDataFilter : public IFilter }; // Parameter Keys - static inline constexpr StringLiteral k_Endianess_Key = "endianess"; + static inline constexpr StringLiteral k_Endianess_Key = "endian_index"; static inline constexpr StringLiteral k_OutputPath_Key = "output_path"; static inline constexpr StringLiteral k_FileExtension_Key = "file_extension"; - static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "selected_data_array_paths"; + static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "input_data_array_paths"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp index 8e0d9a9a7e..6a2db8e406 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp @@ -9,7 +9,7 @@ namespace nx::core { /** * @class WriteFeatureDataCSVFilter - * @brief This filter will export feature data as ASCII to a single file using choice delimiter + * @brief This filter will export feature data as ASCII to a single file using choice delimiter_index */ class SIMPLNXCORE_EXPORT WriteFeatureDataCSVFilter : public IFilter { @@ -36,7 +36,7 @@ class SIMPLNXCORE_EXPORT WriteFeatureDataCSVFilter : public IFilter static inline constexpr StringLiteral k_FeatureDataFile_Key = "feature_data_file"; static inline constexpr StringLiteral k_WriteNeighborListData_Key = "write_neighborlist_data"; static inline constexpr StringLiteral k_WriteNumFeaturesLine_Key = "write_num_features_line"; - static inline constexpr StringLiteral k_DelimiterChoiceInt_Key = "delimiter_choice_int"; + static inline constexpr StringLiteral k_DelimiterChoiceInt_Key = "delimiter_index"; static inline constexpr StringLiteral k_CellFeatureAttributeMatrixPath_Key = "cell_feature_attribute_matrix_path"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp index e957ed94bb..e06741a8af 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp @@ -28,7 +28,7 @@ class SIMPLNXCORE_EXPORT WriteLosAlamosFFTFilter : public IFilter static inline constexpr StringLiteral k_FeatureIdsArrayPath_Key = "feature_ids_array_path"; static inline constexpr StringLiteral k_CellEulerAnglesArrayPath_Key = "cell_euler_angles_array_path"; static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; - static inline constexpr StringLiteral k_ImageGeomPath = "image_geom_path"; + static inline constexpr StringLiteral k_ImageGeomPath = "input_image_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp index b53cc231fc..19d7658c2d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp @@ -24,13 +24,13 @@ class SIMPLNXCORE_EXPORT WriteStlFileFilter : public IFilter WriteStlFileFilter& operator=(WriteStlFileFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_GroupingType_Key = "grouping_type"; + static inline constexpr StringLiteral k_GroupingType_Key = "grouping_type_index"; static inline constexpr StringLiteral k_OutputStlFile_Key = "output_stl_file"; static inline constexpr StringLiteral k_OutputStlDirectory_Key = "output_stl_directory"; static inline constexpr StringLiteral k_OutputStlPrefix_Key = "output_stl_prefix"; static inline constexpr StringLiteral k_FeatureIdsPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_FeaturePhasesPath_Key = "feature_phases_path"; - static inline constexpr StringLiteral k_TriangleGeomPath_Key = "triangle_geom_path"; + static inline constexpr StringLiteral k_TriangleGeomPath_Key = "input_triangle_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp index cc891e6166..79367e1dfe 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp @@ -26,8 +26,8 @@ class SIMPLNXCORE_EXPORT WriteVtkRectilinearGridFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_OutputFile_Key = "output_file"; static inline constexpr StringLiteral k_WriteBinaryFile_Key = "write_binary_file"; - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; - static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "selected_data_array_paths"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "input_data_array_paths"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkStructuredPointsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkStructuredPointsFilter.hpp index b2ca7f98ff..d2fb4a3a36 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkStructuredPointsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkStructuredPointsFilter.hpp @@ -26,8 +26,8 @@ class SIMPLNXCORE_EXPORT WriteVtkStructuredPointsFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_OutputFile_Key = "output_file"; static inline constexpr StringLiteral k_WriteBinaryFile_Key = "write_binary_file"; - static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; - static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "selected_data_array_paths"; + static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; + static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "input_data_array_paths"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/test/AlignSectionsFeatureCentroidTest.cpp b/src/Plugins/SimplnxCore/test/AlignSectionsFeatureCentroidTest.cpp index 36ebc69013..f50c24738e 100644 --- a/src/Plugins/SimplnxCore/test/AlignSectionsFeatureCentroidTest.cpp +++ b/src/Plugins/SimplnxCore/test/AlignSectionsFeatureCentroidTest.cpp @@ -50,24 +50,15 @@ TEST_CASE("SimplnxCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][A AlignSectionsFeatureCentroidFilter filter; - // Parameter Keys - constexpr StringLiteral k_WriteAlignmentShifts_Key = "write_alignment_shifts"; - constexpr StringLiteral k_AlignmentShiftFileName_Key = "alignment_shift_file_name"; - constexpr StringLiteral k_UseReferenceSlice_Key = "use_reference_slice"; - constexpr StringLiteral k_ReferenceSlice_Key = "reference_slice"; - constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry_path"; - constexpr StringLiteral k_SelectedCellDataGroup_Key = "selected_cell_data_path"; - Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(k_WriteAlignmentShifts_Key, std::make_any(true)); - args.insertOrAssign(k_AlignmentShiftFileName_Key, std::make_any(computedShiftsFile)); - args.insertOrAssign(k_UseReferenceSlice_Key, std::make_any(true)); - args.insertOrAssign(k_ReferenceSlice_Key, std::make_any(0)); - args.insertOrAssign(k_MaskArrayPath_Key, std::make_any(k_MaskArrayPath)); - args.insertOrAssign(k_SelectedImageGeometry_Key, std::make_any(k_DataContainerPath)); - args.insertOrAssign(k_SelectedCellDataGroup_Key, std::make_any(k_CellAttributeMatrix)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_WriteAlignmentShifts_Key, std::make_any(true)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_AlignmentShiftFileName_Key, std::make_any(computedShiftsFile)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_UseReferenceSlice_Key, std::make_any(true)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_ReferenceSlice_Key, std::make_any(0)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_MaskArrayPath_Key, std::make_any(k_MaskArrayPath)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_SelectedCellDataGroup_Key, std::make_any(k_CellAttributeMatrix)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -84,28 +75,20 @@ TEST_CASE("SimplnxCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][A // Read Exemplar Shifts File { - static constexpr StringLiteral k_InputFileKey = "input_file"; - static constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; - static constexpr StringLiteral k_NTuplesKey = "n_tuples"; - static constexpr StringLiteral k_NCompKey = "n_comp"; - static constexpr StringLiteral k_NSkipLinesKey = "n_skip_lines"; - static constexpr StringLiteral k_DelimiterChoiceKey = "delimiter_choice"; - static constexpr StringLiteral k_DataArrayKey = "output_data_array"; - // Compare the output of the shifts file with the exemplar file ReadTextDataArrayFilter filter; Arguments args; // read in the exemplar shift data file - args.insertOrAssign(k_InputFileKey, std::make_any( - fs::path(fmt::format("{}/6_6_align_sections_feature_centroids/6_6_align_sections_feature_centroids.txt", unit_test::k_TestFilesDir)))); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(k_TupleDims)); - args.insertOrAssign(k_NCompKey, std::make_any(k_NumColumns)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(k_SkipHeaderLines)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(k_Comma)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_ExemplarShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path( + fmt::format("{}/6_6_align_sections_feature_centroids/6_6_align_sections_feature_centroids.txt", unit_test::k_TestFilesDir)))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_TupleDims)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(k_NumColumns)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(k_SkipHeaderLines)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(k_Comma)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarShiftsPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -118,26 +101,18 @@ TEST_CASE("SimplnxCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][A // Read Computed Shifts File { - static constexpr StringLiteral k_InputFileKey = "input_file"; - static constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; - static constexpr StringLiteral k_NTuplesKey = "n_tuples"; - static constexpr StringLiteral k_NCompKey = "n_comp"; - static constexpr StringLiteral k_NSkipLinesKey = "n_skip_lines"; - static constexpr StringLiteral k_DelimiterChoiceKey = "delimiter_choice"; - static constexpr StringLiteral k_DataArrayKey = "output_data_array"; - // Compare the output of the shifts file with the exemplar file ReadTextDataArrayFilter filter; Arguments args; - args.insertOrAssign(k_InputFileKey, std::make_any(computedShiftsFile)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuplesKey, std::make_any(k_TupleDims)); - args.insertOrAssign(k_NCompKey, std::make_any(k_NumColumns)); - args.insertOrAssign(k_NSkipLinesKey, std::make_any(k_SkipHeaderLines)); - args.insertOrAssign(k_DelimiterChoiceKey, std::make_any(k_Comma)); - args.insertOrAssign(k_DataArrayKey, std::make_any(k_CalculatedShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedShiftsFile)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_TupleDims)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(k_NumColumns)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(k_SkipHeaderLines)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(k_Comma)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_CalculatedShiftsPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/AlignSectionsListTest.cpp b/src/Plugins/SimplnxCore/test/AlignSectionsListTest.cpp index 8bb1a5f528..e49f7fbc27 100644 --- a/src/Plugins/SimplnxCore/test/AlignSectionsListTest.cpp +++ b/src/Plugins/SimplnxCore/test/AlignSectionsListTest.cpp @@ -49,7 +49,7 @@ TEST_CASE("SimplnxCore::AlignSectionsListFilter: Valid filter execution", "[Simp args.insertOrAssign(AlignSectionsListFilter::k_InputFile_Key, std::make_any(fs::path(fmt::format("{}/align_sections_misorientation.txt", unit_test::k_TestFilesDir)))); args.insertOrAssign(AlignSectionsListFilter::k_DREAM3DAlignmentFile_Key, std::make_any(true)); - args.insertOrAssign(AlignSectionsListFilter::k_SelectedImageGeometry_Key, std::make_any(nx::core::Constants::k_DataContainerPath)); + args.insertOrAssign(AlignSectionsListFilter::k_SelectedImageGeometryPath_Key, std::make_any(nx::core::Constants::k_DataContainerPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -78,7 +78,7 @@ TEST_CASE("SimplnxCore::AlignSectionsListFilter: Invalid filter execution", "[Si args.insertOrAssign(AlignSectionsListFilter::k_InputFile_Key, std::make_any( fs::path(fmt::format("{}/export_files_test/write_ascii_data_exemplars/float32/0_0_exemplar_0.txt", unit_test::k_TestFilesDir)))); - args.insertOrAssign(AlignSectionsListFilter::k_SelectedImageGeometry_Key, std::make_any(nx::core::Constants::k_DataContainerPath)); + args.insertOrAssign(AlignSectionsListFilter::k_SelectedImageGeometryPath_Key, std::make_any(nx::core::Constants::k_DataContainerPath)); SECTION("Invalid DREAM3D Alignment file format") { diff --git a/src/Plugins/SimplnxCore/test/AppendImageGeometryZSliceTest.cpp b/src/Plugins/SimplnxCore/test/AppendImageGeometryZSliceTest.cpp index ee5e2db95f..1b8cd11ecc 100644 --- a/src/Plugins/SimplnxCore/test/AppendImageGeometryZSliceTest.cpp +++ b/src/Plugins/SimplnxCore/test/AppendImageGeometryZSliceTest.cpp @@ -45,8 +45,8 @@ TEST_CASE("SimplnxCore::AppendImageGeometryZSliceFilter: Valid Filter Execution" args.insert(CropImageGeometry::k_MinVoxel_Key, std::make_any>(std::vector{0, 0, 0})); args.insert(CropImageGeometry::k_MaxVoxel_Key, std::make_any>(std::vector{188, 200, 50})); // args.insert(CropImageGeometry::k_UpdateOrigin_Key, std::make_any(false)); - args.insert(CropImageGeometry::k_SelectedImageGeometry_Key, std::make_any(k_DataContainerPath)); - args.insert(CropImageGeometry::k_CreatedImageGeometry_Key, std::make_any(k_CroppedBottomHalfPath)); + args.insert(CropImageGeometry::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); + args.insert(CropImageGeometry::k_CreatedImageGeometryPath_Key, std::make_any(k_CroppedBottomHalfPath)); args.insert(CropImageGeometry::k_RenumberFeatures_Key, std::make_any(false)); args.insert(CropImageGeometry::k_CellFeatureIdsArrayPath_Key, std::make_any(DataPath{})); args.insert(CropImageGeometry::k_RemoveOriginalGeometry_Key, std::make_any(false)); @@ -62,8 +62,8 @@ TEST_CASE("SimplnxCore::AppendImageGeometryZSliceFilter: Valid Filter Execution" args.insert(CropImageGeometry::k_MinVoxel_Key, std::make_any>(std::vector{0, 0, 51})); args.insert(CropImageGeometry::k_MaxVoxel_Key, std::make_any>(std::vector{188, 200, 116})); // args.insert(CropImageGeometry::k_UpdateOrigin_Key, std::make_any(true)); - args.insert(CropImageGeometry::k_SelectedImageGeometry_Key, std::make_any(k_DataContainerPath)); - args.insert(CropImageGeometry::k_CreatedImageGeometry_Key, std::make_any(k_CroppedTopHalfPath)); + args.insert(CropImageGeometry::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); + args.insert(CropImageGeometry::k_CreatedImageGeometryPath_Key, std::make_any(k_CroppedTopHalfPath)); args.insert(CropImageGeometry::k_RenumberFeatures_Key, std::make_any(false)); args.insert(CropImageGeometry::k_CellFeatureIdsArrayPath_Key, std::make_any(DataPath{})); args.insert(CropImageGeometry::k_RemoveOriginalGeometry_Key, std::make_any(false)); @@ -140,7 +140,7 @@ TEST_CASE("SimplnxCore::AppendImageGeometryZSliceFilter: Valid Filter Execution" RenameDataObject renameFilter; Arguments renameArgs; renameArgs.insert(RenameDataObject::k_NewName_Key, std::make_any(k_CellData)); - renameArgs.insert(RenameDataObject::k_DataObject_Key, std::make_any(k_AppendedGeometryPath.createChildPath(ImageGeom::k_CellDataName))); + renameArgs.insert(RenameDataObject::k_SourceDataObjectPath_Key, std::make_any(k_AppendedGeometryPath.createChildPath(ImageGeom::k_CellDataName))); auto renameResult = renameFilter.execute(dataStructure, renameArgs); SIMPLNX_RESULT_REQUIRE_VALID(renameResult.result) @@ -183,8 +183,8 @@ TEST_CASE("SimplnxCore::AppendImageGeometryZSliceFilter: InValid Filter Executio cropArgs.insert(CropImageGeometry::k_MinVoxel_Key, std::make_any>(std::vector{0, 0, 0})); cropArgs.insert(CropImageGeometry::k_MaxVoxel_Key, std::make_any>(std::vector{10, 10, 0})); // cropArgs.insert(CropImageGeometry::k_UpdateOrigin_Key, std::make_any(true)); - cropArgs.insert(CropImageGeometry::k_SelectedImageGeometry_Key, std::make_any(k_InvalidTestGeometryPath2)); - cropArgs.insert(CropImageGeometry::k_CreatedImageGeometry_Key, std::make_any(k_CroppedTopHalfPath)); + cropArgs.insert(CropImageGeometry::k_SelectedImageGeometryPath_Key, std::make_any(k_InvalidTestGeometryPath2)); + cropArgs.insert(CropImageGeometry::k_CreatedImageGeometryPath_Key, std::make_any(k_CroppedTopHalfPath)); cropArgs.insert(CropImageGeometry::k_RenumberFeatures_Key, std::make_any(false)); cropArgs.insert(CropImageGeometry::k_CellFeatureIdsArrayPath_Key, std::make_any(DataPath{})); cropArgs.insert(CropImageGeometry::k_RemoveOriginalGeometry_Key, std::make_any(false)); diff --git a/src/Plugins/SimplnxCore/test/ApplyTransformationToGeometryTest.cpp b/src/Plugins/SimplnxCore/test/ApplyTransformationToGeometryTest.cpp index cc30274434..2969ad624e 100644 --- a/src/Plugins/SimplnxCore/test/ApplyTransformationToGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/ApplyTransformationToGeometryTest.cpp @@ -68,7 +68,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Translation_Node", " const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(apply_transformation_to_geometry::k_InputCellAttrMatrixPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_TranslationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Translation_Key, std::make_any({100.0F, 50.0F, -100.0F})); @@ -112,7 +112,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Rotation_Node", "[Si const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(apply_transformation_to_geometry::k_InputCellAttrMatrixPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_RotationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Rotation_Key, std::make_any({0.0F, 0.0F, 1.0F, 45.0F})); @@ -157,7 +157,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Scale_Node", "[Simpl const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(apply_transformation_to_geometry::k_InputCellAttrMatrixPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_ScaleIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Scale_Key, std::make_any({0.5F, 1.5F, 10.0F})); @@ -203,7 +203,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Manual_Node", "[Simp const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(apply_transformation_to_geometry::k_InputCellAttrMatrixPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_ManualTransformationMatrixIdx)); @@ -252,7 +252,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Precomputed_Node", " const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(apply_transformation_to_geometry::k_InputCellAttrMatrixPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_PrecomputedTransformationMatrixIdx)); @@ -304,7 +304,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Translation_Image_Li const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_TranslationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); @@ -344,7 +344,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Rotation_Image_Linea const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_RotationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); @@ -383,7 +383,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Scale_Image_Linear", const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_ScaleIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); @@ -424,7 +424,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Manual_Image_Linear" const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_ManualTransformationMatrixIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); @@ -467,7 +467,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Precomputed_Image_Li const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_PrecomputedTransformationMatrixIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); @@ -513,7 +513,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Translation_Image_NN const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_TranslationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); @@ -554,7 +554,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Rotation_Image_NN", const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_RotationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); @@ -594,7 +594,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Scale_Image_NN", "[S const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_ScaleIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); @@ -636,7 +636,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Manual_Image_NN", "[ const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_ManualTransformationMatrixIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, @@ -692,7 +692,7 @@ TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Precomputed_Image_NN const ApplyTransformationToGeometryFilter filter; Arguments args; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometryPath_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_PrecomputedTransformationMatrixIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, diff --git a/src/Plugins/SimplnxCore/test/ApproximatePointCloudHullTest.cpp b/src/Plugins/SimplnxCore/test/ApproximatePointCloudHullTest.cpp index e81662dd8e..5794d6c357 100644 --- a/src/Plugins/SimplnxCore/test/ApproximatePointCloudHullTest.cpp +++ b/src/Plugins/SimplnxCore/test/ApproximatePointCloudHullTest.cpp @@ -54,7 +54,7 @@ TEST_CASE("SimplnxCore::ApproximatePointCloudHull: Instantiate Filter", "[Approx // Create default Parameters for the filter. args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); + args.insertOrAssign(ReadStlFileFilter::k_CreatedTriangleGeometryPath_Key, std::make_any(triangleGeomDataPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/CalculateArrayHistogramTest.cpp b/src/Plugins/SimplnxCore/test/CalculateArrayHistogramTest.cpp index 22432b6a21..31723e2996 100644 --- a/src/Plugins/SimplnxCore/test/CalculateArrayHistogramTest.cpp +++ b/src/Plugins/SimplnxCore/test/CalculateArrayHistogramTest.cpp @@ -56,9 +56,9 @@ TEST_CASE("SimplnxCore::CalculateArrayHistogram: Valid Filter Execution", "[Simp // Create default Parameters for the filter. args.insertOrAssign(CalculateArrayHistogramFilter::k_NumberOfBins_Key, std::make_any(4)); args.insertOrAssign(CalculateArrayHistogramFilter::k_UserDefinedRange_Key, std::make_any(false)); - args.insertOrAssign(CalculateArrayHistogramFilter::k_NewDataGroup_Key, std::make_any(true)); + args.insertOrAssign(CalculateArrayHistogramFilter::k_CreateNewDataGroup_Key, std::make_any(true)); args.insertOrAssign(CalculateArrayHistogramFilter::k_SelectedArrayPaths_Key, std::make_any(dataPaths)); - args.insertOrAssign(CalculateArrayHistogramFilter::k_NewDataGroupName_Key, std::make_any(dataGPath)); + args.insertOrAssign(CalculateArrayHistogramFilter::k_NewDataGroupPath_Key, std::make_any(dataGPath)); args.insertOrAssign(CalculateArrayHistogramFilter::k_HistoName_Key, std::make_any("Histogram")); // Preflight the filter and check result diff --git a/src/Plugins/SimplnxCore/test/CalculateFeatureSizesTest.cpp b/src/Plugins/SimplnxCore/test/CalculateFeatureSizesTest.cpp index 668e8a8c36..357d68933e 100644 --- a/src/Plugins/SimplnxCore/test/CalculateFeatureSizesTest.cpp +++ b/src/Plugins/SimplnxCore/test/CalculateFeatureSizesTest.cpp @@ -46,9 +46,9 @@ TEST_CASE("SimplnxCore::CalculateFeatureSizes", "[SimplnxCore][CalculateFeatureS args.insert(CalculateFeatureSizesFilter::k_SaveElementSizes_Key, std::make_any(false)); args.insert(CalculateFeatureSizesFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(featureIdsPath)); args.insert(CalculateFeatureSizesFilter::k_CellFeatureAttributeMatrixPath_Key, std::make_any(featureGroup)); - args.insert(CalculateFeatureSizesFilter::k_VolumesPath_Key, std::make_any(volumesName)); - args.insert(CalculateFeatureSizesFilter::k_EquivalentDiametersPath_Key, std::make_any(EquivalentDiametersName)); - args.insert(CalculateFeatureSizesFilter::k_NumElementsPath_Key, std::make_any(numElementsName)); + args.insert(CalculateFeatureSizesFilter::k_VolumesName_Key, std::make_any(volumesName)); + args.insert(CalculateFeatureSizesFilter::k_EquivalentDiametersName_Key, std::make_any(EquivalentDiametersName)); + args.insert(CalculateFeatureSizesFilter::k_NumElementsName_Key, std::make_any(numElementsName)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/CalculateTriangleAreasFilterTest.cpp b/src/Plugins/SimplnxCore/test/CalculateTriangleAreasFilterTest.cpp index 04abd1ca33..f18d04a9c8 100644 --- a/src/Plugins/SimplnxCore/test/CalculateTriangleAreasFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/CalculateTriangleAreasFilterTest.cpp @@ -36,7 +36,7 @@ TEST_CASE("SimplnxCore::CalculateTriangleAreasFilter", "[SimplnxCore][CalculateT // Create default Parameters for the filter. args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); + args.insertOrAssign(ReadStlFileFilter::k_CreatedTriangleGeometryPath_Key, std::make_any(triangleGeomDataPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -60,7 +60,7 @@ TEST_CASE("SimplnxCore::CalculateTriangleAreasFilter", "[SimplnxCore][CalculateT // Create default Parameters for the filter. args.insertOrAssign(CalculateTriangleAreasFilter::k_TriangleGeometryDataPath_Key, std::make_any(geometryPath)); - args.insertOrAssign(CalculateTriangleAreasFilter::k_CalculatedAreasDataPath_Key, std::make_any(triangleAreasName)); + args.insertOrAssign(CalculateTriangleAreasFilter::k_CalculatedAreasDataName_Key, std::make_any(triangleAreasName)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/CombineStlFilesTest.cpp b/src/Plugins/SimplnxCore/test/CombineStlFilesTest.cpp index d0bffcc9fe..c741b743c3 100644 --- a/src/Plugins/SimplnxCore/test/CombineStlFilesTest.cpp +++ b/src/Plugins/SimplnxCore/test/CombineStlFilesTest.cpp @@ -36,7 +36,7 @@ TEST_CASE("SimplnxCore::CombineStlFilesFilter: Valid Filter Execution", "[Simpln // Create default Parameters for the filter. args.insertOrAssign(CombineStlFilesFilter::k_StlFilesPath_Key, std::make_any(fs::path(inputStlDir))); - args.insertOrAssign(CombineStlFilesFilter::k_TriangleDataContainerName_Key, std::make_any(k_ComputedTriangleDataContainerName)); + args.insertOrAssign(CombineStlFilesFilter::k_TriangleGeometryPath_Key, std::make_any(k_ComputedTriangleDataContainerName)); args.insertOrAssign(CombineStlFilesFilter::k_FaceAttributeMatrixName_Key, std::make_any(k_FaceData)); args.insertOrAssign(CombineStlFilesFilter::k_FaceNormalsArrayName_Key, std::make_any("Face Normals")); args.insertOrAssign(CombineStlFilesFilter::k_VertexAttributeMatrixName_Key, std::make_any(k_VertexData)); @@ -74,7 +74,7 @@ TEST_CASE("SimplnxCore::CombineStlFilesFilter: InValid Filter Execution") std::string inputStlDir = fmt::format("{}/Data/Input", unit_test::k_DREAM3DDataDir.view()); args.insertOrAssign(CombineStlFilesFilter::k_StlFilesPath_Key, std::make_any(fs::path(inputStlDir))); - args.insertOrAssign(CombineStlFilesFilter::k_TriangleDataContainerName_Key, std::make_any(k_ComputedTriangleDataContainerName)); + args.insertOrAssign(CombineStlFilesFilter::k_TriangleGeometryPath_Key, std::make_any(k_ComputedTriangleDataContainerName)); args.insertOrAssign(CombineStlFilesFilter::k_FaceAttributeMatrixName_Key, std::make_any(k_FaceData)); args.insertOrAssign(CombineStlFilesFilter::k_FaceNormalsArrayName_Key, std::make_any(k_FaceNormals)); args.insertOrAssign(CombineStlFilesFilter::k_VertexAttributeMatrixName_Key, std::make_any(k_VertexData)); diff --git a/src/Plugins/SimplnxCore/test/ComputeFeatureRectTest.cpp b/src/Plugins/SimplnxCore/test/ComputeFeatureRectTest.cpp index 181c24ad5d..4402ca5244 100644 --- a/src/Plugins/SimplnxCore/test/ComputeFeatureRectTest.cpp +++ b/src/Plugins/SimplnxCore/test/ComputeFeatureRectTest.cpp @@ -108,7 +108,7 @@ TEST_CASE("SimplnxCore::ComputeFeatureRectFilter: Valid filter execution", "[Sim args.insertOrAssign(ComputeFeatureRectFilter::k_FeatureIdsArrayPath_Key, std::make_any(DataPath{{k_ImageGeometryName, k_CellAttrMatrixName, k_FeatureIdsArrayName}})); args.insertOrAssign(ComputeFeatureRectFilter::k_FeatureDataAttributeMatrixPath_Key, std::make_any(DataPath{{k_ImageGeometryName, k_FeatureAttrMatrixName}})); - args.insertOrAssign(ComputeFeatureRectFilter::k_FeatureRectArrayPath_Key, std::make_any(k_RectCoordsArrayName)); + args.insertOrAssign(ComputeFeatureRectFilter::k_FeatureRectArrayName_Key, std::make_any(k_RectCoordsArrayName)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/ComputeMomentInvariants2DTest.cpp b/src/Plugins/SimplnxCore/test/ComputeMomentInvariants2DTest.cpp index feeb3d5f28..e68e6ddf84 100644 --- a/src/Plugins/SimplnxCore/test/ComputeMomentInvariants2DTest.cpp +++ b/src/Plugins/SimplnxCore/test/ComputeMomentInvariants2DTest.cpp @@ -211,10 +211,10 @@ TEST_CASE("SimplnxCore::ComputeMomentInvariants2DFilter: Valid Filter Execution" args.insertOrAssign(ComputeMomentInvariants2DFilter::k_FeatureRectArrayPath_Key, std::make_any(DataPath({k_ImageGeometry, k_FeatureData, k_RectCoords}))); args.insertOrAssign(ComputeMomentInvariants2DFilter::k_NormalizeMomentInvariants_Key, std::make_any(true)); args.insertOrAssign(ComputeMomentInvariants2DFilter::k_FeatureAttributeMatrixPath_Key, std::make_any(DataPath({k_ImageGeometry, k_FeatureData}))); - args.insertOrAssign(ComputeMomentInvariants2DFilter::k_Omega1ArrayPath_Key, std::make_any(k_Omega1)); - args.insertOrAssign(ComputeMomentInvariants2DFilter::k_Omega2ArrayPath_Key, std::make_any(k_Omega2)); + args.insertOrAssign(ComputeMomentInvariants2DFilter::k_Omega1ArrayName_Key, std::make_any(k_Omega1)); + args.insertOrAssign(ComputeMomentInvariants2DFilter::k_Omega2ArrayName_Key, std::make_any(k_Omega2)); args.insertOrAssign(ComputeMomentInvariants2DFilter::k_SaveCentralMoments_Key, std::make_any(false)); - args.insertOrAssign(ComputeMomentInvariants2DFilter::k_CentralMomentsArrayPath_Key, std::make_any(k_CentralMoments)); + args.insertOrAssign(ComputeMomentInvariants2DFilter::k_CentralMomentsArrayName_Key, std::make_any(k_CentralMoments)); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); @@ -247,10 +247,10 @@ TEST_CASE("SimplnxCore::ComputeMomentInvariants2DFilter: InValid Filter Executio args.insertOrAssign(ComputeMomentInvariants2DFilter::k_FeatureRectArrayPath_Key, std::make_any(DataPath({k_ImageGeometry, k_FeatureData, k_RectCoords}))); args.insertOrAssign(ComputeMomentInvariants2DFilter::k_NormalizeMomentInvariants_Key, std::make_any(true)); args.insertOrAssign(ComputeMomentInvariants2DFilter::k_FeatureAttributeMatrixPath_Key, std::make_any(DataPath({k_ImageGeometry, k_FeatureData}))); - args.insertOrAssign(ComputeMomentInvariants2DFilter::k_Omega1ArrayPath_Key, std::make_any(k_Omega1)); - args.insertOrAssign(ComputeMomentInvariants2DFilter::k_Omega2ArrayPath_Key, std::make_any(k_Omega2)); + args.insertOrAssign(ComputeMomentInvariants2DFilter::k_Omega1ArrayName_Key, std::make_any(k_Omega1)); + args.insertOrAssign(ComputeMomentInvariants2DFilter::k_Omega2ArrayName_Key, std::make_any(k_Omega2)); args.insertOrAssign(ComputeMomentInvariants2DFilter::k_SaveCentralMoments_Key, std::make_any(false)); - args.insertOrAssign(ComputeMomentInvariants2DFilter::k_CentralMomentsArrayPath_Key, std::make_any(k_CentralMoments)); + args.insertOrAssign(ComputeMomentInvariants2DFilter::k_CentralMomentsArrayName_Key, std::make_any(k_CentralMoments)); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); diff --git a/src/Plugins/SimplnxCore/test/ConvertColorToGrayScaleTest.cpp b/src/Plugins/SimplnxCore/test/ConvertColorToGrayScaleTest.cpp index f0c5712224..4875109e9e 100644 --- a/src/Plugins/SimplnxCore/test/ConvertColorToGrayScaleTest.cpp +++ b/src/Plugins/SimplnxCore/test/ConvertColorToGrayScaleTest.cpp @@ -299,7 +299,7 @@ void RunTest(const uint8& algoMapIndex, const ConvertColorToGrayScale::Conversio args.insertOrAssign(ConvertColorToGrayScaleFilter::k_ConversionAlgorithm_Key, std::make_any(static_cast(algorithm))); args.insertOrAssign(ConvertColorToGrayScaleFilter::k_ColorWeights_Key, std::make_any(colorWeights)); args.insertOrAssign(ConvertColorToGrayScaleFilter::k_ColorChannel_Key, std::make_any(colorChannel)); - args.insertOrAssign(ConvertColorToGrayScaleFilter::k_InputDataArrayVector_Key, std::make_any(daps)); + args.insertOrAssign(ConvertColorToGrayScaleFilter::k_InputDataArrayPath_Key, std::make_any(daps)); args.insertOrAssign(ConvertColorToGrayScaleFilter::k_OutputArrayPrefix_Key, std::make_any(m_outputArrayPrefix)); // Preflight the filter and check result diff --git a/src/Plugins/SimplnxCore/test/ConvertDataTest.cpp b/src/Plugins/SimplnxCore/test/ConvertDataTest.cpp index d3fd22a1ae..36e66270b2 100644 --- a/src/Plugins/SimplnxCore/test/ConvertDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/ConvertDataTest.cpp @@ -38,8 +38,8 @@ Arguments getArgs(const DataPath& inputArray, DataType type, const std::string& Arguments args; args.insertOrAssign(ConvertDataFilter::k_ScalarType_Key, std::make_any(static_cast(type))); - args.insertOrAssign(ConvertDataFilter::k_ArrayToConvert_Key, std::make_any(inputArray)); - args.insertOrAssign(ConvertDataFilter::k_ConvertedArray_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ConvertDataFilter::k_ArrayToConvertPath_Key, std::make_any(inputArray)); + args.insertOrAssign(ConvertDataFilter::k_ConvertedArrayName_Key, std::make_any(outputArrayName)); return args; } diff --git a/src/Plugins/SimplnxCore/test/CoreFilterTest.cpp b/src/Plugins/SimplnxCore/test/CoreFilterTest.cpp index b04f8a4fe6..80091a774d 100644 --- a/src/Plugins/SimplnxCore/test/CoreFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/CoreFilterTest.cpp @@ -89,13 +89,13 @@ TEST_CASE("CoreFilterTest:RunCoreFilter") Arguments args; DataPath dataPath({"foo"}); - args.insert("input_file", std::make_any(k_FileName)); - args.insert("scalar_type", std::make_any(NumericType::int32)); - args.insert("n_tuples", std::make_any(k_TupleDims)); - args.insert("n_comp", std::make_any(k_NComp)); - args.insert("n_skip_lines", std::make_any(k_NSkipLines)); - args.insert("delimiter_choice", std::make_any(0)); - args.insert("output_data_array", std::make_any(dataPath)); + args.insert(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(k_FileName)); + args.insert(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(NumericType::int32)); + args.insert(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_TupleDims)); + args.insert(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(k_NComp)); + args.insert(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(k_NSkipLines)); + args.insert(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(0)); + args.insert(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(dataPath)); // auto callback = [](const IFilter::Message& message) { fmt::print("{}: {}\n", message.type, message.message); }; // Result<> result = filter.execute(dataStructure, args, IFilter::MessageHandler{callback}); diff --git a/src/Plugins/SimplnxCore/test/CreateDataArrayTest.cpp b/src/Plugins/SimplnxCore/test/CreateDataArrayTest.cpp index 1234588114..c5855abf3d 100644 --- a/src/Plugins/SimplnxCore/test/CreateDataArrayTest.cpp +++ b/src/Plugins/SimplnxCore/test/CreateDataArrayTest.cpp @@ -46,7 +46,7 @@ TEST_CASE("SimplnxCore::CreateDataArray(Invalid Parameters)", "[SimplnxCore][Cre args.insert(CreateDataArray::k_NumComps_Key, std::make_any(k_NComp)); args.insert(CreateDataArray::k_TupleDims_Key, std::make_any(k_TupleDims)); args.insert(CreateDataArray::k_DataPath_Key, std::make_any(k_DataPath)); - args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("-1")); + args.insert(CreateDataArray::k_InitializationValue_Key, std::make_any("-1")); auto result = filter.execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(result.result); @@ -57,7 +57,7 @@ TEST_CASE("SimplnxCore::CreateDataArray(Invalid Parameters)", "[SimplnxCore][Cre args.insert(CreateDataArray::k_NumComps_Key, std::make_any(k_NComp)); args.insert(CreateDataArray::k_TupleDims_Key, std::make_any(k_TupleDims)); args.insert(CreateDataArray::k_DataPath_Key, std::make_any(k_DataPath)); - args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("1024")); + args.insert(CreateDataArray::k_InitializationValue_Key, std::make_any("1024")); auto result = filter.execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(result.result); @@ -68,7 +68,7 @@ TEST_CASE("SimplnxCore::CreateDataArray(Invalid Parameters)", "[SimplnxCore][Cre args.insert(CreateDataArray::k_NumComps_Key, std::make_any(0)); args.insert(CreateDataArray::k_TupleDims_Key, std::make_any(k_TupleDims)); args.insert(CreateDataArray::k_DataPath_Key, std::make_any(k_DataPath)); - args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("1")); + args.insert(CreateDataArray::k_InitializationValue_Key, std::make_any("1")); auto result = filter.execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(result.result); @@ -81,7 +81,7 @@ TEST_CASE("SimplnxCore::CreateDataArray(Invalid Parameters)", "[SimplnxCore][Cre DynamicTableInfo::TableDataType tupleDims = {{static_cast(0.0)}}; args.insert(CreateDataArray::k_TupleDims_Key, std::make_any(tupleDims)); args.insert(CreateDataArray::k_DataPath_Key, std::make_any(k_DataPath)); - args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("1")); + args.insert(CreateDataArray::k_InitializationValue_Key, std::make_any("1")); auto result = filter.execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(result.result); @@ -93,7 +93,7 @@ TEST_CASE("SimplnxCore::CreateDataArray(Invalid Parameters)", "[SimplnxCore][Cre DynamicTableInfo::TableDataType tupleDims = {{static_cast(1.0)}}; args.insert(CreateDataArray::k_TupleDims_Key, std::make_any(tupleDims)); args.insert(CreateDataArray::k_DataPath_Key, std::make_any(k_DataPath)); - args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("")); + args.insert(CreateDataArray::k_InitializationValue_Key, std::make_any("")); auto result = filter.execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(result.result); @@ -105,33 +105,33 @@ TEST_CASE("SimplnxCore::CreateDataArray(Invalid Parameters)", "[SimplnxCore][Cre DynamicTableInfo::TableDataType tupleDims = {{static_cast(1.0)}}; args.insert(CreateDataArray::k_TupleDims_Key, std::make_any(tupleDims)); args.insert(CreateDataArray::k_DataPath_Key, std::make_any(k_DataPath)); - args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("1000")); + args.insert(CreateDataArray::k_InitializationValue_Key, std::make_any("1000")); auto result = filter.execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(result.result); args.insert(CreateDataArray::k_NumericType_Key, std::make_any(NumericType::uint8)); - args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("-1")); + args.insert(CreateDataArray::k_InitializationValue_Key, std::make_any("-1")); result = filter.execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(result.result); args.insert(CreateDataArray::k_NumericType_Key, std::make_any(NumericType::int16)); - args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("70000")); + args.insert(CreateDataArray::k_InitializationValue_Key, std::make_any("70000")); result = filter.execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(result.result); args.insert(CreateDataArray::k_NumericType_Key, std::make_any(NumericType::uint16)); - args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("-1")); + args.insert(CreateDataArray::k_InitializationValue_Key, std::make_any("-1")); result = filter.execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(result.result); args.insert(CreateDataArray::k_NumericType_Key, std::make_any(NumericType::int32)); - args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("4294967297")); + args.insert(CreateDataArray::k_InitializationValue_Key, std::make_any("4294967297")); result = filter.execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(result.result); args.insert(CreateDataArray::k_NumericType_Key, std::make_any(NumericType::int32)); - args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("-4294967297")); + args.insert(CreateDataArray::k_InitializationValue_Key, std::make_any("-4294967297")); result = filter.execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(result.result); } diff --git a/src/Plugins/SimplnxCore/test/CreateGeometryTest.cpp b/src/Plugins/SimplnxCore/test/CreateGeometryTest.cpp index 19ccdca2bb..2b011e3a72 100644 --- a/src/Plugins/SimplnxCore/test/CreateGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/CreateGeometryTest.cpp @@ -2358,7 +2358,7 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG { // Create default Parameters for the filter. args.insertOrAssign(CreateGeometryFilter::k_GeometryType_Key, std::make_any(CreateGeometryFilter::k_ImageGeometry)); - args.insertOrAssign(CreateGeometryFilter::k_GeometryName_Key, std::make_any(geometryPath)); + args.insertOrAssign(CreateGeometryFilter::k_GeometryPath_Key, std::make_any(geometryPath)); args.insertOrAssign(CreateGeometryFilter::k_WarningsAsErrors_Key, std::make_any(false)); args.insertOrAssign(CreateGeometryFilter::k_ArrayHandling_Key, std::make_any(CreateGeometryFilter::k_CopyArray)); // Image Geometry parameters @@ -2369,25 +2369,25 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG args.insertOrAssign(CreateGeometryFilter::k_Origin_Key, std::make_any(imageOrigin)); args.insertOrAssign(CreateGeometryFilter::k_Spacing_Key, std::make_any(imageSpacing)); // RectilinearGrid Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_XBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_YBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_ZBounds_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_XBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_YBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_ZBoundsPath_Key, std::make_any(DataPath{})); // Vertex, Edge, Triangle, Quadrilateral, Tetrahedral, & Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_VertexListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_VertexListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_VertexAttributeMatrixName_Key, std::make_any("")); // Edge Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_EdgeListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_EdgeListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_EdgeAttributeMatrixName_Key, std::make_any("")); // Triangle Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TriangleListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TriangleListPath_Key, std::make_any(DataPath{})); // Quadrilateral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListPath_Key, std::make_any(DataPath{})); // Triangle & Quadrilateral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_FaceAttributeMatrixName_Key, std::make_any("")); // Tetrahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListPath_Key, std::make_any(DataPath{})); // Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_HexahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_HexahedralListPath_Key, std::make_any(DataPath{})); // Image, RectilinearGrid, Tetrahedral, & Hexahedral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_CellAttributeMatrixName_Key, std::make_any(cellAmName)); @@ -2456,7 +2456,7 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG // Create default Parameters for the filter. args.insertOrAssign(CreateGeometryFilter::k_GeometryType_Key, std::make_any(CreateGeometryFilter::k_RectGridGeometry)); - args.insertOrAssign(CreateGeometryFilter::k_GeometryName_Key, std::make_any(geometryPath)); + args.insertOrAssign(CreateGeometryFilter::k_GeometryPath_Key, std::make_any(geometryPath)); args.insertOrAssign(CreateGeometryFilter::k_WarningsAsErrors_Key, std::make_any(false)); args.insertOrAssign(CreateGeometryFilter::k_ArrayHandling_Key, std::make_any(CreateGeometryFilter::k_CopyArray)); // Image Geometry parameters @@ -2464,25 +2464,25 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG args.insertOrAssign(CreateGeometryFilter::k_Origin_Key, std::make_any()); args.insertOrAssign(CreateGeometryFilter::k_Spacing_Key, std::make_any()); // RectilinearGrid Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_XBounds_Key, std::make_any(xBoundsPath)); - args.insertOrAssign(CreateGeometryFilter::k_YBounds_Key, std::make_any(yBoundsPath)); - args.insertOrAssign(CreateGeometryFilter::k_ZBounds_Key, std::make_any(zBoundsPath)); + args.insertOrAssign(CreateGeometryFilter::k_XBoundsPath_Key, std::make_any(xBoundsPath)); + args.insertOrAssign(CreateGeometryFilter::k_YBoundsPath_Key, std::make_any(yBoundsPath)); + args.insertOrAssign(CreateGeometryFilter::k_ZBoundsPath_Key, std::make_any(zBoundsPath)); // Vertex, Edge, Triangle, Quadrilateral, Tetrahedral, & Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_VertexListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_VertexListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_VertexAttributeMatrixName_Key, std::make_any("")); // Edge Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_EdgeListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_EdgeListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_EdgeAttributeMatrixName_Key, std::make_any("")); // Triangle Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TriangleListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TriangleListPath_Key, std::make_any(DataPath{})); // Quadrilateral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListPath_Key, std::make_any(DataPath{})); // Triangle & Quadrilateral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_FaceAttributeMatrixName_Key, std::make_any("")); // Tetrahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListPath_Key, std::make_any(DataPath{})); // Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_HexahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_HexahedralListPath_Key, std::make_any(DataPath{})); // Image, RectilinearGrid, Tetrahedral, & Hexahedral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_CellAttributeMatrixName_Key, std::make_any(cellAmName)); @@ -2516,7 +2516,7 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG { // Create default Parameters for the filter. args.insertOrAssign(CreateGeometryFilter::k_GeometryType_Key, std::make_any(CreateGeometryFilter::k_VertexGeometry)); - args.insertOrAssign(CreateGeometryFilter::k_GeometryName_Key, std::make_any(geometryPath)); + args.insertOrAssign(CreateGeometryFilter::k_GeometryPath_Key, std::make_any(geometryPath)); args.insertOrAssign(CreateGeometryFilter::k_WarningsAsErrors_Key, std::make_any(false)); args.insertOrAssign(CreateGeometryFilter::k_ArrayHandling_Key, std::make_any(CreateGeometryFilter::k_CopyArray)); // Image Geometry parameters @@ -2524,25 +2524,25 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG args.insertOrAssign(CreateGeometryFilter::k_Origin_Key, std::make_any()); args.insertOrAssign(CreateGeometryFilter::k_Spacing_Key, std::make_any()); // RectilinearGrid Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_XBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_YBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_ZBounds_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_XBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_YBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_ZBoundsPath_Key, std::make_any(DataPath{})); // Vertex, Edge, Triangle, Quadrilateral, Tetrahedral, & Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_VertexListName_Key, std::make_any(srcVerticesPath)); + args.insertOrAssign(CreateGeometryFilter::k_VertexListPath_Key, std::make_any(srcVerticesPath)); args.insertOrAssign(CreateGeometryFilter::k_VertexAttributeMatrixName_Key, std::make_any(vertexAmName)); // Edge Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_EdgeListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_EdgeListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_EdgeAttributeMatrixName_Key, std::make_any("")); // Triangle Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TriangleListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TriangleListPath_Key, std::make_any(DataPath{})); // Quadrilateral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListPath_Key, std::make_any(DataPath{})); // Triangle & Quadrilateral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_FaceAttributeMatrixName_Key, std::make_any("")); // Tetrahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListPath_Key, std::make_any(DataPath{})); // Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_HexahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_HexahedralListPath_Key, std::make_any(DataPath{})); // Image, RectilinearGrid, Tetrahedral, & Hexahedral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_CellAttributeMatrixName_Key, std::make_any("")); @@ -2569,7 +2569,7 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG { // Create default Parameters for the filter. args.insertOrAssign(CreateGeometryFilter::k_GeometryType_Key, std::make_any(CreateGeometryFilter::k_EdgeGeometry)); - args.insertOrAssign(CreateGeometryFilter::k_GeometryName_Key, std::make_any(geometryPath)); + args.insertOrAssign(CreateGeometryFilter::k_GeometryPath_Key, std::make_any(geometryPath)); args.insertOrAssign(CreateGeometryFilter::k_WarningsAsErrors_Key, std::make_any(false)); args.insertOrAssign(CreateGeometryFilter::k_ArrayHandling_Key, std::make_any(CreateGeometryFilter::k_CopyArray)); // Image Geometry parameters @@ -2577,25 +2577,25 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG args.insertOrAssign(CreateGeometryFilter::k_Origin_Key, std::make_any()); args.insertOrAssign(CreateGeometryFilter::k_Spacing_Key, std::make_any()); // RectilinearGrid Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_XBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_YBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_ZBounds_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_XBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_YBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_ZBoundsPath_Key, std::make_any(DataPath{})); // Vertex, Edge, Triangle, Quadrilateral, Tetrahedral, & Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_VertexListName_Key, std::make_any(srcVerticesPath)); + args.insertOrAssign(CreateGeometryFilter::k_VertexListPath_Key, std::make_any(srcVerticesPath)); args.insertOrAssign(CreateGeometryFilter::k_VertexAttributeMatrixName_Key, std::make_any(vertexAmName)); // Edge Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_EdgeListName_Key, std::make_any(srcEdgesPath)); + args.insertOrAssign(CreateGeometryFilter::k_EdgeListPath_Key, std::make_any(srcEdgesPath)); args.insertOrAssign(CreateGeometryFilter::k_EdgeAttributeMatrixName_Key, std::make_any(edgeAmName)); // Triangle Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TriangleListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TriangleListPath_Key, std::make_any(DataPath{})); // Quadrilateral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListPath_Key, std::make_any(DataPath{})); // Triangle & Quadrilateral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_FaceAttributeMatrixName_Key, std::make_any("")); // Tetrahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListPath_Key, std::make_any(DataPath{})); // Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_HexahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_HexahedralListPath_Key, std::make_any(DataPath{})); // Image, RectilinearGrid, Tetrahedral, & Hexahedral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_CellAttributeMatrixName_Key, std::make_any("")); @@ -2631,7 +2631,7 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG { // Create default Parameters for the filter. args.insertOrAssign(CreateGeometryFilter::k_GeometryType_Key, std::make_any(CreateGeometryFilter::k_TriangleGeometry)); - args.insertOrAssign(CreateGeometryFilter::k_GeometryName_Key, std::make_any(geometryPath)); + args.insertOrAssign(CreateGeometryFilter::k_GeometryPath_Key, std::make_any(geometryPath)); args.insertOrAssign(CreateGeometryFilter::k_WarningsAsErrors_Key, std::make_any(false)); args.insertOrAssign(CreateGeometryFilter::k_ArrayHandling_Key, std::make_any(CreateGeometryFilter::k_CopyArray)); // Image Geometry parameters @@ -2639,25 +2639,25 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG args.insertOrAssign(CreateGeometryFilter::k_Origin_Key, std::make_any()); args.insertOrAssign(CreateGeometryFilter::k_Spacing_Key, std::make_any()); // RectilinearGrid Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_XBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_YBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_ZBounds_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_XBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_YBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_ZBoundsPath_Key, std::make_any(DataPath{})); // Vertex, Edge, Triangle, Quadrilateral, Tetrahedral, & Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_VertexListName_Key, std::make_any(srcVerticesPath)); + args.insertOrAssign(CreateGeometryFilter::k_VertexListPath_Key, std::make_any(srcVerticesPath)); args.insertOrAssign(CreateGeometryFilter::k_VertexAttributeMatrixName_Key, std::make_any(vertexAmName)); // Edge Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_EdgeListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_EdgeListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_EdgeAttributeMatrixName_Key, std::make_any("")); // Triangle Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TriangleListName_Key, std::make_any(srcTrianglesPath)); + args.insertOrAssign(CreateGeometryFilter::k_TriangleListPath_Key, std::make_any(srcTrianglesPath)); // Quadrilateral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListPath_Key, std::make_any(DataPath{})); // Triangle & Quadrilateral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_FaceAttributeMatrixName_Key, std::make_any(faceAmName)); // Tetrahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListPath_Key, std::make_any(DataPath{})); // Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_HexahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_HexahedralListPath_Key, std::make_any(DataPath{})); // Image, RectilinearGrid, Tetrahedral, & Hexahedral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_CellAttributeMatrixName_Key, std::make_any("")); @@ -2693,7 +2693,7 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG { // Create default Parameters for the filter. args.insertOrAssign(CreateGeometryFilter::k_GeometryType_Key, std::make_any(CreateGeometryFilter::k_QuadGeometry)); - args.insertOrAssign(CreateGeometryFilter::k_GeometryName_Key, std::make_any(geometryPath)); + args.insertOrAssign(CreateGeometryFilter::k_GeometryPath_Key, std::make_any(geometryPath)); args.insertOrAssign(CreateGeometryFilter::k_WarningsAsErrors_Key, std::make_any(false)); args.insertOrAssign(CreateGeometryFilter::k_ArrayHandling_Key, std::make_any(CreateGeometryFilter::k_CopyArray)); // Image Geometry parameters @@ -2701,25 +2701,25 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG args.insertOrAssign(CreateGeometryFilter::k_Origin_Key, std::make_any()); args.insertOrAssign(CreateGeometryFilter::k_Spacing_Key, std::make_any()); // RectilinearGrid Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_XBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_YBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_ZBounds_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_XBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_YBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_ZBoundsPath_Key, std::make_any(DataPath{})); // Vertex, Edge, Triangle, Quadrilateral, Tetrahedral, & Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_VertexListName_Key, std::make_any(srcVerticesPath)); + args.insertOrAssign(CreateGeometryFilter::k_VertexListPath_Key, std::make_any(srcVerticesPath)); args.insertOrAssign(CreateGeometryFilter::k_VertexAttributeMatrixName_Key, std::make_any(vertexAmName)); // Edge Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_EdgeListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_EdgeListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_EdgeAttributeMatrixName_Key, std::make_any("")); // Triangle Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TriangleListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TriangleListPath_Key, std::make_any(DataPath{})); // Quadrilateral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListName_Key, std::make_any(srcQuadsPath)); + args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListPath_Key, std::make_any(srcQuadsPath)); // Triangle & Quadrilateral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_FaceAttributeMatrixName_Key, std::make_any(faceAmName)); // Tetrahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListPath_Key, std::make_any(DataPath{})); // Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_HexahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_HexahedralListPath_Key, std::make_any(DataPath{})); // Image, RectilinearGrid, Tetrahedral, & Hexahedral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_CellAttributeMatrixName_Key, std::make_any("")); @@ -2755,7 +2755,7 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG { // Create default Parameters for the filter. args.insertOrAssign(CreateGeometryFilter::k_GeometryType_Key, std::make_any(CreateGeometryFilter::k_TetGeometry)); - args.insertOrAssign(CreateGeometryFilter::k_GeometryName_Key, std::make_any(geometryPath)); + args.insertOrAssign(CreateGeometryFilter::k_GeometryPath_Key, std::make_any(geometryPath)); args.insertOrAssign(CreateGeometryFilter::k_WarningsAsErrors_Key, std::make_any(false)); args.insertOrAssign(CreateGeometryFilter::k_ArrayHandling_Key, std::make_any(CreateGeometryFilter::k_CopyArray)); // Image Geometry parameters @@ -2763,25 +2763,25 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG args.insertOrAssign(CreateGeometryFilter::k_Origin_Key, std::make_any()); args.insertOrAssign(CreateGeometryFilter::k_Spacing_Key, std::make_any()); // RectilinearGrid Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_XBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_YBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_ZBounds_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_XBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_YBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_ZBoundsPath_Key, std::make_any(DataPath{})); // Vertex, Edge, Triangle, Quadrilateral, Tetrahedral, & Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_VertexListName_Key, std::make_any(srcTetVerticesPath)); + args.insertOrAssign(CreateGeometryFilter::k_VertexListPath_Key, std::make_any(srcTetVerticesPath)); args.insertOrAssign(CreateGeometryFilter::k_VertexAttributeMatrixName_Key, std::make_any(vertexAmName)); // Edge Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_EdgeListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_EdgeListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_EdgeAttributeMatrixName_Key, std::make_any("")); // Triangle Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TriangleListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TriangleListPath_Key, std::make_any(DataPath{})); // Quadrilateral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListPath_Key, std::make_any(DataPath{})); // Triangle & Quadrilateral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_FaceAttributeMatrixName_Key, std::make_any("")); // Tetrahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListName_Key, std::make_any(srcTetsPath)); + args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListPath_Key, std::make_any(srcTetsPath)); // Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_HexahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_HexahedralListPath_Key, std::make_any(DataPath{})); // Image, RectilinearGrid, Tetrahedral, & Hexahedral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_CellAttributeMatrixName_Key, std::make_any(cellAmName)); @@ -2817,7 +2817,7 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG { // Create default Parameters for the filter. args.insertOrAssign(CreateGeometryFilter::k_GeometryType_Key, std::make_any(CreateGeometryFilter::k_HexGeometry)); - args.insertOrAssign(CreateGeometryFilter::k_GeometryName_Key, std::make_any(geometryPath)); + args.insertOrAssign(CreateGeometryFilter::k_GeometryPath_Key, std::make_any(geometryPath)); args.insertOrAssign(CreateGeometryFilter::k_WarningsAsErrors_Key, std::make_any(false)); args.insertOrAssign(CreateGeometryFilter::k_ArrayHandling_Key, std::make_any(CreateGeometryFilter::k_CopyArray)); // Image Geometry parameters @@ -2825,25 +2825,25 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG args.insertOrAssign(CreateGeometryFilter::k_Origin_Key, std::make_any()); args.insertOrAssign(CreateGeometryFilter::k_Spacing_Key, std::make_any()); // RectilinearGrid Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_XBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_YBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_ZBounds_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_XBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_YBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_ZBoundsPath_Key, std::make_any(DataPath{})); // Vertex, Edge, Triangle, Quadrilateral, Tetrahedral, & Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_VertexListName_Key, std::make_any(srcHexVerticesPath)); + args.insertOrAssign(CreateGeometryFilter::k_VertexListPath_Key, std::make_any(srcHexVerticesPath)); args.insertOrAssign(CreateGeometryFilter::k_VertexAttributeMatrixName_Key, std::make_any(vertexAmName)); // Edge Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_EdgeListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_EdgeListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_EdgeAttributeMatrixName_Key, std::make_any("")); // Triangle Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TriangleListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TriangleListPath_Key, std::make_any(DataPath{})); // Quadrilateral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListPath_Key, std::make_any(DataPath{})); // Triangle & Quadrilateral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_FaceAttributeMatrixName_Key, std::make_any("")); // Tetrahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListPath_Key, std::make_any(DataPath{})); // Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_HexahedralListName_Key, std::make_any(srcHexsPath)); + args.insertOrAssign(CreateGeometryFilter::k_HexahedralListPath_Key, std::make_any(srcHexsPath)); // Image, RectilinearGrid, Tetrahedral, & Hexahedral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_CellAttributeMatrixName_Key, std::make_any(cellAmName)); @@ -2879,7 +2879,7 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG { // Create default Parameters for the filter. args.insertOrAssign(CreateGeometryFilter::k_GeometryType_Key, std::make_any(CreateGeometryFilter::k_TriangleGeometry)); - args.insertOrAssign(CreateGeometryFilter::k_GeometryName_Key, std::make_any(geometryPath)); + args.insertOrAssign(CreateGeometryFilter::k_GeometryPath_Key, std::make_any(geometryPath)); args.insertOrAssign(CreateGeometryFilter::k_WarningsAsErrors_Key, std::make_any(false)); args.insertOrAssign(CreateGeometryFilter::k_ArrayHandling_Key, std::make_any(CreateGeometryFilter::k_MoveArray)); // Image Geometry parameters @@ -2887,25 +2887,25 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG args.insertOrAssign(CreateGeometryFilter::k_Origin_Key, std::make_any()); args.insertOrAssign(CreateGeometryFilter::k_Spacing_Key, std::make_any()); // RectilinearGrid Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_XBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_YBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_ZBounds_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_XBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_YBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_ZBoundsPath_Key, std::make_any(DataPath{})); // Vertex, Edge, Triangle, Quadrilateral, Tetrahedral, & Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_VertexListName_Key, std::make_any(srcVerticesPath)); + args.insertOrAssign(CreateGeometryFilter::k_VertexListPath_Key, std::make_any(srcVerticesPath)); args.insertOrAssign(CreateGeometryFilter::k_VertexAttributeMatrixName_Key, std::make_any(vertexAmName)); // Edge Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_EdgeListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_EdgeListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_EdgeAttributeMatrixName_Key, std::make_any("")); // Triangle Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TriangleListName_Key, std::make_any(srcTrianglesPath)); + args.insertOrAssign(CreateGeometryFilter::k_TriangleListPath_Key, std::make_any(srcTrianglesPath)); // Quadrilateral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListPath_Key, std::make_any(DataPath{})); // Triangle & Quadrilateral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_FaceAttributeMatrixName_Key, std::make_any(faceAmName)); // Tetrahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListPath_Key, std::make_any(DataPath{})); // Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_HexahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_HexahedralListPath_Key, std::make_any(DataPath{})); // Image, RectilinearGrid, Tetrahedral, & Hexahedral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_CellAttributeMatrixName_Key, std::make_any("")); @@ -2942,7 +2942,7 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG { // Create default Parameters for the filter. args.insertOrAssign(CreateGeometryFilter::k_GeometryType_Key, std::make_any(CreateGeometryFilter::k_TetGeometry)); - args.insertOrAssign(CreateGeometryFilter::k_GeometryName_Key, std::make_any(geometryPath)); + args.insertOrAssign(CreateGeometryFilter::k_GeometryPath_Key, std::make_any(geometryPath)); args.insertOrAssign(CreateGeometryFilter::k_WarningsAsErrors_Key, std::make_any(true)); args.insertOrAssign(CreateGeometryFilter::k_ArrayHandling_Key, std::make_any(CreateGeometryFilter::k_CopyArray)); // Image Geometry parameters @@ -2950,25 +2950,25 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG args.insertOrAssign(CreateGeometryFilter::k_Origin_Key, std::make_any()); args.insertOrAssign(CreateGeometryFilter::k_Spacing_Key, std::make_any()); // RectilinearGrid Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_XBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_YBounds_Key, std::make_any(DataPath{})); - args.insertOrAssign(CreateGeometryFilter::k_ZBounds_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_XBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_YBoundsPath_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_ZBoundsPath_Key, std::make_any(DataPath{})); // Vertex, Edge, Triangle, Quadrilateral, Tetrahedral, & Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_VertexListName_Key, std::make_any(incompatibleVerticesPath)); + args.insertOrAssign(CreateGeometryFilter::k_VertexListPath_Key, std::make_any(incompatibleVerticesPath)); args.insertOrAssign(CreateGeometryFilter::k_VertexAttributeMatrixName_Key, std::make_any(vertexAmName)); // Edge Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_EdgeListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_EdgeListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_EdgeAttributeMatrixName_Key, std::make_any("")); // Triangle Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TriangleListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TriangleListPath_Key, std::make_any(DataPath{})); // Quadrilateral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListPath_Key, std::make_any(DataPath{})); // Triangle & Quadrilateral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_FaceAttributeMatrixName_Key, std::make_any("")); // Tetrahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListName_Key, std::make_any(srcTetsPath)); + args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListPath_Key, std::make_any(srcTetsPath)); // Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_HexahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_HexahedralListPath_Key, std::make_any(DataPath{})); // Image, RectilinearGrid, Tetrahedral, & Hexahedral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_CellAttributeMatrixName_Key, std::make_any(cellAmName)); @@ -3031,7 +3031,7 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG // Create default Parameters for the filter. args.insertOrAssign(CreateGeometryFilter::k_GeometryType_Key, std::make_any(CreateGeometryFilter::k_RectGridGeometry)); - args.insertOrAssign(CreateGeometryFilter::k_GeometryName_Key, std::make_any(geometryPath)); + args.insertOrAssign(CreateGeometryFilter::k_GeometryPath_Key, std::make_any(geometryPath)); args.insertOrAssign(CreateGeometryFilter::k_WarningsAsErrors_Key, std::make_any(true)); args.insertOrAssign(CreateGeometryFilter::k_ArrayHandling_Key, std::make_any(CreateGeometryFilter::k_CopyArray)); // Image Geometry parameters @@ -3039,25 +3039,25 @@ TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateG args.insertOrAssign(CreateGeometryFilter::k_Origin_Key, std::make_any()); args.insertOrAssign(CreateGeometryFilter::k_Spacing_Key, std::make_any()); // RectilinearGrid Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_XBounds_Key, std::make_any(xBoundsPath)); - args.insertOrAssign(CreateGeometryFilter::k_YBounds_Key, std::make_any(yBoundsPath)); - args.insertOrAssign(CreateGeometryFilter::k_ZBounds_Key, std::make_any(zBoundsPath)); + args.insertOrAssign(CreateGeometryFilter::k_XBoundsPath_Key, std::make_any(xBoundsPath)); + args.insertOrAssign(CreateGeometryFilter::k_YBoundsPath_Key, std::make_any(yBoundsPath)); + args.insertOrAssign(CreateGeometryFilter::k_ZBoundsPath_Key, std::make_any(zBoundsPath)); // Vertex, Edge, Triangle, Quadrilateral, Tetrahedral, & Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_VertexListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_VertexListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_VertexAttributeMatrixName_Key, std::make_any("")); // Edge Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_EdgeListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_EdgeListPath_Key, std::make_any(DataPath{})); args.insertOrAssign(CreateGeometryFilter::k_EdgeAttributeMatrixName_Key, std::make_any("")); // Triangle Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TriangleListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TriangleListPath_Key, std::make_any(DataPath{})); // Quadrilateral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_QuadrilateralListPath_Key, std::make_any(DataPath{})); // Triangle & Quadrilateral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_FaceAttributeMatrixName_Key, std::make_any("")); // Tetrahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_TetrahedralListPath_Key, std::make_any(DataPath{})); // Hexahedral Geometry parameters - args.insertOrAssign(CreateGeometryFilter::k_HexahedralListName_Key, std::make_any(DataPath{})); + args.insertOrAssign(CreateGeometryFilter::k_HexahedralListPath_Key, std::make_any(DataPath{})); // Image, RectilinearGrid, Tetrahedral, & Hexahedral Geometry parameters args.insertOrAssign(CreateGeometryFilter::k_CellAttributeMatrixName_Key, std::make_any(cellAmName)); diff --git a/src/Plugins/SimplnxCore/test/CropImageGeometryTest.cpp b/src/Plugins/SimplnxCore/test/CropImageGeometryTest.cpp index 36930a66a3..5c338ab24e 100644 --- a/src/Plugins/SimplnxCore/test/CropImageGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/CropImageGeometryTest.cpp @@ -69,8 +69,8 @@ TEST_CASE("SimplnxCore::CropImageGeometry(Instantiate)", "[SimplnxCore][CropImag args.insert(CropImageGeometry::k_MinVoxel_Key, std::make_any>(k_MinVector)); args.insert(CropImageGeometry::k_MaxVoxel_Key, std::make_any>(k_MaxVector)); // args.insert(CropImageGeometry::k_UpdateOrigin_Key, std::make_any(k_UpdateOrigin)); - args.insert(CropImageGeometry::k_SelectedImageGeometry_Key, std::make_any(k_ImageGeomPath)); - args.insert(CropImageGeometry::k_CreatedImageGeometry_Key, std::make_any(k_NewImageGeomPath)); + args.insert(CropImageGeometry::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); + args.insert(CropImageGeometry::k_CreatedImageGeometryPath_Key, std::make_any(k_NewImageGeomPath)); args.insert(CropImageGeometry::k_RenumberFeatures_Key, std::make_any(k_RenumberFeatures)); args.insert(CropImageGeometry::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsPath)); args.insert(CropImageGeometry::k_RemoveOriginalGeometry_Key, std::make_any(true)); @@ -103,8 +103,8 @@ TEST_CASE("SimplnxCore::CropImageGeometry Invalid Params", "[SimplnxCore][CropIm args.insertOrAssign(CropImageGeometry::k_MinVoxel_Key, std::make_any>(k_MinVector)); args.insertOrAssign(CropImageGeometry::k_MaxVoxel_Key, std::make_any>(k_MaxVector)); // args.insertOrAssign(CropImageGeometry::k_UpdateOrigin_Key, std::make_any(k_UpdateOrigin)); - args.insertOrAssign(CropImageGeometry::k_SelectedImageGeometry_Key, std::make_any(k_ImageGeomPath)); - args.insertOrAssign(CropImageGeometry::k_CreatedImageGeometry_Key, std::make_any(k_NewImageGeomPath)); + args.insertOrAssign(CropImageGeometry::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); + args.insertOrAssign(CropImageGeometry::k_CreatedImageGeometryPath_Key, std::make_any(k_NewImageGeomPath)); args.insertOrAssign(CropImageGeometry::k_RenumberFeatures_Key, std::make_any(k_RenumberFeatures)); args.insertOrAssign(CropImageGeometry::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsPath)); args.insertOrAssign(CropImageGeometry::k_RemoveOriginalGeometry_Key, std::make_any(true)); @@ -189,11 +189,11 @@ TEST_CASE("SimplnxCore::CropImageGeometry(Execute_Filter)", "[SimplnxCore][CropI args.insert(CropImageGeometry::k_MinVoxel_Key, std::make_any>(k_MinVector)); args.insert(CropImageGeometry::k_MaxVoxel_Key, std::make_any>(k_MaxVector)); // args.insert(CropImageGeometry::k_UpdateOrigin_Key, std::make_any(k_UpdateOrigin)); - args.insert(CropImageGeometry::k_SelectedImageGeometry_Key, std::make_any(k_ImageGeomPath)); - args.insert(CropImageGeometry::k_CreatedImageGeometry_Key, std::make_any(k_NewImageGeomPath)); + args.insert(CropImageGeometry::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); + args.insert(CropImageGeometry::k_CreatedImageGeometryPath_Key, std::make_any(k_NewImageGeomPath)); args.insert(CropImageGeometry::k_RenumberFeatures_Key, std::make_any(k_RenumberFeatures)); args.insert(CropImageGeometry::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsPath)); - args.insert(CropImageGeometry::k_FeatureAttributeMatrix_Key, std::make_any(k_CellFeatureAMPath)); + args.insert(CropImageGeometry::k_FeatureAttributeMatrixPath_Key, std::make_any(k_CellFeatureAMPath)); args.insert(CropImageGeometry::k_RemoveOriginalGeometry_Key, std::make_any(false)); // Preflight the filter and check result @@ -267,11 +267,11 @@ TEST_CASE("SimplnxCore::CropImageGeometry: Crop Physical Bounds", "[SimplnxCore] args.insert(CropImageGeometry::k_UsePhysicalBounds_Key, std::make_any(true)); args.insert(CropImageGeometry::k_MinCoord_Key, std::make_any>(k_MinVector)); args.insert(CropImageGeometry::k_MaxCoord_Key, std::make_any>(k_MaxVector)); - args.insert(CropImageGeometry::k_SelectedImageGeometry_Key, std::make_any(k_ImageGeomPath)); - args.insert(CropImageGeometry::k_CreatedImageGeometry_Key, std::make_any(k_NewImageGeomPath)); + args.insert(CropImageGeometry::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); + args.insert(CropImageGeometry::k_CreatedImageGeometryPath_Key, std::make_any(k_NewImageGeomPath)); args.insert(CropImageGeometry::k_RenumberFeatures_Key, std::make_any(k_RenumberFeatures)); args.insert(CropImageGeometry::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsPath)); - args.insert(CropImageGeometry::k_FeatureAttributeMatrix_Key, std::make_any(k_CellFeatureAMPath)); + args.insert(CropImageGeometry::k_FeatureAttributeMatrixPath_Key, std::make_any(k_CellFeatureAMPath)); args.insert(CropImageGeometry::k_RemoveOriginalGeometry_Key, std::make_any(false)); // const auto oldDimensions = dataStructure.getDataRefAs(k_ImageGeomPath).getDimensions(); diff --git a/src/Plugins/SimplnxCore/test/CropVertexGeometryTest.cpp b/src/Plugins/SimplnxCore/test/CropVertexGeometryTest.cpp index f027e414ea..23d07ac2cb 100644 --- a/src/Plugins/SimplnxCore/test/CropVertexGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/CropVertexGeometryTest.cpp @@ -50,9 +50,9 @@ TEST_CASE("SimplnxCore::CropVertexGeometry(Instantiate)", "[SimplnxCore][CropVer DataStructure dataStructure = createTestData(); Arguments args; - args.insert(CropVertexGeometry::k_VertexGeom_Key, std::make_any(k_VertexGeomPath)); - args.insert(CropVertexGeometry::k_CroppedGeom_Key, std::make_any(k_CroppedGeomPath)); - args.insert(CropVertexGeometry::k_VertexDataName_Key, std::make_any(k_VertexDataName)); + args.insert(CropVertexGeometry::k_SelectedVertexGeometryPath_Key, std::make_any(k_VertexGeomPath)); + args.insert(CropVertexGeometry::k_CreatedVertexGeometryPath_Key, std::make_any(k_CroppedGeomPath)); + args.insert(CropVertexGeometry::k_VertexAttributeMatrixName_Key, std::make_any(k_VertexDataName)); args.insert(CropVertexGeometry::k_MinPos_Key, std::make_any>(k_MinPos)); args.insert(CropVertexGeometry::k_MaxPos_Key, std::make_any>(k_MaxPos)); args.insert(CropVertexGeometry::k_TargetArrayPaths_Key, std::make_any>(targetDataArrays)); @@ -70,9 +70,9 @@ TEST_CASE("SimplnxCore::CropVertexGeometry(Data)", "[SimplnxCore][CropVertexGeom DataStructure dataStructure = createTestData(); Arguments args; - args.insert(CropVertexGeometry::k_VertexGeom_Key, std::make_any(k_VertexGeomPath)); - args.insert(CropVertexGeometry::k_CroppedGeom_Key, std::make_any(k_CroppedGeomPath)); - args.insert(CropVertexGeometry::k_VertexDataName_Key, std::make_any(k_VertexDataName)); + args.insert(CropVertexGeometry::k_SelectedVertexGeometryPath_Key, std::make_any(k_VertexGeomPath)); + args.insert(CropVertexGeometry::k_CreatedVertexGeometryPath_Key, std::make_any(k_CroppedGeomPath)); + args.insert(CropVertexGeometry::k_VertexAttributeMatrixName_Key, std::make_any(k_VertexDataName)); args.insert(CropVertexGeometry::k_MinPos_Key, std::make_any>(k_MinPos)); args.insert(CropVertexGeometry::k_MaxPos_Key, std::make_any>(k_MaxPos)); args.insert(CropVertexGeometry::k_TargetArrayPaths_Key, std::make_any>(targetDataArrays)); diff --git a/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp b/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp index 8627ffedc4..ccc85b2d05 100644 --- a/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp +++ b/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp @@ -158,13 +158,13 @@ Pipeline CreateExportPipeline() } { Arguments args; - args.insert("advanced_options", std::make_any(true)); - args.insert("numeric_type", std::make_any(NumericType::int8)); + args.insert("set_tuple_dimensions", std::make_any(true)); + args.insert("numeric_type_index", std::make_any(NumericType::int8)); args.insert("component_count", std::make_any(3)); args.insert("tuple_dimensions", DynamicTableInfo::TableDataType{{1.0}}); - args.insert("initialization_value", std::make_any("7")); - args.insert("output_data_array", DataPath({DataNames::k_ArrayName})); + args.insert("initialization_value_str", std::make_any("7")); + args.insert("output_array_path", DataPath({DataNames::k_ArrayName})); args.insert("data_format", std::string("")); pipeline.push_back(k_CreateDataArrayHandle, args); } @@ -185,7 +185,7 @@ Pipeline CreateImportPipeline() Dream3dImportParameter::ImportData importData; importData.FilePath = GetExportDataPath(); importData.DataPaths = std::vector{DataPath({DataNames::k_Group1Name}), DataPath({DataNames::k_ArrayName})}; - args.insert("import_file_data", importData); + args.insert("import_data_object", importData); pipeline.push_back(k_ImportD3DHandle, args); } { @@ -241,7 +241,7 @@ Pipeline CreateMultiImportPipeline() Dream3dImportParameter::ImportData importData; importData.FilePath = GetMultiExportDataPath1(); importData.DataPaths = std::vector{DataPath({DataNames::k_Group1Name})}; - args.insert("import_file_data", importData); + args.insert("import_data_object", importData); pipeline.push_back(k_ImportD3DHandle, args); } { @@ -249,7 +249,7 @@ Pipeline CreateMultiImportPipeline() Dream3dImportParameter::ImportData importData; importData.FilePath = GetMultiExportDataPath2(); importData.DataPaths = std::vector{DataPath({DataNames::k_Group2Name})}; - args.insert("import_file_data", importData); + args.insert("import_data_object", importData); pipeline.push_back(k_ImportD3DHandle, args); } { diff --git a/src/Plugins/SimplnxCore/test/ErodeDilateBadDataTest.cpp b/src/Plugins/SimplnxCore/test/ErodeDilateBadDataTest.cpp index 1a2f9ff9cd..333d15ada0 100644 --- a/src/Plugins/SimplnxCore/test/ErodeDilateBadDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/ErodeDilateBadDataTest.cpp @@ -51,7 +51,7 @@ TEST_CASE("SimplnxCore::ErodeDilateBadDataFilter(Erode)", "[SimplnxCore][ErodeDi args.insertOrAssign(ErodeDilateBadDataFilter::k_ZDirOn_Key, std::make_any(true)); args.insertOrAssign(ErodeDilateBadDataFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsDataPath)); args.insertOrAssign(ErodeDilateBadDataFilter::k_IgnoredDataArrayPaths_Key, std::make_any(MultiArraySelectionParameter::ValueType{})); - args.insertOrAssign(ErodeDilateBadDataFilter::k_SelectedImageGeometry_Key, std::make_any(k_InputData)); + args.insertOrAssign(ErodeDilateBadDataFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_InputData)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -100,7 +100,7 @@ TEST_CASE("SimplnxCore::ErodeDilateBadDataFilter(Dilate)", "[SimplnxCore][ErodeD args.insertOrAssign(ErodeDilateBadDataFilter::k_ZDirOn_Key, std::make_any(true)); args.insertOrAssign(ErodeDilateBadDataFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsDataPath)); args.insertOrAssign(ErodeDilateBadDataFilter::k_IgnoredDataArrayPaths_Key, std::make_any(MultiArraySelectionParameter::ValueType{})); - args.insertOrAssign(ErodeDilateBadDataFilter::k_SelectedImageGeometry_Key, std::make_any(k_InputData)); + args.insertOrAssign(ErodeDilateBadDataFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_InputData)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/ErodeDilateCoordinationNumberTest.cpp b/src/Plugins/SimplnxCore/test/ErodeDilateCoordinationNumberTest.cpp index 8e04e3b40f..c05dbd767a 100644 --- a/src/Plugins/SimplnxCore/test/ErodeDilateCoordinationNumberTest.cpp +++ b/src/Plugins/SimplnxCore/test/ErodeDilateCoordinationNumberTest.cpp @@ -47,7 +47,7 @@ TEST_CASE("SimplnxCore::ErodeDilateCoordinationNumberFilter", "[SimplnxCore][Ero args.insertOrAssign(ErodeDilateCoordinationNumberFilter::k_Loop_Key, std::make_any(false)); args.insertOrAssign(ErodeDilateCoordinationNumberFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsDataPath)); args.insertOrAssign(ErodeDilateCoordinationNumberFilter::k_IgnoredDataArrayPaths_Key, std::make_any(MultiArraySelectionParameter::ValueType{})); - args.insertOrAssign(ErodeDilateCoordinationNumberFilter::k_SelectedImageGeometry_Key, std::make_any(k_InputData)); + args.insertOrAssign(ErodeDilateCoordinationNumberFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_InputData)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/ErodeDilateMaskTest.cpp b/src/Plugins/SimplnxCore/test/ErodeDilateMaskTest.cpp index e22dee9f4b..ca31fb03ae 100644 --- a/src/Plugins/SimplnxCore/test/ErodeDilateMaskTest.cpp +++ b/src/Plugins/SimplnxCore/test/ErodeDilateMaskTest.cpp @@ -54,7 +54,7 @@ TEST_CASE("SimplnxCore::ErodeDilateMaskFilter(Dilate)", "[SimplnxCore][ErodeDila args.insertOrAssign(ErodeDilateMaskFilter::k_YDirOn_Key, std::make_any(true)); args.insertOrAssign(ErodeDilateMaskFilter::k_ZDirOn_Key, std::make_any(true)); args.insertOrAssign(ErodeDilateMaskFilter::k_MaskArrayPath_Key, std::make_any(k_MaskArrayDataPath)); - args.insertOrAssign(ErodeDilateMaskFilter::k_SelectedImageGeometry_Key, std::make_any(k_InputData)); + args.insertOrAssign(ErodeDilateMaskFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_InputData)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -93,7 +93,7 @@ TEST_CASE("SimplnxCore::ErodeDilateMaskFilter(Erode)", "[SimplnxCore][ErodeDilat args.insertOrAssign(ErodeDilateMaskFilter::k_YDirOn_Key, std::make_any(true)); args.insertOrAssign(ErodeDilateMaskFilter::k_ZDirOn_Key, std::make_any(true)); args.insertOrAssign(ErodeDilateMaskFilter::k_MaskArrayPath_Key, std::make_any(k_MaskArrayDataPath)); - args.insertOrAssign(ErodeDilateMaskFilter::k_SelectedImageGeometry_Key, std::make_any(k_InputData)); + args.insertOrAssign(ErodeDilateMaskFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_InputData)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/ExtractComponentAsArrayTest.cpp b/src/Plugins/SimplnxCore/test/ExtractComponentAsArrayTest.cpp index 0c5281e353..48c83ddf4f 100644 --- a/src/Plugins/SimplnxCore/test/ExtractComponentAsArrayTest.cpp +++ b/src/Plugins/SimplnxCore/test/ExtractComponentAsArrayTest.cpp @@ -40,7 +40,7 @@ TEST_CASE("SimplnxCore::ExtractComponentAsArrayFilter: Valid filter execution", args.insertOrAssign(ExtractComponentAsArrayFilter::k_RemoveComponentsFromArray_Key, std::make_any(true)); args.insertOrAssign(ExtractComponentAsArrayFilter::k_CompNumber_Key, std::make_any(removeCompIndex)); args.insertOrAssign(ExtractComponentAsArrayFilter::k_SelectedArrayPath_Key, std::make_any(k_QuatsPath)); - args.insertOrAssign(ExtractComponentAsArrayFilter::k_NewArrayPath_Key, std::make_any(k_ExtractedComponents)); + args.insertOrAssign(ExtractComponentAsArrayFilter::k_NewArrayName_Key, std::make_any(k_ExtractedComponents)); // Preflight the filter and check result auto preflightResult = filter.preflight(alteredDs, args); @@ -110,7 +110,7 @@ TEST_CASE("SimplnxCore::ExtractComponentAsArrayFilter: InValid filter execution" args.insertOrAssign(ExtractComponentAsArrayFilter::k_RemoveComponentsFromArray_Key, std::make_any(true)); args.insertOrAssign(ExtractComponentAsArrayFilter::k_CompNumber_Key, std::make_any(5)); // Invalid args.insertOrAssign(ExtractComponentAsArrayFilter::k_SelectedArrayPath_Key, std::make_any(k_QuatsPath)); - args.insertOrAssign(ExtractComponentAsArrayFilter::k_NewArrayPath_Key, std::make_any(k_ExtractedComponents)); + args.insertOrAssign(ExtractComponentAsArrayFilter::k_NewArrayName_Key, std::make_any(k_ExtractedComponents)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/ExtractInternalSurfacesFromTriangleGeometryTest.cpp b/src/Plugins/SimplnxCore/test/ExtractInternalSurfacesFromTriangleGeometryTest.cpp index 2973f3bda2..f777d624a8 100644 --- a/src/Plugins/SimplnxCore/test/ExtractInternalSurfacesFromTriangleGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/ExtractInternalSurfacesFromTriangleGeometryTest.cpp @@ -60,13 +60,13 @@ TEST_CASE("SimplnxCore::ExtractInternalSurfacesFromTriangleGeometry(Instantiate) DataStructure dataStructure = createTestData(k_TriangleGeomName, k_NodeTypesName); Arguments args; - args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_TriangleGeom_Key, std::make_any(k_TriangleGeomPath)); - args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_InternalTriangleGeom_Key, std::make_any(k_InternalTrianglePath)); + args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_SelectedTriangleGeometryPath_Key, std::make_any(k_TriangleGeomPath)); + args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_CreatedTriangleGeometryPath_Key, std::make_any(k_InternalTrianglePath)); args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_NodeTypesPath_Key, std::make_any(k_NodeTypesPath)); args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_CopyVertexPaths_Key, std::make_any>(k_CopyVertexPaths)); args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_CopyTrianglePaths_Key, std::make_any>(k_CopyTrianglePaths)); - args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_VertexDataName_Key, std::make_any("Vertex Data")); - args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_FaceDataName_Key, std::make_any("Face Data")); + args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_VertexAttributeMatrixName_Key, std::make_any("Vertex Data")); + args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_TriangleAttributeMatrixName_Key, std::make_any("Face Data")); auto preflight = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflight.outputActions); @@ -78,13 +78,13 @@ TEST_CASE("SimplnxCore::ExtractInternalSurfacesFromTriangleGeometry(Data)", "[Si DataStructure dataStructure = createTestData(k_TriangleGeomName, k_NodeTypesName); Arguments args; - args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_TriangleGeom_Key, std::make_any(k_TriangleGeomPath)); - args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_InternalTriangleGeom_Key, std::make_any(k_InternalTrianglePath)); + args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_SelectedTriangleGeometryPath_Key, std::make_any(k_TriangleGeomPath)); + args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_CreatedTriangleGeometryPath_Key, std::make_any(k_InternalTrianglePath)); args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_NodeTypesPath_Key, std::make_any(k_NodeTypesPath)); args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_CopyVertexPaths_Key, std::make_any>(k_CopyVertexPaths)); args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_CopyTrianglePaths_Key, std::make_any>(k_CopyTrianglePaths)); - args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_VertexDataName_Key, std::make_any("Vertex Data")); - args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_FaceDataName_Key, std::make_any("Face Data")); + args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_VertexAttributeMatrixName_Key, std::make_any("Vertex Data")); + args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_TriangleAttributeMatrixName_Key, std::make_any("Face Data")); auto preflight = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflight.outputActions); diff --git a/src/Plugins/SimplnxCore/test/FeatureFaceCurvatureTest.cpp b/src/Plugins/SimplnxCore/test/FeatureFaceCurvatureTest.cpp index df692df753..08bb0e5976 100644 --- a/src/Plugins/SimplnxCore/test/FeatureFaceCurvatureTest.cpp +++ b/src/Plugins/SimplnxCore/test/FeatureFaceCurvatureTest.cpp @@ -52,26 +52,26 @@ TEST_CASE("SimplnxCore::FeatureFaceCurvatureFilter: Test Algorithm", "[FeatureFa DataStructure dataStructure = UnitTest::LoadDataStructure(exemplarFilePath); Arguments args; - args.insertOrAssign(FeatureFaceCurvatureFilter::k_TriangleGeom_Key, std::make_any(triangleGeomPath)); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_TriangleGeomPath_Key, std::make_any(triangleGeomPath)); args.insertOrAssign(FeatureFaceCurvatureFilter::k_NeighborhoodRing_Key, std::make_any(3)); args.insertOrAssign(FeatureFaceCurvatureFilter::k_ComputePrincipalDirection_Key, std::make_any(true)); args.insertOrAssign(FeatureFaceCurvatureFilter::k_ComputeGaussianCurvature_Key, std::make_any(true)); - args.insertOrAssign(FeatureFaceCurvatureFilter::k_ComputeMeanCurvature_Key, std::make_any(true)); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_ComputeMeanCurvaturePath_Key, std::make_any(true)); args.insertOrAssign(FeatureFaceCurvatureFilter::k_ComputeWeingartenMatrix_Key, std::make_any(true)); args.insertOrAssign(FeatureFaceCurvatureFilter::k_UseFaceNormals_Key, std::make_any(true)); - args.insertOrAssign(FeatureFaceCurvatureFilter::k_FaceAttribMatrix_Key, std::make_any(faceAttribMatrixPath)); - args.insertOrAssign(FeatureFaceCurvatureFilter::k_FaceLabels_Key, std::make_any(faceAttribMatrixPath.createChildPath("FaceLabels"))); - args.insertOrAssign(FeatureFaceCurvatureFilter::k_FeatureFaceIds_Key, std::make_any(faceAttribMatrixPath.createChildPath("FeatureFaceId"))); - args.insertOrAssign(FeatureFaceCurvatureFilter::k_FaceNormals_Key, std::make_any(faceAttribMatrixPath.createChildPath("FaceNormals"))); - args.insertOrAssign(FeatureFaceCurvatureFilter::k_FaceCentroids_Key, std::make_any(faceAttribMatrixPath.createChildPath("FaceCentroids"))); - - args.insertOrAssign(FeatureFaceCurvatureFilter::k_PrincipalCurvature1_Key, std::make_any(k_PrincipalCurvature1_Path)); - args.insertOrAssign(FeatureFaceCurvatureFilter::k_PrincipalCurvature2_Key, std::make_any(k_PrincipalCurvature2_Path)); - args.insertOrAssign(FeatureFaceCurvatureFilter::k_PrincipalDirection1_Key, std::make_any(k_PrincipalDirection1_Path)); - args.insertOrAssign(FeatureFaceCurvatureFilter::k_PrincipalDirection2_Key, std::make_any(k_PrincipalDirection2_Path)); - args.insertOrAssign(FeatureFaceCurvatureFilter::k_GaussianCurvature_Key, std::make_any(k_GaussianCurvature_Path)); - args.insertOrAssign(FeatureFaceCurvatureFilter::k_MeanCurvature_Key, std::make_any(k_MeanCurvature_Path)); - args.insertOrAssign(FeatureFaceCurvatureFilter::k_WeingartenMatrix_Key, std::make_any(k_WeingartenMatrix_Path)); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_FaceAttribMatrixPath_Key, std::make_any(faceAttribMatrixPath)); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_FaceLabelsPath_Key, std::make_any(faceAttribMatrixPath.createChildPath("FaceLabels"))); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_FeatureFaceIdsPath_Key, std::make_any(faceAttribMatrixPath.createChildPath("FeatureFaceId"))); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_FaceNormalsPath_Key, std::make_any(faceAttribMatrixPath.createChildPath("FaceNormals"))); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_FaceCentroidsPath_Key, std::make_any(faceAttribMatrixPath.createChildPath("FaceCentroids"))); + + args.insertOrAssign(FeatureFaceCurvatureFilter::k_PrincipalCurvature1Path_Key, std::make_any(k_PrincipalCurvature1_Path)); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_PrincipalCurvature2Path_Key, std::make_any(k_PrincipalCurvature2_Path)); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_PrincipalDirection1Path_Key, std::make_any(k_PrincipalDirection1_Path)); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_PrincipalDirection2Path_Key, std::make_any(k_PrincipalDirection2_Path)); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_GaussianCurvaturePath_Key, std::make_any(k_GaussianCurvature_Path)); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_MeanCurvaturePath_Key, std::make_any(k_MeanCurvature_Path)); + args.insertOrAssign(FeatureFaceCurvatureFilter::k_WeingartenMatrixPath_Key, std::make_any(k_WeingartenMatrix_Path)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/FillBadDataTest.cpp b/src/Plugins/SimplnxCore/test/FillBadDataTest.cpp index 1129c5ef01..28ec906cf5 100644 --- a/src/Plugins/SimplnxCore/test/FillBadDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/FillBadDataTest.cpp @@ -41,7 +41,7 @@ TEST_CASE("SimplnxCore::FillBadData", "[Core][FillBadData]") args.insertOrAssign(FillBadDataFilter::k_CellPhasesArrayPath_Key, std::make_any(k_PhasesArrayPath)); args.insertOrAssign(FillBadDataFilter::k_IgnoredDataArrayPaths_Key, std::make_any(MultiArraySelectionParameter::ValueType{})); - args.insertOrAssign(FillBadDataFilter::k_SelectedImageGeometry_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(FillBadDataFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/FindArrayStatisticsTest.cpp b/src/Plugins/SimplnxCore/test/FindArrayStatisticsTest.cpp index b284efbd70..060bf67029 100644 --- a/src/Plugins/SimplnxCore/test/FindArrayStatisticsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindArrayStatisticsTest.cpp @@ -93,7 +93,7 @@ TEST_CASE("SimplnxCore::FindArrayStatisticsFilter: Test Algorithm", "[SimplnxCor args.insertOrAssign(FindArrayStatisticsFilter::k_SelectedArrayPath_Key, std::make_any(inputArrayPath)); args.insertOrAssign(FindArrayStatisticsFilter::k_CellFeatureIdsArrayPath_Key, std::make_any()); args.insertOrAssign(FindArrayStatisticsFilter::k_MaskArrayPath_Key, std::make_any(DataPath({"TestData", "Mask"}))); - args.insertOrAssign(FindArrayStatisticsFilter::k_DestinationAttributeMatrix_Key, std::make_any(statsDataPath)); + args.insertOrAssign(FindArrayStatisticsFilter::k_DestinationAttributeMatrixPath_Key, std::make_any(statsDataPath)); args.insertOrAssign(FindArrayStatisticsFilter::k_HistogramArrayName_Key, std::make_any(histogram)); args.insertOrAssign(FindArrayStatisticsFilter::k_MostPopulatedBinArrayName_Key, std::make_any(mostPopulatedBin)); args.insertOrAssign(FindArrayStatisticsFilter::k_ModalBinArrayName_Key, std::make_any(modalBinRanges)); @@ -106,7 +106,7 @@ TEST_CASE("SimplnxCore::FindArrayStatisticsFilter: Test Algorithm", "[SimplnxCor args.insertOrAssign(FindArrayStatisticsFilter::k_StdDeviationArrayName_Key, std::make_any(std)); args.insertOrAssign(FindArrayStatisticsFilter::k_SummationArrayName_Key, std::make_any(sum)); args.insertOrAssign(FindArrayStatisticsFilter::k_StandardizedArrayName_Key, std::make_any(standardization)); - args.insertOrAssign(FindArrayStatisticsFilter::k_NumUniqueValues_Key, std::make_any(numUniqueValues)); + args.insertOrAssign(FindArrayStatisticsFilter::k_NumUniqueValuesName_Key, std::make_any(numUniqueValues)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -298,7 +298,7 @@ TEST_CASE("SimplnxCore::FindArrayStatisticsFilter: Test Algorithm By Index", "[S args.insertOrAssign(FindArrayStatisticsFilter::k_SelectedArrayPath_Key, std::make_any(inputArrayPath)); args.insertOrAssign(FindArrayStatisticsFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(DataPath({"TestData", "FeatureIds"}))); args.insertOrAssign(FindArrayStatisticsFilter::k_MaskArrayPath_Key, std::make_any(DataPath({"TestData", "Mask"}))); - args.insertOrAssign(FindArrayStatisticsFilter::k_DestinationAttributeMatrix_Key, std::make_any(statsDataPath)); + args.insertOrAssign(FindArrayStatisticsFilter::k_DestinationAttributeMatrixPath_Key, std::make_any(statsDataPath)); args.insertOrAssign(FindArrayStatisticsFilter::k_HistogramArrayName_Key, std::make_any(histogram)); args.insertOrAssign(FindArrayStatisticsFilter::k_MostPopulatedBinArrayName_Key, std::make_any(mostPopulatedBin)); args.insertOrAssign(FindArrayStatisticsFilter::k_ModalBinArrayName_Key, std::make_any(modalBinRanges)); @@ -311,7 +311,7 @@ TEST_CASE("SimplnxCore::FindArrayStatisticsFilter: Test Algorithm By Index", "[S args.insertOrAssign(FindArrayStatisticsFilter::k_StdDeviationArrayName_Key, std::make_any(std)); args.insertOrAssign(FindArrayStatisticsFilter::k_SummationArrayName_Key, std::make_any(sum)); args.insertOrAssign(FindArrayStatisticsFilter::k_StandardizedArrayName_Key, std::make_any(standardization)); - args.insertOrAssign(FindArrayStatisticsFilter::k_NumUniqueValues_Key, std::make_any(numUniqueValues)); + args.insertOrAssign(FindArrayStatisticsFilter::k_NumUniqueValuesName_Key, std::make_any(numUniqueValues)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/FindEuclideanDistMapTest.cpp b/src/Plugins/SimplnxCore/test/FindEuclideanDistMapTest.cpp index ba1d0db90c..7cf46e5a17 100644 --- a/src/Plugins/SimplnxCore/test/FindEuclideanDistMapTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindEuclideanDistMapTest.cpp @@ -37,7 +37,7 @@ TEST_CASE("SimplnxCore::FindEuclideanDistMap", "[SimplnxCore][FindEuclideanDistM args.insert(FindEuclideanDistMapFilter::k_DoQuadPoints_Key, std::make_any(true)); args.insert(FindEuclideanDistMapFilter::k_SaveNearestNeighbors_Key, std::make_any(true)); // Input Arrays - args.insert(FindEuclideanDistMapFilter::k_SelectedImageGeometry_Key, std::make_any(k_DataContainerPath)); + args.insert(FindEuclideanDistMapFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); args.insert(FindEuclideanDistMapFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(k_CellAttributeMatrix.createChildPath(k_FeatureIds))); // Output Arrays diff --git a/src/Plugins/SimplnxCore/test/FindFeatureCentroidsFilterTest.cpp b/src/Plugins/SimplnxCore/test/FindFeatureCentroidsFilterTest.cpp index e654fe0cda..c3b6e69bd9 100644 --- a/src/Plugins/SimplnxCore/test/FindFeatureCentroidsFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindFeatureCentroidsFilterTest.cpp @@ -38,9 +38,9 @@ TEST_CASE("SimplnxCore::FindFeatureCentroidsFilter", "[SimplnxCore][FindFeatureC // Create default Parameters for the filter. args.insertOrAssign(FindFeatureCentroidsFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsArrayPath2)); - args.insertOrAssign(FindFeatureCentroidsFilter::k_CentroidsArrayPath_Key, std::make_any(k_CentroidsNX)); - args.insertOrAssign(FindFeatureCentroidsFilter::k_FeatureAttributeMatrix_Key, std::make_any(k_FeatureAttributeMatrix)); - args.insertOrAssign(FindFeatureCentroidsFilter::k_SelectedImageGeometry_Key, std::make_any(k_SelectedImageGeometry)); + args.insertOrAssign(FindFeatureCentroidsFilter::k_CentroidsArrayName_Key, std::make_any(k_CentroidsNX)); + args.insertOrAssign(FindFeatureCentroidsFilter::k_FeatureAttributeMatrixPath_Key, std::make_any(k_FeatureAttributeMatrix)); + args.insertOrAssign(FindFeatureCentroidsFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_SelectedImageGeometry)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/FindFeatureClusteringTest.cpp b/src/Plugins/SimplnxCore/test/FindFeatureClusteringTest.cpp index 9d93fd8840..952767a009 100644 --- a/src/Plugins/SimplnxCore/test/FindFeatureClusteringTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindFeatureClusteringTest.cpp @@ -33,7 +33,7 @@ TEST_CASE("SimplnxCore::FindFeatureClusteringFilter: Valid Filter Execution", "[ Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(FindFeatureClusteringFilter::k_SelectedImageGeometry_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(FindFeatureClusteringFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); args.insertOrAssign(FindFeatureClusteringFilter::k_NumberOfBins_Key, std::make_any(10)); args.insertOrAssign(FindFeatureClusteringFilter::k_PhaseNumber_Key, std::make_any(2)); args.insertOrAssign(FindFeatureClusteringFilter::k_RemoveBiasedFeatures_Key, std::make_any(false)); @@ -43,7 +43,7 @@ TEST_CASE("SimplnxCore::FindFeatureClusteringFilter: Valid Filter Execution", "[ args.insertOrAssign(FindFeatureClusteringFilter::k_FeaturePhasesArrayPath_Key, std::make_any(k_CellFeatureDataPath.createChildPath(k_Phases))); args.insertOrAssign(FindFeatureClusteringFilter::k_CentroidsArrayPath_Key, std::make_any(k_CellFeatureDataPath.createChildPath(k_Centroids))); args.insertOrAssign(FindFeatureClusteringFilter::k_BiasedFeaturesArrayPath_Key, std::make_any(DataPath{})); - args.insertOrAssign(FindFeatureClusteringFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleAttributeMatrixPath)); + args.insertOrAssign(FindFeatureClusteringFilter::k_CellEnsembleAttributeMatrixPath_Key, std::make_any(k_CellEnsembleAttributeMatrixPath)); args.insertOrAssign(FindFeatureClusteringFilter::k_ClusteringListArrayName_Key, std::make_any(k_GeneratedClusteringList)); args.insertOrAssign(FindFeatureClusteringFilter::k_RDFArrayName_Key, std::make_any(k_GeneratedRDF)); args.insertOrAssign(FindFeatureClusteringFilter::k_MaxMinArrayName_Key, std::make_any(k_GeneratedMinMaxDistances)); @@ -75,7 +75,7 @@ TEST_CASE("SimplnxCore::FindFeatureClusteringFilter: InValid Filter Execution", Arguments args; // Mismatching cell feature data tuples case : - args.insertOrAssign(FindFeatureClusteringFilter::k_SelectedImageGeometry_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(FindFeatureClusteringFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); args.insertOrAssign(FindFeatureClusteringFilter::k_NumberOfBins_Key, std::make_any(10)); args.insertOrAssign(FindFeatureClusteringFilter::k_PhaseNumber_Key, std::make_any(2)); args.insertOrAssign(FindFeatureClusteringFilter::k_RemoveBiasedFeatures_Key, std::make_any(false)); @@ -85,7 +85,7 @@ TEST_CASE("SimplnxCore::FindFeatureClusteringFilter: InValid Filter Execution", args.insertOrAssign(FindFeatureClusteringFilter::k_FeaturePhasesArrayPath_Key, std::make_any(k_DataContainerPath.createChildPath(k_Cell_Data).createChildPath(k_Phases))); args.insertOrAssign(FindFeatureClusteringFilter::k_CentroidsArrayPath_Key, std::make_any(k_CellFeatureDataPath.createChildPath(k_Centroids))); args.insertOrAssign(FindFeatureClusteringFilter::k_BiasedFeaturesArrayPath_Key, std::make_any(DataPath{})); - args.insertOrAssign(FindFeatureClusteringFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleAttributeMatrixPath)); + args.insertOrAssign(FindFeatureClusteringFilter::k_CellEnsembleAttributeMatrixPath_Key, std::make_any(k_CellEnsembleAttributeMatrixPath)); args.insertOrAssign(FindFeatureClusteringFilter::k_ClusteringListArrayName_Key, std::make_any(k_GeneratedClusteringList)); args.insertOrAssign(FindFeatureClusteringFilter::k_RDFArrayName_Key, std::make_any(k_GeneratedRDF)); args.insertOrAssign(FindFeatureClusteringFilter::k_MaxMinArrayName_Key, std::make_any(k_GeneratedMinMaxDistances)); diff --git a/src/Plugins/SimplnxCore/test/FindLargestCrossSectionsTest.cpp b/src/Plugins/SimplnxCore/test/FindLargestCrossSectionsTest.cpp index 0ec863a417..a19002391f 100644 --- a/src/Plugins/SimplnxCore/test/FindLargestCrossSectionsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindLargestCrossSectionsTest.cpp @@ -293,7 +293,7 @@ TEST_CASE("SimplnxCore::FindLargestCrossSectionsFilter: Valid Filter Execution", args.insertOrAssign(FindLargestCrossSectionsFilter::k_ImageGeometryPath_Key, std::make_any(DataPath({k_ImageGeometry}))); args.insertOrAssign(FindLargestCrossSectionsFilter::k_FeatureIdsArrayPath_Key, std::make_any(DataPath({k_ImageGeometry, k_CellData, k_FeatureIds}))); args.insertOrAssign(FindLargestCrossSectionsFilter::k_CellFeatureAttributeMatrixPath_Key, std::make_any(DataPath({k_ImageGeometry, k_CellFeatureData}))); - args.insertOrAssign(FindLargestCrossSectionsFilter::k_LargestCrossSectionsArrayPath_Key, std::make_any(k_LargestCrossSections)); + args.insertOrAssign(FindLargestCrossSectionsFilter::k_LargestCrossSectionsArrayName_Key, std::make_any(k_LargestCrossSections)); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); @@ -327,7 +327,7 @@ TEST_CASE("SimplnxCore::FindLargestCrossSectionsFilter: InValid Filter Execution args.insertOrAssign(FindLargestCrossSectionsFilter::k_Plane_Key, std::make_any(0)); args.insertOrAssign(FindLargestCrossSectionsFilter::k_ImageGeometryPath_Key, std::make_any(DataPath({k_ImageGeometry}))); args.insertOrAssign(FindLargestCrossSectionsFilter::k_FeatureIdsArrayPath_Key, std::make_any(DataPath({k_ImageGeometry, k_CellData, k_FeatureIds}))); - args.insertOrAssign(FindLargestCrossSectionsFilter::k_LargestCrossSectionsArrayPath_Key, std::make_any(k_LargestCrossSections)); + args.insertOrAssign(FindLargestCrossSectionsFilter::k_LargestCrossSectionsArrayName_Key, std::make_any(k_LargestCrossSections)); SECTION("Invalid Image Geometry (should be 3D)") { diff --git a/src/Plugins/SimplnxCore/test/FindNeighborListStatisticsTest.cpp b/src/Plugins/SimplnxCore/test/FindNeighborListStatisticsTest.cpp index 34029ed53b..cfbcbd4908 100644 --- a/src/Plugins/SimplnxCore/test/FindNeighborListStatisticsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindNeighborListStatisticsTest.cpp @@ -52,14 +52,14 @@ TEST_CASE("SimplnxCore::FindNeighborListStatistics: Test Algorithm", "[FindNeigh args.insertOrAssign(FindNeighborListStatistics::k_FindStandardDeviation_Key, std::make_any(true)); args.insertOrAssign(FindNeighborListStatistics::k_FindSummation_Key, std::make_any(true)); - args.insertOrAssign(FindNeighborListStatistics::k_InputArray_Key, std::make_any(inputArrayPath)); - args.insertOrAssign(FindNeighborListStatistics::k_Length_Key, std::make_any(length)); - args.insertOrAssign(FindNeighborListStatistics::k_Minimum_Key, std::make_any(minimum)); - args.insertOrAssign(FindNeighborListStatistics::k_Maximum_Key, std::make_any(maximum)); - args.insertOrAssign(FindNeighborListStatistics::k_Mean_Key, std::make_any(mean)); - args.insertOrAssign(FindNeighborListStatistics::k_Median_Key, std::make_any(median)); - args.insertOrAssign(FindNeighborListStatistics::k_StandardDeviation_Key, std::make_any(stdDev)); - args.insertOrAssign(FindNeighborListStatistics::k_Summation_Key, std::make_any(summation)); + args.insertOrAssign(FindNeighborListStatistics::k_InputNeighborListPath_Key, std::make_any(inputArrayPath)); + args.insertOrAssign(FindNeighborListStatistics::k_LengthName_Key, std::make_any(length)); + args.insertOrAssign(FindNeighborListStatistics::k_MinimumName_Key, std::make_any(minimum)); + args.insertOrAssign(FindNeighborListStatistics::k_MaximumName_Key, std::make_any(maximum)); + args.insertOrAssign(FindNeighborListStatistics::k_MeanName_Key, std::make_any(mean)); + args.insertOrAssign(FindNeighborListStatistics::k_MedianName_Key, std::make_any(median)); + args.insertOrAssign(FindNeighborListStatistics::k_StandardDeviationName_Key, std::make_any(stdDev)); + args.insertOrAssign(FindNeighborListStatistics::k_SummationName_Key, std::make_any(summation)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -178,14 +178,14 @@ TEST_CASE("SimplnxCore::FindNeighborListStatistics: Invalid Input Array", "[Find args.insertOrAssign(FindNeighborListStatistics::k_FindStandardDeviation_Key, std::make_any(true)); args.insertOrAssign(FindNeighborListStatistics::k_FindSummation_Key, std::make_any(true)); - args.insertOrAssign(FindNeighborListStatistics::k_InputArray_Key, std::make_any(inputArrayPath)); - args.insertOrAssign(FindNeighborListStatistics::k_Length_Key, std::make_any(length)); - args.insertOrAssign(FindNeighborListStatistics::k_Minimum_Key, std::make_any(minimum)); - args.insertOrAssign(FindNeighborListStatistics::k_Maximum_Key, std::make_any(maximum)); - args.insertOrAssign(FindNeighborListStatistics::k_Mean_Key, std::make_any(mean)); - args.insertOrAssign(FindNeighborListStatistics::k_Median_Key, std::make_any(median)); - args.insertOrAssign(FindNeighborListStatistics::k_StandardDeviation_Key, std::make_any(stdDev)); - args.insertOrAssign(FindNeighborListStatistics::k_Summation_Key, std::make_any(summation)); + args.insertOrAssign(FindNeighborListStatistics::k_InputNeighborListPath_Key, std::make_any(inputArrayPath)); + args.insertOrAssign(FindNeighborListStatistics::k_LengthName_Key, std::make_any(length)); + args.insertOrAssign(FindNeighborListStatistics::k_MinimumName_Key, std::make_any(minimum)); + args.insertOrAssign(FindNeighborListStatistics::k_MaximumName_Key, std::make_any(maximum)); + args.insertOrAssign(FindNeighborListStatistics::k_MeanName_Key, std::make_any(mean)); + args.insertOrAssign(FindNeighborListStatistics::k_MedianName_Key, std::make_any(median)); + args.insertOrAssign(FindNeighborListStatistics::k_StandardDeviationName_Key, std::make_any(stdDev)); + args.insertOrAssign(FindNeighborListStatistics::k_SummationName_Key, std::make_any(summation)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/FindNeighborhoodsTest.cpp b/src/Plugins/SimplnxCore/test/FindNeighborhoodsTest.cpp index 9292542614..36cb8fc857 100644 --- a/src/Plugins/SimplnxCore/test/FindNeighborhoodsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindNeighborhoodsTest.cpp @@ -39,7 +39,7 @@ TEST_CASE("SimplnxCore::FindNeighborhoods", "[SimplnxCore][FindNeighborhoods]") // Create default Parameters for the filter. args.insert(FindNeighborhoodsFilter::k_MultiplesOfAverage_Key, std::make_any(1.0F)); - args.insert(FindNeighborhoodsFilter::k_SelectedImageGeometry_Key, std::make_any(k_DataContainerPath)); + args.insert(FindNeighborhoodsFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); args.insert(FindNeighborhoodsFilter::k_EquivalentDiametersArrayPath_Key, std::make_any(k_CellFeatureDataAM.createChildPath(k_EquivalentDiameters))); args.insert(FindNeighborhoodsFilter::k_FeaturePhasesArrayPath_Key, std::make_any(k_CellFeatureDataAM.createChildPath(k_Phases))); args.insert(FindNeighborhoodsFilter::k_CentroidsArrayPath_Key, std::make_any(k_CellFeatureDataAM.createChildPath(k_Centroids))); diff --git a/src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp b/src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp index 781ea67202..6ae233fb1d 100644 --- a/src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp @@ -31,19 +31,19 @@ TEST_CASE("SimplnxCore::FindNeighbors", "[SimplnxCore][FindNeighbors]") FindNeighbors filter; Arguments args; - args.insertOrAssign(FindNeighbors::k_ImageGeom_Key, std::make_any(smallIn100Group)); - args.insertOrAssign(FindNeighbors::k_FeatureIds_Key, std::make_any(featureIdsDataPath)); - args.insertOrAssign(FindNeighbors::k_CellFeatures_Key, std::make_any(cellFeatureAttributeMatrixPath)); + args.insertOrAssign(FindNeighbors::k_SelectedImageGeometryPath_Key, std::make_any(smallIn100Group)); + args.insertOrAssign(FindNeighbors::k_FeatureIdsPath_Key, std::make_any(featureIdsDataPath)); + args.insertOrAssign(FindNeighbors::k_CellFeaturesPath_Key, std::make_any(cellFeatureAttributeMatrixPath)); args.insertOrAssign(FindNeighbors::k_StoreBoundary_Key, std::make_any(true)); - args.insertOrAssign(FindNeighbors::k_BoundaryCells_Key, std::make_any(boundaryCellsName)); + args.insertOrAssign(FindNeighbors::k_BoundaryCellsName_Key, std::make_any(boundaryCellsName)); args.insertOrAssign(FindNeighbors::k_StoreSurface_Key, std::make_any(true)); - args.insertOrAssign(FindNeighbors::k_SurfaceFeatures_Key, std::make_any(surfaceFeaturesName)); + args.insertOrAssign(FindNeighbors::k_SurfaceFeaturesName_Key, std::make_any(surfaceFeaturesName)); - args.insertOrAssign(FindNeighbors::k_NumNeighbors_Key, std::make_any(numNeighborName)); - args.insertOrAssign(FindNeighbors::k_NeighborList_Key, std::make_any(neighborListName)); - args.insertOrAssign(FindNeighbors::k_SharedSurfaceArea_Key, std::make_any(sharedSurfaceAreaListName)); + args.insertOrAssign(FindNeighbors::k_NumNeighborsName_Key, std::make_any(numNeighborName)); + args.insertOrAssign(FindNeighbors::k_NeighborListName_Key, std::make_any(neighborListName)); + args.insertOrAssign(FindNeighbors::k_SharedSurfaceAreaName_Key, std::make_any(sharedSurfaceAreaListName)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/FindNumFeaturesTest.cpp b/src/Plugins/SimplnxCore/test/FindNumFeaturesTest.cpp index 752812c6df..00ecd1b57b 100644 --- a/src/Plugins/SimplnxCore/test/FindNumFeaturesTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindNumFeaturesTest.cpp @@ -37,7 +37,7 @@ TEST_CASE("SimplnxCore::FindNumFeaturesFilter: Valid filter execution", "[Simpln // Create default Parameters for the filter. args.insertOrAssign(FindNumFeaturesFilter::k_FeaturePhasesArrayPath_Key, std::make_any(k_FeaturePhasesPath)); args.insertOrAssign(FindNumFeaturesFilter::k_EnsembleAttributeMatrixPath_Key, std::make_any(k_FeatureCountsPathNX.getParent())); - args.insertOrAssign(FindNumFeaturesFilter::k_NumFeaturesArrayPath_Key, std::make_any(k_FeatureCountsNX)); + args.insertOrAssign(FindNumFeaturesFilter::k_NumFeaturesArrayName_Key, std::make_any(k_FeatureCountsNX)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -70,7 +70,7 @@ TEST_CASE("SimplnxCore::FindNumFeaturesFilter: InValid filter execution", "[Simp // Create default Parameters for the filter. args.insertOrAssign(FindNumFeaturesFilter::k_FeaturePhasesArrayPath_Key, std::make_any(k_IncorrectFeaturePhasesPath)); args.insertOrAssign(FindNumFeaturesFilter::k_EnsembleAttributeMatrixPath_Key, std::make_any(k_FeatureCountsPathNX.getParent())); - args.insertOrAssign(FindNumFeaturesFilter::k_NumFeaturesArrayPath_Key, std::make_any(k_FeatureCountsNX)); + args.insertOrAssign(FindNumFeaturesFilter::k_NumFeaturesArrayName_Key, std::make_any(k_FeatureCountsNX)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/FindSurfaceAreaToVolumeTest.cpp b/src/Plugins/SimplnxCore/test/FindSurfaceAreaToVolumeTest.cpp index 97249631ce..9237c1bbd8 100644 --- a/src/Plugins/SimplnxCore/test/FindSurfaceAreaToVolumeTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindSurfaceAreaToVolumeTest.cpp @@ -44,7 +44,7 @@ TEST_CASE("SimplnxCore::FindSurfaceAreaToVolume", "[SimplnxCore][FindSurfaceArea // Create default Parameters for the filter. args.insertOrAssign(FindSurfaceAreaToVolumeFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsArrayPath2)); args.insertOrAssign(FindSurfaceAreaToVolumeFilter::k_NumCellsArrayPath_Key, std::make_any(k_NumElementsArrayPath)); - args.insertOrAssign(FindSurfaceAreaToVolumeFilter::k_SelectedImageGeometry_Key, std::make_any(k_SelectedGeometryPath)); + args.insertOrAssign(FindSurfaceAreaToVolumeFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_SelectedGeometryPath)); args.insertOrAssign(FindSurfaceAreaToVolumeFilter::k_CalculateSphericity_Key, std::make_any(true)); args.insertOrAssign(FindSurfaceAreaToVolumeFilter::k_SurfaceAreaVolumeRatioArrayName_Key, std::make_any(k_SurfaceAreaVolumeRationArrayNameNX)); args.insertOrAssign(FindSurfaceAreaToVolumeFilter::k_SphericityArrayName_Key, std::make_any(k_SphericityArrayNameNX)); diff --git a/src/Plugins/SimplnxCore/test/FindSurfaceFeaturesTest.cpp b/src/Plugins/SimplnxCore/test/FindSurfaceFeaturesTest.cpp index c721359f49..5ba3eba321 100644 --- a/src/Plugins/SimplnxCore/test/FindSurfaceFeaturesTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindSurfaceFeaturesTest.cpp @@ -75,7 +75,7 @@ void test_impl(const std::vector& geometryDims, const std::string& featu args.insertOrAssign(FindSurfaceFeatures::k_FeatureGeometryPath_Key, std::make_any(k_FeatureGeometryPath)); args.insertOrAssign(FindSurfaceFeatures::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIDsPath)); args.insertOrAssign(FindSurfaceFeatures::k_CellFeatureAttributeMatrixPath_Key, std::make_any(k_CellFeatureAMPath)); - args.insertOrAssign(FindSurfaceFeatures::k_SurfaceFeaturesArrayPath_Key, std::make_any(k_SurfaceFeaturesArrayPath.getTargetName())); + args.insertOrAssign(FindSurfaceFeatures::k_SurfaceFeaturesArrayName_Key, std::make_any(k_SurfaceFeaturesArrayPath.getTargetName())); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -124,7 +124,7 @@ TEST_CASE("SimplnxCore::FindSurfaceFeatures: Valid filter execution in 3D", "[Si args.insertOrAssign(FindSurfaceFeatures::k_FeatureGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); args.insertOrAssign(FindSurfaceFeatures::k_CellFeatureIdsArrayPath_Key, std::make_any(Constants::k_FeatureIdsArrayPath)); args.insertOrAssign(FindSurfaceFeatures::k_CellFeatureAttributeMatrixPath_Key, std::make_any(Constants::k_CellFeatureDataPath)); - args.insertOrAssign(FindSurfaceFeatures::k_SurfaceFeaturesArrayPath_Key, std::make_any(k_SurfaceFeatures)); + args.insertOrAssign(FindSurfaceFeatures::k_SurfaceFeaturesArrayName_Key, std::make_any(k_SurfaceFeatures)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/FindTriangleGeomCentroidsTest.cpp b/src/Plugins/SimplnxCore/test/FindTriangleGeomCentroidsTest.cpp index e613febb75..49d716a98a 100644 --- a/src/Plugins/SimplnxCore/test/FindTriangleGeomCentroidsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindTriangleGeomCentroidsTest.cpp @@ -43,7 +43,7 @@ TEST_CASE("SimplnxCore::FindTriangleGeomCentroids", "[SimplnxCore][FindTriangleG // Create default Parameters for the filter. args.insertOrAssign(FindTriangleGeomCentroidsFilter::k_TriGeometryDataPath_Key, std::make_any(k_GeometryPath)); args.insertOrAssign(FindTriangleGeomCentroidsFilter::k_FaceLabelsArrayPath_Key, std::make_any(k_FaceLabelsPath)); - args.insertOrAssign(FindTriangleGeomCentroidsFilter::k_FeatureAttributeMatrixName_Key, std::make_any(k_FeatureAttributeMatrixPath)); + args.insertOrAssign(FindTriangleGeomCentroidsFilter::k_FeatureAttributeMatrixPath_Key, std::make_any(k_FeatureAttributeMatrixPath)); // Output Path args.insertOrAssign(FindTriangleGeomCentroidsFilter::k_CentroidsArrayName_Key, std::make_any(k_CentroidsArrayName)); diff --git a/src/Plugins/SimplnxCore/test/FindTriangleGeomSizesTest.cpp b/src/Plugins/SimplnxCore/test/FindTriangleGeomSizesTest.cpp index efdb9320b3..a54e8c5650 100644 --- a/src/Plugins/SimplnxCore/test/FindTriangleGeomSizesTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindTriangleGeomSizesTest.cpp @@ -43,7 +43,7 @@ TEST_CASE("SimplnxCore::FindTriangleGeomSizes", "[SimplnxCore][FindTriangleGeomS // Create default Parameters for the filter. args.insertOrAssign(FindTriangleGeomSizesFilter::k_TriGeometryDataPath_Key, std::make_any(k_GeometryPath)); args.insertOrAssign(FindTriangleGeomSizesFilter::k_FaceLabelsArrayPath_Key, std::make_any(k_FaceLabelsPath)); - args.insertOrAssign(FindTriangleGeomSizesFilter::k_FeatureAttributeMatrixName_Key, std::make_any(k_FeatureAttributeMatrixPath)); + args.insertOrAssign(FindTriangleGeomSizesFilter::k_FeatureAttributeMatrixPath_Key, std::make_any(k_FeatureAttributeMatrixPath)); // Output Path args.insertOrAssign(FindTriangleGeomSizesFilter::k_VolumesArrayName_Key, std::make_any(k_VolumesArrayName)); diff --git a/src/Plugins/SimplnxCore/test/FindVertexToTriangleDistancesTest.cpp b/src/Plugins/SimplnxCore/test/FindVertexToTriangleDistancesTest.cpp index a33854cbc7..e4751875eb 100644 --- a/src/Plugins/SimplnxCore/test/FindVertexToTriangleDistancesTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindVertexToTriangleDistancesTest.cpp @@ -39,11 +39,11 @@ TEST_CASE("SimplnxCore::FindVertexToTriangleDistancesFilter", "[SimplnxCore][Fin Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(FindVertexToTriangleDistancesFilter::k_VertexDataContainer_Key, std::make_any(vertexData)); - args.insertOrAssign(FindVertexToTriangleDistancesFilter::k_TriangleDataContainer_Key, std::make_any(triangleData)); + args.insertOrAssign(FindVertexToTriangleDistancesFilter::k_SelectedVertexGeometryPath_Key, std::make_any(vertexData)); + args.insertOrAssign(FindVertexToTriangleDistancesFilter::k_SelectedTriangleGeometryPath_Key, std::make_any(triangleData)); args.insertOrAssign(FindVertexToTriangleDistancesFilter::k_TriangleNormalsArrayPath_Key, std::make_any(normalsPath)); - args.insertOrAssign(FindVertexToTriangleDistancesFilter::k_DistancesArrayPath_Key, std::make_any(k_DistancesNameNX)); - args.insertOrAssign(FindVertexToTriangleDistancesFilter::k_ClosestTriangleIdArrayPath_Key, std::make_any(k_ClosestTriangleIdsNameNX)); + args.insertOrAssign(FindVertexToTriangleDistancesFilter::k_DistancesArrayName_Key, std::make_any(k_DistancesNameNX)); + args.insertOrAssign(FindVertexToTriangleDistancesFilter::k_ClosestTriangleIdArrayName_Key, std::make_any(k_ClosestTriangleIdsNameNX)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/FindVolFractionsTest.cpp b/src/Plugins/SimplnxCore/test/FindVolFractionsTest.cpp index 41afccfce6..435852540f 100644 --- a/src/Plugins/SimplnxCore/test/FindVolFractionsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindVolFractionsTest.cpp @@ -36,7 +36,7 @@ TEST_CASE("SimplnxCore::FindVolFractionsFilter: Valid filter execution", "[Simpl // Create default Parameters for the filter. args.insertOrAssign(FindVolFractionsFilter::k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); args.insertOrAssign(FindVolFractionsFilter::k_CellEnsembleAttributeMatrixPath_Key, std::make_any(Constants::k_CellEnsembleAttributeMatrixPath)); - args.insertOrAssign(FindVolFractionsFilter::k_VolFractionsArrayPath_Key, std::make_any(k_VolumeFractionsNX)); + args.insertOrAssign(FindVolFractionsFilter::k_VolFractionsArrayName_Key, std::make_any(k_VolumeFractionsNX)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -71,7 +71,7 @@ TEST_CASE("SimplnxCore::FindVolFractionsFilter: InValid filter execution", "[Sim // Create default Parameters for the filter. args.insertOrAssign(FindVolFractionsFilter::k_CellPhasesArrayPath_Key, std::make_any(k_IncorrectCellPhasesPath)); args.insertOrAssign(FindVolFractionsFilter::k_CellEnsembleAttributeMatrixPath_Key, std::make_any(Constants::k_CellEnsembleAttributeMatrixPath)); - args.insertOrAssign(FindVolFractionsFilter::k_VolFractionsArrayPath_Key, std::make_any(k_VolumeFractionsNX)); + args.insertOrAssign(FindVolFractionsFilter::k_VolFractionsArrayName_Key, std::make_any(k_VolumeFractionsNX)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/FlyingEdges3DTest.cpp b/src/Plugins/SimplnxCore/test/FlyingEdges3DTest.cpp index 51427bbe79..ac3fbeee37 100644 --- a/src/Plugins/SimplnxCore/test/FlyingEdges3DTest.cpp +++ b/src/Plugins/SimplnxCore/test/FlyingEdges3DTest.cpp @@ -3,6 +3,7 @@ #include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" #include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" #include "simplnx/Parameters/DataObjectNameParameter.hpp" #include "simplnx/Parameters/GeometrySelectionParameter.hpp" #include "simplnx/UnitTest/UnitTestCommon.hpp" @@ -50,10 +51,10 @@ TEST_CASE("SimplnxCore::Image Contouring Valid Execution", "[SimplnxCore][Flying // Create default Parameters for the filter. args.insertOrAssign(FlyingEdges3DFilter::k_IsoVal_Key, std::make_any(ContourTest::k_IsoVal)); // Selected Data Objects - args.insertOrAssign(FlyingEdges3DFilter::k_SelectedImageGeometry_Key, std::make_any(ContourTest::k_GeometryPath)); - args.insertOrAssign(FlyingEdges3DFilter::k_SelectedDataArray_Key, std::make_any(ContourTest::k_DataPath)); + args.insertOrAssign(FlyingEdges3DFilter::k_SelectedImageGeometryPath_Key, std::make_any(ContourTest::k_GeometryPath)); + args.insertOrAssign(FlyingEdges3DFilter::k_SelectedDataArrayPath_Key, std::make_any(ContourTest::k_DataPath)); // Output Path - args.insertOrAssign(FlyingEdges3DFilter::k_NewTriangleGeometryName_Key, std::make_any(ContourTest::k_NewTriangleContourName)); + args.insertOrAssign(FlyingEdges3DFilter::k_CreatedTriangleGeometryPath_Key, std::make_any(ContourTest::k_NewContourPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/GenerateColorTableTest.cpp b/src/Plugins/SimplnxCore/test/GenerateColorTableTest.cpp index ab6e90367d..a6ed344e3f 100644 --- a/src/Plugins/SimplnxCore/test/GenerateColorTableTest.cpp +++ b/src/Plugins/SimplnxCore/test/GenerateColorTableTest.cpp @@ -82,11 +82,11 @@ TEST_CASE("SimplnxCore::GenerateColorTableFilter: Valid filter execution") const ReadTextDataArrayFilter filter; Arguments args; - args.insertOrAssign(ReadTextDataArrayFilter::k_InputFileKey, std::make_any(k_InputImageFilePath)); - args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarTypeKey, std::make_any(NumericType::float32)); - args.insertOrAssign(ReadTextDataArrayFilter::k_NCompKey, std::make_any(1)); - args.insertOrAssign(ReadTextDataArrayFilter::k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(37989)}})); - args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayKey, std::make_any(DataPath{{Constants::k_Confidence_Index.str()}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(k_InputImageFilePath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(37989)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(DataPath{{Constants::k_Confidence_Index.str()}})); IFilter::ExecuteResult executeResult = filter.execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); diff --git a/src/Plugins/SimplnxCore/test/IdentifySampleTest.cpp b/src/Plugins/SimplnxCore/test/IdentifySampleTest.cpp index 66164f7ea9..a5a1f3e298 100644 --- a/src/Plugins/SimplnxCore/test/IdentifySampleTest.cpp +++ b/src/Plugins/SimplnxCore/test/IdentifySampleTest.cpp @@ -16,7 +16,7 @@ TEST_CASE("SimplnxCore::IdentifySample : Valid filter execution", "[SimplnxCore] DataStructure dataStructure = LoadDataStructure(fs::path(fmt::format("{}/6_6_identify_sample/6_6_identify_sample.dream3d", unit_test::k_TestFilesDir))); IdentifySample filter; Arguments args; - args.insert(IdentifySample::k_ImageGeom_Key, std::make_any(Constants::k_DataContainerPath)); + args.insert(IdentifySample::k_SelectedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); args.insert(IdentifySample::k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); std::string k_ExemplarDataContainerName; @@ -56,7 +56,7 @@ TEST_CASE("SimplnxCore::IdentifySample : Invalid filter execution", "[SimplnxCor IdentifySample filter; Arguments args; args.insert(IdentifySample::k_FillHoles_Key, std::make_any(false)); - args.insert(IdentifySample::k_ImageGeom_Key, std::make_any(Constants::k_DataContainerPath)); + args.insert(IdentifySample::k_SelectedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); args.insert(IdentifySample::k_MaskArrayPath_Key, std::make_any(Constants::k_CellAttributeMatrix.createChildPath(k_InvalidMaskArrayName))); // Preflight the filter and check result diff --git a/src/Plugins/SimplnxCore/test/InterpolatePointCloudToRegularGridTest.cpp b/src/Plugins/SimplnxCore/test/InterpolatePointCloudToRegularGridTest.cpp index f9dbeb9f5d..54b789624f 100644 --- a/src/Plugins/SimplnxCore/test/InterpolatePointCloudToRegularGridTest.cpp +++ b/src/Plugins/SimplnxCore/test/InterpolatePointCloudToRegularGridTest.cpp @@ -61,14 +61,14 @@ TEST_CASE("SimplnxCore::InterpolatePointCloudToRegularGridFilter: Valid Filter E args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_StoreKernelDistances_Key, std::make_any(true)); args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_InterpolationTechnique_Key, std::make_any(InterpolatePointCloudToRegularGridFilter::k_Uniform)); args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_KernelSize_Key, std::make_any>(std::vector{1, 1, 1})); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_VertexGeom_Key, std::make_any(k_VertexGeometryPath)); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_ImageGeom_Key, std::make_any(k_ImageGeomPath)); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_VoxelIndices_Key, std::make_any(k_VoxelIndicesPath)); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_Mask_Key, std::make_any(k_MaskPath)); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_SelectedVertexGeometryPath_Key, std::make_any(k_VertexGeometryPath)); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_VoxelIndicesPath_Key, std::make_any(k_VoxelIndicesPath)); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_InputMaskPath_Key, std::make_any(k_MaskPath)); args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_InterpolateArrays_Key, std::make_any>(std::vector{k_FaceAreasPath})); args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_CopyArrays_Key, std::make_any>(std::vector{k_VoxelIndicesPath})); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_InterpolatedGroup_Key, std::make_any(k_UniformInterpolatedDataComputed.getTargetName())); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_KernelDistancesArray_Key, std::make_any(k_UniformKernalDistancesComputed.getTargetName())); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_InterpolatedGroupName_Key, std::make_any(k_UniformInterpolatedDataComputed.getTargetName())); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_KernelDistancesArrayName_Key, std::make_any(k_UniformKernalDistancesComputed.getTargetName())); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -100,13 +100,13 @@ TEST_CASE("SimplnxCore::InterpolatePointCloudToRegularGridFilter: Valid Filter E args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_InterpolationTechnique_Key, std::make_any(InterpolatePointCloudToRegularGridFilter::k_Gaussian)); args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_KernelSize_Key, std::make_any>(std::vector{1, 1, 1})); args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_GaussianSigmas_Key, std::make_any>(std::vector{1, 1, 1})); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_VertexGeom_Key, std::make_any(k_VertexGeometryPath)); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_ImageGeom_Key, std::make_any(k_ImageGeomPath)); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_VoxelIndices_Key, std::make_any(k_VoxelIndicesPath)); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_SelectedVertexGeometryPath_Key, std::make_any(k_VertexGeometryPath)); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_VoxelIndicesPath_Key, std::make_any(k_VoxelIndicesPath)); args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_InterpolateArrays_Key, std::make_any>(std::vector{k_FaceAreasPath})); args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_CopyArrays_Key, std::make_any>(std::vector{k_VoxelIndicesPath})); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_InterpolatedGroup_Key, std::make_any(k_GaussianInterpolatedDataComputed.getTargetName())); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_KernelDistancesArray_Key, std::make_any(k_GaussianKernalDistancesComputed.getTargetName())); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_InterpolatedGroupName_Key, std::make_any(k_GaussianInterpolatedDataComputed.getTargetName())); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_KernelDistancesArrayName_Key, std::make_any(k_GaussianKernalDistancesComputed.getTargetName())); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -136,12 +136,12 @@ TEST_CASE("SimplnxCore::InterpolatePointCloudToRegularGridFilter: Invalid Filter args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_UseMask_Key, std::make_any(false)); args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_StoreKernelDistances_Key, std::make_any(true)); args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_InterpolationTechnique_Key, std::make_any(InterpolatePointCloudToRegularGridFilter::k_Gaussian)); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_VertexGeom_Key, std::make_any(k_VertexGeometryPath)); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_ImageGeom_Key, std::make_any(k_ImageGeomPath)); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_VoxelIndices_Key, std::make_any(k_VoxelIndicesPath)); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_SelectedVertexGeometryPath_Key, std::make_any(k_VertexGeometryPath)); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_VoxelIndicesPath_Key, std::make_any(k_VoxelIndicesPath)); args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_CopyArrays_Key, std::make_any>(std::vector{k_VoxelIndicesPath})); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_InterpolatedGroup_Key, std::make_any(k_GaussianInterpolatedDataComputed.getTargetName())); - args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_KernelDistancesArray_Key, std::make_any(k_GaussianKernalDistancesComputed.getTargetName())); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_InterpolatedGroupName_Key, std::make_any(k_GaussianInterpolatedDataComputed.getTargetName())); + args.insertOrAssign(InterpolatePointCloudToRegularGridFilter::k_KernelDistancesArrayName_Key, std::make_any(k_GaussianKernalDistancesComputed.getTargetName())); SECTION("Invalid Kernel Size") { diff --git a/src/Plugins/SimplnxCore/test/LaplacianSmoothingFilterTest.cpp b/src/Plugins/SimplnxCore/test/LaplacianSmoothingFilterTest.cpp index 651de625cb..45cfa12444 100644 --- a/src/Plugins/SimplnxCore/test/LaplacianSmoothingFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/LaplacianSmoothingFilterTest.cpp @@ -40,7 +40,7 @@ TEST_CASE("SimplnxCore::LaplacianSmoothingFilter", "[SurfaceMeshing][LaplacianSm // Create default Parameters for the filter. args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); + args.insertOrAssign(ReadStlFileFilter::k_CreatedTriangleGeometryPath_Key, std::make_any(triangleGeomDataPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/MapPointCloudToRegularGridTest.cpp b/src/Plugins/SimplnxCore/test/MapPointCloudToRegularGridTest.cpp index a9cc42b5b8..b8458cd59b 100644 --- a/src/Plugins/SimplnxCore/test/MapPointCloudToRegularGridTest.cpp +++ b/src/Plugins/SimplnxCore/test/MapPointCloudToRegularGridTest.cpp @@ -53,10 +53,10 @@ TEST_CASE("SimplnxCore::MapPointCloudToRegularGridFilter: Valid Filter Execution args.insertOrAssign(MapPointCloudToRegularGridFilter::k_SamplingGridType_Key, std::make_any(samplingGridType)); args.insertOrAssign(MapPointCloudToRegularGridFilter::k_GridDimensions_Key, std::make_any>(gridDimensions)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_VertexGeometry_Key, std::make_any(k_VertexGeometryPath)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_NewImageGeometry_Key, std::make_any(k_ManualImageGeomPathComputed)); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_SelectedVertexGeometryPath_Key, std::make_any(k_VertexGeometryPath)); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_CreatedImageGeometryPath_Key, std::make_any(k_ManualImageGeomPathComputed)); args.insertOrAssign(MapPointCloudToRegularGridFilter::k_UseMask_Key, std::make_any(false)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_VoxelIndices_Key, std::make_any(k_VoxelIndicesManualComputed.getTargetName())); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_VoxelIndicesName_Key, std::make_any(k_VoxelIndicesManualComputed.getTargetName())); args.insertOrAssign(MapPointCloudToRegularGridFilter::k_CellDataName_Key, std::make_any(k_CellData)); // Preflight the filter and check result @@ -88,11 +88,11 @@ TEST_CASE("SimplnxCore::MapPointCloudToRegularGridFilter: Valid Filter Execution args.insertOrAssign(MapPointCloudToRegularGridFilter::k_SamplingGridType_Key, std::make_any(samplingGridType)); args.insertOrAssign(MapPointCloudToRegularGridFilter::k_GridDimensions_Key, std::make_any>(gridDimensions)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_VertexGeometry_Key, std::make_any(k_VertexGeometryPath)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_NewImageGeometry_Key, std::make_any(k_ManualMaskImageGeomPathComputed)); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_SelectedVertexGeometryPath_Key, std::make_any(k_VertexGeometryPath)); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_CreatedImageGeometryPath_Key, std::make_any(k_ManualMaskImageGeomPathComputed)); args.insertOrAssign(MapPointCloudToRegularGridFilter::k_UseMask_Key, std::make_any(true)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_MaskPath_Key, std::make_any(k_MaskPath)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_VoxelIndices_Key, std::make_any(k_VoxelIndicesManualMaskComputed.getTargetName())); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_InputMaskPath_Key, std::make_any(k_MaskPath)); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_VoxelIndicesName_Key, std::make_any(k_VoxelIndicesManualMaskComputed.getTargetName())); args.insertOrAssign(MapPointCloudToRegularGridFilter::k_CellDataName_Key, std::make_any(k_CellData)); // Preflight the filter and check result @@ -122,11 +122,11 @@ TEST_CASE("SimplnxCore::MapPointCloudToRegularGridFilter: Valid Filter Execution uint64 samplingGridType = 1; args.insertOrAssign(MapPointCloudToRegularGridFilter::k_SamplingGridType_Key, std::make_any(samplingGridType)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_VertexGeometry_Key, std::make_any(k_VertexGeometryPath)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_ExistingImageGeometry_Key, std::make_any(k_ExistingImageGeomPath)); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_SelectedVertexGeometryPath_Key, std::make_any(k_VertexGeometryPath)); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_ExistingImageGeomPath)); args.insertOrAssign(MapPointCloudToRegularGridFilter::k_UseMask_Key, std::make_any(true)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_MaskPath_Key, std::make_any(k_MaskPath)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_VoxelIndices_Key, std::make_any(k_VoxelIndicesExistingMaskComputed.getTargetName())); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_InputMaskPath_Key, std::make_any(k_MaskPath)); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_VoxelIndicesName_Key, std::make_any(k_VoxelIndicesExistingMaskComputed.getTargetName())); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -155,24 +155,24 @@ TEST_CASE("SimplnxCore::MapPointCloudToRegularGridFilter: Invalid Filter Executi std::vector gridDimensions{11, 11, 26}; args.insertOrAssign(MapPointCloudToRegularGridFilter::k_SamplingGridType_Key, std::make_any(samplingGridType)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_VertexGeometry_Key, std::make_any(k_VertexGeometryPath)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_NewImageGeometry_Key, std::make_any(k_ManualMaskImageGeomPathComputed)); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_SelectedVertexGeometryPath_Key, std::make_any(k_VertexGeometryPath)); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_CreatedImageGeometryPath_Key, std::make_any(k_ManualMaskImageGeomPathComputed)); args.insertOrAssign(MapPointCloudToRegularGridFilter::k_UseMask_Key, std::make_any(true)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_VoxelIndices_Key, std::make_any(k_VoxelIndicesManualMaskComputed.getTargetName())); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_VoxelIndicesName_Key, std::make_any(k_VoxelIndicesManualMaskComputed.getTargetName())); args.insertOrAssign(MapPointCloudToRegularGridFilter::k_CellDataName_Key, std::make_any(k_CellData)); SECTION("Invalid Grid Dimensions") { gridDimensions[2] = 0; args.insertOrAssign(MapPointCloudToRegularGridFilter::k_GridDimensions_Key, std::make_any>(gridDimensions)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_MaskPath_Key, std::make_any(k_MaskPath)); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_InputMaskPath_Key, std::make_any(k_MaskPath)); } SECTION("Mismatching mask & voxel indices array tuples") { const std::string invalidMask = "Invalid Mask Array"; UnitTest::CreateTestDataArray(dataStructure, invalidMask, std::vector{100}, std::vector{1}); args.insertOrAssign(MapPointCloudToRegularGridFilter::k_GridDimensions_Key, std::make_any>(gridDimensions)); - args.insertOrAssign(MapPointCloudToRegularGridFilter::k_MaskPath_Key, std::make_any(DataPath({invalidMask}))); + args.insertOrAssign(MapPointCloudToRegularGridFilter::k_InputMaskPath_Key, std::make_any(DataPath({invalidMask}))); } // Preflight the filter and check result diff --git a/src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp b/src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp index 90ea066d4d..305256eb42 100644 --- a/src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp +++ b/src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp @@ -73,19 +73,19 @@ TEST_CASE("SimplnxCore::MinNeighbors", "[SimplnxCore][MinNeighbors]") FindNeighbors filter; Arguments args; - args.insertOrAssign(FindNeighbors::k_ImageGeom_Key, std::make_any(smallIn100Group)); - args.insertOrAssign(FindNeighbors::k_FeatureIds_Key, std::make_any(featureIdsDataPath)); - args.insertOrAssign(FindNeighbors::k_CellFeatures_Key, std::make_any(cellFeatureAttributeMatrixPath)); + args.insertOrAssign(FindNeighbors::k_SelectedImageGeometryPath_Key, std::make_any(smallIn100Group)); + args.insertOrAssign(FindNeighbors::k_FeatureIdsPath_Key, std::make_any(featureIdsDataPath)); + args.insertOrAssign(FindNeighbors::k_CellFeaturesPath_Key, std::make_any(cellFeatureAttributeMatrixPath)); args.insertOrAssign(FindNeighbors::k_StoreBoundary_Key, std::make_any(true)); - args.insertOrAssign(FindNeighbors::k_BoundaryCells_Key, std::make_any(boundaryCellsName)); + args.insertOrAssign(FindNeighbors::k_BoundaryCellsName_Key, std::make_any(boundaryCellsName)); args.insertOrAssign(FindNeighbors::k_StoreSurface_Key, std::make_any(true)); - args.insertOrAssign(FindNeighbors::k_SurfaceFeatures_Key, std::make_any(surfaceFeaturesName)); + args.insertOrAssign(FindNeighbors::k_SurfaceFeaturesName_Key, std::make_any(surfaceFeaturesName)); - args.insertOrAssign(FindNeighbors::k_NumNeighbors_Key, std::make_any(numNeighborName)); - args.insertOrAssign(FindNeighbors::k_NeighborList_Key, std::make_any(neighborListName)); - args.insertOrAssign(FindNeighbors::k_SharedSurfaceArea_Key, std::make_any(sharedSurfaceAreaListName)); + args.insertOrAssign(FindNeighbors::k_NumNeighborsName_Key, std::make_any(numNeighborName)); + args.insertOrAssign(FindNeighbors::k_NeighborListName_Key, std::make_any(neighborListName)); + args.insertOrAssign(FindNeighbors::k_SharedSurfaceAreaName_Key, std::make_any(sharedSurfaceAreaListName)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -104,10 +104,10 @@ TEST_CASE("SimplnxCore::MinNeighbors", "[SimplnxCore][MinNeighbors]") args.insertOrAssign(MinNeighbors::k_ApplyToSinglePhase_Key, std::make_any(false)); // args.insertOrAssign(MinNeighbors::k_PhaseNumber_Key, std::make_any(0)); // args.insertOrAssign(MinNeighbors::k_FeaturePhases_Key, std::make_any(k_FeaturePhases)); - args.insertOrAssign(MinNeighbors::k_ImageGeom_Key, std::make_any(smallIn100Group)); - args.insertOrAssign(MinNeighbors::k_CellDataAttributeMatrix_Key, std::make_any(cellDataAttributeMatrix)); - args.insertOrAssign(MinNeighbors::k_FeatureIds_Key, std::make_any(featureIdsDataPath)); - args.insertOrAssign(MinNeighbors::k_NumNeighbors_Key, std::make_any(numNeighborPath)); + args.insertOrAssign(MinNeighbors::k_SelectedImageGeometryPath_Key, std::make_any(smallIn100Group)); + args.insertOrAssign(MinNeighbors::k_CellDataAttributeMatrixPath_Key, std::make_any(cellDataAttributeMatrix)); + args.insertOrAssign(MinNeighbors::k_FeatureIdsPath_Key, std::make_any(featureIdsDataPath)); + args.insertOrAssign(MinNeighbors::k_NumNeighborsPath_Key, std::make_any(numNeighborPath)); // args.insertOrAssign(MinNeighbors::k_IgnoredVoxelArrays_Key, std::make_any>(k_VoxelArrays)); // Preflight the filter and check result @@ -156,7 +156,7 @@ TEST_CASE("SimplnxCore::MinNeighbors: Bad Phase Number", "[MinNeighbors]") uint64 k_MinNumNeighbors = 1; std::vector k_VoxelArrays = k_VoxelArrayPaths; - args.insertOrAssign(MinNeighbors::k_ImageGeom_Key, std::make_any(k_ImageGeomPath)); + args.insertOrAssign(MinNeighbors::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); args.insertOrAssign(MinNeighbors::k_ApplyToSinglePhase_Key, std::make_any(k_ApplyToSinglePhase)); args.insertOrAssign(MinNeighbors::k_PhaseNumber_Key, std::make_any(k_PhaseNumber)); args.insertOrAssign(MinNeighbors::k_FeatureIds_Key, std::make_any(k_FeatureIdsPath)); @@ -190,7 +190,7 @@ TEST_CASE("SimplnxCore::MinNeighbors: Phase Array", "[MinNeighbors]") uint64 k_MinNumNeighbors = 1; std::vector k_VoxelArrays = k_VoxelArrayPaths; - args.insertOrAssign(MinNeighbors::k_ImageGeom_Key, std::make_any(k_ImageGeomPath)); + args.insertOrAssign(MinNeighbors::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); args.insertOrAssign(MinNeighbors::k_ApplyToSinglePhase_Key, std::make_any(k_ApplyToSinglePhase)); args.insertOrAssign(MinNeighbors::k_PhaseNumber_Key, std::make_any(k_PhaseNumber)); args.insertOrAssign(MinNeighbors::k_FeatureIds_Key, std::make_any(k_FeatureIdsPath)); diff --git a/src/Plugins/SimplnxCore/test/MoveDataTest.cpp b/src/Plugins/SimplnxCore/test/MoveDataTest.cpp index 9096e4e2f7..9b92e60aab 100644 --- a/src/Plugins/SimplnxCore/test/MoveDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/MoveDataTest.cpp @@ -51,8 +51,8 @@ TEST_CASE("SimplnxCore::MoveData Successful", "[Simplnx::Core][MoveData]") const DataPath k_Group3Path({k_Group2Name, k_Group3Name}); const DataPath k_Group4Path({k_Group2Name, k_Group4Name}); - args.insertOrAssign(MoveData::k_Data_Key, std::make_any>({k_Group3Path, k_Group4Path})); - args.insertOrAssign(MoveData::k_NewParent_Key, std::make_any(k_Group1Path)); + args.insertOrAssign(MoveData::k_SourceDataPaths_Key, std::make_any>({k_Group3Path, k_Group4Path})); + args.insertOrAssign(MoveData::k_DestinationParentPath_Key, std::make_any(k_Group1Path)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -90,8 +90,8 @@ TEST_CASE("SimplnxCore::MoveData Unsuccessful", "[Simplnx::Core][MoveData]") SECTION("Object already exists in new data path") { - args.insertOrAssign(MoveData::k_Data_Key, std::make_any>({k_Group3Path})); - args.insertOrAssign(MoveData::k_NewParent_Key, std::make_any(k_Group2Path)); + args.insertOrAssign(MoveData::k_SourceDataPaths_Key, std::make_any>({k_Group3Path})); + args.insertOrAssign(MoveData::k_DestinationParentPath_Key, std::make_any(k_Group2Path)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -99,8 +99,8 @@ TEST_CASE("SimplnxCore::MoveData Unsuccessful", "[Simplnx::Core][MoveData]") } SECTION("Cannot reparent object to itself") { - args.insertOrAssign(MoveData::k_Data_Key, std::make_any>({k_Group3Path})); - args.insertOrAssign(MoveData::k_NewParent_Key, std::make_any(k_Group3Path)); + args.insertOrAssign(MoveData::k_SourceDataPaths_Key, std::make_any>({k_Group3Path})); + args.insertOrAssign(MoveData::k_DestinationParentPath_Key, std::make_any(k_Group3Path)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -108,8 +108,8 @@ TEST_CASE("SimplnxCore::MoveData Unsuccessful", "[Simplnx::Core][MoveData]") } SECTION("Cannot reparent object to a child object") { - args.insertOrAssign(MoveData::k_Data_Key, std::make_any>({k_Group2Path})); - args.insertOrAssign(MoveData::k_NewParent_Key, std::make_any(k_Group3Path)); + args.insertOrAssign(MoveData::k_SourceDataPaths_Key, std::make_any>({k_Group2Path})); + args.insertOrAssign(MoveData::k_DestinationParentPath_Key, std::make_any(k_Group3Path)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -126,8 +126,8 @@ TEST_CASE("SimplnxCore::MoveData Tuple Size Mismatches Warning and Failure", "[S const DataPath k_DataArrayPath({k_DataArray1Name}); const DataPath k_AMPath({k_AM1Name}); - args.insertOrAssign(MoveData::k_Data_Key, std::make_any>({k_DataArrayPath})); - args.insertOrAssign(MoveData::k_NewParent_Key, std::make_any(k_AMPath)); + args.insertOrAssign(MoveData::k_SourceDataPaths_Key, std::make_any>({k_DataArrayPath})); + args.insertOrAssign(MoveData::k_DestinationParentPath_Key, std::make_any(k_AMPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/MultiThresholdObjectsTest.cpp b/src/Plugins/SimplnxCore/test/MultiThresholdObjectsTest.cpp index 4bbf3e3e8d..a326a727e5 100644 --- a/src/Plugins/SimplnxCore/test/MultiThresholdObjectsTest.cpp +++ b/src/Plugins/SimplnxCore/test/MultiThresholdObjectsTest.cpp @@ -95,8 +95,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution", "[SimplnxCore][ threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::boolean)); // Preflight the filter and check result @@ -136,8 +136,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution", "[SimplnxCore][ threshold->setComparisonValue(15); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::boolean)); // Preflight the filter and check result @@ -183,8 +183,8 @@ TEMPLATE_TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution - Custom threshold->setComparisonValue(15); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_UseCustomTrueValue, std::make_any(true)); args.insertOrAssign(MultiThresholdObjects::k_CustomTrueValue, std::make_any(trueValue)); args.insertOrAssign(MultiThresholdObjects::k_UseCustomFalseValue, std::make_any(true)); @@ -226,8 +226,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Invalid Execution", "[SimplnxCore { ArrayThresholdSet thresholdSet; - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); } SECTION("Empty ArrayThreshold DataPath") { @@ -237,8 +237,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Invalid Execution", "[SimplnxCore threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); } SECTION("MultiComponents in Threshold Array") { @@ -249,8 +249,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Invalid Execution", "[SimplnxCore threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); } SECTION("Mismatching Tuples in Threshold Arrays") { @@ -265,8 +265,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Invalid Execution", "[SimplnxCore threshold2->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold1, threshold2}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); } // Preflight the filter and check result @@ -324,8 +324,8 @@ TEMPLATE_TEST_CASE("SimplnxCore::MultiThresholdObjects: Invalid Execution - Out threshold->setComparisonValue(15); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_UseCustomTrueValue, std::make_any(true)); args.insertOrAssign(MultiThresholdObjects::k_CustomTrueValue, std::make_any(trueValue)); args.insertOrAssign(MultiThresholdObjects::k_UseCustomFalseValue, std::make_any(true)); @@ -366,8 +366,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Invalid Execution - Boolean Custo threshold->setComparisonValue(15); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::boolean)); // Preflight the filter @@ -416,8 +416,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution, DataType", "[Sim threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::int8)); // Preflight the filter and check result @@ -443,8 +443,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution, DataType", "[Sim threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::int16)); // Preflight the filter and check result @@ -470,8 +470,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution, DataType", "[Sim threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::int32)); // Preflight the filter and check result @@ -497,8 +497,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution, DataType", "[Sim threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::int64)); // Preflight the filter and check result @@ -525,8 +525,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution, DataType", "[Sim threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::uint8)); // Preflight the filter and check result @@ -552,8 +552,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution, DataType", "[Sim threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::uint16)); // Preflight the filter and check result @@ -579,8 +579,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution, DataType", "[Sim threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::uint32)); // Preflight the filter and check result @@ -606,8 +606,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution, DataType", "[Sim threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::uint64)); // Preflight the filter and check result @@ -634,8 +634,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution, DataType", "[Sim threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::float32)); // Preflight the filter and check result @@ -661,8 +661,8 @@ TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution, DataType", "[Sim threshold->setComparisonValue(0.1); thresholdSet.setArrayThresholds({threshold}); - args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholds_Key, std::make_any(thresholdSet)); - args.insertOrAssign(MultiThresholdObjects::k_CreatedDataPath_Key, std::make_any(k_ThresholdArrayName)); + args.insertOrAssign(MultiThresholdObjects::k_ArrayThresholdsObject_Key, std::make_any(thresholdSet)); + args.insertOrAssign(MultiThresholdObjects::k_CreatedDataName_Key, std::make_any(k_ThresholdArrayName)); args.insertOrAssign(MultiThresholdObjects::k_CreatedMaskType_Key, std::make_any(DataType::float64)); // Preflight the filter and check result diff --git a/src/Plugins/SimplnxCore/test/PipelineTest.cpp b/src/Plugins/SimplnxCore/test/PipelineTest.cpp index 1c4c10e420..21db985a45 100644 --- a/src/Plugins/SimplnxCore/test/PipelineTest.cpp +++ b/src/Plugins/SimplnxCore/test/PipelineTest.cpp @@ -224,7 +224,7 @@ TEST_CASE("PipelineTest:PipelineJson") Arguments filter2Args; filter2Args.insert("param1", 42); filter2Args.insert("param2", std::string("foobarbaz")); - filter2Args.insert("param3", ChoicesParameter::ValueType{}); + filter2Args.insert("param3_index", ChoicesParameter::ValueType{}); pipeline.push_back(k_Test2FilterHandle, filter2Args); nlohmann::json pipelineJson = pipeline.toJson(); diff --git a/src/Plugins/SimplnxCore/test/PointSampleTriangleGeometryFilterTest.cpp b/src/Plugins/SimplnxCore/test/PointSampleTriangleGeometryFilterTest.cpp index 870013b930..269311088f 100644 --- a/src/Plugins/SimplnxCore/test/PointSampleTriangleGeometryFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/PointSampleTriangleGeometryFilterTest.cpp @@ -91,7 +91,7 @@ TEST_CASE("SimplnxCore::PointSampleTriangleGeometryFilter", "[DREAM3DReview][Poi // Create default Parameters for the filter. args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); + args.insertOrAssign(ReadStlFileFilter::k_CreatedTriangleGeometryPath_Key, std::make_any(triangleGeomDataPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -115,7 +115,7 @@ TEST_CASE("SimplnxCore::PointSampleTriangleGeometryFilter", "[DREAM3DReview][Poi // Create default Parameters for the filter. args.insertOrAssign(CalculateTriangleAreasFilter::k_TriangleGeometryDataPath_Key, std::make_any(geometryPath)); - args.insertOrAssign(CalculateTriangleAreasFilter::k_CalculatedAreasDataPath_Key, std::make_any(triangleAreasName)); + args.insertOrAssign(CalculateTriangleAreasFilter::k_CalculatedAreasDataName_Key, std::make_any(triangleAreasName)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -165,7 +165,7 @@ TEST_CASE("SimplnxCore::PointSampleTriangleGeometryFilter", "[DREAM3DReview][Poi DataPath vertGeometryDataPath({vertexGeometryName}); args.insertOrAssign(PointSampleTriangleGeometryFilter::k_VertexGeometryPath_Key, std::make_any(vertGeometryDataPath)); DataPath vertexDataGroupPath = vertGeometryDataPath.createChildPath(vertexNodeDataGroup); - args.insertOrAssign(PointSampleTriangleGeometryFilter::k_VertexDataGroupPath_Key, std::make_any(vertexNodeDataGroup)); + args.insertOrAssign(PointSampleTriangleGeometryFilter::k_VertexDataGroupName_Key, std::make_any(vertexNodeDataGroup)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/QuickSurfaceMeshFilterTest.cpp b/src/Plugins/SimplnxCore/test/QuickSurfaceMeshFilterTest.cpp index 58be759772..339a22608f 100644 --- a/src/Plugins/SimplnxCore/test/QuickSurfaceMeshFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/QuickSurfaceMeshFilterTest.cpp @@ -47,7 +47,7 @@ TEST_CASE("SimplnxCore::QuickSurfaceMeshFilter", "[SimplnxCore][QuickSurfaceMesh args.insertOrAssign(QuickSurfaceMeshFilter::k_SelectedDataArrayPaths_Key, std::make_any(selectedArrayPaths)); - args.insertOrAssign(QuickSurfaceMeshFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeometryPath)); + args.insertOrAssign(QuickSurfaceMeshFilter::k_CreatedTriangleGeometryPath_Key, std::make_any(triangleGeometryPath)); DataPath vertexGroupDataPath = triangleGeometryPath.createChildPath(k_VertexDataGroupName); args.insertOrAssign(QuickSurfaceMeshFilter::k_VertexDataGroupName_Key, std::make_any(k_VertexDataGroupName)); diff --git a/src/Plugins/SimplnxCore/test/ReadStlFileTest.cpp b/src/Plugins/SimplnxCore/test/ReadStlFileTest.cpp index d694f70ae4..e6a5d4227b 100644 --- a/src/Plugins/SimplnxCore/test/ReadStlFileTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReadStlFileTest.cpp @@ -29,7 +29,7 @@ TEST_CASE("SimplnxCore::ReadStlFileFilter", "[SimplnxCore][ReadStlFileFilter]") // Create default Parameters for the filter. args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); + args.insertOrAssign(ReadStlFileFilter::k_CreatedTriangleGeometryPath_Key, std::make_any(triangleGeomDataPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/ReadTextDataArrayTest.cpp b/src/Plugins/SimplnxCore/test/ReadTextDataArrayTest.cpp index e006c3ab21..231c93145c 100644 --- a/src/Plugins/SimplnxCore/test/ReadTextDataArrayTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReadTextDataArrayTest.cpp @@ -91,12 +91,12 @@ void RunInvalidTest() DataStructure dataStructure; AttributeMatrix* am = AttributeMatrix::Create(dataStructure, k_GroupAName, tupleDims); Arguments args; - args.insertOrAssign(ReadTextDataArrayFilter::k_InputFileKey, std::make_any(fs::path(inputFilePath))); - args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarTypeKey, std::make_any(GetNumericType())); - args.insertOrAssign(ReadTextDataArrayFilter::k_NCompKey, std::make_any(1)); - args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLinesKey, std::make_any(0)); - args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoiceKey, std::make_any(4)); - args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayKey, std::make_any(createdArrayPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path(inputFilePath))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(GetNumericType())); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(createdArrayPath)); args.insertOrAssign(ReadTextDataArrayFilter::k_DataFormat_Key, std::make_any("")); args.insertOrAssign(ReadTextDataArrayFilter::k_AdvancedOptions_Key, std::make_any(false)); @@ -124,12 +124,12 @@ void RunInvalidTest() DataStructure dataStructure; AttributeMatrix* am = AttributeMatrix::Create(dataStructure, k_GroupAName, tupleDims); Arguments args; - args.insertOrAssign(ReadTextDataArrayFilter::k_InputFileKey, std::make_any(fs::path(inputFilePath))); - args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarTypeKey, std::make_any(GetNumericType())); - args.insertOrAssign(ReadTextDataArrayFilter::k_NCompKey, std::make_any(1)); - args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLinesKey, std::make_any(0)); - args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoiceKey, std::make_any(4)); - args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayKey, std::make_any(createdArrayPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path(inputFilePath))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(GetNumericType())); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(createdArrayPath)); args.insertOrAssign(ReadTextDataArrayFilter::k_DataFormat_Key, std::make_any("")); args.insertOrAssign(ReadTextDataArrayFilter::k_AdvancedOptions_Key, std::make_any(false)); @@ -174,12 +174,12 @@ void RunInvalidTest() DataStructure dataStructure; AttributeMatrix* am = AttributeMatrix::Create(dataStructure, k_GroupAName, tupleDims); Arguments args; - args.insertOrAssign(ReadTextDataArrayFilter::k_InputFileKey, std::make_any(fs::path(inputFilePath))); - args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarTypeKey, std::make_any(GetNumericType())); - args.insertOrAssign(ReadTextDataArrayFilter::k_NCompKey, std::make_any(1)); - args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLinesKey, std::make_any(0)); - args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoiceKey, std::make_any(4)); - args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayKey, std::make_any(createdArrayPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path(inputFilePath))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(GetNumericType())); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(createdArrayPath)); args.insertOrAssign(ReadTextDataArrayFilter::k_DataFormat_Key, std::make_any("")); args.insertOrAssign(ReadTextDataArrayFilter::k_AdvancedOptions_Key, std::make_any(false)); @@ -212,12 +212,12 @@ void RunTest(char sep, int delimiter) ReadTextDataArrayFilter filter; Arguments args; - args.insertOrAssign(ReadTextDataArrayFilter::k_InputFileKey, std::make_any(fs::path(inputFilePath))); - args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarTypeKey, std::make_any(scalarType)); - args.insertOrAssign(ReadTextDataArrayFilter::k_NCompKey, std::make_any(numberOfComponents)); - args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLinesKey, std::make_any(skipHeaderLines)); - args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoiceKey, std::make_any(delimiter)); - args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayKey, std::make_any(createdAttributeArrayPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path(inputFilePath))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(scalarType)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(numberOfComponents)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(skipHeaderLines)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(delimiter)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(createdAttributeArrayPath)); args.insertOrAssign(ReadTextDataArrayFilter::k_DataFormat_Key, std::make_any("")); args.insertOrAssign(ReadTextDataArrayFilter::k_AdvancedOptions_Key, std::make_any(false)); @@ -324,12 +324,12 @@ TEST_CASE("SimplnxCore::ReadTextDataArrayFilter: Invalid filter execution", "[Si DataStructure dataStructure; DataGroup* dataGroup = DataGroup::Create(dataStructure, k_GroupAName); Arguments args; - args.insertOrAssign(ReadTextDataArrayFilter::k_InputFileKey, std::make_any(fs::path(inputFilePath))); - args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarTypeKey, std::make_any(NumericType::int32)); - args.insertOrAssign(ReadTextDataArrayFilter::k_NCompKey, std::make_any(1)); - args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLinesKey, std::make_any(0)); - args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoiceKey, std::make_any(4)); - args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayKey, std::make_any(createdArrayPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path(inputFilePath))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(NumericType::int32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(createdArrayPath)); args.insertOrAssign(ReadTextDataArrayFilter::k_DataFormat_Key, std::make_any("")); args.insertOrAssign(ReadTextDataArrayFilter::k_AdvancedOptions_Key, std::make_any(false)); @@ -348,15 +348,15 @@ TEST_CASE("SimplnxCore::ReadTextDataArrayFilter: Invalid filter execution", "[Si DataStructure dataStructure; DataGroup* dataGroup = DataGroup::Create(dataStructure, k_GroupAName); Arguments args; - args.insertOrAssign(ReadTextDataArrayFilter::k_InputFileKey, std::make_any(fs::path(inputFilePath))); - args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarTypeKey, std::make_any(NumericType::int32)); - args.insertOrAssign(ReadTextDataArrayFilter::k_NCompKey, std::make_any(1)); - args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLinesKey, std::make_any(0)); - args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoiceKey, std::make_any(4)); - args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayKey, std::make_any(createdArrayPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path(inputFilePath))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(NumericType::int32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(createdArrayPath)); args.insertOrAssign(ReadTextDataArrayFilter::k_DataFormat_Key, std::make_any("")); args.insertOrAssign(ReadTextDataArrayFilter::k_AdvancedOptions_Key, std::make_any(false)); - args.insertOrAssign(ReadTextDataArrayFilter::k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{0}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{0}})); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/ReadVtkStructuredPointsTest.cpp b/src/Plugins/SimplnxCore/test/ReadVtkStructuredPointsTest.cpp index 053c6da9c0..6616e43628 100644 --- a/src/Plugins/SimplnxCore/test/ReadVtkStructuredPointsTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReadVtkStructuredPointsTest.cpp @@ -42,8 +42,8 @@ Arguments createArgs(const fs::path& filePath) args.insertOrAssign(ReadVtkStructuredPointsFilter::k_InputFile_Key, std::make_any(filePath)); args.insertOrAssign(ReadVtkStructuredPointsFilter::k_ReadPointData_Key, std::make_any(true)); args.insertOrAssign(ReadVtkStructuredPointsFilter::k_ReadCellData_Key, std::make_any(true)); - args.insertOrAssign(ReadVtkStructuredPointsFilter::k_VertexDataContainerName_Key, std::make_any(DataPath{{pointDataContainerName}})); - args.insertOrAssign(ReadVtkStructuredPointsFilter::k_VolumeDataContainerName_Key, std::make_any(DataPath{{cellDataContainerName}})); + args.insertOrAssign(ReadVtkStructuredPointsFilter::k_CreatedVertexGeometryPath_Key, std::make_any(DataPath{{pointDataContainerName}})); + args.insertOrAssign(ReadVtkStructuredPointsFilter::k_CreatedImageGeometryPath_Key, std::make_any(DataPath{{cellDataContainerName}})); args.insertOrAssign(ReadVtkStructuredPointsFilter::k_VertexAttributeMatrixName_Key, std::make_any(pointAttrMatrixName)); args.insertOrAssign(ReadVtkStructuredPointsFilter::k_CellAttributeMatrixName_Key, std::make_any(cellAttrMatrixName)); diff --git a/src/Plugins/SimplnxCore/test/RemoveFlaggedFeaturesTest.cpp b/src/Plugins/SimplnxCore/test/RemoveFlaggedFeaturesTest.cpp index bcb8904b20..93428b4d51 100644 --- a/src/Plugins/SimplnxCore/test/RemoveFlaggedFeaturesTest.cpp +++ b/src/Plugins/SimplnxCore/test/RemoveFlaggedFeaturesTest.cpp @@ -144,7 +144,7 @@ TEST_CASE("SimplnxCore::RemoveFlaggedFeatures: Test Remove Algorithm", "[Simplnx // Create default Parameters for the filter. args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_Functionality_Key, std::make_any(0)); args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_FillRemovedFeatures_Key, std::make_any(false)); - args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_ImageGeometry_Key, std::make_any(k_ImageGeomPath)); + args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsPath)); args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_FlaggedFeaturesArrayPath_Key, std::make_any(k_FlaggedFeaturesPath)); args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_IgnoredDataArrayPaths_Key, std::make_any(MultiArraySelectionParameter::ValueType{})); @@ -172,7 +172,7 @@ TEST_CASE("SimplnxCore::RemoveFlaggedFeatures: Test Extract Algorithm", "[Simpln // Create default Parameters for the filter. args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_Functionality_Key, std::make_any(1)); - args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_ImageGeometry_Key, std::make_any(k_ImageGeomPath)); + args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_CreatedImageGeometryPrefix_Key, std::make_any(k_NewImgGeomPrefix)); args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsPath)); args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_FlaggedFeaturesArrayPath_Key, std::make_any(k_FlaggedFeaturesPath)); @@ -210,7 +210,7 @@ TEST_CASE("SimplnxCore::RemoveFlaggedFeatures: Test Extract then Remove Algorith // Create default Parameters for the filter. args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_Functionality_Key, std::make_any(2)); args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_FillRemovedFeatures_Key, std::make_any(false)); - args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_ImageGeometry_Key, std::make_any(k_ImageGeomPath)); + args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_CreatedImageGeometryPrefix_Key, std::make_any(k_NewImgGeomPrefix)); args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsPath)); args.insertOrAssign(RemoveFlaggedFeaturesFilter::k_FlaggedFeaturesArrayPath_Key, std::make_any(k_FlaggedFeaturesPath)); diff --git a/src/Plugins/SimplnxCore/test/RemoveFlaggedTrianglesTest.cpp b/src/Plugins/SimplnxCore/test/RemoveFlaggedTrianglesTest.cpp index 2274e05180..1bebe6e096 100644 --- a/src/Plugins/SimplnxCore/test/RemoveFlaggedTrianglesTest.cpp +++ b/src/Plugins/SimplnxCore/test/RemoveFlaggedTrianglesTest.cpp @@ -39,9 +39,9 @@ TEST_CASE("SimplnxCore::RemoveFlaggedTrianglesFilter: Valid Filter Execution", " Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(RemoveFlaggedTrianglesFilter::k_InputGeometry_Key, std::make_any(::k_TriangleGeomPath)); + args.insertOrAssign(RemoveFlaggedTrianglesFilter::k_SelectedTriangleGeometryPath_Key, std::make_any(::k_TriangleGeomPath)); args.insertOrAssign(RemoveFlaggedTrianglesFilter::k_MaskArrayPath_Key, std::make_any(::k_MaskPath)); - args.insertOrAssign(RemoveFlaggedTrianglesFilter::k_OutputGeometry_Key, std::make_any(::k_ReducedGeomPath)); + args.insertOrAssign(RemoveFlaggedTrianglesFilter::k_CreatedTriangleGeometryPath_Key, std::make_any(::k_ReducedGeomPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/RemoveFlaggedVerticesTest.cpp b/src/Plugins/SimplnxCore/test/RemoveFlaggedVerticesTest.cpp index 42cbec3f0a..e34eba2548 100644 --- a/src/Plugins/SimplnxCore/test/RemoveFlaggedVerticesTest.cpp +++ b/src/Plugins/SimplnxCore/test/RemoveFlaggedVerticesTest.cpp @@ -15,9 +15,9 @@ TEST_CASE("SimplnxCore::RemoveFlaggedVertices: Instantiate", "[SimplnxCore][Remo DataStructure dataStructure; Arguments args; - args.insertOrAssign(RemoveFlaggedVertices::k_VertexGeomPath_Key, std::make_any()); - args.insertOrAssign(RemoveFlaggedVertices::k_MaskPath_Key, std::make_any()); - args.insertOrAssign(RemoveFlaggedVertices::k_ReducedVertexGeometryPath_Key, std::make_any()); + args.insertOrAssign(RemoveFlaggedVertices::k_SelectedVertexGeometryPath_Key, std::make_any()); + args.insertOrAssign(RemoveFlaggedVertices::k_InputMaskPath_Key, std::make_any()); + args.insertOrAssign(RemoveFlaggedVertices::k_CreatedVertexGeometryPath_Key, std::make_any()); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -68,9 +68,9 @@ TEST_CASE("SimplnxCore::RemoveFlaggedVertices: Test Algorithm", "[SimplnxCore][R DataPath reducedVertexPath({Constants::k_SmallIN100, Constants::k_ReducedGeometry}); DataPath reducedVertexAMPath = reducedVertexPath.createChildPath(Constants::k_VertexDataGroupName); - args.insertOrAssign(RemoveFlaggedVertices::k_VertexGeomPath_Key, std::make_any(vertexGeomPath)); - args.insertOrAssign(RemoveFlaggedVertices::k_MaskPath_Key, std::make_any(maskPath)); - args.insertOrAssign(RemoveFlaggedVertices::k_ReducedVertexGeometryPath_Key, std::make_any(reducedVertexPath)); + args.insertOrAssign(RemoveFlaggedVertices::k_SelectedVertexGeometryPath_Key, std::make_any(vertexGeomPath)); + args.insertOrAssign(RemoveFlaggedVertices::k_InputMaskPath_Key, std::make_any(maskPath)); + args.insertOrAssign(RemoveFlaggedVertices::k_CreatedVertexGeometryPath_Key, std::make_any(reducedVertexPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/RenameDataObjectTest.cpp b/src/Plugins/SimplnxCore/test/RenameDataObjectTest.cpp index 688dd7e7fa..e91f946f1b 100644 --- a/src/Plugins/SimplnxCore/test/RenameDataObjectTest.cpp +++ b/src/Plugins/SimplnxCore/test/RenameDataObjectTest.cpp @@ -17,7 +17,7 @@ TEST_CASE("SimplnxCore::RenameDataAction(Instantiate)", "[SimplnxCore][RenameDat Arguments args; args.insert(RenameDataObject::k_NewName_Key, std::make_any(k_NewName)); - args.insert(RenameDataObject::k_DataObject_Key, std::make_any(k_DataPath)); + args.insert(RenameDataObject::k_SourceDataObjectPath_Key, std::make_any(k_DataPath)); auto result = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(result.outputActions); @@ -33,7 +33,7 @@ TEST_CASE("SimplnxCore::RenameDataAction(Invalid Parameters)", "[SimplnxCore][Re Arguments args; args.insert(RenameDataObject::k_NewName_Key, std::make_any(k_NewName)); - args.insert(RenameDataObject::k_DataObject_Key, std::make_any(k_DataPath)); + args.insert(RenameDataObject::k_SourceDataObjectPath_Key, std::make_any(k_DataPath)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); @@ -52,7 +52,7 @@ TEST_CASE("SimplnxCore::RenameDataAction(Valid Parameters)", "[SimplnxCore][Rena Arguments args; args.insert(RenameDataObject::k_NewName_Key, std::make_any(k_NewName)); - args.insert(RenameDataObject::k_DataObject_Key, std::make_any(k_DataPath)); + args.insert(RenameDataObject::k_SourceDataObjectPath_Key, std::make_any(k_DataPath)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); diff --git a/src/Plugins/SimplnxCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp b/src/Plugins/SimplnxCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp index 2b032c7623..1c5966396e 100644 --- a/src/Plugins/SimplnxCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp @@ -43,7 +43,7 @@ TEST_CASE("SimplnxCore::ReplaceElementAttributesWithNeighborValuesFilter", "[Sim args.insertOrAssign(ReplaceElementAttributesWithNeighborValuesFilter::k_SelectedComparison_Key, std::make_any(0)); args.insertOrAssign(ReplaceElementAttributesWithNeighborValuesFilter::k_Loop_Key, std::make_any(true)); args.insertOrAssign(ReplaceElementAttributesWithNeighborValuesFilter::k_ComparisonDataPath, std::make_any(k_ConfidenceIndexPath)); - args.insertOrAssign(ReplaceElementAttributesWithNeighborValuesFilter::k_SelectedImageGeometry_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(ReplaceElementAttributesWithNeighborValuesFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/ResampleImageGeomTest.cpp b/src/Plugins/SimplnxCore/test/ResampleImageGeomTest.cpp index 00bc20cc66..45804b2e3d 100644 --- a/src/Plugins/SimplnxCore/test/ResampleImageGeomTest.cpp +++ b/src/Plugins/SimplnxCore/test/ResampleImageGeomTest.cpp @@ -69,7 +69,7 @@ TEST_CASE("SimplnxCore::ResampleImageGeom: Invalid Parameters", "[SimplnxCore][R // Assign values to the filter parameters args.insertOrAssign(ResampleImageGeomFilter::k_RenumberFeatures_Key, std::make_any(true)); args.insertOrAssign(ResampleImageGeomFilter::k_RemoveOriginalGeometry_Key, std::make_any(true)); - args.insertOrAssign(ResampleImageGeomFilter::k_SelectedImageGeometry_Key, std::make_any(srcGeomPath)); + args.insertOrAssign(ResampleImageGeomFilter::k_SelectedImageGeometryPath_Key, std::make_any(srcGeomPath)); args.insertOrAssign(ResampleImageGeomFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(featureIdsPath)); args.insertOrAssign(ResampleImageGeomFilter::k_FeatureAttributeMatrix_Key, std::make_any(cellFeatureDataPath)); args.insertOrAssign(ResampleImageGeomFilter::k_CreatedImageGeometry_Key, std::make_any(destGeomPath)); @@ -122,7 +122,7 @@ TEST_CASE("SimplnxCore::ResampleImageGeom: 3D In Place", "[SimplnxCore][Resample } args.insertOrAssign(ResampleImageGeomFilter::k_RenumberFeatures_Key, std::make_any(true)); args.insertOrAssign(ResampleImageGeomFilter::k_RemoveOriginalGeometry_Key, std::make_any(true)); - args.insertOrAssign(ResampleImageGeomFilter::k_SelectedImageGeometry_Key, std::make_any(srcGeomPath)); + args.insertOrAssign(ResampleImageGeomFilter::k_SelectedImageGeometryPath_Key, std::make_any(srcGeomPath)); args.insertOrAssign(ResampleImageGeomFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(featureIdsPath)); args.insertOrAssign(ResampleImageGeomFilter::k_FeatureAttributeMatrix_Key, std::make_any(cellFeatureDataPath)); args.insertOrAssign(ResampleImageGeomFilter::k_CreatedImageGeometry_Key, std::make_any(destGeomPath)); @@ -264,7 +264,7 @@ TEST_CASE("SimplnxCore::ResampleImageGeom: 3D Save Geometry", "[SimplnxCore][Res } args.insertOrAssign(ResampleImageGeomFilter::k_RenumberFeatures_Key, std::make_any(true)); args.insertOrAssign(ResampleImageGeomFilter::k_RemoveOriginalGeometry_Key, std::make_any(false)); - args.insertOrAssign(ResampleImageGeomFilter::k_SelectedImageGeometry_Key, std::make_any(srcGeomPath)); + args.insertOrAssign(ResampleImageGeomFilter::k_SelectedImageGeometryPath_Key, std::make_any(srcGeomPath)); args.insertOrAssign(ResampleImageGeomFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(featureIdsPath)); args.insertOrAssign(ResampleImageGeomFilter::k_FeatureAttributeMatrix_Key, std::make_any(cellFeatureDataPath)); args.insertOrAssign(ResampleImageGeomFilter::k_CreatedImageGeometry_Key, std::make_any(destGeomPath)); @@ -401,7 +401,7 @@ TEST_CASE("SimplnxCore::ResampleImageGeom: 2D In Place", "[SimplnxCore][Resample } args.insertOrAssign(ResampleImageGeomFilter::k_RenumberFeatures_Key, std::make_any(false)); args.insertOrAssign(ResampleImageGeomFilter::k_RemoveOriginalGeometry_Key, std::make_any(true)); - args.insertOrAssign(ResampleImageGeomFilter::k_SelectedImageGeometry_Key, std::make_any(srcGeomPath)); + args.insertOrAssign(ResampleImageGeomFilter::k_SelectedImageGeometryPath_Key, std::make_any(srcGeomPath)); args.insertOrAssign(ResampleImageGeomFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(DataPath{})); args.insertOrAssign(ResampleImageGeomFilter::k_FeatureAttributeMatrix_Key, std::make_any(DataPath{})); args.insertOrAssign(ResampleImageGeomFilter::k_CreatedImageGeometry_Key, std::make_any(destGeomPath)); @@ -493,7 +493,7 @@ TEST_CASE("SimplnxCore::ResampleImageGeom: 2D Save Geometry", "[SimplnxCore][Res } args.insertOrAssign(ResampleImageGeomFilter::k_RenumberFeatures_Key, std::make_any(false)); args.insertOrAssign(ResampleImageGeomFilter::k_RemoveOriginalGeometry_Key, std::make_any(false)); - args.insertOrAssign(ResampleImageGeomFilter::k_SelectedImageGeometry_Key, std::make_any(srcGeomPath)); + args.insertOrAssign(ResampleImageGeomFilter::k_SelectedImageGeometryPath_Key, std::make_any(srcGeomPath)); args.insertOrAssign(ResampleImageGeomFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(DataPath{})); args.insertOrAssign(ResampleImageGeomFilter::k_FeatureAttributeMatrix_Key, std::make_any(DataPath{})); args.insertOrAssign(ResampleImageGeomFilter::k_CreatedImageGeometry_Key, std::make_any(destGeomPath)); diff --git a/src/Plugins/SimplnxCore/test/ResampleRectGridToImageGeomTest.cpp b/src/Plugins/SimplnxCore/test/ResampleRectGridToImageGeomTest.cpp index 63de965622..5c2b5c9995 100644 --- a/src/Plugins/SimplnxCore/test/ResampleRectGridToImageGeomTest.cpp +++ b/src/Plugins/SimplnxCore/test/ResampleRectGridToImageGeomTest.cpp @@ -60,7 +60,7 @@ TEST_CASE("SimplnxCore::ResampleRectGridToImageGeomFilter: Valid Filter Executio std::make_any(MultiArraySelectionParameter::ValueType{ k_RectGridCellDataPath.createChildPath(k_ConfidenceIndex), k_RectGridCellDataPath.createChildPath(k_EulerAngles), k_RectGridCellDataPath.createChildPath(k_FeatureIds), k_RectGridCellDataPath.createChildPath(k_NeighborListArrayName), k_RectGridCellDataPath.createChildPath(k_StringArrayName)})); - args.insertOrAssign(ResampleRectGridToImageGeomFilter::k_ImageGeomCellAttributeMatrix_Key, std::make_any(k_CellData)); + args.insertOrAssign(ResampleRectGridToImageGeomFilter::k_ImageGeomCellAttributeMatrixName_Key, std::make_any(k_CellData)); std::string exemplarImageGeomName; @@ -98,7 +98,7 @@ TEST_CASE("SimplnxCore::ResampleRectGridToImageGeomFilter: InValid Filter Execut // Create Parameters for the filter. args.insertOrAssign(ResampleRectGridToImageGeomFilter::k_RectilinearGridPath_Key, std::make_any(k_RectGridGeomPath)); args.insertOrAssign(ResampleRectGridToImageGeomFilter::k_ImageGeometryPath_Key, std::make_any(k_ImageGeomComputed)); - args.insertOrAssign(ResampleRectGridToImageGeomFilter::k_ImageGeomCellAttributeMatrix_Key, std::make_any(k_CellData)); + args.insertOrAssign(ResampleRectGridToImageGeomFilter::k_ImageGeomCellAttributeMatrixName_Key, std::make_any(k_CellData)); SECTION("Missing Selected Arrays") { diff --git a/src/Plugins/SimplnxCore/test/RobustAutomaticThresholdTest.cpp b/src/Plugins/SimplnxCore/test/RobustAutomaticThresholdTest.cpp index c4f77928af..58c7828212 100644 --- a/src/Plugins/SimplnxCore/test/RobustAutomaticThresholdTest.cpp +++ b/src/Plugins/SimplnxCore/test/RobustAutomaticThresholdTest.cpp @@ -24,14 +24,14 @@ TEST_CASE("SimplnxCore::RobustAutomaticThreshold: Missing/Empty DataPaths", "[Ro auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) } - args.insertOrAssign(RobustAutomaticThreshold::k_InputArrayPath, std::make_any(inputPath)); + args.insertOrAssign(RobustAutomaticThreshold::k_InputArrayPath_Key, std::make_any(inputPath)); // Preflight the filter and check result { auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) } - args.insertOrAssign(RobustAutomaticThreshold::k_GradientMagnitudePath, std::make_any(gradientMagnitudePath)); + args.insertOrAssign(RobustAutomaticThreshold::k_GradientMagnitudePath_Key, std::make_any(gradientMagnitudePath)); // Preflight the filter and check result { @@ -49,9 +49,9 @@ TEST_CASE("SimplnxCore::RobustAutomaticThreshold: Test Algorithm", "[RobustAutom DataPath inputPath({k_SmallIN100, k_EbsdScanData, "Phases"}); DataPath gradientMagnitudePath({k_SmallIN100, k_EbsdScanData, k_ConfidenceIndex}); - args.insertOrAssign(RobustAutomaticThreshold::k_InputArrayPath, std::make_any(inputPath)); - args.insertOrAssign(RobustAutomaticThreshold::k_GradientMagnitudePath, std::make_any(gradientMagnitudePath)); - args.insertOrAssign(RobustAutomaticThreshold::k_ArrayCreationPath, std::make_any("Created Array")); + args.insertOrAssign(RobustAutomaticThreshold::k_InputArrayPath_Key, std::make_any(inputPath)); + args.insertOrAssign(RobustAutomaticThreshold::k_GradientMagnitudePath_Key, std::make_any(gradientMagnitudePath)); + args.insertOrAssign(RobustAutomaticThreshold::k_ArrayCreationName_Key, std::make_any("Created Array")); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/RotateSampleRefFrameTest.cpp b/src/Plugins/SimplnxCore/test/RotateSampleRefFrameTest.cpp index e7eb868f52..9deb56a08c 100644 --- a/src/Plugins/SimplnxCore/test/RotateSampleRefFrameTest.cpp +++ b/src/Plugins/SimplnxCore/test/RotateSampleRefFrameTest.cpp @@ -136,7 +136,7 @@ TEST_CASE("SimplnxCore::RotateSampleRefFrame", "[Core][RotateSampleRefFrameFilte Arguments args; args.insertOrAssign(RotateSampleRefFrameFilter::k_RotationRepresentation_Key, std::make_any(to_underlying(RotateSampleRefFrameFilter::RotationRepresentation::AxisAngle))); - args.insertOrAssign(RotateSampleRefFrameFilter::k_SelectedImageGeometry_Key, std::make_any(k_OriginalGeomPath)); + args.insertOrAssign(RotateSampleRefFrameFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_OriginalGeomPath)); args.insertOrAssign(RotateSampleRefFrameFilter::k_RemoveOriginalGeometry_Key, std::make_any(false)); // We need to keep the geometries around. REQUIRE(dc != nullptr); @@ -155,7 +155,7 @@ TEST_CASE("SimplnxCore::RotateSampleRefFrame", "[Core][RotateSampleRefFrameFilte REQUIRE(expectedRotatedArray != nullptr); const DataPath testAxisAngleGeomPath({fmt::format("{}_Test_AxisAngle", name)}); - args.insertOrAssign(RotateSampleRefFrameFilter::k_CreatedImageGeometry_Key, std::make_any(testAxisAngleGeomPath)); + args.insertOrAssign(RotateSampleRefFrameFilter::k_CreatedImageGeometryPath_Key, std::make_any(testAxisAngleGeomPath)); const std::vector parts = StringUtilities::split(name, '_'); REQUIRE(parts.size() == 5); @@ -197,7 +197,7 @@ TEST_CASE("SimplnxCore::RotateSampleRefFrame", "[Core][RotateSampleRefFrameFilte args.insertOrAssign(RotateSampleRefFrameFilter::k_RotationRepresentation_Key, std::make_any(to_underlying(RotateSampleRefFrameFilter::RotationRepresentation::RotationMatrix))); args.insertOrAssign(RotateSampleRefFrameFilter::k_RotationMatrix_Key, std::make_any(table)); - args.insertOrAssign(RotateSampleRefFrameFilter::k_CreatedImageGeometry_Key, std::make_any(testRotationMatrixGeomPath)); + args.insertOrAssign(RotateSampleRefFrameFilter::k_CreatedImageGeometryPath_Key, std::make_any(testRotationMatrixGeomPath)); auto preflightRotationMatrixResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightRotationMatrixResult.outputActions); diff --git a/src/Plugins/SimplnxCore/test/ScalarSegmentFeaturesFilterTest.cpp b/src/Plugins/SimplnxCore/test/ScalarSegmentFeaturesFilterTest.cpp index b17e376026..bb0b042f74 100644 --- a/src/Plugins/SimplnxCore/test/ScalarSegmentFeaturesFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/ScalarSegmentFeaturesFilterTest.cpp @@ -47,9 +47,9 @@ TEST_CASE("SimplnxCore::ScalarSegmentFeatures", "[Reconstruction][ScalarSegmentF args.insertOrAssign(ScalarSegmentFeaturesFilter::k_InputArrayPathKey, std::make_any(inputDataArrayPath)); args.insertOrAssign(ScalarSegmentFeaturesFilter::k_ScalarToleranceKey, std::make_any(scalarTolerance)); // Set the paths to the created arrays - args.insertOrAssign(ScalarSegmentFeaturesFilter::k_FeatureIdsPathKey, std::make_any(outputFeatureIdsName)); - args.insertOrAssign(ScalarSegmentFeaturesFilter::k_CellFeaturePathKey, std::make_any(computedCellDataName)); - args.insertOrAssign(ScalarSegmentFeaturesFilter::k_ActiveArrayPathKey, std::make_any(k_ActiveName)); + args.insertOrAssign(ScalarSegmentFeaturesFilter::k_FeatureIdsName_Key, std::make_any(outputFeatureIdsName)); + args.insertOrAssign(ScalarSegmentFeaturesFilter::k_CellFeatureName_Key, std::make_any(computedCellDataName)); + args.insertOrAssign(ScalarSegmentFeaturesFilter::k_ActiveArrayName_Key, std::make_any(k_ActiveName)); // Are we going to randomize the featureIds when completed. args.insertOrAssign(ScalarSegmentFeaturesFilter::k_RandomizeFeatures_Key, std::make_any(false)); diff --git a/src/Plugins/SimplnxCore/test/SetImageGeomOriginScalingFilterTest.cpp b/src/Plugins/SimplnxCore/test/SetImageGeomOriginScalingFilterTest.cpp index 9f9433ceee..8ef1c7c45d 100644 --- a/src/Plugins/SimplnxCore/test/SetImageGeomOriginScalingFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/SetImageGeomOriginScalingFilterTest.cpp @@ -19,7 +19,7 @@ TEST_CASE("SimplnxCore::SetImageGeomOriginScalingFilter(Instantiate)", "[Simplnx DataStructure dataStructure = UnitTest::CreateDataStructure(); Arguments args; - args.insert(SetImageGeomOriginScalingFilter::k_ImageGeomPath_Key, std::make_any(k_ImageGeomPath)); + args.insert(SetImageGeomOriginScalingFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); args.insert(SetImageGeomOriginScalingFilter::k_ChangeOrigin_Key, std::make_any(k_ChangeOrigin)); args.insert(SetImageGeomOriginScalingFilter::k_ChangeSpacing_Key, std::make_any(k_ChangeResolution)); args.insert(SetImageGeomOriginScalingFilter::k_Origin_Key, std::make_any>(k_Origin)); @@ -41,7 +41,7 @@ TEST_CASE("SimplnxCore::SetImageGeomOriginScalingFilter: Valid Execution", "[Sim DataStructure dataStructure = UnitTest::CreateDataStructure(); Arguments args; - args.insert(SetImageGeomOriginScalingFilter::k_ImageGeomPath_Key, std::make_any(k_ImageGeomPath)); + args.insert(SetImageGeomOriginScalingFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); args.insert(SetImageGeomOriginScalingFilter::k_ChangeOrigin_Key, std::make_any(k_ChangeOrigin)); args.insert(SetImageGeomOriginScalingFilter::k_ChangeSpacing_Key, std::make_any(k_ChangeResolution)); args.insert(SetImageGeomOriginScalingFilter::k_Origin_Key, std::make_any>(k_Origin)); @@ -70,7 +70,7 @@ TEST_CASE("SimplnxCore::SetImageGeomOriginScalingFilter: 0,0,0 Central Origin", DataStructure dataStructure = UnitTest::CreateDataStructure(); Arguments args; - args.insert(SetImageGeomOriginScalingFilter::k_ImageGeomPath_Key, std::make_any(k_ImageGeomPath)); + args.insert(SetImageGeomOriginScalingFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); args.insert(SetImageGeomOriginScalingFilter::k_ChangeOrigin_Key, std::make_any(k_ChangeOrigin)); args.insert(SetImageGeomOriginScalingFilter::k_CenterOrigin_Key, std::make_any(true)); args.insert(SetImageGeomOriginScalingFilter::k_ChangeSpacing_Key, std::make_any(k_ChangeResolution)); @@ -100,7 +100,7 @@ TEST_CASE("SimplnxCore::SetImageGeomOriginScalingFilter: Custom Central Origin", DataStructure dataStructure = UnitTest::CreateDataStructure(); Arguments args; - args.insert(SetImageGeomOriginScalingFilter::k_ImageGeomPath_Key, std::make_any(k_ImageGeomPath)); + args.insert(SetImageGeomOriginScalingFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); args.insert(SetImageGeomOriginScalingFilter::k_ChangeOrigin_Key, std::make_any(k_ChangeOrigin)); args.insert(SetImageGeomOriginScalingFilter::k_CenterOrigin_Key, std::make_any(true)); args.insert(SetImageGeomOriginScalingFilter::k_ChangeSpacing_Key, std::make_any(k_ChangeResolution)); diff --git a/src/Plugins/SimplnxCore/test/SplitAttributeArrayTest.cpp b/src/Plugins/SimplnxCore/test/SplitAttributeArrayTest.cpp index 407920cf93..5e39769422 100644 --- a/src/Plugins/SimplnxCore/test/SplitAttributeArrayTest.cpp +++ b/src/Plugins/SimplnxCore/test/SplitAttributeArrayTest.cpp @@ -105,7 +105,7 @@ void TestSplitByType(DataStructure& dataStructure, const std::string& dataType, Arguments args; // read in the exemplar shift data file - args.insertOrAssign(SplitAttributeArrayFilter::k_MultiCompArray_Key, std::make_any(arrayPath)); + args.insertOrAssign(SplitAttributeArrayFilter::k_MultiCompArrayPath_Key, std::make_any(arrayPath)); args.insertOrAssign(SplitAttributeArrayFilter::k_Postfix_Key, std::make_any("Component")); args.insertOrAssign(SplitAttributeArrayFilter::k_DeleteOriginal_Key, std::make_any(false)); if(!extractComps.empty()) diff --git a/src/Plugins/SimplnxCore/test/SurfaceNetsTest.cpp b/src/Plugins/SimplnxCore/test/SurfaceNetsTest.cpp index b09af1b6ed..d6a29f56d8 100644 --- a/src/Plugins/SimplnxCore/test/SurfaceNetsTest.cpp +++ b/src/Plugins/SimplnxCore/test/SurfaceNetsTest.cpp @@ -47,7 +47,7 @@ TEST_CASE("SimplnxCore::SurfaceNetsFilter: NO Smoothing", "[SimplnxCore][Surface args.insertOrAssign(SurfaceNetsFilter::k_SelectedDataArrayPaths_Key, std::make_any(selectedArrayPaths)); - args.insertOrAssign(SurfaceNetsFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeometryPath)); + args.insertOrAssign(SurfaceNetsFilter::k_CreatedTriangleGeometryPath_Key, std::make_any(triangleGeometryPath)); const DataPath vertexGroupDataPath = triangleGeometryPath.createChildPath(k_VertexDataGroupName); args.insertOrAssign(SurfaceNetsFilter::k_VertexDataGroupName_Key, std::make_any(k_VertexDataGroupName)); @@ -124,7 +124,7 @@ TEST_CASE("SimplnxCore::SurfaceNetsFilter: With Smoothing", "[SimplnxCore][Surfa args.insertOrAssign(SurfaceNetsFilter::k_SelectedDataArrayPaths_Key, std::make_any(selectedArrayPaths)); - args.insertOrAssign(SurfaceNetsFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeometryPath)); + args.insertOrAssign(SurfaceNetsFilter::k_CreatedTriangleGeometryPath_Key, std::make_any(triangleGeometryPath)); const DataPath vertexGroupDataPath = triangleGeometryPath.createChildPath(k_VertexDataGroupName); args.insertOrAssign(SurfaceNetsFilter::k_VertexDataGroupName_Key, std::make_any(k_VertexDataGroupName)); diff --git a/src/Plugins/SimplnxCore/test/TriangleNormalFilterTest.cpp b/src/Plugins/SimplnxCore/test/TriangleNormalFilterTest.cpp index 18974c5cb7..abde556032 100644 --- a/src/Plugins/SimplnxCore/test/TriangleNormalFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/TriangleNormalFilterTest.cpp @@ -44,7 +44,7 @@ TEST_CASE("SimplnxCore::TriangleNormalFilter", "[SimplnxCore][TriangleNormalFilt // Create default Parameters for the filter. args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); + args.insertOrAssign(ReadStlFileFilter::k_CreatedTriangleGeometryPath_Key, std::make_any(triangleGeomDataPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -68,7 +68,7 @@ TEST_CASE("SimplnxCore::TriangleNormalFilter", "[SimplnxCore][TriangleNormalFilt // Create default Parameters for the filter. args.insertOrAssign(TriangleNormalFilter::k_TriGeometryDataPath_Key, std::make_any(geometryPath)); - args.insertOrAssign(TriangleNormalFilter::k_SurfaceMeshTriangleNormalsArrayPath_Key, std::make_any(triangleNormalsName)); + args.insertOrAssign(TriangleNormalFilter::k_SurfaceMeshTriangleNormalsArrayName_Key, std::make_any(triangleNormalsName)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/wrapping/python/simplnxpy.cpp b/src/Plugins/SimplnxCore/wrapping/python/simplnxpy.cpp index 57481158cb..cd71051270 100644 --- a/src/Plugins/SimplnxCore/wrapping/python/simplnxpy.cpp +++ b/src/Plugins/SimplnxCore/wrapping/python/simplnxpy.cpp @@ -837,7 +837,7 @@ PYBIND11_MODULE(simplnx, mod) iDataCreationActionArrayHandlingType.value("Create", IDataCreationAction::ArrayHandlingType::Create); auto copyArrayInstanceAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CopyArrayInstanceAction, IDataCreationAction); - copyArrayInstanceAction.def(py::init(), "selected_data_path"_a, "created_data_path"_a); + copyArrayInstanceAction.def(py::init(), "input_data_array_path"_a, "output_data_array_path"_a); auto copyDataObjectAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CopyDataObjectAction, IDataCreationAction); copyDataObjectAction.def(py::init>(), "path"_a, "new_path"_a, "all_created_paths"_a); diff --git a/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.hpp b/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.hpp index 8edd67e4d1..71d52956f2 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.hpp @@ -20,11 +20,11 @@ class TESTONE_EXPORT CreateOutOfCoreArray : public IFilter CreateOutOfCoreArray& operator=(CreateOutOfCoreArray&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_NumericType_Key = "numeric_type"; + static inline constexpr StringLiteral k_NumericType_Key = "numeric_type_index"; static inline constexpr StringLiteral k_NumComps_Key = "component_count"; static inline constexpr StringLiteral k_TupleDims_Key = "tuple_dimensions"; - static inline constexpr StringLiteral k_DataPath_Key = "output_data_array"; - static inline constexpr StringLiteral k_InitilizationValue_Key = "initialization_value"; + static inline constexpr StringLiteral k_DataPath_Key = "output_array_path"; + static inline constexpr StringLiteral k_InitilizationValue_Key = "initialization_value_str"; /** * @brief diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.cpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.cpp index 9cfaf94fbc..2e345fd760 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.cpp @@ -25,10 +25,10 @@ constexpr StringLiteral k_Param2 = "param2"; constexpr StringLiteral k_Param3 = "param3"; constexpr StringLiteral k_Param4 = "param4"; constexpr StringLiteral k_Param5 = "param5"; -constexpr StringLiteral k_Param6 = "param6"; +constexpr StringLiteral k_Param6 = "param6_index"; constexpr StringLiteral k_Param7 = "param7"; constexpr StringLiteral k_Param8 = "param8"; -constexpr StringLiteral k_Param9 = "param9"; +constexpr StringLiteral k_Param9 = "param9_index"; constexpr StringLiteral k_Param10 = "param10"; } // namespace diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.cpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.cpp index 1c422c63b4..a27c97e9bd 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.cpp @@ -19,20 +19,18 @@ namespace { constexpr StringLiteral k_Param1 = "param1"; constexpr StringLiteral k_Param2 = "param2"; -constexpr StringLiteral k_Param3 = "param3"; +constexpr StringLiteral k_Param3 = "param3_index"; constexpr StringLiteral k_Param4 = "param4"; -constexpr StringLiteral k_Param5 = "param5"; -constexpr StringLiteral k_Param6 = "param6"; +constexpr StringLiteral k_Param5 = "param5_path"; +constexpr StringLiteral k_Param6 = "param6_path"; constexpr StringLiteral k_Param7 = "param7"; -constexpr StringLiteral k_Param8 = "param8"; -constexpr StringLiteral k_Param9 = "param9"; -constexpr StringLiteral k_Param10 = "param10"; -constexpr StringLiteral k_Param11 = "param11"; -constexpr StringLiteral k_Param12 = "param12"; +constexpr StringLiteral k_Param8 = "param8_path"; +constexpr StringLiteral k_Param9 = "param9_path"; +constexpr StringLiteral k_Param10 = "param10_path"; +constexpr StringLiteral k_Param11 = "param11_path"; +constexpr StringLiteral k_Param12 = "param12s"; constexpr StringLiteral k_Param13 = "param13"; -constexpr StringLiteral k_Param14 = "param14"; -constexpr StringLiteral k_Param15 = "param15"; -constexpr StringLiteral k_Param16 = "param16"; + } // namespace namespace nx::core diff --git a/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp b/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp index 1e5151fbce..9571ed8d9e 100644 --- a/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp +++ b/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp @@ -11,7 +11,7 @@ namespace { constexpr StringLiteral k_Param1 = "param1"; constexpr StringLiteral k_Param2 = "param2"; -constexpr StringLiteral k_Param3 = "param3"; +constexpr StringLiteral k_Param3 = "param3_index"; } // namespace Test2Filter::Test2Filter() = default; diff --git a/src/nxrunner/src/CliObserver.cpp b/src/nxrunner/src/CliObserver.cpp index 66f8b8ddaa..9f9cc07003 100644 --- a/src/nxrunner/src/CliObserver.cpp +++ b/src/nxrunner/src/CliObserver.cpp @@ -1,7 +1,9 @@ #include "CliObserver.hpp" #include "simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp" +#include "simplnx/Utilities/TimeUtilities.hpp" +#include #include #include @@ -27,21 +29,21 @@ PipelineObserver::PipelineObserver(Pipeline* pipeline) for(const auto cxFilter : *pipeline) { m_SignalConnections.push_back(cxFilter->getFilterUpdateSignal().connect([currentFilterIndex](nx::core::AbstractPipelineNode* node, int32_t, const std::string& message) { - std::cout << "[" << currentFilterIndex << "] " << node->getName() << ": " << message << std::endl; + std::cout << timestamp() << " [" << currentFilterIndex << "] " << node->getName() << ": " << message << std::endl; })); m_SignalConnections.push_back(cxFilter->getFilterProgressSignal().connect([currentFilterIndex](nx::core::AbstractPipelineNode* node, int32_t, int32_t progress, const std::string& message) { - std::cout << "[" << currentFilterIndex << "] " << node->getName() << ": " << progress << "% " << message << std::endl; + std::cout << timestamp() << " [" << currentFilterIndex << "] " << node->getName() << ": " << progress << "% " << message << std::endl; })); m_SignalConnections.push_back(cxFilter->getFilterFaultSignal().connect([currentFilterIndex](nx::core::AbstractPipelineNode*, int32_t filterIndex, nx::core::FaultState state) { if(state == nx::core::FaultState::Errors) { - std::cout << "[" << currentFilterIndex << "] Error(s) Encountered during filter execution. Fault state= " << static_cast(state) << std::endl; + std::cout << timestamp() << " [" << currentFilterIndex << "] Error(s) Encountered during filter execution. Fault state= " << static_cast(state) << std::endl; } if(state == nx::core::FaultState::Warnings) { - std::cout << "[" << currentFilterIndex << "] Warning(s) Encountered during filter execution. Fault state= " << static_cast(state) << std::endl; + std::cout << timestamp() << " [" << currentFilterIndex << "] Warning(s) Encountered during filter execution. Fault state= " << static_cast(state) << std::endl; } })); @@ -78,7 +80,7 @@ void PipelineObserver::onNotify(AbstractPipelineNode* node, const std::shared_pt void PipelineObserver::onCancelled() const { - std::cout << "Pipeline has been cancelled" << std::endl; + std::cout << timestamp() << " Pipeline has been cancelled" << std::endl; } void PipelineObserver::onFilterProgress(AbstractPipelineNode* node, int32 progress, int32 maxProgress, const std::string& msg) const @@ -91,13 +93,13 @@ void PipelineObserver::onRunStateChanged(AbstractPipelineNode* node, RunState st switch(state) { case RunState::Executing: - std::cout << fmt::format("{} has begun executing", node->getName()) << std::endl; + std::cout << timestamp() << fmt::format(" {} has begun executing", node->getName()) << std::endl; break; case RunState::Preflighting: - std::cout << fmt::format("{} has begun preflighting", node->getName()) << std::endl; + std::cout << timestamp() << fmt::format(" {} has begun preflighting", node->getName()) << std::endl; break; case RunState::Idle: - std::cout << fmt::format("{} has completed", node->getName()) << std::endl; + std::cout << timestamp() << fmt::format(" {} has completed", node->getName()) << std::endl; break; case RunState::Queued: break; @@ -114,10 +116,10 @@ void PipelineObserver::onFaultStateChanged(AbstractPipelineNode* node, FaultStat switch(state) { case FaultState::Errors: - std::cout << fmt::format("{} has completed with errors", node->getName()) << std::endl; + std::cout << timestamp() << fmt::format(" '{}' has completed with errors", node->getName()) << std::endl; break; case FaultState::Warnings: - std::cout << fmt::format("{} has completed with warnings", node->getName()) << std::endl; + std::cout << timestamp() << fmt::format(" '{}' has completed with warnings", node->getName()) << std::endl; break; case FaultState::None: break; diff --git a/src/nxrunner/src/nxrunner.cpp b/src/nxrunner/src/nxrunner.cpp index c7c93d438d..209271b5a2 100644 --- a/src/nxrunner/src/nxrunner.cpp +++ b/src/nxrunner/src/nxrunner.cpp @@ -6,6 +6,7 @@ #include "simplnx/SIMPLNXVersion.hpp" #include "simplnx/SimplnxPython.hpp" #include "simplnx/Utilities/StringUtilities.hpp" +#include "simplnx/Utilities/TimeUtilities.hpp" #include @@ -293,7 +294,7 @@ Result<> ExecutePipeline(Pipeline& pipeline) std::string ss = "Error executing pipeline"; return nx::core::MakeErrorResult(k_ExecutePipelineError, ss); } - cliOut << "Finished executing pipeline"; + cliOut << timestamp() << " Finished executing pipeline"; cliOut.endline(); return {}; } @@ -308,6 +309,15 @@ Result<> ExecutePipeline(const Argument& arg) cliOut.endline(); return nx::core::ConvertResult(std::move(loadPipelineResult)); } + if(!loadPipelineResult.m_Warnings.empty()) + { + cliOut << "Input Pipeline Warnings" + << "\n"; + for(const auto& warning : loadPipelineResult.m_Warnings) + { + cliOut << fmt::format(" [{}] {}", warning.code, warning.message) << "\n"; + } + } Pipeline pipeline = loadPipelineResult.value(); cliOut << fmt::format("Executing pipeline at path: '{}'\n", pipelinePath); @@ -325,6 +335,15 @@ Result<> PreflightPipeline(const Argument& arg) cliOut.endline(); return nx::core::ConvertResult(std::move(loadPipelineResult)); } + if(!loadPipelineResult.m_Warnings.empty()) + { + cliOut << "Input Pipeline Warnings" + << "\n"; + for(const auto& warning : loadPipelineResult.m_Warnings) + { + cliOut << fmt::format(" [{}] {}", warning.code, warning.message) << "\n"; + } + } cliOut << fmt::format("Preflighting pipeline at path: '{}'\n", pipelinePath); cliOut.endline(); diff --git a/src/simplnx/Filter/IFilter.cpp b/src/simplnx/Filter/IFilter.cpp index 47a17c04a0..bd9b6b9fbf 100644 --- a/src/simplnx/Filter/IFilter.cpp +++ b/src/simplnx/Filter/IFilter.cpp @@ -2,6 +2,7 @@ #include "simplnx/Filter/DataParameter.hpp" #include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include @@ -262,12 +263,17 @@ Result IFilter::fromJson(const nlohmann::json& json) const Arguments args; std::vector errors; std::vector warnings; + + std::vector paramKeyNotFound; + std::vector jsonKeyNotFound; + for(const auto& [name, param] : params) { if(!json.contains(name)) { - warnings.push_back(Warning{-1, fmt::format("JSON does not contain key '{}'. Falling back to default value.", name)}); + // warnings.push_back(Warning{-5432, fmt::format("PARAMETER_KEY_NOT_FOUND_IN_JSON | '{}' | Parameter Key '{}' missing from the JSON", className(), name)}); args.insert(name, param->defaultValue()); + paramKeyNotFound.push_back(name); continue; } const auto& jsonValue = json[name]; @@ -279,6 +285,29 @@ Result IFilter::fromJson(const nlohmann::json& json) const } args.insert(name, std::move(jsonResult.value())); } + + for(auto& [key, val] : json.items()) + { + if(!params.contains(key)) + { + // warnings.push_back(Warning{-5433, fmt::format("JSON_KEY_NOT_FOUND_IN_PARAMETER | '{}' | JSON Key '{}' missing from the parameter list", className(), key)}); + jsonKeyNotFound.push_back(key); + continue; + } + } + + auto bestMatches = StringUtilities::FindBestMatches(jsonKeyNotFound, paramKeyNotFound); + for(const auto& match : bestMatches) + { + if(!match.first.empty() && !match.second.empty()) + { + warnings.push_back( + Warning{-5434, fmt::format("Filter '{}': JSON Parameter Warning\n JSON Parameter Key '{}' is not an accepted Parameter Key for the filter. Closest match is " + "'{}'\n Suggested change is '{}' ==> '{}' (This is *ONLY* a suggestion.)\n Open the JSON file in a text editor and make the suggested changes.", + className(), match.first, match.second, match.first, match.second)}); + } + } + if(!errors.empty()) { return {nonstd::make_unexpected(std::move(errors))}; diff --git a/src/simplnx/Utilities/FileUtilities.cpp b/src/simplnx/Utilities/FileUtilities.cpp index 988df77167..5ce3264c78 100644 --- a/src/simplnx/Utilities/FileUtilities.cpp +++ b/src/simplnx/Utilities/FileUtilities.cpp @@ -168,13 +168,14 @@ Result<> ValidateDirectoryWritePermission(const fs::path& path, bool isFile) { if(path.empty()) { - return MakeErrorResult(-16, "ValidateDirectoryWritePermission() error: given path was empty."); + return MakeErrorResult(-16, "ValidateDirectoryWritePermission() Error: Input path empty."); } auto checkedPath = path; - if(isFile) + auto parentPath = checkedPath.parent_path(); + if(isFile && !parentPath.empty()) { - checkedPath = checkedPath.parent_path(); + checkedPath = parentPath; } // We now have the parent directory. Let us see if *any* part of the path exists @@ -186,7 +187,9 @@ Result<> ValidateDirectoryWritePermission(const fs::path& path, bool isFile) checkedPath = fs::absolute(checkedPath); } catch(const std::filesystem::filesystem_error& error) { - return MakeErrorResult(-15, fmt::format("ValidateDirectoryWritePermission() threw an error: '{}'", error.what())); + return MakeErrorResult(-15, fmt::format("ValidateDirectoryWritePermission() Error: Input Path '{}' was relative and trying to create an absolute path threw an exception with message '{}'. " + "Further error code and message from the file system was: Code={} Message={}", + path.string(), error.what(), error.code().value(), error.code().message())); } } @@ -207,12 +210,13 @@ Result<> ValidateDirectoryWritePermission(const fs::path& path, bool isFile) if(checkedPath.empty()) { - return MakeErrorResult(-19, "ValidateDirectoryWritePermission() resolved path was empty"); + return MakeErrorResult(-19, fmt::format("ValidateDirectoryWritePermission() Error: Input path '{}' resolved to an empty path", path.string())); } if(!fs::exists(checkedPath)) { - return MakeErrorResult(-11, fmt::format("ValidateDirectoryWritePermission() error: The drive does not exist on this system: '{}'", checkedPath.string())); + return MakeErrorResult(-11, + fmt::format("ValidateDirectoryWritePermission() Error: Input Path '{}' resolved to '{}'. The drive does not exist on this system.", path.string(), checkedPath.string())); } // We should be at the top of the tree with an existing directory. @@ -220,6 +224,6 @@ Result<> ValidateDirectoryWritePermission(const fs::path& path, bool isFile) { return {}; } - return MakeErrorResult(-8, fmt::format("User does not have write permissions to path '{}'", path.string())); + return MakeErrorResult(-8, fmt::format("ValidateDirectoryWritePermission() Error: User does not have write permissions to path '{}'", path.string())); } } // namespace nx::core::FileUtilities diff --git a/src/simplnx/Utilities/StringUtilities.hpp b/src/simplnx/Utilities/StringUtilities.hpp index d8978ff84b..5a5cc5e8fd 100644 --- a/src/simplnx/Utilities/StringUtilities.hpp +++ b/src/simplnx/Utilities/StringUtilities.hpp @@ -32,12 +32,17 @@ #pragma once #include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Common/Types.hpp" #include #include +#include #include +#include #include +#include +#include #include /*' '(0x20)space(SPC) @@ -439,4 +444,62 @@ inline std::string toLower(std::string input) return input; } +/** + * @brief Calculates the Levenshtein distance between two strings. + * @param s1 + * @param s2 + * @return uint32 + */ +inline uint32 CalculateLevenshteinDistance(const std::string& s1, const std::string& s2) +{ + usize len1 = s1.size(); + usize len2 = s2.size(); + std::vector> d(len1 + 1, std::vector(len2 + 1)); + + d[0][0] = 0; + for(uint32 i = 1; i <= len1; ++i) + { + d[i][0] = i; + } + for(uint32 i = 1; i <= len2; ++i) + { + d[0][i] = i; + } + + for(uint32 i = 1; i <= len1; ++i) + { + for(uint32 j = 1; j <= len2; ++j) + { + d[i][j] = std::min({d[i - 1][j] + 1, d[i][j - 1] + 1, d[i - 1][j - 1] + (s1[i - 1] == s2[j - 1] ? 0 : 1)}); + } + } + return d[len1][len2]; +} + +/** + * @brief Finds the best matches between two lists of strings using the Levenshtein distance. + * @param vec1 + * @param vec2 + * @return std::vector> + */ +inline std::vector> FindBestMatches(const std::vector& vec1, const std::vector& vec2) +{ + std::vector> bestPairs; + for(const auto& word1 : vec1) + { + uint32 bestDistance = std::numeric_limits::max(); + std::string bestMatch; + for(const auto& word2 : vec2) + { + uint32 currentDistance = CalculateLevenshteinDistance(word1, word2); + if(currentDistance < bestDistance) + { + bestDistance = currentDistance; + bestMatch = word2; + } + } + bestPairs.emplace_back(word1, bestMatch); + } + return bestPairs; +} } // namespace nx::core::StringUtilities diff --git a/src/simplnx/Utilities/TimeUtilities.hpp b/src/simplnx/Utilities/TimeUtilities.hpp index e971aed62f..732ed06f49 100644 --- a/src/simplnx/Utilities/TimeUtilities.hpp +++ b/src/simplnx/Utilities/TimeUtilities.hpp @@ -2,6 +2,7 @@ #include "simplnx/simplnx_export.hpp" +#include #include #include @@ -11,6 +12,12 @@ namespace nx::core { +inline std::string timestamp() +{ + std::time_t t = std::time(nullptr); + return fmt::format("[{:%Y:%m:%d %H:%M:%S}]", fmt::localtime(t)); +} + /** * @brief Converts a millisecond count to Hours:Minutes:Seconds type of display. This assumes * that the time would not be longer than 99 hours, 99 minutes, 99 seconds. diff --git a/test/PluginTest.cpp b/test/PluginTest.cpp index 87566d2eea..48bfbcfd76 100644 --- a/test/PluginTest.cpp +++ b/test/PluginTest.cpp @@ -2,6 +2,7 @@ #include "simplnx/DataStructure/DataStructure.hpp" #include "simplnx/Filter/FilterHandle.hpp" #include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include "simplnx/unit_test/simplnx_test_dirs.hpp" #include @@ -21,8 +22,78 @@ constexpr Uuid k_TestTwoPluginId = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43 constexpr Uuid k_Test2FilterId = *Uuid::FromString("ad9cf22b-bc5e-41d6-b02e-bb49ffd12c04"); const FilterHandle k_Test2FilterHandle(k_Test2FilterId, k_TestTwoPluginId); +std::map s_ParameterMap; + } // namespace +#define ADD_PARAMETER_TRAIT(thing1, thing2) \ + { \ + auto uuidResult = nx::core::Uuid::FromString(thing2); \ + if(uuidResult.has_value()) \ + { \ + ::s_ParameterMap[uuidResult.value()] = #thing1; \ + } \ + } + +void GenerateParameterList() +{ + ::s_ParameterMap.clear(); + ADD_PARAMETER_TRAIT(simplnx.OEMEbsdScanSelectionParameter, "3935c833-aa51-4a58-81e9-3a51972c05ea") + ADD_PARAMETER_TRAIT(simplnx.ReadH5EbsdFileParameter, "FAC15aa6-b367-508e-bf73-94ab6be0058b") + ADD_PARAMETER_TRAIT(simplnx.NumericTypeParameter, "a8ff9dbd-45e7-4ed6-8537-12dd53069bce") + ADD_PARAMETER_TRAIT(simplnx.StringParameter, "5d6d1868-05f8-11ec-9a03-0242ac130003") + ADD_PARAMETER_TRAIT(simplnx.DataStoreFormatParameter, "cfd5c150-2938-42a7-b023-4a9288fb6899") + ADD_PARAMETER_TRAIT(simplnx.MultiPathSelectionParameter, "b5632f4f-fc13-4234-beb2-8fd8820eb6b6") + ADD_PARAMETER_TRAIT(simplnx.DataTypeParameter, "d31358d5-3253-4c69-aff0-eb98618f851b") + ADD_PARAMETER_TRAIT(simplnx.EnsembleInfoParameter, "10d3924f-b4c9-4e06-9225-ce11ec8dff89") + ADD_PARAMETER_TRAIT(simplnx.ArrayThresholdsParameter, "e93251bc-cdad-44c2-9332-58fe26aedfbe") + ADD_PARAMETER_TRAIT(simplnx.GenerateColorTableParameter, "7b0e5b25-564e-4797-b154-4324ef276bf0") + ADD_PARAMETER_TRAIT(simplnx.DataObjectNameParameter, "fbc89375-3ca4-4eb2-8257-aad9bf8e1c94") + ADD_PARAMETER_TRAIT(simplnx.NeighborListSelectionParameter, "ab0b7a7f-f9ab-4e6f-99b5-610e7b69fc5b") + ADD_PARAMETER_TRAIT(simplnx.ChoicesParameter, "ee4d5ce2-9582-48fa-b182-8a766ce0feff") + ADD_PARAMETER_TRAIT(simplnx.GeneratedFileListParameter, "aac15aa6-b367-508e-bf73-94ab6be0058b") + ADD_PARAMETER_TRAIT(simplnx.DataPathSelectionParameter, "cd12d081-fbf0-46c4-8f4a-15e2e06e98b8") + ADD_PARAMETER_TRAIT(simplnx.CalculatorParameter, "ba2d4937-dbec-5536-8c5c-c0a406e80f77") + ADD_PARAMETER_TRAIT(simplnx.ReadCSVFileParameter, "4f6d6a33-48da-427a-8b17-61e07d1d5b45") + + ADD_PARAMETER_TRAIT(simplnx.MultiArraySelectionParameter, "d11e0bd8-f227-4fd1-b618-b6f16b259fc8") + ADD_PARAMETER_TRAIT(simplnx.ArraySelectionParameter, "ab047a7f-f9ab-4e6f-99b5-610e7b69fc5b") + ADD_PARAMETER_TRAIT(simplnx.DataGroupSelectionParameter, "bff3d4ac-04a6-5251-b178-4f83f7865074") + ADD_PARAMETER_TRAIT(simplnx.AttributeMatrixSelectionParameter, "a3619d74-a1d9-4bc2-9e03-ca001d65b119") + ADD_PARAMETER_TRAIT(simplnx.GeometrySelectionParameter, "3804cd7f-4ee4-400f-80ad-c5af17735de2") + + ADD_PARAMETER_TRAIT(simplnx.DataGroupCreationParameter, "bff2d4ac-04a6-5251-b188-4f83f7865074") + ADD_PARAMETER_TRAIT(simplnx.ArrayCreationParameter, "ab047a7d-f81b-4e6f-99b5-610e7b69fc5b") + + ADD_PARAMETER_TRAIT(simplnx.FileSystemPathParameter, "f9a93f3d-21ef-43a1-a958-e57cbf3b2909") + ADD_PARAMETER_TRAIT(simplnx.BoolParameter, "b6936d18-7476-4855-9e13-e795d717c50f") + ADD_PARAMETER_TRAIT(simplnx.ReadHDF5DatasetParameter, "32e83e13-ee4c-494e-8bab-4e699df74a5a") + ADD_PARAMETER_TRAIT(simplnx.Dream3dImportParameter, "170a257d-5952-4854-9a91-4281cd06f4f5") + ADD_PARAMETER_TRAIT(simplnx.DynamicTableParameter, "eea76f1a-fab9-4704-8da5-4c21057cf44e") + + ADD_PARAMETER_TRAIT(simplnx.Int8Parameter, "cae73834-68f8-4235-b010-8bea87d8ff7a") + ADD_PARAMETER_TRAIT(simplnx.UInt8Parameter, "6c3efeff-ce8f-47c0-83d1-262f2b2dd6cc") + ADD_PARAMETER_TRAIT(simplnx.Int16Parameter, "44ae56e8-e6e7-4e4d-8128-dd3dc2c6696e") + ADD_PARAMETER_TRAIT(simplnx.UInt16Parameter, "156a6f46-77e5-41d8-8f5a-65ba1da52f2a") + ADD_PARAMETER_TRAIT(simplnx.Int32Parameter, "21acff45-a653-45db-a0d1-f43cd344b93a") + ADD_PARAMETER_TRAIT(simplnx.UInt32Parameter, "e9521130-276c-40c7-95d7-0b4cb4f80649") + ADD_PARAMETER_TRAIT(simplnx.Int64Parameter, "b2039349-bd3a-4dbb-93d2-b4b5c633e697") + ADD_PARAMETER_TRAIT(simplnx.UInt64Parameter, "36d91b23-5500-4ed4-bdf3-d680f54ee5d1") + ADD_PARAMETER_TRAIT(simplnx.Float32Parameter, "e4452dfe-2f70-4833-819e-0cbbec21289b") + ADD_PARAMETER_TRAIT(simplnx.Float64Parameter, "f2a18fff-a095-47d7-b436-ede41b5ea21a") + + ADD_PARAMETER_TRAIT(simplnx.VectorInt8Parameter, "9f5f9683-e492-4a79-8378-79d727b2356a") + ADD_PARAMETER_TRAIT(simplnx.VectorUInt8Parameter, "bff78ff3-35ef-482a-b3b1-df8806e7f7ef") + ADD_PARAMETER_TRAIT(simplnx.VectorInt16Parameter, "43810a29-1a5f-4472-bec6-41de9ffe27f7") + ADD_PARAMETER_TRAIT(simplnx.VectorUInt16Parameter, "2f1ba2f4-c5d5-403c-8b90-0bf60d2bde9b") + ADD_PARAMETER_TRAIT(simplnx.VectorInt32Parameter, "d3188e18-e383-4727-ab32-88b5fda56ae8") + ADD_PARAMETER_TRAIT(simplnx.VectorUInt32Parameter, "37322aa6-1a2f-4ecb-9aa1-8922d7ac1e49") + ADD_PARAMETER_TRAIT(simplnx.VectorInt64Parameter, "4ceaffc1-7326-4f65-a33a-eae263dc22d1") + ADD_PARAMETER_TRAIT(simplnx.VectorUInt64Parameter, "17309744-c4e8-4d1e-807e-e7012387f1ec") + ADD_PARAMETER_TRAIT(simplnx.VectorFloat32Parameter, "88f231a1-7956-41f5-98b7-4471705d2805") + ADD_PARAMETER_TRAIT(simplnx.VectorFloat64Parameter, "57cbdfdf-9d1a-4de8-95d7-71d0c01c5c96") +} + TEST_CASE("Test Loading Plugins") { auto app = Application::GetOrCreateInstance(); @@ -106,8 +177,9 @@ TEST_CASE("Test Singleton") REQUIRE(Application::Instance() == nullptr); } -TEST_CASE("Test Filter Help Text") +TEST_CASE("Test Filter Parameter Keys") { + GenerateParameterList(); auto appPtr = Application::GetOrCreateInstance(); appPtr->loadPlugins(unit_test::k_BuildDir.view()); REQUIRE(appPtr != nullptr); @@ -149,6 +221,29 @@ TEST_CASE("Test Filter Help Text") break; } } + + std::string pType = s_ParameterMap[paramValue->uuid()]; + if(!nx::core::StringUtilities::ends_with(parameter.first, "_path") && + (pType == "simplnx.ArraySelectionParameter" || pType == "simplnx.ArrayCreationParameter" || pType == "simplnx.AttributeMatrixSelectionParameter" || + pType == "simplnx.DataGroupCreationParameter" || pType == "simplnx.DataGroupSelectionParameter" || pType == "simplnx.DataPathSelectionParameter" || + pType == "simplnx.GeometrySelectionParameter" || pType == "simplnx.NeighborListSelectionParameter" || pType == "simplnx.DataGroupCreationParameter")) + { + output << plugName << "->" << filter->name() << "->" << paramValue->name() << " The parameter key should end with '_path' for a Parameter of Type " << pType << std::endl; + } + + if(pType == "simplnx.MultiArraySelectionParameter" && !nx::core::StringUtilities::ends_with(parameter.first, "s")) + { + output << plugName << "->" << filter->name() << "->" << paramValue->name() << " The parameter key should end with 's' for a Parameter of Type " << pType << std::endl; + } + + if(pType == "simplnx.DataObjectNameParameter" && !nx::core::StringUtilities::ends_with(parameter.first, "_name")) + { + output << plugName << "->" << filter->name() << "->" << paramValue->name() << " The parameter key should end with '_name' for a Parameter of Type " << pType << std::endl; + } + if((pType == "simplnx.ChoicesParameter" || pType == "simplnx.NumericTypeParameter") && !nx::core::StringUtilities::ends_with(parameter.first, "_index")) + { + output << plugName << "->" << filter->name() << "->" << paramValue->name() << " The parameter key should end with '_index' for a Parameter of Type " << pType << std::endl; + } } } } diff --git a/test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp b/test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp index 30f3563588..b215f7f935 100644 --- a/test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp +++ b/test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp @@ -438,7 +438,7 @@ void CompareDataArrays(const IDataArray& left, const IDataArray& right, usize st newVal = newDataStore[i]; if(oldVal != newVal) { - UNSCOPED_INFO(fmt::format("oldValue != newValue. {} != {}", oldVal, newVal)); + UNSCOPED_INFO(fmt::format("index=: {} oldValue != newValue. {} != {}", i, oldVal, newVal)); if constexpr(std::is_floating_point_v) { @@ -1211,8 +1211,8 @@ namespace SmallIn100 //------------------------------------------------------------------------------ inline void ExecuteMultiThresholdObjects(DataStructure& dataStructure, const FilterList& filterList) { - constexpr StringLiteral k_ArrayThresholds_Key = "array_thresholds"; - constexpr StringLiteral k_CreatedDataPath_Key = "created_data_path"; + constexpr StringLiteral k_ArrayThresholds_Key = "array_thresholds_object"; + constexpr StringLiteral k_CreatedDataPath_Key = "output_data_array_name"; INFO(fmt::format("Error creating Filter '{}' ", k_MultiThresholdObjectsFilterHandle.getFilterName())); auto filter = filterList.createFilter(k_MultiThresholdObjectsFilterHandle); @@ -1258,7 +1258,7 @@ inline void ExecuteIdentifySample(DataStructure& dataStructure, const FilterList // Parameter Keys constexpr StringLiteral k_FillHoles_Key = "fill_holes"; - constexpr StringLiteral k_ImageGeom_Key = "image_geometry"; + constexpr StringLiteral k_ImageGeom_Key = "input_image_geometry_path"; constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; Arguments args; diff --git a/wrapping/python/docs/generate_sphinx_docs.cpp b/wrapping/python/docs/generate_sphinx_docs.cpp index a9a6481f88..48102e0c55 100644 --- a/wrapping/python/docs/generate_sphinx_docs.cpp +++ b/wrapping/python/docs/generate_sphinx_docs.cpp @@ -594,43 +594,6 @@ void GenerateMarkdownFilterParameterTable() needTableHeader++; } -#if SOMETHING - for(const auto& parameter : parameters) - { - auto const& paramValue = parameter.second; - if(paramValue->helpText().empty()) - { - std::cout << filter->name() << "::" << paramValue->name() << " HELP Text is empty\n"; - } - for(const auto& letter : paramValue->name()) - { - if(::isupper(letter) != 0) - { - std::cout << filter->name() << "::" << paramValue->name() << " HAS CAPS. Should be lower snake case\n"; - break; - } - } - - if(CheckScalarPrimitive(pTableStream, paramValue)) - { - continue; - } - if(CheckVectorPrimitive(pTableStream, paramValue)) - { - continue; - } - if(CheckArraySelectionParameter(pTableStream, paramValue)) - { - continue; - } - if(CheckGeometrySelectionParameter(pTableStream, paramValue)) - { - continue; - } - CheckParameter(pTableStream, paramValue); - } -#endif - pTableStream << '\n'; // Read the Current Filter's Documentation File @@ -765,18 +728,6 @@ void GeneratePythonRstFiles() for(const auto& parameter : parameters) { auto const& paramValue = parameter.second; - if(paramValue->helpText().empty()) - { - std::cout << filter->name() << "::" << paramValue->name() << " HELP Text is empty\n"; - } - for(const auto& letter : paramValue->name()) - { - if(::isupper(letter) != 0) - { - std::cout << filter->name() << "::" << paramValue->name() << " HAS CAPS. Should be lower snake case\n"; - break; - } - } rstStream << " |" << CreateFilledString(paramValue->humanName(), columnWidths[0], ' ') << "|" << CreateFilledString(paramValue->name(), columnWidths[1], ' ') << "|\n"; rstStream << " +" << std::string(columnWidths[0], '-') << "+" << std::string(columnWidths[1], '-') << "+\n"; diff --git a/wrapping/python/docs/index_template.rst b/wrapping/python/docs/index_template.rst index 23f7f86e58..34e0013c96 100644 --- a/wrapping/python/docs/index_template.rst +++ b/wrapping/python/docs/index_template.rst @@ -73,6 +73,7 @@ How to use SIMPLNX from Python :maxdepth: 1 :caption: Release Notes + ReleaseNotes_130 ReleaseNotes_127 ReleaseNotes_126 ReleaseNotes_124 diff --git a/wrapping/python/docs/source/Installation.rst b/wrapping/python/docs/source/Installation.rst index fbb3d34438..4ca2bd9a46 100644 --- a/wrapping/python/docs/source/Installation.rst +++ b/wrapping/python/docs/source/Installation.rst @@ -1,7 +1,7 @@ Installation ============ -Latest Version: 1.2.7 +Latest Version: 1.3.0 --------------------- The *simplnx* library can be installed through an Anaconda packages from the *BlueQuartzSoftware* channel. This can be achieved diff --git a/wrapping/python/docs/source/ReleaseNotes_130.rst b/wrapping/python/docs/source/ReleaseNotes_130.rst new file mode 100644 index 0000000000..bcb48924ac --- /dev/null +++ b/wrapping/python/docs/source/ReleaseNotes_130.rst @@ -0,0 +1,19 @@ +Release Notes 1.3.0 +=================== + +The `simplnx` library is under activate development and while we strive to maintain a stable API bugs are +found the necessitate the changing of the API. + +Version 1.3.0 +------------- + + + + +API Changes & Additions 1.3.0 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- Most of the parameter keys have been updated. This will _break_ your pipelines and python codes. + +Change Log 1.3.0 +^^^^^^^^^^^^^^^^^^^^ diff --git a/wrapping/python/docs/source/User_API.rst b/wrapping/python/docs/source/User_API.rst index d12dc8ba28..e65dc9505e 100644 --- a/wrapping/python/docs/source/User_API.rst +++ b/wrapping/python/docs/source/User_API.rst @@ -333,7 +333,7 @@ General Parameters result = nx.GenerateColorTableFilter.execute(data_structure=data_structure, rgb_array_path="CI Color", - selected_data_array_path=nx.DataPath("Small IN100/Scan Data/Confidence Index"), + input_data_array_path=nx.DataPath("Small IN100/Scan Data/Confidence Index"), selected_preset="hsv") .. _GeneratedFileListParameter: @@ -388,7 +388,7 @@ General Parameters result = cxitk.ITKImportImageStack.execute(data_structure=data_structure, cell_data_name="Cell Data", image_data_array_path="Image Data", - image_geometry_path=nx.DataPath(["Image Stack"]), + output_image_geometry_path=nx.DataPath(["Image Stack"]), image_transform_choice=0, input_file_list_info=generated_file_list_value, origin=[0., 0., 0.], diff --git a/wrapping/python/docs/source/Writing_A_New_Python_Filter.rst b/wrapping/python/docs/source/Writing_A_New_Python_Filter.rst index c3ec590709..b7ed237627 100644 --- a/wrapping/python/docs/source/Writing_A_New_Python_Filter.rst +++ b/wrapping/python/docs/source/Writing_A_New_Python_Filter.rst @@ -46,7 +46,7 @@ Wait until the environment is fully installed. .. code:: shell - dream3dnx + DREAM3DNX **Windows** @@ -120,7 +120,7 @@ After you have generated your Python plugin/filters, close the current instance .. code:: shell - dream3dnx + DREAM3DNX **Windows** diff --git a/wrapping/python/docs/source/conf.py b/wrapping/python/docs/source/conf.py index b04be80cad..35a23594dc 100644 --- a/wrapping/python/docs/source/conf.py +++ b/wrapping/python/docs/source/conf.py @@ -9,7 +9,7 @@ project = 'SIMPLNX Python Docs' copyright = '2024, BlueQuartz Software, LLC' author = 'BlueQuartz Software, LLC' -release = '1.2.7' +release = '1.3.0' # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/wrapping/python/examples/notebooks/basic_ebsd_ipf.ipynb b/wrapping/python/examples/notebooks/basic_ebsd_ipf.ipynb index 422b3aec4a..319d4925e2 100644 --- a/wrapping/python/examples/notebooks/basic_ebsd_ipf.ipynb +++ b/wrapping/python/examples/notebooks/basic_ebsd_ipf.ipynb @@ -196,7 +196,7 @@ "source": [ "result = cxitk.ITKImageWriter.execute(data_structure=data_structure, file_name='/tmp/Small_IN100_IPF_Z.png',\n", " image_array_path=.nxDataPath(['Small IN100', 'Scan Data', 'IPFColors']),\n", - " image_geom_path=.nxDataPath(['Small IN100']),\n", + " input_image_geometry_path=.nxDataPath(['Small IN100']),\n", " index_offset=0,\n", " plane=0,\n", ")\n", @@ -254,7 +254,7 @@ " crystal_structures_array_path=.nxDataPath(['Small IN100', 'Phase Data', 'CrystalStructures']),\n", " generation_algorithm=1, # Discrete = 1\n", " mask_array_path=.nxDataPath(['Small IN100', 'Scan Data', 'Mask']),\n", - " image_geometry_path=.nxDataPath(['Small IN100 Pole Figure']),\n", + " output_image_geometry_path=.nxDataPath(['Small IN100 Pole Figure']),\n", " image_layout=0, # O = Horizontal Layout\n", " image_prefix=prefix,\n", " image_size=512,\n", diff --git a/wrapping/python/examples/pipelines/ITKImageProcessing/02_Image_Segmentation.py b/wrapping/python/examples/pipelines/ITKImageProcessing/02_Image_Segmentation.py index c74431bd0d..4ea0c12148 100644 --- a/wrapping/python/examples/pipelines/ITKImageProcessing/02_Image_Segmentation.py +++ b/wrapping/python/examples/pipelines/ITKImageProcessing/02_Image_Segmentation.py @@ -30,9 +30,9 @@ data_structure=data_structure, cell_attribute_matrix_name="Cell Data", image_data_array_name="ImageData", - image_geometry_path=nx.DataPath("ImageDataContainer"), - image_transform_choice=0, - input_file_list_info=generated_file_list_value, + output_image_geometry_path=nx.DataPath("ImageDataContainer"), + image_transform_index=0, + input_file_list_object =generated_file_list_value, origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0] ) @@ -54,8 +54,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=dt, # Use the DataType variable here use_custom_false_value=False, use_custom_true_value=False @@ -71,10 +71,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - active_array_path="Active", - cell_feature_group_path="CellFeatureData", - feature_ids_path="FeatureIds", - grid_geometry_path=nx.DataPath("ImageDataContainer"), + active_array_name="Active", + cell_feature_group_name="CellFeatureData", + feature_ids_name="FeatureIds", + input_image_geometry_path=nx.DataPath("ImageDataContainer"), input_array_path=nx.DataPath("ImageDataContainer/Cell Data/ImageData"), mask_path=nx.DataPath("ImageDataContainer/Cell Data/Mask"), randomize_features=True, @@ -89,13 +89,13 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - equivalent_diameters_path="EquivalentDiameters", - feature_attribute_matrix=nx.DataPath("ImageDataContainer/CellFeatureData"), + equivalent_diameters_name="EquivalentDiameters", + feature_attribute_matrix_path =nx.DataPath("ImageDataContainer/CellFeatureData"), feature_ids_path=nx.DataPath("ImageDataContainer/Cell Data/FeatureIds"), - geometry_path=nx.DataPath("ImageDataContainer"), - num_elements_path="NumElements", + input_image_geometry_path =nx.DataPath("ImageDataContainer"), + num_elements_name="NumElements", save_element_sizes=False, - volumes_path="Volumes" + volumes_name="Volumes" ) nxtest.check_filter_result(nx_filter, result) @@ -107,7 +107,7 @@ data_structure=data_structure, created_array_suffix="Created Array Suffix", feature_ids_path=nx.DataPath("ImageDataContainer/Cell Data/FeatureIds"), - selected_feature_array_path=[nx.DataPath("ImageDataContainer/CellFeatureData/EquivalentDiameters")] + selected_feature_array_paths=[nx.DataPath("ImageDataContainer/CellFeatureData/EquivalentDiameters")] ) nxtest.check_filter_result(nx_filter, result) @@ -117,12 +117,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=False, + set_tuple_dimensions=False, component_count=1, data_format="", - initialization_value="1", - numeric_type=nx.NumericType.int32, - output_data_array=nx.DataPath("ImageDataContainer/Cell Data/Phases") + initialization_value_str="1", + numeric_type_index=nx.NumericType.int32, + output_array_path=nx.DataPath("ImageDataContainer/Cell Data/Phases") # tuple_dimensions: List[List[float]] = ... # Not currently part of the code ) nxtest.check_filter_result(nx_filter, result) @@ -161,10 +161,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - centroids_array_path="Centroids", - feature_attribute_matrix=nx.DataPath("ImageDataContainer/CellFeatureData"), + centroids_array_name="Centroids", + feature_attribute_matrix_path =nx.DataPath("ImageDataContainer/CellFeatureData"), feature_ids_path=nx.DataPath("ImageDataContainer/Cell Data/FeatureIds"), - selected_image_geometry=nx.DataPath("ImageDataContainer") + input_image_geometry_path=nx.DataPath("ImageDataContainer") ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/ITKImageProcessing/03_Porosity_Mesh_Export.py b/wrapping/python/examples/pipelines/ITKImageProcessing/03_Porosity_Mesh_Export.py index 1ede7be86d..6f02f54695 100644 --- a/wrapping/python/examples/pipelines/ITKImageProcessing/03_Porosity_Mesh_Export.py +++ b/wrapping/python/examples/pipelines/ITKImageProcessing/03_Porosity_Mesh_Export.py @@ -31,9 +31,9 @@ data_structure=data_structure, cell_attribute_matrix_name="Cell Data", image_data_array_name="ImageData", - image_geometry_path=nx.DataPath("ImageDataContainer"), - image_transform_choice=0, - input_file_list_info=generated_file_list_value, + output_image_geometry_path=nx.DataPath("ImageDataContainer"), + image_transform_index=0, + input_file_list_object =generated_file_list_value, origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0] ) @@ -55,8 +55,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=dt, use_custom_false_value=False, use_custom_true_value=False @@ -71,10 +71,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - active_array_path="Active", - cell_feature_group_path="CellFeatureData", - feature_ids_path="FeatureIds", - grid_geometry_path=nx.DataPath("ImageDataContainer"), + active_array_name="Active", + cell_feature_group_name="CellFeatureData", + feature_ids_name="FeatureIds", + input_image_geometry_path=nx.DataPath("ImageDataContainer"), input_array_path=nx.DataPath("ImageDataContainer/Cell Data/ImageData"), mask_path=nx.DataPath("ImageDataContainer/Cell Data/Mask"), randomize_features=True, @@ -95,10 +95,10 @@ feature_ids_path=nx.DataPath("ImageDataContainer/Cell Data/FeatureIds"), fix_problem_voxels=True, generate_triple_lines=False, - grid_geometry_data_path=nx.DataPath("ImageDataContainer"), + input_grid_geometry_path=nx.DataPath("ImageDataContainer"), node_types_array_name="NodeTypes", - selected_data_array_paths=[], - triangle_geometry_name=nx.DataPath("TriangleDataContainer"), + input_data_array_paths=[], + output_triangle_geometry_path=nx.DataPath("TriangleDataContainer"), vertex_data_group_name="Vertex Data" ) nxtest.check_filter_result(nx_filter, result) @@ -118,7 +118,7 @@ surface_point_lambda=0.0, surface_quad_point_lambda=0.0, surface_triple_line_lambda=0.0, - triangle_geometry_data_path=nx.DataPath("TriangleDataContainer"), + input_triangle_geometry_path=nx.DataPath("TriangleDataContainer"), triple_line_lambda=0.1, use_taubin_smoothing=True ) @@ -131,7 +131,7 @@ result = nx_filter.execute( data_structure=data_structure, delete_original_array=True, - multicomponent_array=nx.DataPath("TriangleDataContainer/Face Data/FaceLabels"), + multicomponent_array_path=nx.DataPath("TriangleDataContainer/Face Data/FaceLabels"), postfix="-", select_components_to_extract=False # components_to_extract: List[List[float]] = ..., # Not currently part of the code @@ -155,8 +155,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="FaceLabels-0 Mask", + array_thresholds_object=threshold_set, + output_data_array_name="FaceLabels-0 Mask", created_mask_type=dt, # Use the DataType variable here use_custom_false_value=False, use_custom_true_value=False @@ -182,8 +182,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="FaceLabels-1 Mask", + array_thresholds_object=threshold_set, + output_data_array_name="FaceLabels-1 Mask", created_mask_type=dt, # Use the DataType variable here use_custom_false_value=False, use_custom_true_value=False @@ -231,8 +231,8 @@ data_structure=data_structure, move_values=True, normalize_data=False, - stacked_data_array_name="Face Labels", - selected_data_array_paths=[ + output_data_array_name="Face Labels", + input_data_array_paths=[ nx.DataPath("TriangleDataContainer/Face Data/FaceLabels-0"), nx.DataPath("TriangleDataContainer/Face Data/FaceLabels-1") ] diff --git a/wrapping/python/examples/pipelines/Incomplete/ImportEdaxOIMData.py b/wrapping/python/examples/pipelines/Incomplete/ImportEdaxOIMData.py index b228960a05..2bf785c89f 100644 --- a/wrapping/python/examples/pipelines/Incomplete/ImportEdaxOIMData.py +++ b/wrapping/python/examples/pipelines/Incomplete/ImportEdaxOIMData.py @@ -31,7 +31,7 @@ result = nx_filter.execute( data_structure=data_structure, euler_angles_array_path=nx.DataPath("ImageGeom/Cell Data/EulerAngles"), - rotation_axis=[0.0, 0.0, 1.0, 90.0] + rotation_axis_angle=[0.0, 0.0, 1.0, 90.0] ) nxtest.check_filter_result(nx_filter, result) @@ -43,9 +43,9 @@ data_structure=data_structure, remove_original_geometry=True, rotate_slice_by_slice=True, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], rotation_representation=("Axis Angle"), - selected_image_geometry=nx.DataPath("ImageGeom") + input_image_geometry_path=nx.DataPath("ImageGeom") ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Archive.py b/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Archive.py index 58b7d798ce..b0bae41dba 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Archive.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Archive.py @@ -28,10 +28,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - input_file_list_info=generated_file_list_value, + input_file_list_object =generated_file_list_value, output_file_path=nxtest.get_data_directory() / "Output/Reconstruction/Small_IN100.h5ebsd", - reference_frame=0, - stacking_order=1, + reference_frame_index=0, + stacking_order_index=1, z_spacing=0.25 ) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Morphological_Statistics.py b/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Morphological_Statistics.py index 2bf986aa11..abf1cf6e0b 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Morphological_Statistics.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Morphological_Statistics.py @@ -19,7 +19,7 @@ nx_filter = nx.ReadDREAM3DFilter() # Execute Filter with Parameters result = nx_filter.execute(data_structure=data_structure, - import_file_data=import_data + import_data_object=import_data ) nxtest.check_filter_result(nx_filter, result) @@ -42,10 +42,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - centroids_array_path=("Centroids"), - feature_attribute_matrix=nx.DataPath("DataContainer/CellFeatureData"), + centroids_array_name="Centroids", + feature_attribute_matrix_path=nx.DataPath("DataContainer/CellFeatureData"), feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), - selected_image_geometry=nx.DataPath("DataContainer") + input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -56,13 +56,13 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - equivalent_diameters_path=("EquivalentDiameters"), - feature_attribute_matrix=nx.DataPath("DataContainer/CellFeatureData"), + equivalent_diameters_name="EquivalentDiameters", + feature_attribute_matrix_path=nx.DataPath("DataContainer/CellFeatureData"), feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), - geometry_path=nx.DataPath("DataContainer"), - num_elements_path=("NumElements"), + input_image_geometry_path=nx.DataPath("DataContainer"), + num_elements_name="NumElements", save_element_sizes=False, - volumes_path=("Size Volumes") + volumes_name="Size Volumes" ) nxtest.check_filter_result(nx_filter, result) @@ -79,7 +79,7 @@ centroids_array_path=nx.DataPath("DataContainer/CellFeatureData/Centroids"), feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), omega3s_array_name=("Omega3s"), - selected_image_geometry=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), volumes_array_name=("Shape Volumes") ) nxtest.check_filter_result(nx_filter, result) @@ -93,12 +93,12 @@ data_structure=data_structure, # Boundary cells parameter is not currently part of the code # boundary_cells: str = ..., - cell_feature_arrays=nx.DataPath("DataContainer/CellFeatureData"), - feature_ids=nx.DataPath("DataContainer/CellData/FeatureIds"), - image_geometry=nx.DataPath("DataContainer"), - neighbor_list=("NeighborList"), - number_of_neighbors=("NumNeighbors"), - shared_surface_area_list=("SharedSurfaceAreaList"), + cell_feature_array_path=nx.DataPath("DataContainer/CellFeatureData"), + feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), + input_image_geometry_path =nx.DataPath("DataContainer"), + neighbor_list_name=("NeighborList"), + number_of_neighbors_name=("NumNeighbors"), + shared_surface_area_list_name=("SharedSurfaceAreaList"), store_boundary_cells=False, # Surface features parameter is not currently part of the code # surface_features: str = ..., @@ -120,7 +120,7 @@ multiples_of_average=1.0, neighborhood_list_array_name=("NeighborhoodList"), neighborhoods_array_name=("Neighborhoods"), - selected_image_geometry_path=nx.DataPath("DataContainer") + input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -141,7 +141,7 @@ # nearest_neighbors_array_name: str = ..., q_pdistances_array_name=("QPManhattanDistances"), save_nearest_neighbors=False, - selected_image_geometry=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), t_jdistances_array_name=("TJManhattanDistances") ) nxtest.check_filter_result(nx_filter, result) @@ -156,7 +156,7 @@ calculate_sphericity=True, feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), num_cells_array_path=nx.DataPath("DataContainer/CellFeatureData/NumElements"), - selected_image_geometry=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), sphericity_array_name=("Sphericity"), surface_area_volume_ratio_array_name=("SurfaceAreaVolumeRatio") ) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Quick_Mesh.py b/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Quick_Mesh.py index e9bddf2765..b0218ea852 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Quick_Mesh.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Quick_Mesh.py @@ -18,7 +18,7 @@ nx_filter = nx.ReadDREAM3DFilter() # Execute Filter with Parameters result = nx_filter.execute(data_structure=data_structure, - import_file_data=import_data) + import_data_object=import_data) nxtest.check_filter_result(nx_filter, result) @@ -28,13 +28,13 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - cell_feature_attribute_matrix=nx.DataPath("DataContainer/CellFeatureData"), - feature_ids=nx.DataPath("DataContainer/CellData/FeatureIds"), + cell_feature_attribute_matrix_path=nx.DataPath("DataContainer/CellFeatureData"), + feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), max_voxel=[140, 140, 99], min_voxel=[41, 41, 0], remove_original_geometry=True, renumber_features=True, - selected_image_geometry=nx.DataPath("DataContainer") + input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -61,9 +61,9 @@ feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), fix_problem_voxels=False, generate_triple_lines=False, - grid_geometry_data_path=nx.DataPath("DataContainer"), + input_grid_geometry_path=nx.DataPath("DataContainer"), node_types_array_name=("NodeType"), - triangle_geometry_name=nx.DataPath("TriangleDataContainer"), + output_triangle_geometry_path=nx.DataPath("TriangleDataContainer"), vertex_data_group_name=("VertexData") ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/02_Small_IN100_Smooth_Mesh.py b/wrapping/python/examples/pipelines/OrientationAnalysis/02_Small_IN100_Smooth_Mesh.py index 49587160bb..7b1c843e85 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/02_Small_IN100_Smooth_Mesh.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/02_Small_IN100_Smooth_Mesh.py @@ -17,7 +17,7 @@ # Instantiate Filter nx_filter = nx.ReadDREAM3DFilter() # Execute Filter with Parameters -result = nx_filter.execute(data_structure=data_structure, import_file_data=import_data) +result = nx_filter.execute(data_structure=data_structure, import_data_object=import_data) nxtest.check_filter_result(nx_filter, result) # Filter 2 @@ -34,7 +34,7 @@ surface_point_lambda=0.0, surface_quad_point_lambda=0.0, surface_triple_line_lambda=0.0, - triangle_geometry_data_path=nx.DataPath("TriangleDataContainer"), + input_triangle_geometry_path=nx.DataPath("TriangleDataContainer"), triple_line_lambda=0.2, use_taubin_smoothing=True ) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/03_Small_IN100_Mesh_Statistics.py b/wrapping/python/examples/pipelines/OrientationAnalysis/03_Small_IN100_Mesh_Statistics.py index 37593955fd..93e0bc7109 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/03_Small_IN100_Mesh_Statistics.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/03_Small_IN100_Mesh_Statistics.py @@ -17,7 +17,7 @@ # Instantiate Filter nx_filter = nx.ReadDREAM3DFilter() # Execute Filter with Parameters -result = nx_filter.execute(data_structure=data_structure, import_file_data=import_data) +result = nx_filter.execute(data_structure=data_structure, import_data_object=import_data) nxtest.check_filter_result(nx_filter, result) # Filter 2 @@ -26,8 +26,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - triangle_areas_array_path="FaceAreas", - triangle_geometry_data_path=nx.DataPath("TriangleDataContainer") + triangle_areas_array_name="FaceAreas", + input_triangle_geometry_path=nx.DataPath("TriangleDataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -37,8 +37,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - surface_mesh_triangle_normals_array_path="FaceNormals", - tri_geometry_data_path=nx.DataPath("TriangleDataContainer") + output_normals_array_name="FaceNormals", + input_triangle_geometry_path=nx.DataPath("TriangleDataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -49,7 +49,7 @@ result = nx_filter.execute( data_structure=data_structure, surface_mesh_triangle_dihedral_angles_array_name="FaceDihedralAngles", - tri_geometry_data_path=nx.DataPath("TriangleDataContainer") + input_triangle_geometry_path=nx.DataPath("TriangleDataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -94,7 +94,7 @@ feature_num_triangles_array_name="NumTriangles", grain_boundary_attribute_matrix_name="SharedFeatureFace", randomize_features=False, - triangle_geometry_path=nx.DataPath("TriangleDataContainer") + input_triangle_geometry_path=nx.DataPath("TriangleDataContainer") ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/04_Small_IN100_GBCD.py b/wrapping/python/examples/pipelines/OrientationAnalysis/04_Small_IN100_GBCD.py index 2e038aaa13..6ea476c3e5 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/04_Small_IN100_GBCD.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/04_Small_IN100_GBCD.py @@ -17,7 +17,7 @@ # Instantiate Filter nx_filter = nx.ReadDREAM3DFilter() # Execute Filter with Parameters -result = nx_filter.execute(data_structure=data_structure, import_file_data=import_data) +result = nx_filter.execute(data_structure=data_structure, import_data_object=import_data) nxtest.check_filter_result(nx_filter, result) # Filter 2 @@ -35,7 +35,7 @@ surface_mesh_face_areas_array_path=nx.DataPath("TriangleDataContainer/FaceData/FaceAreas"), surface_mesh_face_labels_array_path=nx.DataPath("TriangleDataContainer/FaceData/FaceLabels"), surface_mesh_face_normals_array_path=nx.DataPath("TriangleDataContainer/FaceData/FaceNormals"), - triangle_geometry=nx.DataPath("TriangleDataContainer") + input_triangle_geometry_path=nx.DataPath("TriangleDataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -50,7 +50,7 @@ cell_intensity_array_name="MRD", crystal_structures_array_path=nx.DataPath("DataContainer/CellEnsembleData/CrystalStructures"), gbcd_array_path=nx.DataPath("TriangleDataContainer/FaceEnsembleData/GBCD"), - image_geometry_name=nx.DataPath("GBCD Pole Figure [Sigma 3]"), + output_image_geometry_path=nx.DataPath("GBCD Pole Figure [Sigma 3]"), misorientation_rotation=[60.0, 1.0, 1.0, 1.0], output_image_dimension=100, phase_of_interest=1 @@ -67,7 +67,7 @@ cell_intensity_array_name="MRD", crystal_structures_array_path=nx.DataPath("DataContainer/CellEnsembleData/CrystalStructures"), gbcd_array_path=nx.DataPath("TriangleDataContainer/FaceEnsembleData/GBCD"), - image_geometry_name=nx.DataPath("GBCD Pole Figure [Sigma 9]"), + output_image_geometry_path=nx.DataPath("GBCD Pole Figure [Sigma 9]"), misorientation_rotation=[39.0, 1.0, 1.0, 1.0], output_image_dimension=100, phase_of_interest=1 @@ -84,7 +84,7 @@ cell_intensity_array_name="MRD", crystal_structures_array_path=nx.DataPath("DataContainer/CellEnsembleData/CrystalStructures"), gbcd_array_path=nx.DataPath("TriangleDataContainer/FaceEnsembleData/GBCD"), - image_geometry_name=nx.DataPath("GBCD Pole Figure [Sigma 11]"), + output_image_geometry_path=nx.DataPath("GBCD Pole Figure [Sigma 11]"), misorientation_rotation=[50.5, 1.0, 1.0, 1.0], output_image_dimension=100, phase_of_interest=1 diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_Crystallographic_Statistics.py b/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_Crystallographic_Statistics.py index e889127b2e..aaafe2d56d 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_Crystallographic_Statistics.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_Crystallographic_Statistics.py @@ -17,7 +17,7 @@ # Instantiate Filter nx_filter = nx.ReadDREAM3DFilter() # Execute Filter with Parameters -result = nx_filter.execute(data_structure=data_structure, import_file_data=import_data) +result = nx_filter.execute(data_structure=data_structure, import_data_object=import_data) nxtest.check_filter_result(nx_filter, result) # Filter 2 @@ -48,9 +48,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - avg_euler_angles_array_path="AvgEulerAngles", - avg_quats_array_path="AvgQuats", - cell_feature_attribute_matrix=nx.DataPath("DataContainer/CellFeatureData"), + avg_euler_angles_array_name="AvgEulerAngles", + avg_quats_array_name="AvgQuats", + cell_feature_attribute_matrix_path=nx.DataPath("DataContainer/CellFeatureData"), cell_feature_ids_array_path=nx.DataPath("DataContainer/CellData/FeatureIds"), cell_phases_array_path=nx.DataPath("DataContainer/CellData/Phases"), cell_quats_array_path=nx.DataPath("DataContainer/CellData/Quats"), @@ -109,7 +109,7 @@ feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), feature_reference_misorientations_array_name="FeatureReferenceMisorientations", quats_array_path=nx.DataPath("DataContainer/CellData/Quats"), - reference_orientation=0 + reference_orientation_index=0 # cell_feature_attribute_matrix_path=nx.DataPath("DataContainer/"), # Not currently part of the code # g_beuclidean_distances_array_path=nx.DataPath("DataContainer/"), # Not currently part of the code ) @@ -127,7 +127,7 @@ kernel_average_misorientations_array_name="KernelAverageMisorientations", kernel_size=[1, 1, 1], quats_array_path=nx.DataPath("DataContainer/CellData/Quats"), - selected_image_geometry_path=nx.DataPath("DataContainer") + input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_GBCD_Metric.py b/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_GBCD_Metric.py index 955f309b53..9e6a849b52 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_GBCD_Metric.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_GBCD_Metric.py @@ -76,7 +76,7 @@ nx_filter = nx.ReadDREAM3DFilter() # Execute Filter with Parameters result = nx_filter.execute(data_structure=data_structure, - import_file_data=import_data) + import_data_object=import_data) nxtest.check_filter_result(nx_filter, result) @@ -92,7 +92,7 @@ feature_num_triangles_array_name="NumTriangles", grain_boundary_attribute_matrix_name="SharedFeatureFace", randomize_features=False, - triangle_geometry_path=nx.DataPath("TriangleDataContainer") + input_triangle_geometry_path=nx.DataPath("TriangleDataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -102,7 +102,7 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - chosen_limit_dists=0, + chosen_limit_dists_index=0, crystal_structures_array_path=nx.DataPath("DataContainer/CellEnsembleData/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", @@ -118,7 +118,7 @@ surface_mesh_face_labels_array_path=nx.DataPath("TriangleDataContainer/FaceData/FaceLabels"), surface_mesh_face_normals_array_path=nx.DataPath("TriangleDataContainer/FaceData/FaceNormals"), surface_mesh_feature_face_labels_array_path=nx.DataPath("TriangleDataContainer/SharedFeatureFace/FaceLabels"), - triangle_geometry_path=nx.DataPath("TriangleDataContainer") + input_triangle_geometry_path=nx.DataPath("TriangleDataContainer") ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/08_Small_IN100_Full_Reconstruction.py b/wrapping/python/examples/pipelines/OrientationAnalysis/08_Small_IN100_Full_Reconstruction.py index 874b2de8f8..b7abb7299b 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/08_Small_IN100_Full_Reconstruction.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/08_Small_IN100_Full_Reconstruction.py @@ -26,8 +26,8 @@ data_structure=data_structure, cell_attribute_matrix_name="CellData", cell_ensemble_attribute_matrix_name="CellEnsembleData", - data_container_name=nx.DataPath("DataContainer"), - read_h5_ebsd_parameter=filter_parameter + output_image_geometry_path =nx.DataPath("DataContainer"), + read_h5_ebsd_object=filter_parameter ) nxtest.check_filter_result(nx_filter, result) @@ -52,8 +52,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=nx.DataType.boolean ) nxtest.check_filter_result(nx_filter, result) @@ -65,9 +65,9 @@ result = nx_filter.execute( data_structure=data_structure, input_orientation_array_path=nx.DataPath("DataContainer/CellData/EulerAngles"), - input_type=0, + input_representation_index=0, output_orientation_array_name="Quats", - output_type=2 + output_representation_index=2 ) nxtest.check_filter_result(nx_filter, result) @@ -83,7 +83,7 @@ mask_array_path=nx.DataPath("DataContainer/CellData/Mask"), misorientation_tolerance=5.0, quats_array_path=nx.DataPath("DataContainer/CellData/Quats"), - selected_image_geometry_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), use_mask=True, write_alignment_shifts=False # alignment_shift_file_name: PathLike = ..., # Not currently part of the code @@ -98,7 +98,7 @@ data_structure=data_structure, fill_holes=False, mask_array_path=nx.DataPath("DataContainer/CellData/Mask"), - image_geometry=nx.DataPath("DataContainer") + input_image_geometry_path =nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -111,7 +111,7 @@ mask_array_path=nx.DataPath("DataContainer/CellData/Mask"), reference_slice=0, selected_cell_data_path=nx.DataPath("DataContainer/CellData"), - selected_image_geometry_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), use_reference_slice=True, write_alignment_shifts=False # alignment_shift_file_name: PathLike = ..., # Not currently part of the code @@ -128,7 +128,7 @@ cell_phases_array_path=nx.DataPath("DataContainer/CellData/Phases"), crystal_structures_array_path=nx.DataPath("DataContainer/CellEnsembleData/CrystalStructures"), mask_array_path=nx.DataPath("DataContainer/CellData/Mask"), - image_geometry_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), misorientation_tolerance=5.0, number_of_neighbors=4, quats_array_path=nx.DataPath("DataContainer/CellData/Quats") @@ -144,7 +144,7 @@ cell_phases_array_path=nx.DataPath("DataContainer/CellData/Phases"), correlation_array_path=nx.DataPath("DataContainer/CellData/Confidence Index"), crystal_structures_array_path=nx.DataPath("DataContainer/CellEnsembleData/CrystalStructures"), - image_geometry_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), level=2, min_confidence=0.2, misorientation_tolerance=5.0, @@ -164,10 +164,10 @@ cell_phases_array_path=nx.DataPath("DataContainer/CellData/Phases"), crystal_structures_array_path=nx.DataPath("DataContainer/CellEnsembleData/CrystalStructures"), feature_ids_array_name="FeatureIds", - mask_array_path=nx.DataPath("DataContainer/CellData/Mask"), - grid_geometry_path=nx.DataPath("DataContainer"), + cell_mask_array_path=nx.DataPath("DataContainer/CellData/Mask"), + input_image_geometry_path =nx.DataPath("DataContainer"), misorientation_tolerance=5.0, - quats_array_path=nx.DataPath("DataContainer/CellData/Quats"), + cell_quats_array_path=nx.DataPath("DataContainer/CellData/Quats"), randomize_features=True, use_mask=True ) @@ -193,9 +193,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - avg_euler_angles_array_path="AvgEulerAngles", - avg_quats_array_path="AvgQuats", - cell_feature_attribute_matrix=nx.DataPath("DataContainer/CellFeatureData"), + avg_euler_angles_array_name="AvgEulerAngles", + avg_quats_array_name="AvgQuats", + cell_feature_attribute_matrix_path=nx.DataPath("DataContainer/CellFeatureData"), cell_feature_ids_array_path=nx.DataPath("DataContainer/CellData/FeatureIds"), cell_phases_array_path=nx.DataPath("DataContainer/CellData/Phases"), cell_quats_array_path=nx.DataPath("DataContainer/CellData/Quats"), @@ -209,12 +209,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - cell_feature_arrays=nx.DataPath("DataContainer/CellFeatureData"), - feature_ids=nx.DataPath("DataContainer/CellData/FeatureIds"), - image_geometry=nx.DataPath("DataContainer"), - neighbor_list="NeighborList2", - number_of_neighbors="NumNeighbors2", - shared_surface_area_list="SharedSurfaceAreaList2", + cell_feature_array_path=nx.DataPath("DataContainer/CellFeatureData"), + feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), + input_image_geometry_path =nx.DataPath("DataContainer"), + neighbor_list_name="NeighborList2", + number_of_neighbors_name="NumNeighbors2", + shared_surface_area_list_name="SharedSurfaceAreaList2", store_boundary_cells=False, store_surface_features=False # boundary_cells: str = ..., # Not currently part of the code @@ -239,7 +239,7 @@ feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), feature_parent_ids_array_name="ParentIds", feature_phases_array_path=nx.DataPath("DataContainer/CellFeatureData/Phases"), - new_cell_feature_attribute_matrix_name="NewGrain Data", + created_feature_attribute_matrix_name="NewGrain Data", use_non_contiguous_neighbors=False # non_contiguous_neighbor_list_array_path: DataPath = ..., # Not currently part of the code ) @@ -251,13 +251,13 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - equivalent_diameters_path="EquivalentDiameters", - feature_attribute_matrix=nx.DataPath("DataContainer/CellFeatureData"), + equivalent_diameters_name="EquivalentDiameters", + feature_attribute_matrix_path=nx.DataPath("DataContainer/CellFeatureData"), feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), - geometry_path=nx.DataPath("DataContainer"), - num_elements_path="NumElements", + input_image_geometry_path=nx.DataPath("DataContainer"), + num_elements_name="NumElements", save_element_sizes=False, - volumes_path="Volumes" + volumes_name="Volumes" ) nxtest.check_filter_result(nx_filter, result) @@ -269,7 +269,7 @@ data_structure=data_structure, apply_single_phase=False, feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), - image_geom_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), min_allowed_features_size=16, num_cells_path=nx.DataPath("DataContainer/CellFeatureData/NumElements") # feature_phases_path: DataPath = ..., # Not currently part of the code @@ -284,12 +284,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - cell_feature_arrays=nx.DataPath("DataContainer/CellFeatureData"), - feature_ids=nx.DataPath("DataContainer/CellData/FeatureIds"), - image_geometry=nx.DataPath("DataContainer"), - neighbor_list="NeighborList", - number_of_neighbors="NumNeighbors", - shared_surface_area_list="SharedSurfaceAreaList", + cell_feature_array_path=nx.DataPath("DataContainer/CellFeatureData"), + feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), + input_image_geometry_path =nx.DataPath("DataContainer"), + neighbor_list_name="NeighborList", + number_of_neighbors_name="NumNeighbors", + shared_surface_area_list_name="SharedSurfaceAreaList", store_boundary_cells=False, store_surface_features=False # boundary_cells: str = ..., # Not currently part of the code @@ -304,11 +304,11 @@ result = nx_filter.execute( data_structure=data_structure, apply_to_single_phase=False, - cell_attribute_matrix=nx.DataPath("DataContainer/CellData"), - feature_ids=nx.DataPath("DataContainer/CellData/FeatureIds"), - image_geom=nx.DataPath("DataContainer"), + cell_attribute_matrix_path=nx.DataPath("DataContainer/CellData"), + feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), + input_image_geometry_path=nx.DataPath("DataContainer"), min_num_neighbors=2, - num_neighbors=nx.DataPath("DataContainer/CellFeatureData/NumNeighbors"), + num_neighbors_path=nx.DataPath("DataContainer/CellFeatureData/NumNeighbors"), phase_number=0 # feature_phases: DataPath = ..., # Not currently part of the code # ignored_voxel_arrays: List[DataPath] = ... # Not currently part of the code @@ -323,7 +323,7 @@ data_structure=data_structure, feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), min_allowed_defect_size=1000, - selected_image_geometry=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), store_as_new_phase=False # cell_phases_array_path: DataPath = ..., # Not currently part of the code # ignored_data_array_paths: List[DataPath] = ... # Not currently part of the code @@ -339,8 +339,8 @@ data_structure=data_structure, feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), num_iterations=2, - operation=0, - selected_image_geometry=nx.DataPath("DataContainer"), + operation_index=0, + input_image_geometry_path=nx.DataPath("DataContainer"), x_dir_on=True, y_dir_on=True, z_dir_on=True, @@ -356,8 +356,8 @@ data_structure=data_structure, feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), num_iterations=2, - operation=1, # Dilate operation - selected_image_geometry=nx.DataPath("DataContainer"), + operation_index=1, # Dilate operation + input_image_geometry_path=nx.DataPath("DataContainer"), x_dir_on=True, y_dir_on=True, z_dir_on=True, diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/APTR12_Analysis.py b/wrapping/python/examples/pipelines/OrientationAnalysis/APTR12_Analysis.py index 8f9c8e02a3..757591eab1 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/APTR12_Analysis.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/APTR12_Analysis.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_attribute_matrix_name="Cell Data", cell_ensemble_attribute_matrix_name="CellEnsembleData", - data_container_name=nx.DataPath("fw-ar-IF1-aptr12-corr"), + output_image_geometry_path =nx.DataPath("fw-ar-IF1-aptr12-corr"), degrees_to_radians=True, edax_hexagonal_alignment=True, input_file=nxtest.get_data_directory() / "T12-MAI-2010/fw-ar-IF1-aptr12-corr.ctf" @@ -30,13 +30,13 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - created_image_geometry=nx.DataPath("fw-ar-IF1-aptr12-corr"), + output_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], #rotation_matrix=[] - rotation_representation=0, - selected_image_geometry=nx.DataPath("fw-ar-IF1-aptr12-corr") + rotation_representation_index=0, + input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr") ) nxtest.check_filter_result(nx_filter, result) @@ -56,8 +56,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="ThresholdArray", + array_thresholds_object=threshold_set, + output_data_array_name="ThresholdArray", created_mask_type=nx.DataType.boolean ) nxtest.check_filter_result(nx_filter, result) @@ -69,9 +69,9 @@ result = nx_filter.execute( data_structure=data_structure, input_orientation_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/EulerAngles"), - input_type=0, + input_representation_index=0, output_orientation_array_name="Quats", - output_type=2 + output_representation_index=2 ) nxtest.check_filter_result(nx_filter, result) @@ -84,8 +84,8 @@ comparison_data_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/Error"), loop=False, min_confidence=0.0, - selected_comparison=0, - selected_image_geometry=nx.DataPath("fw-ar-IF1-aptr12-corr") + comparison_index=0, + input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr") ) nxtest.check_filter_result(nx_filter, result) @@ -112,9 +112,9 @@ data_structure=data_structure, file_name=nxtest.get_data_directory() / "Output/fw-ar-IF1-aptr12-corr/fw-ar-IF1-aptr12-corr_001.png", image_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/IPF_001"), - image_geom_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), + input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -142,9 +142,9 @@ data_structure=data_structure, file_name=nxtest.get_data_directory() / "Output/fw-ar-IF1-aptr12-corr/fw-ar-IF1-aptr12-corr_010.png", image_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/IPF_010"), - image_geom_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), + input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -171,9 +171,9 @@ data_structure=data_structure, file_name=nxtest.get_data_directory() / "Output/fw-ar-IF1-aptr12-corr/fw-ar-IF1-aptr12-corr_100.png", image_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/IPF_100"), - image_geom_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), + input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -188,10 +188,10 @@ cell_phases_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/Phases"), crystal_structures_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/CellEnsembleData/CrystalStructures"), feature_ids_array_name="FeatureIds", - grid_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), - mask_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/ThresholdArray"), + input_image_geometry_path =nx.DataPath("fw-ar-IF1-aptr12-corr"), + cell_mask_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/ThresholdArray"), misorientation_tolerance=5.0, - quats_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/Quats"), + cell_quats_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/Quats"), randomize_features=True, use_mask=True ) @@ -205,7 +205,7 @@ data_structure=data_structure, feature_ids_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds"), min_allowed_defect_size=10, - selected_image_geometry=nx.DataPath("fw-ar-IF1-aptr12-corr"), + input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), store_as_new_phase=False # cell_phases_array_path and ignored_data_array_paths parameters are not used in this context ) @@ -217,13 +217,13 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - equivalent_diameters_path="EquivalentDiameters", - feature_attribute_matrix=nx.DataPath("fw-ar-IF1-aptr12-corr/CellFeatureData"), + equivalent_diameters_name="EquivalentDiameters", + feature_attribute_matrix_path=nx.DataPath("fw-ar-IF1-aptr12-corr/CellFeatureData"), feature_ids_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds"), - geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), - num_elements_path="NumElements", + input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), + num_elements_name="NumElements", save_element_sizes=False, - volumes_path="Volumes" + volumes_name="Volumes" ) nxtest.check_filter_result(nx_filter, result) @@ -235,7 +235,7 @@ data_structure=data_structure, apply_single_phase=False, feature_ids_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds"), - image_geom_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), + input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), min_allowed_features_size=5, num_cells_path=nx.DataPath("fw-ar-IF1-aptr12-corr/CellFeatureData/NumElements") # feature_phases_path and phase_number parameters are not used in this context @@ -248,9 +248,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - avg_euler_angles_array_path="AvgEulerAngles", - avg_quats_array_path="AvgQuats", - cell_feature_attribute_matrix=nx.DataPath("fw-ar-IF1-aptr12-corr/CellFeatureData"), + avg_euler_angles_array_name="AvgEulerAngles", + avg_quats_array_name="AvgQuats", + cell_feature_attribute_matrix_path=nx.DataPath("fw-ar-IF1-aptr12-corr/CellFeatureData"), cell_feature_ids_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds"), cell_phases_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/Phases"), cell_quats_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/Quats"), @@ -270,7 +270,7 @@ kernel_average_misorientations_array_name="KernelAverageMisorientations", kernel_size=[1, 1, 1], quats_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/Quats"), - selected_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr") + input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr") ) nxtest.check_filter_result(nx_filter, result) @@ -280,10 +280,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - centroids_array_path="Centroids", - feature_attribute_matrix=nx.DataPath("fw-ar-IF1-aptr12-corr/CellFeatureData"), + centroids_array_name="Centroids", + feature_attribute_matrix_path=nx.DataPath("fw-ar-IF1-aptr12-corr/CellFeatureData"), feature_ids_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds"), - selected_image_geometry=nx.DataPath("fw-ar-IF1-aptr12-corr") + input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr") ) nxtest.check_filter_result(nx_filter, result) @@ -300,7 +300,7 @@ feature_ids_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds"), g_bdistances_array_name="GBManhattanDistances", save_nearest_neighbors=False, - selected_image_geometry=nx.DataPath("fw-ar-IF1-aptr12-corr") + input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr") # Parameters for nearest_neighbors_array_name, q_pdistances_array_name, and t_jdistances_array_name are not used ) nxtest.check_filter_result(nx_filter, result) @@ -318,7 +318,7 @@ feature_ids_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds"), feature_reference_misorientations_array_name="FeatureReferenceMisorientations", quats_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/Quats"), - reference_orientation=0 + reference_orientation_index=0 # Parameters for cell_feature_attribute_matrix_path and g_beuclidean_distances_array_path are not used ) nxtest.check_filter_result(nx_filter, result) @@ -330,7 +330,7 @@ result = nx_filter.execute( data_structure=data_structure, cell_feature_attribute_matrix_path=nx.DataPath("fw-ar-IF1-aptr12-corr/CellFeatureData"), - delimiter_choice_int=2, + delimiter_index=2, feature_data_file=nxtest.get_data_directory() / "Output/fw-ar-IF1-aptr12-corr/FeatureData.csv", write_neighborlist_data=False, write_num_features_line=True @@ -344,8 +344,8 @@ result = nx_filter.execute( data_structure=data_structure, histogram_suffix=" Histogram", - new_data_group=True, - new_data_group_name=nx.DataPath("fw-ar-IF1-aptr12-corr/Histograms"), + create_new_data_group=True, + new_data_group_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Histograms"), number_of_bins=256, selected_array_paths=[nx.DataPath("fw-ar-IF1-aptr12-corr/CellFeatureData/EquivalentDiameters")], user_defined_range=False @@ -358,10 +358,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - delimiter=2, + delimiter_index=2, output_path=nxtest.get_data_directory() / "Output/fw-ar-IF1-aptr12-corr/EqDiamHistogram.csv", - output_style=1, - selected_data_array_paths=[nx.DataPath("fw-ar-IF1-aptr12-corr/Histograms/EquivalentDiameters Histogram")] + output_style_index=1, + input_data_array_paths=[nx.DataPath("fw-ar-IF1-aptr12-corr/Histograms/EquivalentDiameters Histogram")] ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/AVTR12_Analysis.py b/wrapping/python/examples/pipelines/OrientationAnalysis/AVTR12_Analysis.py index 358eb42862..0cc5640c77 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/AVTR12_Analysis.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/AVTR12_Analysis.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_attribute_matrix_name="Cell Data", cell_ensemble_attribute_matrix_name="CellEnsembleData", - data_container_name=nx.DataPath("fw-ar-IF1-avtr12-corr"), + output_image_geometry_path =nx.DataPath("fw-ar-IF1-avtr12-corr"), degrees_to_radians=True, edax_hexagonal_alignment=True, input_file=nxtest.get_data_directory() / "T12-MAI-2010/fw-ar-IF1-avtr12-corr.ctf" @@ -30,13 +30,13 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - created_image_geometry=nx.DataPath("fw-ar-IF1-avtr12-corr"), + output_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], #rotation_matrix=[] - rotation_representation=0, - selected_image_geometry=nx.DataPath("fw-ar-IF1-avtr12-corr") + rotation_representation_index=0, + input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr") ) nxtest.check_filter_result(nx_filter, result) @@ -56,8 +56,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="ThresholdArray", + array_thresholds_object=threshold_set, + output_data_array_name="ThresholdArray", created_mask_type=nx.DataType.boolean ) nxtest.check_filter_result(nx_filter, result) @@ -69,9 +69,9 @@ result = nx_filter.execute( data_structure=data_structure, input_orientation_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/EulerAngles"), - input_type=0, + input_representation_index=0, output_orientation_array_name="Quats", - output_type=2 + output_representation_index=2 ) nxtest.check_filter_result(nx_filter, result) @@ -84,8 +84,8 @@ comparison_data_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/Error"), loop=False, min_confidence=0.0, - selected_comparison=0, - selected_image_geometry=nx.DataPath("fw-ar-IF1-avtr12-corr") + comparison_index=0, + input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr") ) nxtest.check_filter_result(nx_filter, result) @@ -112,9 +112,9 @@ data_structure=data_structure, file_name=nxtest.get_data_directory() / "Output/fw-ar-IF1-avtr12-corr/fw-ar-IF1-avtr12-corr_001.png", image_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/IPF_001"), - image_geom_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), + input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -142,9 +142,9 @@ data_structure=data_structure, file_name=nxtest.get_data_directory() / "Output/fw-ar-IF1-avtr12-corr/fw-ar-IF1-avtr12-corr_010.png", image_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/IPF_010"), - image_geom_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), + input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -171,9 +171,9 @@ data_structure=data_structure, file_name=nxtest.get_data_directory() / "Output/fw-ar-IF1-avtr12-corr/fw-ar-IF1-avtr12-corr_100.png", image_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/IPF_100"), - image_geom_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), + input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -188,10 +188,10 @@ cell_phases_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/Phases"), crystal_structures_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/CellEnsembleData/CrystalStructures"), feature_ids_array_name="FeatureIds", - grid_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), - mask_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/ThresholdArray"), + input_image_geometry_path =nx.DataPath("fw-ar-IF1-avtr12-corr"), + cell_mask_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/ThresholdArray"), misorientation_tolerance=5.0, - quats_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/Quats"), + cell_quats_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/Quats"), randomize_features=True, use_mask=True ) @@ -205,7 +205,7 @@ data_structure=data_structure, feature_ids_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds"), min_allowed_defect_size=10, - selected_image_geometry=nx.DataPath("fw-ar-IF1-avtr12-corr"), + input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), store_as_new_phase=False # cell_phases_array_path and ignored_data_array_paths parameters are not used in this context ) @@ -217,13 +217,13 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - equivalent_diameters_path="EquivalentDiameters", - feature_attribute_matrix=nx.DataPath("fw-ar-IF1-avtr12-corr/CellFeatureData"), + equivalent_diameters_name="EquivalentDiameters", + feature_attribute_matrix_path=nx.DataPath("fw-ar-IF1-avtr12-corr/CellFeatureData"), feature_ids_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds"), - geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), - num_elements_path="NumElements", + input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), + num_elements_name="NumElements", save_element_sizes=False, - volumes_path="Volumes" + volumes_name="Volumes" ) nxtest.check_filter_result(nx_filter, result) @@ -235,7 +235,7 @@ data_structure=data_structure, apply_single_phase=False, feature_ids_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds"), - image_geom_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), + input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), min_allowed_features_size=5, num_cells_path=nx.DataPath("fw-ar-IF1-avtr12-corr/CellFeatureData/NumElements") # feature_phases_path and phase_number parameters are not used in this context @@ -248,9 +248,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - avg_euler_angles_array_path="AvgEulerAngles", - avg_quats_array_path="AvgQuats", - cell_feature_attribute_matrix=nx.DataPath("fw-ar-IF1-avtr12-corr/CellFeatureData"), + avg_euler_angles_array_name="AvgEulerAngles", + avg_quats_array_name="AvgQuats", + cell_feature_attribute_matrix_path=nx.DataPath("fw-ar-IF1-avtr12-corr/CellFeatureData"), cell_feature_ids_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds"), cell_phases_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/Phases"), cell_quats_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/Quats"), @@ -270,7 +270,7 @@ kernel_average_misorientations_array_name="KernelAverageMisorientations", kernel_size=[1, 1, 1], quats_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/Quats"), - selected_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr") + input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr") ) nxtest.check_filter_result(nx_filter, result) @@ -280,10 +280,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - centroids_array_path="Centroids", - feature_attribute_matrix=nx.DataPath("fw-ar-IF1-avtr12-corr/CellFeatureData"), + centroids_array_name="Centroids", + feature_attribute_matrix_path=nx.DataPath("fw-ar-IF1-avtr12-corr/CellFeatureData"), feature_ids_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds"), - selected_image_geometry=nx.DataPath("fw-ar-IF1-avtr12-corr") + input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr") ) nxtest.check_filter_result(nx_filter, result) @@ -300,7 +300,7 @@ feature_ids_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds"), g_bdistances_array_name="GBManhattanDistances", save_nearest_neighbors=False, - selected_image_geometry=nx.DataPath("fw-ar-IF1-avtr12-corr") + input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr") # Parameters for nearest_neighbors_array_name, q_pdistances_array_name, and t_jdistances_array_name are not used ) nxtest.check_filter_result(nx_filter, result) @@ -318,7 +318,7 @@ feature_ids_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds"), feature_reference_misorientations_array_name="FeatureReferenceMisorientations", quats_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/Quats"), - reference_orientation=0 + reference_orientation_index=0 # Parameters for cell_feature_attribute_matrix_path and g_beuclidean_distances_array_path are not used ) nxtest.check_filter_result(nx_filter, result) @@ -330,7 +330,7 @@ result = nx_filter.execute( data_structure=data_structure, cell_feature_attribute_matrix_path=nx.DataPath("fw-ar-IF1-avtr12-corr/CellFeatureData"), - delimiter_choice_int=2, + delimiter_index=2, feature_data_file=nxtest.get_data_directory() / "Output/fw-ar-IF1-avtr12-corr/FeatureData.csv", write_neighborlist_data=False, write_num_features_line=True @@ -344,8 +344,8 @@ result = nx_filter.execute( data_structure=data_structure, histogram_suffix=" Histogram", - new_data_group=True, - new_data_group_name=nx.DataPath("fw-ar-IF1-avtr12-corr/Histograms"), + create_new_data_group=True, + new_data_group_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Histograms"), number_of_bins=256, selected_array_paths=[nx.DataPath("fw-ar-IF1-avtr12-corr/CellFeatureData/EquivalentDiameters")], user_defined_range=False @@ -358,10 +358,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - delimiter=2, + delimiter_index=2, output_path=nxtest.get_data_directory() / "Output/fw-ar-IF1-avtr12-corr/EqDiamHistogram.csv", - output_style=1, - selected_data_array_paths=[nx.DataPath("fw-ar-IF1-avtr12-corr/Histograms/EquivalentDiameters Histogram")] + output_style_index=1, + input_data_array_paths=[nx.DataPath("fw-ar-IF1-avtr12-corr/Histograms/EquivalentDiameters Histogram")] ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/AlignSectionsMutualInformation.py b/wrapping/python/examples/pipelines/OrientationAnalysis/AlignSectionsMutualInformation.py index fd84669943..118ac08a7b 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/AlignSectionsMutualInformation.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/AlignSectionsMutualInformation.py @@ -27,8 +27,8 @@ data_structure=data_structure, cell_attribute_matrix_name="CellData", cell_ensemble_attribute_matrix_name="CellEnsembleData", - data_container_name=nx.DataPath("DataContainer"), - read_h5_ebsd_parameter=h5ebsdParameter + output_image_geometry_path =nx.DataPath("DataContainer"), + read_h5_ebsd_object=h5ebsdParameter ) nxtest.check_filter_result(nx_filter, result) @@ -53,8 +53,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=nx.DataType.boolean ) nxtest.check_filter_result(nx_filter, result) @@ -66,9 +66,9 @@ result = nx_filter.execute( data_structure=data_structure, input_orientation_array_path=nx.DataPath("DataContainer/CellData/EulerAngles"), - input_type=0, + input_representation_index=0, output_orientation_array_name="Quats", - output_type=2 + output_representation_index=2 ) nxtest.check_filter_result(nx_filter, result) @@ -84,7 +84,7 @@ mask_array_path=nx.DataPath("DataContainer/CellData/Mask"), misorientation_tolerance=5.0, quats_array_path=nx.DataPath("DataContainer/CellData/Quats"), - selected_image_geometry_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), use_mask=True, write_alignment_shifts=True ) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/AvizoWriters.py b/wrapping/python/examples/pipelines/OrientationAnalysis/AvizoWriters.py index b4014d6c9b..e21c9cf5ad 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/AvizoWriters.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/AvizoWriters.py @@ -17,7 +17,7 @@ import_data.file_path = str(nxtest.get_data_directory() / "Output/Reconstruction/SmallIN100_Final.dream3d") import_data.data_paths = None # Execute Filter with Parameters -result = nx_filter.execute(data_structure=data_structure, import_file_data=import_data) +result = nx_filter.execute(data_structure=data_structure, import_data_object=import_data) nxtest.check_filter_result(nx_filter, result) # Filter 2 @@ -27,7 +27,7 @@ # Execute Filter with Parameters result = nx_filter.execute(data_structure=data_structure, feature_ids_array_path=nx.DataPath("DataContainer/CellData/FeatureIds"), - geometry_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), output_file=output_file_path, units="meters", write_binary_file=False @@ -42,7 +42,7 @@ # Execute Filter with Parameters result = nx_filter.execute(data_structure=data_structure, feature_ids_array_path=nx.DataPath("DataContainer/CellData/FeatureIds"), - geometry_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), output_file=output_file_path, units="meters", write_binary_file=False diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/CI_Histogram.py b/wrapping/python/examples/pipelines/OrientationAnalysis/CI_Histogram.py index 0aca04ec18..64cf7670cc 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/CI_Histogram.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/CI_Histogram.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_attribute_matrix_name=("Cell Data"), cell_ensemble_attribute_matrix_name=("CellEnsembleData"), - data_container_name=nx.DataPath("DataContainer"), + output_image_geometry_path =nx.DataPath("DataContainer"), input_file=nxtest.get_data_directory() / "Small_IN100/Slice_1.ang", ) nxtest.check_filter_result(nx_filter, result) @@ -29,7 +29,7 @@ result = nx_filter.execute( data_structure=data_structure, euler_angles_array_path=nx.DataPath("DataContainer/Cell Data/EulerAngles"), - rotation_axis=[0.0, 0.0, 1.0, 90.0] + rotation_axis_angle=[0.0, 0.0, 1.0, 90.0] ) nxtest.check_filter_result(nx_filter, result) @@ -39,12 +39,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - created_image_geometry=nx.DataPath("beans"), + output_image_geometry_path=nx.DataPath("beans"), remove_original_geometry=False, rotate_slice_by_slice=True, - rotation_axis=[0.0, 1.0, 0.0, 180.0], - rotation_representation=0, - selected_image_geometry=nx.DataPath("DataContainer") + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], + rotation_representation_index=0, + input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -64,8 +64,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=nx.DataType.boolean ) nxtest.check_filter_result(nx_filter, result) @@ -94,8 +94,8 @@ histogram_suffix=" Histogram", max_range=1.0, min_range=0.0, - new_data_group=True, - new_data_group_name=nx.DataPath("DataContainer/Statistics"), + create_new_data_group=True, + new_data_group_path=nx.DataPath("DataContainer/Statistics"), number_of_bins=25, selected_array_paths=[nx.DataPath("DataContainer/Cell Data/Confidence Index")], user_defined_range=True @@ -110,13 +110,13 @@ result = nx_filter.execute( data_structure=data_structure, #file_extension: str = ..., - delimiter=2, - includes=1, + delimiter_index=2, + header_option_index=1, #max_val_per_line: int = ..., #output_dir: PathLike = ..., output_path=output_file_path, - output_style=1, - selected_data_array_paths=[nx.DataPath("DataContainer/Statistics/Confidence Index Histogram")] + output_style_index=1, + input_data_array_paths=[nx.DataPath("DataContainer/Statistics/Confidence Index Histogram")] ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/Edax_IPF_Colors.py b/wrapping/python/examples/pipelines/OrientationAnalysis/Edax_IPF_Colors.py index f8f040b530..7dffdffd3d 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/Edax_IPF_Colors.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/Edax_IPF_Colors.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_attribute_matrix_name=("Cell Data"), cell_ensemble_attribute_matrix_name=("CellEnsembleData"), - data_container_name=nx.DataPath("DataContainer"), + output_image_geometry_path =nx.DataPath("DataContainer"), input_file=nxtest.get_data_directory() / "Small_IN100/Slice_1.ang" ) nxtest.check_filter_result(nx_filter, result) @@ -29,7 +29,7 @@ result = nx_filter.execute( data_structure=data_structure, euler_angles_array_path=nx.DataPath("DataContainer/Cell Data/EulerAngles"), - rotation_axis=[0.0, 0.0, 1.0, 90.0] + rotation_axis_angle=[0.0, 0.0, 1.0, 90.0] ) nxtest.check_filter_result(nx_filter, result) @@ -41,9 +41,9 @@ data_structure=data_structure, remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], - rotation_representation=0, - selected_image_geometry=nx.DataPath("DataContainer") + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], + rotation_representation_index=0, + input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -64,8 +64,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=nx.DataType.boolean ) nxtest.check_filter_result(nx_filter, result) @@ -96,9 +96,9 @@ data_structure=data_structure, file_name=output_file_path, image_array_path=nx.DataPath("DataContainer/Cell Data/IPFColors"), - image_geom_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/FindBiasedFeatures.py b/wrapping/python/examples/pipelines/OrientationAnalysis/FindBiasedFeatures.py index 612fdb92aa..6fa2d291b0 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/FindBiasedFeatures.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/FindBiasedFeatures.py @@ -18,7 +18,7 @@ nx_filter = nx.ReadDREAM3DFilter() # Execute Filter with Parameters result = nx_filter.execute(data_structure=data_structure, - import_file_data=import_data + import_data_object=import_data ) nxtest.check_filter_result(nx_filter, result) @@ -54,12 +54,12 @@ result = nx_filter.execute( data_structure=data_structure, #boundary_cells: str = ..., - cell_feature_arrays=nx.DataPath("DataContainer/CellFeatureData"), - feature_ids=nx.DataPath("DataContainer/CellData/FeatureIds"), - image_geometry=nx.DataPath("DataContainer"), - neighbor_list="NeighborList", - number_of_neighbors="NumNeighbors", - shared_surface_area_list="SharedSurfaceAreaList", + cell_feature_array_path=nx.DataPath("DataContainer/CellFeatureData"), + feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), + input_image_geometry_path =nx.DataPath("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: str = ... @@ -72,10 +72,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - centroids_array_path="Centroids", - feature_attribute_matrix=nx.DataPath("DataContainer/CellFeatureData"), + centroids_array_name="Centroids", + feature_attribute_matrix_path=nx.DataPath("DataContainer/CellFeatureData"), feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), - selected_image_geometry=nx.DataPath("DataContainer") + input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -86,10 +86,10 @@ result = nx_filter.execute( data_structure=data_structure, feature_attribute_matrix_path=nx.DataPath("DataContainer/CellFeatureData"), - feature_geometry_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), mark_feature_0_neighbors=True, - surface_features_array_path="SurfaceFeatures" + surface_features_array_name="SurfaceFeatures" ) nxtest.check_filter_result(nx_filter, result) @@ -102,7 +102,7 @@ biased_features_array_name="BiasedFeatures", calc_by_phase=True, centroids_array_path=nx.DataPath("DataContainer/CellFeatureData/Centroids"), - image_geometry_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), phases_array_path=nx.DataPath("DataContainer/CellFeatureData/Phases"), surface_features_array_path=nx.DataPath("DataContainer/CellFeatureData/SurfaceFeatures") ) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/FindBoundaryCells.py b/wrapping/python/examples/pipelines/OrientationAnalysis/FindBoundaryCells.py index 24807fc9c6..4801e17cc9 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/FindBoundaryCells.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/FindBoundaryCells.py @@ -20,7 +20,7 @@ nx_filter = nx.ReadDREAM3DFilter() # Execute Filter with Parameters result = nx_filter.execute(data_structure=data_structure, - import_file_data=import_data) + import_data_object=import_data) nxtest.check_filter_result(nx_filter, result) # Filter 2 @@ -32,7 +32,7 @@ boundary_cells_array_name="BoundaryCells", feature_ids_array_path=nx.DataPath("DataContainer/CellData/FeatureIds"), ignore_feature_zero=True, - image_geometry_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), include_volume_boundary=True, ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/FindGBCD-GBPDMetricBased.py b/wrapping/python/examples/pipelines/OrientationAnalysis/FindGBCD-GBPDMetricBased.py index 0c6c940659..579894f0bf 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/FindGBCD-GBPDMetricBased.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/FindGBCD-GBPDMetricBased.py @@ -18,7 +18,7 @@ nx_filter = nx.ReadDREAM3DFilter() # Execute Filter with Parameters result = nx_filter.execute(data_structure=data_structure, - import_file_data=import_data) + import_data_object=import_data) nxtest.check_filter_result(nx_filter, result) # Filter 2 @@ -33,7 +33,7 @@ feature_num_triangles_array_name=("NumTriangles"), grain_boundary_attribute_matrix_name=("FaceFeatureData"), randomize_features=False, - triangle_geometry_path=nx.DataPath("TriangleDataContainer") + input_triangle_geometry_path=nx.DataPath("TriangleDataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -44,7 +44,7 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - chosen_limit_dists=2, + chosen_limit_dists_index=2, crystal_structures_array_path=nx.DataPath("DataContainer/CellEnsembleData/CrystalStructures"), dist_output_file=nxtest.get_data_directory() / "Output/GBPDMetricBased/gbcd_distribution.dat", err_output_file=nxtest.get_data_directory() / "Output/GBPDMetricBased/gbcd_distribution_errors.dat", @@ -60,7 +60,7 @@ surface_mesh_face_labels_array_path=nx.DataPath("TriangleDataContainer/FaceData/FaceLabels"), surface_mesh_face_normals_array_path=nx.DataPath("TriangleDataContainer/FaceData/FaceNormals"), surface_mesh_feature_face_labels_array_path=nx.DataPath("TriangleDataContainer/FaceFeatureData/FaceLabels"), - triangle_geometry_path=nx.DataPath("TriangleDataContainer") + input_triangle_geometry_path=nx.DataPath("TriangleDataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -86,7 +86,7 @@ surface_mesh_face_labels_array_path=nx.DataPath("TriangleDataContainer/FaceData/FaceLabels"), surface_mesh_face_normals_array_path=nx.DataPath("TriangleDataContainer/FaceData/FaceNormals"), surface_mesh_feature_face_labels_array_path=nx.DataPath("TriangleDataContainer/FaceFeatureData/FaceLabels"), - triangle_geometry_path=nx.DataPath("TriangleDataContainer") + input_triangle_geometry_path=nx.DataPath("TriangleDataContainer") ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/FindLargestCrossSections.py b/wrapping/python/examples/pipelines/OrientationAnalysis/FindLargestCrossSections.py index 64147ac572..bfd5223eae 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/FindLargestCrossSections.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/FindLargestCrossSections.py @@ -26,8 +26,8 @@ data_structure=data_structure, cell_attribute_matrix_name="CellData", cell_ensemble_attribute_matrix_name="CellEnsembleData", - data_container_name=nx.DataPath("DataContainer"), - read_h5_ebsd_parameter=h5ebsdParameter + output_image_geometry_path =nx.DataPath("DataContainer"), + read_h5_ebsd_object=h5ebsdParameter ) nxtest.check_filter_result(nx_filter, result) @@ -48,8 +48,8 @@ # Execute Filter with Parameters result = nx.MultiThresholdObjects.execute(data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path = "Mask", + array_thresholds_object=threshold_set, + output_data_array_name = "Mask", created_mask_type = nx.DataType.boolean, ) nxtest.check_filter_result(nx_filter, result) @@ -61,9 +61,9 @@ result = nx_filter.execute( data_structure=data_structure, input_orientation_array_path=nx.DataPath("DataContainer/CellData/EulerAngles"), - input_type=0, + input_representation_index=0, output_orientation_array_name="Quats", - output_type=2 + output_representation_index=2 ) nxtest.check_filter_result(nx_filter, result) @@ -78,10 +78,10 @@ cell_phases_array_path=nx.DataPath("DataContainer/CellData/Phases"), crystal_structures_array_path=nx.DataPath("DataContainer/CellEnsembleData/CrystalStructures"), feature_ids_array_name="FeatureIds", - grid_geometry_path=nx.DataPath("DataContainer"), - mask_array_path=nx.DataPath("DataContainer/CellData/Mask"), + input_image_geometry_path =nx.DataPath("DataContainer"), + cell_mask_array_path=nx.DataPath("DataContainer/CellData/Mask"), misorientation_tolerance=5.0, - quats_array_path=nx.DataPath("DataContainer/CellData/Quats"), + cell_quats_array_path=nx.DataPath("DataContainer/CellData/Quats"), randomize_features=True, use_mask=True ) @@ -95,9 +95,9 @@ data_structure=data_structure, cell_feature_attribute_matrix_path=nx.DataPath("DataContainer/CellFeatureData"), feature_ids_array_path=nx.DataPath("DataContainer/CellData/FeatureIds"), - image_geometry_path=nx.DataPath("DataContainer"), - largest_cross_sections_array_path="LargestCrossSections", - plane=0 + input_image_geometry_path=nx.DataPath("DataContainer"), + largest_cross_sections_array_name="LargestCrossSections", + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/ReadAng.py b/wrapping/python/examples/pipelines/OrientationAnalysis/ReadAng.py index ce75ff9e31..d9f0a92ce7 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/ReadAng.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/ReadAng.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_attribute_matrix_name=("Cell Data"), cell_ensemble_attribute_matrix_name=("Cell Ensemble Data"), - data_container_name=nx.DataPath("DataContainer"), + output_image_geometry_path =nx.DataPath("DataContainer"), input_file=nxtest.get_data_directory() / "Small_IN100/Slice_1.ang" ) nxtest.check_filter_result(nx_filter, result) @@ -29,7 +29,7 @@ result = nx_filter.execute( data_structure=data_structure, euler_angles_array_path=nx.DataPath("DataContainer/Cell Data/EulerAngles"), - rotation_axis=[0.0, 0.0, 1.0, 90.0] + rotation_axis_angle=[0.0, 0.0, 1.0, 90.0] ) nxtest.check_filter_result(nx_filter, result) @@ -42,10 +42,10 @@ #created_image_geometry: DataPath = ..., remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], #rotation_matrix: Any = ..., - rotation_representation=0, - selected_image_geometry=nx.DataPath("DataContainer") + rotation_representation_index=0, + input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -64,8 +64,8 @@ nx_filter = nx.MultiThresholdObjects() # Execute Filter with Parameters result = nx_filter.execute(data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=nx.DataType.boolean) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/ReadCTF.py b/wrapping/python/examples/pipelines/OrientationAnalysis/ReadCTF.py index 52919a2e43..6608069ce8 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/ReadCTF.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/ReadCTF.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_attribute_matrix_name=("Cell Data"), cell_ensemble_attribute_matrix_name=("CellEnsembleData"), - data_container_name=nx.DataPath("DataContainer"), + output_image_geometry_path =nx.DataPath("DataContainer"), degrees_to_radians=True, edax_hexagonal_alignment=False, input_file=nxtest.get_data_directory() / "T12-MAI-2010/fw-ar-IF1-aptr12-corr.ctf" @@ -30,13 +30,13 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - #created_image_geometry=nx.DataPath("DataContainer/"), + #output_image_geometry_path=nx.DataPath("DataContainer/"), remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], #rotation_matrix: List[List[float]] = ..., - rotation_representation=0, - selected_image_geometry=nx.DataPath("DataContainer") + rotation_representation_index=0, + input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -55,8 +55,8 @@ nx_filter = nx.MultiThresholdObjects() # Execute Filter with Parameters result = nx_filter.execute(data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=nx.DataType.boolean) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Exposed.py b/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Exposed.py index 3425a01104..7197bca7e1 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Exposed.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Exposed.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_attribute_matrix_name=("EBSD Scan Data"), cell_ensemble_attribute_matrix_name=("Phase Data"), - data_container_name=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2"), + output_image_geometry_path =nx.DataPath("Cugrid_after 2nd_15kv_2kx_2"), degrees_to_radians=True, edax_hexagonal_alignment=True, input_file=nxtest.get_data_directory() / "Textured_Copper/Cugrid_after 2nd_15kv_2kx_2.ctf" @@ -32,10 +32,10 @@ data_structure=data_structure, remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], #rotation_matrix= - rotation_representation=0, - selected_image_geometry=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2") + rotation_representation_index=0, + input_image_geometry_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2") ) nxtest.check_filter_result(nx_filter, result) @@ -49,7 +49,7 @@ min_voxel=[0, 0, 0], remove_original_geometry=True, renumber_features=False, - selected_image_geometry=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2") + input_image_geometry_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2") # update_origin=True ) nxtest.check_filter_result(nx_filter, result) @@ -64,8 +64,8 @@ threshold_set = nx.ArrayThresholdSet() threshold_set.thresholds = [threshold_1] result = nx.MultiThresholdObjects.execute(data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=nx.DataType.boolean) nxtest.check_filter_result(nx_filter, result) @@ -94,9 +94,9 @@ data_structure=data_structure, file_name=nxtest.get_data_directory() / "Output/TexturedCopper/IPF_Exposed.png", image_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/IPF_Exposed_001"), - image_geom_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2"), + input_image_geometry_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -109,10 +109,10 @@ cell_euler_angles_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles"), cell_phases_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases"), crystal_structures_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures"), - generation_algorithm=0, + generation_algorithm_index=0, mask_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask"), - image_geometry_path=nx.DataPath("PoleFigure"), - image_layout=2, + output_image_geometry_path=nx.DataPath("PoleFigure"), + image_layout_index=2, image_prefix="Cugrid_after 2nd_15kv_2kx_2_Exposed_", image_size=1024, lambert_size=64, diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Unexposed.py b/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Unexposed.py index e5a541fd5b..c9d9c61e19 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Unexposed.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Unexposed.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_attribute_matrix_name=("EBSD Scan Data"), cell_ensemble_attribute_matrix_name=("Phase Data"), - data_container_name=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2"), + output_image_geometry_path =nx.DataPath("Cugrid_after 2nd_15kv_2kx_2"), degrees_to_radians=True, edax_hexagonal_alignment=True, input_file=nxtest.get_data_directory() / "Textured_Copper/Cugrid_after 2nd_15kv_2kx_2.ctf" @@ -32,10 +32,10 @@ data_structure=data_structure, remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], #rotation_matrix= - rotation_representation=0, - selected_image_geometry=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2") + rotation_representation_index=0, + input_image_geometry_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2") ) nxtest.check_filter_result(nx_filter, result) @@ -49,7 +49,7 @@ min_voxel=[488, 0, 0], remove_original_geometry=True, renumber_features=False, - selected_image_geometry=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2") + input_image_geometry_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2") ) nxtest.check_filter_result(nx_filter, result) @@ -63,8 +63,8 @@ threshold_set = nx.ArrayThresholdSet() threshold_set.thresholds = [threshold_1] result = nx.MultiThresholdObjects.execute(data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=nx.DataType.boolean) nxtest.check_filter_result(nx_filter, result) @@ -93,9 +93,9 @@ data_structure=data_structure, file_name=nxtest.get_data_directory() / "Output/TexturedCopper/IPF_Unexposed.png", image_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/IPF_Unexposed_001"), - image_geom_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2"), + input_image_geometry_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -108,10 +108,10 @@ cell_euler_angles_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles"), cell_phases_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases"), crystal_structures_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures"), - generation_algorithm=0, + generation_algorithm_index=0, mask_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask"), - image_geometry_path=nx.DataPath("PoleFigure"), - image_layout=2, + output_image_geometry_path=nx.DataPath("PoleFigure"), + image_layout_index=2, image_prefix="Cugrid_after 2nd_15kv_2kx_2_Unexposed_", image_size=1024, lambert_size=64, diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/VtkRectilinearGridWriter.py b/wrapping/python/examples/pipelines/OrientationAnalysis/VtkRectilinearGridWriter.py index c90c112ab1..f4d1742e76 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/VtkRectilinearGridWriter.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/VtkRectilinearGridWriter.py @@ -19,7 +19,7 @@ nx_filter = nx.ReadDREAM3DFilter() # Execute Filter with Parameters result = nx_filter.execute(data_structure=data_structure, - import_file_data=import_data) + import_data_object=import_data) nxtest.check_filter_result(nx_filter, result) # Filter 2 @@ -39,23 +39,23 @@ # Execute Filter result = nx_filter.execute( data_structure=data_structure, - image_geometry_path=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), output_file=output_file_path, write_binary_file=True, - selected_data_array_paths=[ - nx.DataPath("DataContainer/CellData/Confidence Index"), - nx.DataPath("DataContainer/CellData/EulerAngles"), - nx.DataPath("DataContainer/CellData/FeatureIds"), - nx.DataPath("DataContainer/CellData/Fit"), - nx.DataPath("DataContainer/CellData/IPFColors"), - nx.DataPath("DataContainer/CellData/Image Quality"), - nx.DataPath("DataContainer/CellData/Mask"), - nx.DataPath("DataContainer/CellData/ParentIds"), - nx.DataPath("DataContainer/CellData/Phases"), - nx.DataPath("DataContainer/CellData/Quats"), - nx.DataPath("DataContainer/CellData/SEM Signal"), - nx.DataPath("DataContainer/CellData/X Position"), - nx.DataPath("DataContainer/CellData/Y Position")] + input_data_array_paths=[ + nx.DataPath("DataContainer/CellData/Confidence Index"), + nx.DataPath("DataContainer/CellData/EulerAngles"), + nx.DataPath("DataContainer/CellData/FeatureIds"), + nx.DataPath("DataContainer/CellData/Fit"), + nx.DataPath("DataContainer/CellData/IPFColors"), + nx.DataPath("DataContainer/CellData/Image Quality"), + nx.DataPath("DataContainer/CellData/Mask"), + nx.DataPath("DataContainer/CellData/ParentIds"), + nx.DataPath("DataContainer/CellData/Phases"), + nx.DataPath("DataContainer/CellData/Quats"), + nx.DataPath("DataContainer/CellData/SEM Signal"), + nx.DataPath("DataContainer/CellData/X Position"), + nx.DataPath("DataContainer/CellData/Y Position")] ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/AppendImageGeometryZSlice.py b/wrapping/python/examples/pipelines/Simplnx/AppendImageGeometryZSlice.py index 09858bcab1..d91d8851a5 100644 --- a/wrapping/python/examples/pipelines/Simplnx/AppendImageGeometryZSlice.py +++ b/wrapping/python/examples/pipelines/Simplnx/AppendImageGeometryZSlice.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_data_name="Cell Data", dimensions=[60, 80, 100], - geometry_data_path=nx.DataPath("[Image Geometry]"), + output_image_geometry_path=nx.DataPath("[Image Geometry]"), origin=[100.0, 100.0, 0.0], spacing=[1.0, 1.0, 1.0] ) @@ -29,15 +29,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=True, + set_tuple_dimensions=True, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/ConfidenceIndex.csv", - n_comp=1, - n_skip_lines=0, - n_tuples=[[480000.0]], - output_data_array=nx.DataPath("Confidence Index"), - scalar_type=nx.NumericType.float32 + number_comp=1, + skip_line_count=0, + number_tuples=[[480000.0]], + output_data_array_path=nx.DataPath("Confidence Index"), + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -47,15 +47,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=True, + set_tuple_dimensions=True, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/FeatureIds.csv", - n_comp=1, - n_skip_lines=0, - n_tuples=[[480000.0]], - output_data_array=nx.DataPath("[Image Geometry]/Cell Data/FeatureIds"), - scalar_type=nx.NumericType.int32 + number_comp=1, + skip_line_count=0, + number_tuples=[[480000.0]], + output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/FeatureIds"), + scalar_type_index=nx.NumericType.int32 ) nxtest.check_filter_result(nx_filter, result) @@ -66,15 +66,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=True, + set_tuple_dimensions=True, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/ImageQuality.csv", - n_comp=1, - n_skip_lines=0, - n_tuples=[[480000.0]], - output_data_array=nx.DataPath("[Image Geometry]/Cell Data/Image Quality"), - scalar_type=nx.NumericType.float32 + number_comp=1, + skip_line_count=0, + number_tuples=[[480000.0]], + output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/Image Quality"), + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) # Filter 5 @@ -83,15 +83,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=True, + set_tuple_dimensions=True, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/IPFColor.csv", - n_comp=3, - n_skip_lines=0, - n_tuples=[[480000.0]], - output_data_array=nx.DataPath("[Image Geometry]/Cell Data/IPFColors"), - scalar_type=nx.NumericType.uint8 + number_comp=3, + skip_line_count=0, + number_tuples=[[480000.0]], + output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/IPFColors"), + scalar_type_index=nx.NumericType.uint8 ) nxtest.check_filter_result(nx_filter, result) # Filter 6 @@ -100,12 +100,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - created_image_geometry=nx.DataPath("CroppedBottomHalf"), + output_image_geometry_path=nx.DataPath("CroppedBottomHalf"), max_voxel=[59, 79, 50], min_voxel=[0, 0, 0], remove_original_geometry=False, renumber_features=False, - selected_image_geometry=nx.DataPath("[Image Geometry]") + input_image_geometry_path=nx.DataPath("[Image Geometry]") #update_origin=False # cell_feature_attribute_matrix: DataPath = ..., # Not currently part of the code # feature_ids: DataPath = ..., # Not currently part of the code @@ -119,12 +119,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - created_image_geometry=nx.DataPath("CroppedTopHalf"), + output_image_geometry_path=nx.DataPath("CroppedTopHalf"), max_voxel=[59, 79, 99], min_voxel=[0, 0, 51], remove_original_geometry=False, renumber_features=False, - selected_image_geometry=nx.DataPath("[Image Geometry]") + input_image_geometry_path=nx.DataPath("[Image Geometry]") # update_origin=True # cell_feature_attribute_matrix: DataPath = ..., # Not currently part of the code # feature_ids: DataPath = ..., # Not currently part of the code @@ -138,9 +138,9 @@ result = nx_filter.execute( data_structure=data_structure, check_resolution=True, - destination_geometry=nx.DataPath("CroppedBottomHalf"), - input_geometry=nx.DataPath("CroppedTopHalf"), - new_geometry=nx.DataPath("AppendedImageGeom"), + destination_image_geometry_path=nx.DataPath("CroppedBottomHalf"), + input_image_geometry_path=nx.DataPath("CroppedTopHalf"), + output_image_geometry_path=nx.DataPath("AppendedImageGeom"), save_as_new_geometry=True ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Demo.py b/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Demo.py index 09be9f1025..ff27060b03 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Demo.py +++ b/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Demo.py @@ -35,16 +35,16 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_handling=0, + array_handling_index=0, cell_attribute_matrix_name="Cell Data", dimensions=[10, 10 , 2], #edge_attribute_matrix_name="Edge Data", (not used here) #edge_list_name: DataPath = ..., (not used here) #face_attribute_matrix_name="Face Data", (not used here) - geometry_name=nx.DataPath("Group 1/Group 2/[Geometry]"), - geometry_type=0, + output_geometry_path=nx.DataPath("Group 1/Group 2/[Geometry]"), + geometry_type_index=0, #hexahedral_list_name: DataPath = ..., (not used here) - length_unit_type=7, + length_unit_index=7, origin=[0.0, 0.0, 0.0], #quadrilateral_list_name: DataPath = ..., (not used here) spacing=[1.0, 1.0, 1.0], @@ -68,9 +68,9 @@ data_structure=data_structure, component_count=1, data_format="", - initialization_value="2", - numeric_type=nx.NumericType.int32, - output_data_array=nx.DataPath("Group 1/Group 2/[Geometry]/Cell Data/Data"), + initialization_value_str="2", + numeric_type_index=nx.NumericType.int32, + output_array_path=nx.DataPath("Group 1/Group 2/[Geometry]/Cell Data/Data"), tuple_dimensions=[[2.0, 10.0, 10.0]] ) nxtest.check_filter_result(nx_filter, result) @@ -82,10 +82,10 @@ result = nx_filter.execute( data_structure=data_structure, cell_attribute_matrix_path=nx.DataPath("Group 1/Group 2/[Geometry]/Cell Data"), - interpolation_type=1, + interpolation_type_index=1, scale=[2.0, 2.0, 2.0], - selected_image_geometry=nx.DataPath("Group 1/Group 2/[Geometry]"), - transformation_type=5, + input_image_geometry_path=nx.DataPath("Group 1/Group 2/[Geometry]"), + transformation_type_index=5, translate_geometry_to_global_origin=False ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Image.py b/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Image.py index 5f435b01e8..d85a9d606c 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Image.py +++ b/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Image.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_attribute_matrix_name="Cell Data", cell_ensemble_attribute_matrix_name="CellEnsembleData", - data_container_name=nx.DataPath("Small IN100"), + output_image_geometry_path =nx.DataPath("Small IN100"), input_file=nxtest.get_data_directory() / "Small_IN100/Slice_1.ang" ) nxtest.check_filter_result(nx_filter, result) @@ -30,7 +30,7 @@ data_structure=data_structure, cell_attribute_matrix_name="Cell Data", cell_ensemble_attribute_matrix_name="CellEnsembleData", - data_container_name=nx.DataPath("Transform [Rotate]"), + output_image_geometry_path=nx.DataPath("Transform [Rotate]"), input_file=nxtest.get_data_directory() / "Small_IN100/Slice_1.ang" ) nxtest.check_filter_result(nx_filter, result) @@ -42,10 +42,10 @@ result = nx_filter.execute( data_structure=data_structure, cell_attribute_matrix_path=nx.DataPath("Transform [Rotate]/Cell Data"), - interpolation_type=1, + interpolation_type_index=1, rotation=[0.0, 1.0, 0.0, 180.0], - selected_image_geometry=nx.DataPath("Transform [Rotate]"), - transformation_type=3, + input_image_geometry_path=nx.DataPath("Transform [Rotate]"), + transformation_type_index=3, translate_geometry_to_global_origin=False # computed_transformation_matrix: DataPath = ..., # Not used here # manual_transformation_matrix: List[List[float]] = ..., # Not used here @@ -63,7 +63,7 @@ data_structure=data_structure, cell_attribute_matrix_name="Cell Data", cell_ensemble_attribute_matrix_name="CellEnsembleData", - data_container_name=nx.DataPath("Transform [Scale]"), + output_image_geometry_path=nx.DataPath("Transform [Scale]"), input_file=nxtest.get_data_directory() / "Small_IN100/Slice_1.ang" ) nxtest.check_filter_result(nx_filter, result) @@ -75,10 +75,10 @@ result = nx_filter.execute( data_structure=data_structure, cell_attribute_matrix_path=nx.DataPath("Transform [Scale]/Cell Data"), - interpolation_type=1, + interpolation_type_index=1, scale=[2.0, 2.0, 1.0], # Scale transformation - selected_image_geometry=nx.DataPath("Transform [Scale]"), - transformation_type=5, # Type for scale transformation + input_image_geometry_path=nx.DataPath("Transform [Scale]"), + transformation_type_index=5, # Type for scale transformation translate_geometry_to_global_origin=False # computed_transformation_matrix: DataPath = ..., # manual_transformation_matrix: List[List[float]] = ..., @@ -95,7 +95,7 @@ data_structure=data_structure, cell_attribute_matrix_name="Cell Data", cell_ensemble_attribute_matrix_name="CellEnsembleData", - data_container_name=nx.DataPath("Transform [Translate]"), + output_image_geometry_path=nx.DataPath("Transform [Translate]"), input_file=nxtest.get_data_directory() / "Small_IN100/Slice_1.ang" ) nxtest.check_filter_result(nx_filter, result) @@ -107,9 +107,9 @@ result = nx_filter.execute( data_structure=data_structure, cell_attribute_matrix_path=nx.DataPath("Transform [Translate]/Cell Data"), - interpolation_type=1, - selected_image_geometry=nx.DataPath("Transform [Translate]"), - transformation_type=4, + interpolation_type_index=1, + input_image_geometry_path=nx.DataPath("Transform [Translate]"), + transformation_type_index=4, translate_geometry_to_global_origin=False, translation=[50.0, 0.0, 0.0] # computed_transformation_matrix: DataPath = ..., # Not used here @@ -127,7 +127,7 @@ data_structure=data_structure, cell_attribute_matrix_name="Cell Data", cell_ensemble_attribute_matrix_name="CellEnsembleData", - data_container_name=nx.DataPath("Transform [Rotation-Interpolation]"), + output_image_geometry_path=nx.DataPath("Transform [Rotation-Interpolation]"), input_file=nxtest.get_data_directory() / "Small_IN100/Slice_1.ang" ) nxtest.check_filter_result(nx_filter, result) @@ -139,10 +139,10 @@ result = nx_filter.execute( data_structure=data_structure, cell_attribute_matrix_path=nx.DataPath("Transform [Rotation-Interpolation]/Cell Data"), - interpolation_type=0, + interpolation_type_index=0, rotation=[0.0, 0.0, 1.0, 45.0], - selected_image_geometry=nx.DataPath("Transform [Rotation-Interpolation]"), - transformation_type=3, + input_image_geometry_path=nx.DataPath("Transform [Rotation-Interpolation]"), + transformation_type_index=3, translate_geometry_to_global_origin=False # computed_transformation_matrix: DataPath = ..., # manual_transformation_matrix: List[List[float]] = ..., @@ -160,7 +160,7 @@ data_structure=data_structure, cell_attribute_matrix_name="Cell Data", cell_ensemble_attribute_matrix_name="CellEnsembleData", - data_container_name=nx.DataPath("Transform [Scale-Interpolation]"), + output_image_geometry_path=nx.DataPath("Transform [Scale-Interpolation]"), input_file=nxtest.get_data_directory() / "Small_IN100/Slice_1.ang" ) nxtest.check_filter_result(nx_filter, result) @@ -172,10 +172,10 @@ result = nx_filter.execute( data_structure=data_structure, cell_attribute_matrix_path=nx.DataPath("Transform [Scale-Interpolation]/Cell Data"), - interpolation_type=0, + interpolation_type_index=0, scale=[3.0, 3.0, 1.0], - selected_image_geometry=nx.DataPath("Transform [Scale-Interpolation]"), - transformation_type=5, + input_image_geometry_path=nx.DataPath("Transform [Scale-Interpolation]"), + transformation_type_index=5, translate_geometry_to_global_origin=False # computed_transformation_matrix: DataPath = ..., # manual_transformation_matrix: List[List[float]] = ..., diff --git a/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Node.py b/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Node.py index ba30b46775..fbb6e46a3c 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Node.py +++ b/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Node.py @@ -15,12 +15,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - face_attribute_matrix="Face Data", - face_normals_data_path="Face Normals", + face_attribute_matrix_name="Face Data", + face_normals_name="Face Normals", scale_output=False, stl_file_path=nxtest.get_data_directory() / "STL_Models/ASTMD638_specimen.stl", - triangle_geometry_name=nx.DataPath("Blade"), - vertex_attribute_matrix="Vertex Data" + output_triangle_geometry_path=nx.DataPath("Blade"), + vertex_attribute_matrix_name="Vertex Data" ) nxtest.check_filter_result(nx_filter, result) @@ -30,13 +30,13 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - face_attribute_matrix="Face Data", - face_normals_data_path="Face Normals", + face_attribute_matrix_name="Face Data", + face_normals_name="Face Normals", #scale_factor: float = ..., scale_output=False, stl_file_path=nxtest.get_data_directory() / "STL_Models/ASTMD638_specimen.stl", - triangle_geometry_name=nx.DataPath("Blade [Rotation]"), - vertex_attribute_matrix="Vertex Data" + output_triangle_geometry_path=nx.DataPath("Blade [Rotation]"), + vertex_attribute_matrix_name="Vertex Data" ) nxtest.check_filter_result(nx_filter, result) @@ -48,12 +48,12 @@ data_structure=data_structure, #cell_attribute_matrix_path: DataPath = ..., #computed_transformation_matrix: DataPath = ..., - interpolation_type=2, + interpolation_type_index=2, #manual_transformation_matrix: List[List[float]] = ..., rotation=[1.0, 0.0, 0.0, 180], #scale: List[float] = ..., - selected_image_geometry=nx.DataPath("Blade [Rotation]"), - transformation_type=3, + input_image_geometry_path=nx.DataPath("Blade [Rotation]"), + transformation_type_index=3, translate_geometry_to_global_origin=False #translation: List[float] = ... ) @@ -65,12 +65,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - face_attribute_matrix="Face Data", - face_normals_data_path="Face Normals", + face_attribute_matrix_name="Face Data", + face_normals_name="Face Normals", scale_output=False, stl_file_path=nxtest.get_data_directory() / "STL_Models/ASTMD638_specimen.stl", - triangle_geometry_name=nx.DataPath("Blade [Translation]"), - vertex_attribute_matrix="Vertex Data" + output_triangle_geometry_path=nx.DataPath("Blade [Translation]"), + vertex_attribute_matrix_name="Vertex Data" ) nxtest.check_filter_result(nx_filter, result) @@ -80,9 +80,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - interpolation_type=2, - selected_image_geometry=nx.DataPath("Blade [Translation]"), - transformation_type=4, + interpolation_type_index=2, + input_image_geometry_path=nx.DataPath("Blade [Translation]"), + transformation_type_index=4, translate_geometry_to_global_origin=False, translation=[10.0, 10.0, 10.0] ) @@ -94,12 +94,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - face_attribute_matrix="Face Data", - face_normals_data_path="Face Normals", + face_attribute_matrix_name="Face Data", + face_normals_name="Face Normals", scale_output=False, stl_file_path=nxtest.get_data_directory() / "STL_Models/ASTMD638_specimen.stl", - triangle_geometry_name=nx.DataPath("Blade [Scale]"), - vertex_attribute_matrix="Vertex Data" + output_triangle_geometry_path=nx.DataPath("Blade [Scale]"), + vertex_attribute_matrix_name="Vertex Data" ) nxtest.check_filter_result(nx_filter, result) @@ -109,10 +109,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - interpolation_type=2, + interpolation_type_index=2, scale=[0.5, 0.5, 1.0], - selected_image_geometry=nx.DataPath("Blade [Scale]"), - transformation_type=5, + input_image_geometry_path=nx.DataPath("Blade [Scale]"), + transformation_type_index=5, translate_geometry_to_global_origin=False ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/ArrayCalculatorExample.py b/wrapping/python/examples/pipelines/Simplnx/ArrayCalculatorExample.py index 11af7e2a07..e2339646e4 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ArrayCalculatorExample.py +++ b/wrapping/python/examples/pipelines/Simplnx/ArrayCalculatorExample.py @@ -15,12 +15,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=True, + set_tuple_dimensions=True, component_count=1, data_format="", - initialization_value="2", - numeric_type=nx.NumericType.int32, - output_data_array=nx.DataPath("TestArray"), + initialization_value_str="2", + numeric_type_index=nx.NumericType.int32, + output_array_path=nx.DataPath("TestArray"), tuple_dimensions=[[10.0]] ) nxtest.check_filter_result(nx_filter, result) @@ -32,12 +32,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=True, + set_tuple_dimensions=True, component_count=1, data_format="", - initialization_value="1.23878", - numeric_type=nx.NumericType.float32, - output_data_array=nx.DataPath("Confidence Index"), + initialization_value_str="1.23878", + numeric_type_index=nx.NumericType.float32, + output_array_path=nx.DataPath("Confidence Index"), tuple_dimensions=[[10.0]] ) nxtest.check_filter_result(nx_filter, result) @@ -48,12 +48,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=True, + set_tuple_dimensions=True, component_count=3, data_format="", - initialization_value="1.23878", - numeric_type=nx.NumericType.float32, - output_data_array=nx.DataPath("EulerAngles"), + initialization_value_str="1.23878", + numeric_type_index=nx.NumericType.float32, + output_array_path=nx.DataPath("EulerAngles"), tuple_dimensions=[[10.0]] ) nxtest.check_filter_result(nx_filter, result) @@ -66,9 +66,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - calculated_array=nx.DataPath("Caclulated_TestArray"), + calculated_array_path=nx.DataPath("Caclulated_TestArray"), calculator_parameter=calc_param, - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -79,9 +79,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - calculated_array=nx.DataPath("Caclulated_ConfidenceIndex"), + calculated_array_path=nx.DataPath("Caclulated_ConfidenceIndex"), calculator_parameter=calc_param, - scalar_type=nx.NumericType.float64 + scalar_type_index=nx.NumericType.float64 ) nxtest.check_filter_result(nx_filter, result) @@ -93,9 +93,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - calculated_array=nx.DataPath("Caclulated_EulerAngles"), + calculated_array_path=nx.DataPath("Caclulated_EulerAngles"), calculator_parameter=calc_param, - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -106,9 +106,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - calculated_array=nx.DataPath("Caclulated_EulerAngles2"), + calculated_array_path=nx.DataPath("Caclulated_EulerAngles2"), calculator_parameter=calc_param, - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/CombineSTLFiles.py b/wrapping/python/examples/pipelines/Simplnx/CombineSTLFiles.py index 0f0fb8947d..f324404590 100644 --- a/wrapping/python/examples/pipelines/Simplnx/CombineSTLFiles.py +++ b/wrapping/python/examples/pipelines/Simplnx/CombineSTLFiles.py @@ -18,7 +18,7 @@ face_attribute_matrix_name="Face Data", face_normals_array_name="Face Normals", stl_files_path=nxtest.get_data_directory() / "STL_Models", - triangle_data_container_name=nx.DataPath("TriangleGeometry"), + output_triangle_geometry_path=nx.DataPath("TriangleGeometry"), vertex_attribute_matrix_name="Vertex Data" ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/EnsembleInfoReader.py b/wrapping/python/examples/pipelines/Simplnx/EnsembleInfoReader.py index fd108e02cc..92aded354c 100644 --- a/wrapping/python/examples/pipelines/Simplnx/EnsembleInfoReader.py +++ b/wrapping/python/examples/pipelines/Simplnx/EnsembleInfoReader.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_data_name=("Cell Data"), dimensions=[100, 100, 2], - geometry_data_path=nx.DataPath("[Image Geometry]"), + output_image_geometry_path=nx.DataPath("[Image Geometry]"), origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0] ) @@ -30,10 +30,10 @@ result = nx_filter.execute( data_structure=data_structure, created_attribute_array_path=nx.DataPath("[Image Geometry]/Cell Data/Quats"), - endian=0, + endian_index=0, input_file=nxtest.get_data_directory() / "OrientationAnalysis/quats.raw", number_of_components=4, - scalar_type=nx.NumericType.float32, + scalar_type_index=nx.NumericType.float32, skip_header_bytes=0, tuple_dimensions=[[2.0, 100.0, 100.0]] ) @@ -46,9 +46,9 @@ result = nx_filter.execute( data_structure=data_structure, input_orientation_array_path=nx.DataPath("[Image Geometry]/Cell Data/Quats"), - input_type=2, + input_representation_index=2, output_orientation_array_name="Eulers", - output_type=0 + output_representation_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -59,12 +59,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=True, + set_tuple_dimensions=True, component_count=1, data_format="", - initialization_value="1", - numeric_type=nx.NumericType.int32, - output_data_array=nx.DataPath("[Image Geometry]/Cell Data/Phases"), + initialization_value_str="1", + numeric_type_index=nx.NumericType.int32, + output_array_path=nx.DataPath("[Image Geometry]/Cell Data/Phases"), tuple_dimensions=[[2.0, 100.0, 100.0]] ) nxtest.check_filter_result(nx_filter, result) @@ -77,7 +77,7 @@ data_structure=data_structure, cell_ensemble_attribute_matrix_name=("Cell Ensemble"), crystal_structures_array_name=("CrystalStructures"), - data_container_name=nx.DataPath("[Image Geometry]"), + parent_group_path=nx.DataPath("[Image Geometry]"), input_file=nxtest.get_data_directory() / "OrientationAnalysis/Ensemble.ini", phase_types_array_name=("PhaseTypes") ) diff --git a/wrapping/python/examples/pipelines/Simplnx/Import_ASCII.py b/wrapping/python/examples/pipelines/Simplnx/Import_ASCII.py index 99a20b685a..7d9c1f9d3c 100644 --- a/wrapping/python/examples/pipelines/Simplnx/Import_ASCII.py +++ b/wrapping/python/examples/pipelines/Simplnx/Import_ASCII.py @@ -15,16 +15,16 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_handling=0, + array_handling_index=0, cell_attribute_matrix_name="Cell Data", dimensions=[60, 80, 100], #edge_attribute_matrix_name: str = ..., #edge_list_name: DataPath = ..., #face_attribute_matrix_name: str = ..., - geometry_name=nx.DataPath("[Image Geometry]"), - geometry_type=0, + output_geometry_path=nx.DataPath("[Image Geometry]"), + geometry_type_index=0, #hexahedral_list_name: DataPath = ..., - length_unit_type=7, + length_unit_index=7, origin=[0, 0, 0], #quadrilateral_list_name: DataPath = ..., spacing=[1, 1, 1], @@ -58,9 +58,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - created_data_group=nx.DataPath("Imported Data"), - read_csv_data=read_csv_data, - selected_data_group=nx.DataPath("[Image Geometry]/Cell Data"), + created_data_group_path=nx.DataPath("Imported Data"), + read_csv_data_object=read_csv_data, + selected_attribute_matrix_path=nx.DataPath("[Image Geometry]/Cell Data"), use_existing_group=True, ) nxtest.check_filter_result(nx_filter, result) @@ -71,12 +71,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=False, + set_tuple_dimensions=False, component_count=1, data_format="", - initialization_value="1", - numeric_type=nx.NumericType.int32, - output_data_array=nx.DataPath("[Image Geometry]/Cell Data/Phase") + initialization_value_str="1", + numeric_type_index=nx.NumericType.int32, + output_array_path=nx.DataPath("[Image Geometry]/Cell Data/Phase") #tuple_dimensions=[] ) nxtest.check_filter_result(nx_filter, result) @@ -89,10 +89,10 @@ data_structure=data_structure, move_values=True, normalize_data=False, - selected_data_array_paths=[nx.DataPath("[Image Geometry]/Cell Data/phi1"), + input_data_array_paths=[nx.DataPath("[Image Geometry]/Cell Data/phi1"), nx.DataPath("[Image Geometry]/Cell Data/Phi"), nx.DataPath("[Image Geometry]/Cell Data/phi2")], - stacked_data_array_name="Eulers" + output_data_array_name="Eulers" ) nxtest.check_filter_result(nx_filter, result) @@ -108,7 +108,7 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - cell_ensemble_attribute_matrix_name=nx.DataPath("[Image Geometry]/CellEnsembleData"), + cell_ensemble_attribute_matrix_path=nx.DataPath("[Image Geometry]/CellEnsembleData"), crystal_structures_array_name="CrystalStructures", phase_names_array_name="PhaseNames", phase_types_array_name="PhaseTypes", @@ -144,9 +144,9 @@ data_structure=data_structure, file_name=output_file_path, image_array_path=nx.DataPath("[Image Geometry]/Cell Data/IPFColors"), - image_geom_path=nx.DataPath("[Image Geometry]"), + input_image_geometry_path=nx.DataPath("[Image Geometry]"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/Import_CSV_Data.py b/wrapping/python/examples/pipelines/Simplnx/Import_CSV_Data.py index 626017c287..4f08004640 100644 --- a/wrapping/python/examples/pipelines/Simplnx/Import_CSV_Data.py +++ b/wrapping/python/examples/pipelines/Simplnx/Import_CSV_Data.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_data_name="Cell Data", dimensions=[60, 80, 100], - geometry_data_path=nx.DataPath("[Image Geometry]"), + output_image_geometry_path=nx.DataPath("[Image Geometry]"), origin=[100.0, 100.0, 0.0], spacing=[1.0, 1.0, 1.0] ) @@ -29,15 +29,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=False, + set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/ConfidenceIndex.csv", - n_comp=1, - n_skip_lines=0, + number_comp=1, + skip_line_count=0, #n_tuples: List[List[float]] = ..., - output_data_array=nx.DataPath("[Image Geometry]/Cell Data/Confidence Index"), - scalar_type=nx.NumericType.float32 + output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/Confidence Index"), + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -47,15 +47,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=False, + set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/FeatureIds.csv", - n_comp=1, - n_skip_lines=0, + number_comp=1, + skip_line_count=0, #n_tuples: List[List[float]] = ..., - output_data_array=nx.DataPath("[Image Geometry]/Cell Data/FeatureIds"), - scalar_type=nx.NumericType.int32 + output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/FeatureIds"), + scalar_type_index=nx.NumericType.int32 ) nxtest.check_filter_result(nx_filter, result) @@ -65,15 +65,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=False, + set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/ImageQuality.csv", - n_comp=1, - n_skip_lines=0, + number_comp=1, + skip_line_count=0, #n_tuples: List[List[float]] = ..., - output_data_array=nx.DataPath("[Image Geometry]/Cell Data/Image Quality"), - scalar_type=nx.NumericType.float32 + output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/Image Quality"), + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -83,15 +83,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=False, + set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/IPFColor.csv", - n_comp=3, - n_skip_lines=0, + number_comp=3, + skip_line_count=0, #n_tuples: List[List[float]] = ..., - output_data_array=nx.DataPath("[Image Geometry]/Cell Data/IPFColors"), - scalar_type=nx.NumericType.uint8 + output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/IPFColors"), + scalar_type_index=nx.NumericType.uint8 ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/Import_STL_Model.py b/wrapping/python/examples/pipelines/Simplnx/Import_STL_Model.py index 74f455975b..32d20ff656 100644 --- a/wrapping/python/examples/pipelines/Simplnx/Import_STL_Model.py +++ b/wrapping/python/examples/pipelines/Simplnx/Import_STL_Model.py @@ -15,12 +15,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - face_attribute_matrix="Face Data", - face_normals_data_path="Face Normals", + face_attribute_matrix_name="Face Data", + face_normals_name="Face Normals", #scale_factor: float = ..., stl_file_path=nxtest.get_data_directory() / "STL_Models/Cylinder.stl", - triangle_geometry_name=nx.DataPath("[Triangle Geometry]"), - vertex_attribute_matrix="Vertex Data" + output_triangle_geometry_path=nx.DataPath("[Triangle Geometry]"), + vertex_attribute_matrix_name="Vertex Data" ) nxtest.check_filter_result(nx_filter, result) @@ -30,8 +30,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - triangle_areas_array_path="Areas", - triangle_geometry_data_path=nx.DataPath("[Triangle Geometry]") + triangle_areas_array_name="Areas", + input_triangle_geometry_path=nx.DataPath("[Triangle Geometry]") ) nxtest.check_filter_result(nx_filter, result) @@ -41,12 +41,12 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=True, + set_tuple_dimensions=True, component_count=1, data_format="", - initialization_value="0", - numeric_type=nx.NumericType.float32, - output_data_array=nx.DataPath("Node Type"), + initialization_value_str="0", + numeric_type_index=nx.NumericType.float32, + output_array_path=nx.DataPath("Node Type"), tuple_dimensions=[[1.0]] ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/ReplaceElementAttributesWithNeighbor.py b/wrapping/python/examples/pipelines/Simplnx/ReplaceElementAttributesWithNeighbor.py index 9631951e6f..b6e20dc22d 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ReplaceElementAttributesWithNeighbor.py +++ b/wrapping/python/examples/pipelines/Simplnx/ReplaceElementAttributesWithNeighbor.py @@ -17,7 +17,7 @@ data_structure=data_structure, cell_attribute_matrix_name=("Cell Data"), cell_ensemble_attribute_matrix_name=("CellEnsembleData"), - data_container_name=nx.DataPath("DataContainer"), + output_image_geometry_path =nx.DataPath("DataContainer"), input_file=nxtest.get_data_directory() / "Small_IN100/Slice_1.ang" ) nxtest.check_filter_result(nx_filter, result) @@ -44,8 +44,8 @@ # Execute filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=nx.DataType.boolean ) nxtest.check_filter_result(nx_filter, result) @@ -59,9 +59,9 @@ data_structure=data_structure, remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180], - rotation_representation=0, - selected_image_geometry=nx.DataPath("DataContainer") + rotation_axis_angle=[0.0, 1.0, 0.0, 180], + rotation_representation_index=0, + input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -72,7 +72,7 @@ result = nx_filter.execute( data_structure=data_structure, euler_angles_array_path=nx.DataPath("DataContainer/Cell Data/EulerAngles"), - rotation_axis=[0.0, 0.0, 1.0, 90.0] + rotation_axis_angle=[0.0, 0.0, 1.0, 90.0] ) nxtest.check_filter_result(nx_filter, result) @@ -85,7 +85,7 @@ data_structure=data_structure, change_origin=True, change_spacing=True, - image_geom=nx.DataPath("DataContainer"), + input_image_geometry_path=nx.DataPath("DataContainer"), origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0] ) @@ -104,7 +104,7 @@ min_voxel=[25, 25, 0], remove_original_geometry=True, renumber_features=False, - selected_image_geometry=nx.DataPath("DataContainer") + input_image_geometry_path=nx.DataPath("DataContainer") # update_origin=False ) nxtest.check_filter_result(nx_filter, result) @@ -134,8 +134,8 @@ comparison_data_path=nx.DataPath("DataContainer/Cell Data/Confidence Index"), loop=True, min_confidence=0.1, - selected_comparison=0, - selected_image_geometry=nx.DataPath("DataContainer") + comparison_index=0, + input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/ResamplePorosityImage.py b/wrapping/python/examples/pipelines/Simplnx/ResamplePorosityImage.py index 32958a755f..274b4d441c 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ResamplePorosityImage.py +++ b/wrapping/python/examples/pipelines/Simplnx/ResamplePorosityImage.py @@ -30,9 +30,9 @@ data_structure=data_structure, cell_attribute_matrix_name="Cell Data", image_data_array_name="ImageData", - image_geometry_path=nx.DataPath("Porosity_Image"), - image_transform_choice=0, - input_file_list_info=generated_file_list_value, + output_image_geometry_path=nx.DataPath("Porosity_Image"), + image_transform_index=0, + input_file_list_object =generated_file_list_value, origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0] ) @@ -51,9 +51,9 @@ new_data_container_path=nx.DataPath("Porosity_Image_Resampled_Spacing"), remove_original_geometry=False, renumber_features=False, - resampling_mode=0, + resampling_mode_index=0, #scaling: List[float] = ..., - selected_image_geometry=nx.DataPath("Porosity_Image"), + input_image_geometry_path=nx.DataPath("Porosity_Image"), spacing=[2.0, 2.0, 2.0] ) nxtest.check_filter_result(nx_filter, result) @@ -71,9 +71,9 @@ new_data_container_path=nx.DataPath("Porosity_Image_Resampled_Scaled"), remove_original_geometry=False, renumber_features=False, - resampling_mode=1, + resampling_mode_index=1, scaling=[0.5, 0.5, 0.5], - selected_image_geometry=nx.DataPath("Porosity_Image") + input_image_geometry_path=nx.DataPath("Porosity_Image") #spacing: List[float] = ... ) # Error/Result Handling for Filter @@ -92,9 +92,9 @@ new_data_container_path=nx.DataPath("Porosity_Image_Resampled_Exact_Dims"), remove_original_geometry=False, renumber_features=False, - resampling_mode=2, + resampling_mode_index=2, #scaling: List[float] = ..., - selected_image_geometry=nx.DataPath("Porosity_Image") + input_image_geometry_path=nx.DataPath("Porosity_Image") #spacing: List[float] = ... ) # Error/Result Handling for Filter diff --git a/wrapping/python/examples/pipelines/Simplnx/ResampleRectGridToImageGeom.py b/wrapping/python/examples/pipelines/Simplnx/ResampleRectGridToImageGeom.py index c8a230449e..9c4dbbd60c 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ResampleRectGridToImageGeom.py +++ b/wrapping/python/examples/pipelines/Simplnx/ResampleRectGridToImageGeom.py @@ -29,8 +29,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - created_data_group=nx.DataPath("Bounds"), - read_csv_data=read_csv_data, + created_data_group_path=nx.DataPath("Bounds"), + read_csv_data_object=read_csv_data, # selected_data_group: DataPath = ..., use_existing_group=False, ) @@ -43,16 +43,16 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_handling=1, + array_handling_index=1, cell_attribute_matrix_name="CellData", # dimensions: List[int] = ..., # edge_attribute_matrix_name: str = ..., # edge_list_name: DataPath = ..., # face_attribute_matrix_name: str = ..., - geometry_name=nx.DataPath("RectGridGeometry"), - geometry_type=1, + output_geometry_path=nx.DataPath("RectGridGeometry"), + geometry_type_index=1, # hexahedral_list_name: DataPath = ..., - length_unit_type=7, + length_unit_index=7, # origin: List[float] = ..., # quadrilateral_list_name: DataPath = ..., # spacing: List[float] = ..., @@ -61,9 +61,9 @@ # vertex_attribute_matrix_name: str = ..., # vertex_list_name: DataPath = ..., warnings_as_errors=False, - x_bounds=nx.DataPath("Bounds/x"), - y_bounds=nx.DataPath("Bounds/y"), - z_bounds=nx.DataPath("Bounds/z") + x_bounds_path=nx.DataPath("Bounds/x"), + y_bounds_path=nx.DataPath("Bounds/y"), + z_bounds_path=nx.DataPath("Bounds/z") ) nxtest.check_filter_result(nx_filter, result) @@ -74,15 +74,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=False, + set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/ConfidenceIndex.csv", - n_comp=1, - n_skip_lines=0, + number_comp=1, + skip_line_count=0, # n_tuples: List[List[float]] = ..., - output_data_array=nx.DataPath("RectGridGeometry/CellData/ConfidenceIndex"), - scalar_type=nx.NumericType.float32 + output_data_array_path=nx.DataPath("RectGridGeometry/CellData/ConfidenceIndex"), + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -92,15 +92,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=False, + set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/ImageQuality.csv", - n_comp=1, - n_skip_lines=0, + number_comp=1, + skip_line_count=0, # n_tuples: List[List[float]] = ..., - output_data_array=nx.DataPath("RectGridGeometry/CellData/ImageQuality"), - scalar_type=nx.NumericType.float32 + output_data_array_path=nx.DataPath("RectGridGeometry/CellData/ImageQuality"), + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -111,15 +111,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=False, + set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/SEM Signal.csv", - n_comp=1, - n_skip_lines=0, + number_comp=1, + skip_line_count=0, # n_tuples: List[List[float]] = ..., - output_data_array=nx.DataPath("RectGridGeometry/CellData/SEM Signal"), - scalar_type=nx.NumericType.float32 + output_data_array_path=nx.DataPath("RectGridGeometry/CellData/SEM Signal"), + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -129,15 +129,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=False, + set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/Fit.csv", - n_comp=1, - n_skip_lines=0, + number_comp=1, + skip_line_count=0, # n_tuples: List[List[float]] = ..., - output_data_array=nx.DataPath("RectGridGeometry/CellData/Fit"), - scalar_type=nx.NumericType.float32 + output_data_array_path=nx.DataPath("RectGridGeometry/CellData/Fit"), + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -148,15 +148,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=False, + set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/EulerAngles.csv", - n_comp=3, - n_skip_lines=0, + number_comp=3, + skip_line_count=0, # n_tuples: List[List[float]] = ..., - output_data_array=nx.DataPath("RectGridGeometry/CellData/EulerAngles"), - scalar_type=nx.NumericType.float32 + output_data_array_path=nx.DataPath("RectGridGeometry/CellData/EulerAngles"), + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -166,15 +166,15 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - advanced_options=False, + set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/Phases.csv", - n_comp=1, - n_skip_lines=0, + number_comp=1, + skip_line_count=0, # n_tuples: List[List[float]] = ..., - output_data_array=nx.DataPath("RectGridGeometry/CellData/Phases"), - scalar_type=nx.NumericType.int32 + output_data_array_path=nx.DataPath("RectGridGeometry/CellData/Phases"), + scalar_type_index=nx.NumericType.int32 ) nxtest.check_filter_result(nx_filter, result) @@ -186,10 +186,10 @@ result = nx_filter.execute( data_structure=data_structure, dimensions=[20, 20, 20], - image_geom_cell_attribute_matrix="CellData", - image_geometry_path=nx.DataPath("Image Geometry"), + image_geom_cell_attribute_matrix_name="CellData", + input_image_geometry_path=nx.DataPath("Image Geometry"), rectilinear_grid_path=nx.DataPath("RectGridGeometry"), - selected_data_array_paths=[nx.DataPath("RectGridGeometry/CellData/ConfidenceIndex"), + input_data_array_paths=[nx.DataPath("RectGridGeometry/CellData/ConfidenceIndex"), nx.DataPath("RectGridGeometry/CellData/EulerAngles"), nx.DataPath("RectGridGeometry/CellData/Fit"), nx.DataPath("RectGridGeometry/CellData/ImageQuality"), diff --git a/wrapping/python/examples/pipelines/Simplnx/SurfaceNets_Demo.py b/wrapping/python/examples/pipelines/Simplnx/SurfaceNets_Demo.py index b40b39e6df..2e943b1568 100644 --- a/wrapping/python/examples/pipelines/Simplnx/SurfaceNets_Demo.py +++ b/wrapping/python/examples/pipelines/Simplnx/SurfaceNets_Demo.py @@ -30,9 +30,9 @@ data_structure=data_structure, cell_attribute_matrix_name="Optical Data", image_data_array_name="Image Data", - image_geometry_path=nx.DataPath("RoboMet.3D Image Stack"), - image_transform_choice=0, - input_file_list_info=generated_file_list_value, + output_image_geometry_path=nx.DataPath("RoboMet.3D Image Stack"), + image_transform_index=0, + input_file_list_object =generated_file_list_value, origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0] ) @@ -54,8 +54,8 @@ # Execute filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=nx.DataType.boolean ) nxtest.check_filter_result(nx_filter, result) @@ -66,10 +66,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - active_array_path="Active", - cell_feature_group_path="Pore Data", - feature_ids_path="FeatureIds", - grid_geometry_path=nx.DataPath("RoboMet.3D Image Stack"), + active_array_name="Active", + cell_feature_group_name="Pore Data", + feature_ids_name="FeatureIds", + input_image_geometry_path =nx.DataPath("RoboMet.3D Image Stack"), input_array_path=nx.DataPath("RoboMet.3D Image Stack/Optical Data/Image Data"), mask_path=nx.DataPath("RoboMet.3D Image Stack/Optical Data/Mask"), randomize_features=False, @@ -89,13 +89,13 @@ face_feature_attribute_matrix_name="Face Feature Data", face_labels_array_name="FaceLabels", feature_ids_path=nx.DataPath("RoboMet.3D Image Stack/Optical Data/FeatureIds"), - grid_geometry_data_path=nx.DataPath("RoboMet.3D Image Stack"), + input_grid_geometry_path=nx.DataPath("RoboMet.3D Image Stack"), max_distance_from_voxel=1.0, node_types_array_name="NodeTypes", relaxation_factor=0.5, - #selected_data_array_paths: List[DataPath] = ..., + #input_data_array_paths: List[DataPath] = ..., smoothing_iterations=20, - triangle_geometry_name=nx.DataPath("TriangleDataContainer"), + output_triangle_geometry_path=nx.DataPath("TriangleDataContainer"), vertex_data_group_name="Vertex Data" ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/Triangle_Face_Data_Demo.py b/wrapping/python/examples/pipelines/Simplnx/Triangle_Face_Data_Demo.py index 76a510f8d9..9ed0afd9d5 100644 --- a/wrapping/python/examples/pipelines/Simplnx/Triangle_Face_Data_Demo.py +++ b/wrapping/python/examples/pipelines/Simplnx/Triangle_Face_Data_Demo.py @@ -15,13 +15,13 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - face_attribute_matrix="Face Data", - face_normals_data_path="Face Normals", + face_attribute_matrix_name="Face Data", + face_normals_name="Face Normals", scale_factor=1.0, scale_output=False, stl_file_path=nxtest.get_data_directory() / "STL_Models/ASTMD638_specimen.stl", - triangle_geometry_name=nx.DataPath("[Triangle Geometry]"), - vertex_attribute_matrix="Vertex Data" + output_triangle_geometry_path=nx.DataPath("[Triangle Geometry]"), + vertex_attribute_matrix_name="Vertex Data" ) nxtest.check_filter_result(nx_filter, result) @@ -31,8 +31,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - triangle_areas_array_path="Face Areas", - triangle_geometry_data_path=nx.DataPath("[Triangle Geometry]") + triangle_areas_array_name="Face Areas", + input_triangle_geometry_path=nx.DataPath("[Triangle Geometry]") ) nxtest.check_filter_result(nx_filter, result) @@ -42,8 +42,8 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - surface_mesh_triangle_normals_array_path="Face Normals (Calculated)", - tri_geometry_data_path=nx.DataPath("[Triangle Geometry]") + output_normals_array_name="Face Normals (Calculated)", + input_triangle_geometry_path=nx.DataPath("[Triangle Geometry]") ) nxtest.check_filter_result(nx_filter, result) @@ -54,7 +54,7 @@ result = nx_filter.execute( data_structure=data_structure, surface_mesh_triangle_dihedral_angles_array_name="Dihedral Angles", - tri_geometry_data_path=nx.DataPath("[Triangle Geometry]") + input_triangle_geometry_path=nx.DataPath("[Triangle Geometry]") ) nxtest.check_filter_result(nx_filter, result) @@ -65,7 +65,7 @@ result = nx_filter.execute( data_structure=data_structure, centroids_array_name="Centroids", - triangle_geometry_path=nx.DataPath("[Triangle Geometry]") + input_triangle_geometry_path=nx.DataPath("[Triangle Geometry]") ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/scripts/Import_STL_File.py b/wrapping/python/examples/scripts/Import_STL_File.py index 647d241efa..0808ff0cf8 100644 --- a/wrapping/python/examples/scripts/Import_STL_File.py +++ b/wrapping/python/examples/scripts/Import_STL_File.py @@ -11,12 +11,12 @@ result = nx.ReadStlFileFilter.execute(data_structure=data_structure, face_attribute_matrix="Face Data" , - face_normals_data_path="Face Normals", + face_normals_name="Face Normals", scale_factor=1, scale_output=False , stl_file_path="Data/STL_Models/Cylinder.stl" , triangle_geometry_name=nx.DataPath(["[Triangle Geomtry]"]) , - vertex_attribute_matrix="Vertex Data") + vertex_attribute_matrix_name="Vertex Data") if len(result.errors) != 0: print('Errors: {}', result.errors) diff --git a/wrapping/python/examples/scripts/angle_conversion.py b/wrapping/python/examples/scripts/angle_conversion.py index 241a86b471..33331b09ea 100644 --- a/wrapping/python/examples/scripts/angle_conversion.py +++ b/wrapping/python/examples/scripts/angle_conversion.py @@ -57,11 +57,11 @@ # Create a DataArray to copy the Euler Angles into array_path = nx.DataPath(['Euler Angles']) result = nx.CreateDataArray.execute(data_structure=data_structure, - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, component_count=3, tuple_dimensions=[[99]], - output_data_array=array_path, - initialization_value='0') + output_array_path=array_path, + initialization_value_str='0') nxtest.check_filter_result(nx.CreateDataArray, result) @@ -82,9 +82,9 @@ quat_path = nx.DataPath(['Quaternions']) result = nxor.ConvertOrientations.execute(data_structure=data_structure, input_orientation_array_path=array_path, - input_type=0, + input_representation_index=0, output_orientation_array_name='Quaternions', - output_type=2) + output_representation_index=2) nxtest.check_filter_result(nxor.ConvertOrientations, result) diff --git a/wrapping/python/examples/scripts/basic_arrays.py b/wrapping/python/examples/scripts/basic_arrays.py index 88520bf94e..4b987b3479 100644 --- a/wrapping/python/examples/scripts/basic_arrays.py +++ b/wrapping/python/examples/scripts/basic_arrays.py @@ -119,12 +119,12 @@ tuple_dims = [[10]] create_array_nx_filter = nx.CreateDataArray() result = create_array_nx_filter.execute(data_structure=data_structure, - component_count=1, - data_format="", - initialization_value="10", - numeric_type=array_type, - output_data_array=output_array_path, - tuple_dimensions=tuple_dims) + component_count=1, + data_format="", + initialization_value_str="10", + numeric_type_index=array_type, + output_array_path=output_array_path, + tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) @@ -144,9 +144,9 @@ result = create_array_nx_filter.execute(data_structure=data_structure, component_count=1, data_format="", - initialization_value="10", - numeric_type=array_type, - output_data_array=output_array_path, + initialization_value_str="10", + numeric_type_index=array_type, + output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) @@ -173,9 +173,9 @@ result = create_array_nx_filter.execute(data_structure=data_structure, component_count=1, data_format="", - initialization_value="10", - numeric_type=array_type, - output_data_array=output_array_path, + initialization_value_str="10", + numeric_type_index=array_type, + output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) diff --git a/wrapping/python/examples/scripts/basic_ebsd_ipf.py b/wrapping/python/examples/scripts/basic_ebsd_ipf.py index 95759f416e..a7031db430 100644 --- a/wrapping/python/examples/scripts/basic_ebsd_ipf.py +++ b/wrapping/python/examples/scripts/basic_ebsd_ipf.py @@ -57,7 +57,7 @@ result = nxor.ReadAngDataFilter.execute(data_structure=data_structure, cell_attribute_matrix_name="Scan Data", cell_ensemble_attribute_matrix_name="Phase Data", - data_container_name=nx.DataPath(["Small IN100"]), + output_image_geometry_path=nx.DataPath(["Small IN100"]), input_file=nxtest.get_data_directory() / "Small_IN100/Slice_1.ang") nxtest.check_filter_result(nxor.ReadAngDataFilter, result) @@ -67,19 +67,19 @@ #------------------------------------------------------------------------------ result = nxor.RotateEulerRefFrameFilter.execute(data_structure=data_structure, euler_angles_array_path=nx.DataPath(["Small IN100", "Scan Data", "EulerAngles"]), - rotation_axis=[0,0,1,90]) + rotation_axis_angle=[0,0,1,90]) nxtest.check_filter_result(nxor.RotateEulerRefFrameFilter, result) #------------------------------------------------------------------------------ # Rotate the Sample Reference Frame 180@010 #------------------------------------------------------------------------------ result = nx.RotateSampleRefFrameFilter.execute(data_structure=data_structure, - # created_image_geometry=nx.DataPath(["Small IN100 Rotated"]), + # output_image_geometry_path=nx.DataPath(["Small IN100 Rotated"]), remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0,1,0,180], - rotation_representation=0, - selected_image_geometry=nx.DataPath(["Small IN100"]), + rotation_axis_angle=[0,1,0,180], + rotation_representation_index=0, + input_image_geometry_path=nx.DataPath(["Small IN100"]), #rotation_matrix=[[1,0,0],[0,1,0],[0,0,1]] ) nxtest.check_filter_result(nx.RotateSampleRefFrameFilter, result) @@ -103,8 +103,8 @@ threshold_set.thresholds = [threshold_1, threshold_2] dt = nx.DataType.boolean result = nx.MultiThresholdObjects.execute(data_structure=data_structure, - array_thresholds=threshold_set, - created_data_path="Mask", + array_thresholds_object=threshold_set, + output_data_array_name="Mask", created_mask_type=nx.DataType.boolean) nxtest.check_filter_result(nx.MultiThresholdObjects, result) @@ -131,9 +131,9 @@ result = nxitk.ITKImageWriter.execute(data_structure=data_structure, file_name=nxtest.get_test_temp_directory() / "Small_IN100_IPF_Z.png", image_array_path=nx.DataPath(["Small IN100", "Scan Data", "IPFColors"]), - image_geom_path=nx.DataPath(["Small IN100"]), + input_image_geometry_path=nx.DataPath(["Small IN100"]), index_offset=0, - plane=0) + plane_index=0) nxtest.check_filter_result(nxitk.ITKImageWriter, result) # #------------------------------------------------------------------------------ @@ -158,7 +158,7 @@ #------------------------------------------------------------------------------ result = nx.GenerateColorTableFilter.execute(data_structure=data_structure, output_rgb_array_name="CI Color", - selected_data_array_path=nx.DataPath(["Small IN100", "Scan Data", "Confidence Index"]), + input_data_array_path=nx.DataPath(["Small IN100", "Scan Data", "Confidence Index"]), selected_preset="Rainbow Desaturated") nxtest.check_filter_result(nx.GenerateColorTableFilter, result) @@ -171,10 +171,10 @@ cell_euler_angles_array_path=nx.DataPath(["Small IN100", "Scan Data", "EulerAngles"]), cell_phases_array_path=nx.DataPath(["Small IN100", "Scan Data", "Phases"]), crystal_structures_array_path=nx.DataPath(["Small IN100", "Phase Data", "CrystalStructures"]), - generation_algorithm=1, # Discrete = 1 + generation_algorithm_index=1, # Discrete = 1 mask_array_path=nx.DataPath(["Small IN100", "Scan Data", "Mask"]), - image_geometry_path=nx.DataPath(["Small IN100 Pole Figure"]), - image_layout=0, # O = Horizontal Layout + output_image_geometry_path=nx.DataPath(["Small IN100 Pole Figure"]), + image_layout_index=0, # O = Horizontal Layout image_prefix=prefix, image_size=512, lambert_size=64, diff --git a/wrapping/python/examples/scripts/basic_numpy.py b/wrapping/python/examples/scripts/basic_numpy.py index 89c6fb9537..b76f0f240a 100644 --- a/wrapping/python/examples/scripts/basic_numpy.py +++ b/wrapping/python/examples/scripts/basic_numpy.py @@ -57,11 +57,11 @@ array_path = nx.DataPath(['data']) assert nx.CreateDataArray.execute(data_structure, - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, component_count=1, tuple_dimensions=[[3, 2]], - output_data_array=array_path, - initialization_value='0') + output_array_path=array_path, + initialization_value_str='0') npdata = data_structure[array_path].npview() # Manipulate the underlying array @@ -74,7 +74,7 @@ radians_data = np.radians(degrees_data) # Run a D3D filter to convert back to degrees -result = nx.ChangeAngleRepresentation.execute(data_structure, conversion_type=0, angles_array_path=array_path) +result = nx.ChangeAngleRepresentation.execute(data_structure, conversion_type_index=0, angles_array_path=array_path) nxtest.check_filter_result(nx.ChangeAngleRepresentation, result) # compare the 2 arrays diff --git a/wrapping/python/examples/scripts/create_ensemble_info.py b/wrapping/python/examples/scripts/create_ensemble_info.py index 63183a5904..4b5a2bb9e6 100644 --- a/wrapping/python/examples/scripts/create_ensemble_info.py +++ b/wrapping/python/examples/scripts/create_ensemble_info.py @@ -57,7 +57,7 @@ create_ensemble_info = nxor.CreateEnsembleInfoFilter() result = create_ensemble_info.execute(data_structure=data_structure, - cell_ensemble_attribute_matrix_name=nx.DataPath(["Phase Information"]), + cell_ensemble_attribute_matrix_path=nx.DataPath(["Phase Information"]), crystal_structures_array_name="CrystalStructures", phase_names_array_name="Phase Names", phase_types_array_name="Primary", diff --git a/wrapping/python/examples/scripts/generated_file_list.py b/wrapping/python/examples/scripts/generated_file_list.py index fb015389e8..28cf251f51 100644 --- a/wrapping/python/examples/scripts/generated_file_list.py +++ b/wrapping/python/examples/scripts/generated_file_list.py @@ -68,9 +68,9 @@ result = nxitk.ITKImportImageStack.execute(data_structure=data_structure, cell_attribute_matrix_name="Cell Data", image_data_array_name="Image Data", - image_geometry_path=nx.DataPath(["Image Stack"]), - image_transform_choice=0, - input_file_list_info=generated_file_list_value, + output_image_geometry_path=nx.DataPath(["Image Stack"]), + image_transform_index=0, + input_file_list_object=generated_file_list_value, origin=[0., 0., 0.], spacing=[1., 1.,1.]) nxtest.check_filter_result(nxitk.ITKImportImageStack, result) diff --git a/wrapping/python/examples/scripts/geometry_examples.py b/wrapping/python/examples/scripts/geometry_examples.py index 088bd9d705..1a2caf7601 100644 --- a/wrapping/python/examples/scripts/geometry_examples.py +++ b/wrapping/python/examples/scripts/geometry_examples.py @@ -58,11 +58,11 @@ data_structure = nx.DataStructure() ig_dims = [10, 20, 30] # NOTE: These are in XYZ order result = nx.CreateGeometryFilter.execute(data_structure=data_structure, - array_handling=0, # This does not matter for Image Geometry + array_handling_index=0, # This does not matter for Image Geometry cell_attribute_matrix_name="Cell Data", dimensions=ig_dims, # Note that the dimensions are list as X, Y, Z - geometry_name=nx.DataPath("Image Geometry"), - geometry_type=0, # 0 = Image Geometry + output_geometry_path=nx.DataPath("Image Geometry"), + geometry_type_index=0, # 0 = Image Geometry origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0]) nxtest.check_filter_result(nx.CreateGeometryFilter, result) @@ -84,8 +84,8 @@ array_type = nx.NumericType.float32 create_array_nx_filter = nx.CreateDataArray() result = create_array_nx_filter.execute(data_structure=data_structure, component_count=1, data_format="", - initialization_value="10", - numeric_type=array_type, output_data_array=output_array_path) + initialization_value_str="10", + numeric_type_index=array_type, output_array_path=output_array_path) nxtest.check_filter_result(nx.CreateDataArray, result) @@ -108,9 +108,9 @@ result = create_array_nx_filter.execute(data_structure=data_structure, component_count=1, data_format="", - initialization_value="0", - numeric_type=array_type, - output_data_array=output_array_path, + initialization_value_str="0", + numeric_type_index=array_type, + output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) @@ -126,9 +126,9 @@ result = create_array_nx_filter.execute(data_structure=data_structure, component_count=1, data_format="", - initialization_value="0", - numeric_type=array_type, - output_data_array=output_array_path, + initialization_value_str="0", + numeric_type_index=array_type, + output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) @@ -144,9 +144,9 @@ result = create_array_nx_filter.execute(data_structure=data_structure, component_count=1, data_format="", - initialization_value="0", - numeric_type=array_type, - output_data_array=output_array_path, + initialization_value_str="0", + numeric_type_index=array_type, + output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) @@ -156,13 +156,13 @@ z_coords[:] = np.arange(20, 30, 1) result = nx.CreateGeometryFilter.execute(data_structure=data_structure, - array_handling=1, # Move the arrays from their original location. + array_handling_index=1, # Move the arrays from their original location. cell_attribute_matrix_name="Cell Data", - geometry_name=nx.DataPath("RectGrid Geometry"), - geometry_type=1, - x_bounds=nx.DataPath("RectGridCoords/X Coords"), - y_bounds=nx.DataPath("RectGridCoords/Y Coords"), - z_bounds=nx.DataPath("RectGridCoords/Z Coords") + output_geometry_path=nx.DataPath("RectGrid Geometry"), + geometry_type_index=1, + x_bounds_path=nx.DataPath("RectGridCoords/X Coords"), + y_bounds_path=nx.DataPath("RectGridCoords/Y Coords"), + z_bounds_path=nx.DataPath("RectGridCoords/Z Coords") ) nxtest.check_filter_result(nx.CreateGeometryFilter, result) @@ -181,11 +181,11 @@ # ------------------------------------------------------------------------------ array_path = nx.DataPath('Vertices') result = nx.CreateDataArray.execute(data_structure, - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, component_count=3, tuple_dimensions=[[144]], - output_data_array=array_path, - initialization_value='0') + output_array_path=array_path, + initialization_value_str='0') nxtest.check_filter_result(nx.CreateDataArray, result) @@ -196,11 +196,11 @@ array_path = nx.DataPath('Triangles') result = nx.CreateDataArray.execute(data_structure, - numeric_type=nx.NumericType.uint64, + numeric_type_index=nx.NumericType.uint64, component_count=3, tuple_dimensions=[[242]], - output_data_array=array_path, - initialization_value='0') + output_array_path=array_path, + initialization_value_str='0') nxtest.check_filter_result(nx.CreateDataArray, result) # Read the CSV file into the DataArray using the numpy view @@ -209,14 +209,14 @@ triangles[:] = np.loadtxt(file_path, delimiter=',', skiprows=1) result = nx.CreateGeometryFilter.execute(data_structure=data_structure, - array_handling=1, # Move the arrays from their original location. - geometry_name=nx.DataPath("Triangle Geometry"), - geometry_type=4, + array_handling_index=1, # Move the arrays from their original location. + output_geometry_path=nx.DataPath("Triangle Geometry"), + geometry_type_index=4, face_attribute_matrix_name="Triangle Data", edge_attribute_matrix_name="Triangle Edge Data", vertex_attribute_matrix_name="Vertex Data", - vertex_list_name=nx.DataPath('Vertices'), - triangle_list_name=nx.DataPath('Triangles') + vertex_list_path=nx.DataPath('Vertices'), + triangle_list_path=nx.DataPath('Triangles') ) nxtest.check_filter_result(nx.CreateGeometryFilter, result) @@ -227,11 +227,11 @@ # ------------------------------------------------------------------------------ array_path = nx.DataPath('Vertices') result = nx.CreateDataArray.execute(data_structure, - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, component_count=3, tuple_dimensions=[[144]], - output_data_array=array_path, - initialization_value='0') + output_array_path=array_path, + initialization_value_str='0') nxtest.check_filter_result(nx.CreateDataArray, result) @@ -242,11 +242,11 @@ array_path = nx.DataPath('Edges') result = nx.CreateDataArray.execute(data_structure, - numeric_type=nx.NumericType.uint64, + numeric_type_index=nx.NumericType.uint64, component_count=2, tuple_dimensions=[[264]], - output_data_array=array_path, - initialization_value='0') + output_array_path=array_path, + initialization_value_str='0') nxtest.check_filter_result(nx.CreateDataArray, result) @@ -256,13 +256,13 @@ edges_view[:] = np.loadtxt(file_path, delimiter=',', skiprows=1) result = nx.CreateGeometryFilter.execute(data_structure=data_structure, - array_handling=1, # Move the arrays from their original location. - geometry_name=nx.DataPath("Edge Geometry"), - geometry_type=3, + array_handling_index=1, # Move the arrays from their original location. + output_geometry_path=nx.DataPath("Edge Geometry"), + geometry_type_index=3, edge_attribute_matrix_name="Edge Data", vertex_attribute_matrix_name="Vertex Data", - vertex_list_name=nx.DataPath('Vertices'), - edge_list_name=nx.DataPath('Edges') + vertex_list_path=nx.DataPath('Vertices'), + edge_list_path=nx.DataPath('Edges') ) nxtest.check_filter_result(nx.CreateGeometryFilter, result) diff --git a/wrapping/python/examples/scripts/import_d3d.py b/wrapping/python/examples/scripts/import_d3d.py index 7a332c0d5a..49a28ada54 100644 --- a/wrapping/python/examples/scripts/import_d3d.py +++ b/wrapping/python/examples/scripts/import_d3d.py @@ -57,7 +57,7 @@ print(f'{import_data.file_path}') -result = nx.ReadDREAM3DFilter.execute(data_structure=data_structure, import_file_data=import_data) +result = nx.ReadDREAM3DFilter.execute(data_structure=data_structure, import_data_object=import_data) nxtest.check_filter_result(nx.ReadDREAM3DFilter, result) #------------------------------------------------------------------------------ diff --git a/wrapping/python/examples/scripts/import_hdf5.py b/wrapping/python/examples/scripts/import_hdf5.py index 81e624d0f9..7b12c32224 100644 --- a/wrapping/python/examples/scripts/import_hdf5.py +++ b/wrapping/python/examples/scripts/import_hdf5.py @@ -65,8 +65,8 @@ data_structure=data_structure, cell_attribute_matrix_name="CellData", cell_ensemble_attribute_matrix_name="CellEnsembleData", - data_container_name=nx.DataPath("DataContainer"), - read_h5_ebsd_parameter=h5ebsdParameter + output_image_geometry_path=nx.DataPath("DataContainer"), + read_h5_ebsd_object=h5ebsdParameter ) dataset1 = nx.ReadHDF5DatasetParameter.DatasetImportInfo() diff --git a/wrapping/python/examples/scripts/output_file.py b/wrapping/python/examples/scripts/output_file.py index 0505717127..08fabd4202 100644 --- a/wrapping/python/examples/scripts/output_file.py +++ b/wrapping/python/examples/scripts/output_file.py @@ -59,8 +59,8 @@ array_type = nx.NumericType.float32 tuple_dims = [[3, 2,5]] create_array_nx_filter = nx.CreateDataArray() -result = create_array_nx_filter.execute(data_structure=data_structure, component_count=1, data_format="", initialization_value="10", - numeric_type=array_type, output_data_array=output_array_path, tuple_dimensions=tuple_dims) +result = create_array_nx_filter.execute(data_structure=data_structure, component_count=1, data_format="", initialization_value_str="10", + numeric_type_index=array_type, output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) diff --git a/wrapping/python/examples/scripts/pipeline.py b/wrapping/python/examples/scripts/pipeline.py index fc15762475..606820d7d7 100644 --- a/wrapping/python/examples/scripts/pipeline.py +++ b/wrapping/python/examples/scripts/pipeline.py @@ -56,8 +56,8 @@ -# pipeline.append(nx.CreateDataArray(), {'numeric_type': nx.NumericType.int32}) -# pipeline[0].set_args({'numeric_type': nx.NumericType.int32}) +# pipeline.append(nx.CreateDataArray(), {'numeric_type_index': nx.NumericType.int32}) +# pipeline[0].set_args({'numeric_type_index': nx.NumericType.int32}) # did_execute = pipeline.execute(data_structure) diff --git a/wrapping/python/examples/scripts/read_csv_file.py b/wrapping/python/examples/scripts/read_csv_file.py index dece7e6d67..b8ef404f92 100644 --- a/wrapping/python/examples/scripts/read_csv_file.py +++ b/wrapping/python/examples/scripts/read_csv_file.py @@ -64,13 +64,13 @@ # This will store the imported arrays into a newly generated DataGroup result = nx.ReadCSVFileFilter.execute(data_structure=data_structure, # This will store the imported arrays into a newly generated DataGroup - created_data_group=nx.DataPath(["Imported Data"]), + created_data_group_path=nx.DataPath(["Imported Data"]), # We are not using this parameter but it still needs a value - selected_data_group=nx.DataPath(), + selected_attribute_matrix_path=nx.DataPath(), # Use an existing DataGroup or AttributeMatrix. If an AttributemMatrix is used, the total number of tuples must match use_existing_group=False, # The ReadCSVData object with all member variables set. - read_csv_data=read_csv_data # The ReadCSVData object with all member variables set. + read_csv_data_object=read_csv_data # The ReadCSVData object with all member variables set. ) nxtest.check_filter_result(nx.ReadCSVFileFilter, result) diff --git a/wrapping/python/plugins/ExamplePlugin/CreateArray.py b/wrapping/python/plugins/ExamplePlugin/CreateArray.py index d16ed1e416..c993638ea1 100644 --- a/wrapping/python/plugins/ExamplePlugin/CreateArray.py +++ b/wrapping/python/plugins/ExamplePlugin/CreateArray.py @@ -1,9 +1,9 @@ from typing import List, Union import simplnx as nx -def _convert_str_to_num(init_value: str, numeric_type: nx.NumericType) -> Union[int, float, None]: +def _convert_str_to_num(init_value: str, numeric_type_index: nx.NumericType) -> Union[int, float, None]: try: - if numeric_type == nx.NumericType.float32 or numeric_type == nx.NumericType.float64: + if numeric_type_index == nx.NumericType.float32 or numeric_type_index == nx.NumericType.float64: return float(init_value) else: return int(init_value) @@ -11,10 +11,10 @@ def _convert_str_to_num(init_value: str, numeric_type: nx.NumericType) -> Union[ return None class CreateArrayFilter: - NUMERIC_TYPE_KEY = "numeric_type" - INITILIZATION_VALUE_KEY = "initialization_value" + NUMERIC_TYPE_KEY = "numeric_type_index" + INITILIZATION_VALUE_KEY = "initialization_value_str" NUM_COMPS_KEY = "component_count" - DATA_PATH_KEY = "output_data_array" + DATA_PATH_KEY = "output_array_path" TUPLE_DIMS_KEY = "tuple_dimensions" def uuid(self) -> nx.Uuid: @@ -50,7 +50,7 @@ def parameters(self) -> nx.Parameters: return params def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: - numeric_type: nx.NumericType = args[CreateArrayFilter.NUMERIC_TYPE_KEY] + numeric_type_index: nx.NumericType = args[CreateArrayFilter.NUMERIC_TYPE_KEY] init_value: str = args[CreateArrayFilter.INITILIZATION_VALUE_KEY] num_components: int = args[CreateArrayFilter.NUM_COMPS_KEY] data_array_path: nx.DataPath = args[CreateArrayFilter.DATA_PATH_KEY] @@ -59,7 +59,7 @@ def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_h if init_value == '': return nx.IFilter.PreflightResult(errors=[nx.Error(-123, 'Init Value cannot be empty')]) - if _convert_str_to_num(init_value, numeric_type) is None: + if _convert_str_to_num(init_value, numeric_type_index) is None: return nx.IFilter.PreflightResult(errors=[nx.Error(-124, 'Init Value cannot be converted')]) tuple_dims: List[int] = [] @@ -69,18 +69,18 @@ def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_h tuple_dims.append(int(value)) output_actions = nx.OutputActions() - output_actions.append_action(nx.CreateArrayAction(nx.convert_numeric_type_to_data_type(numeric_type), tuple_dims, [num_components], data_array_path)) + output_actions.append_action(nx.CreateArrayAction(nx.convert_numeric_type_to_data_type(numeric_type_index), tuple_dims, [num_components], data_array_path)) return nx.IFilter.PreflightResult(output_actions=output_actions) def execute_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.ExecuteResult: - numeric_type: nx.NumericType = args[CreateArrayFilter.NUMERIC_TYPE_KEY] + numeric_type_index: nx.NumericType = args[CreateArrayFilter.NUMERIC_TYPE_KEY] init_value: str = args[CreateArrayFilter.INITILIZATION_VALUE_KEY] data_array_path: nx.DataPath = args[CreateArrayFilter.DATA_PATH_KEY] - value = _convert_str_to_num(init_value, numeric_type) + value = _convert_str_to_num(init_value, numeric_type_index) if value is None: - raise RuntimeError(f'Unable to convert init value "{init_value}" to "{numeric_type}"') + raise RuntimeError(f'Unable to convert init value "{init_value}" to "{numeric_type_index}"') data_array = data_structure[data_array_path] data = data_array.store.npview() diff --git a/wrapping/python/plugins/ExamplePlugin/InitializeData.py b/wrapping/python/plugins/ExamplePlugin/InitializeData.py index 9595f8b35e..d78bbefe65 100644 --- a/wrapping/python/plugins/ExamplePlugin/InitializeData.py +++ b/wrapping/python/plugins/ExamplePlugin/InitializeData.py @@ -20,7 +20,7 @@ class InitType(IntEnum): INDICES = 3 CELL_ARRAY_PATHS_KEY = 'cell_arrays' - IMAGE_GEOMETRY_PATH_KEY = 'image_geom_path' + IMAGE_GEOMETRY_PATH_KEY = 'input_image_geometry_path' MIN_POINT_KEY = 'min_point' MAX_POINT_KEY = 'max_point' INIT_TYPE_KEY = 'init_type' @@ -68,7 +68,7 @@ def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_h message_handler(nx.IFilter.Message(nx.IFilter.Message.Type.Info, f'Preflighting InitializeData')) cell_array_paths: List[nx.DataPath] = args[InitializeDataPythonFilter.CELL_ARRAY_PATHS_KEY] - image_geom_path: nx.DataPath = args[InitializeDataPythonFilter.IMAGE_GEOMETRY_PATH_KEY] + input_image_geometry_path: nx.DataPath = args[InitializeDataPythonFilter.IMAGE_GEOMETRY_PATH_KEY] min_point: List[int] = args[InitializeDataPythonFilter.MIN_POINT_KEY] max_point: List[int] = args[InitializeDataPythonFilter.MAX_POINT_KEY] init_type: int = args[InitializeDataPythonFilter.INIT_TYPE_KEY] @@ -98,7 +98,7 @@ def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_h if z_max < z_min: errors.append(nx.Error(-5553, f'Z Max ({z_max}) less than Z Min ({z_min})')) - image_geom = data_structure[image_geom_path] + image_geom = data_structure[input_image_geometry_path] if x_max > (image_geom.num_x_cells - 1): errors.append(nx.Error(-5557, f'The X Max you entered of {x_max} is greater than your Max X Point of {image_geom.num_x_cells - 1}')) @@ -116,7 +116,7 @@ def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_h for path in cell_array_paths: data_array = data_structure[path] if len(data_array.tuple_shape) != len(reversed_image_dims): - errors.append(nx.Error(-5560, f'DataArray at \'{path}\' does not match dimensions of ImageGeometry at \'{image_geom_path}\'')) + errors.append(nx.Error(-5560, f'DataArray at \'{path}\' does not match dimensions of ImageGeometry at \'{input_image_geometry_path}\'')) dtype = data_array.dtype min_value, max_value = _get_min_max_of(dtype)