diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImage.cpp index da75efd17b..fde3846f19 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..0ca0bc9aae 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImage.hpp @@ -64,7 +64,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKApproximateSignedDistanceMapImage : public IF // 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_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/ITKBoundedReciprocalImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImage.hpp index a9b80533e9..52eed83065 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImage.hpp @@ -31,7 +31,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBoundedReciprocalImage : public IFilter // 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_OutputImageArrayName_Key = "output_array_name"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImage.cpp index b599b35593..9bc3fe8744 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..6ce358a988 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImage.hpp @@ -39,7 +39,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKConnectedComponentImage : public IFilter // 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_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/ITKCurvatureAnisotropicDiffusionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImage.cpp index 40bb133cef..62ce87fbec 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..b974e161e4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImage.hpp @@ -51,7 +51,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKCurvatureAnisotropicDiffusionImage : public I // 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_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 b73e6a98fa..0651a946ec 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..508a1d5c97 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImage.hpp @@ -67,7 +67,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKCurvatureFlowImage : public IFilter // 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_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 4f209b7c1e..ae0dfab6f4 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..345fcf219b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImage.hpp @@ -68,7 +68,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKDanielssonDistanceMapImage : public IFilter // 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_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/ITKDoubleThresholdImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImage.cpp index 83fa6c7f06..c1db31296c 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..6f79d16795 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImage.hpp @@ -43,7 +43,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKDoubleThresholdImage : public IFilter // 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_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/ITKGradientAnisotropicDiffusionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImage.cpp index 55678968f6..400b459a35 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..03f16198bd 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImage.hpp @@ -47,7 +47,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientAnisotropicDiffusionImage : public IF // 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_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/ITKIsoContourDistanceImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImage.cpp index a9e06e5791..5a847f2b74 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..ef7de9e8a2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImage.hpp @@ -37,7 +37,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKIsoContourDistanceImage : public IFilter // 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_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/ITKLaplacianRecursiveGaussianImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImage.cpp index 8be008c064..389928e7c4 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..4d15e2c805 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImage.hpp @@ -31,7 +31,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKLaplacianRecursiveGaussianImage : public IFil // 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_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/ITKMeanProjectionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImage.hpp index 96ccd380f7..d03fa8e765 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImage.hpp @@ -54,7 +54,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKMeanProjectionImage : public IFilter // 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_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_ProjectionDimension_Key = "projection_dimension"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImage.cpp index 52f0d21ccc..c5a909199e 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..00e929da02 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImage.hpp @@ -59,7 +59,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKMinMaxCurvatureFlowImage : public IFilter // 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_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/ITKMorphologicalWatershedFromMarkersImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImage.hpp index 587161100e..c9ea959d11 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImage.hpp @@ -58,7 +58,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalWatershedFromMarkersImage : publ // 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_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/ITKNormalizeToConstantImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImage.hpp index a312d0ac94..35adce57d4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImage.hpp @@ -47,7 +47,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKNormalizeToConstantImage : public IFilter // 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_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Constant_Key = "constant"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImage.cpp index 3d95049741..8cbcc34462 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..fbdc3a47fb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImage.hpp @@ -47,7 +47,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKRegionalMaximaImage : public IFilter // 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_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 604ff72421..9627076a1f 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..7925a25735 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImage.hpp @@ -45,7 +45,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKRegionalMinimaImage : public IFilter // 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_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/ITKSignedDanielssonDistanceMapImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImage.cpp index 8832a277db..6b2c56a6bd 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..97e203b470 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImage.hpp @@ -53,7 +53,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKSignedDanielssonDistanceMapImage : public IFi // 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_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/ITKSmoothingRecursiveGaussianImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImage.hpp index 56851c9356..e89fc50442 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImage.hpp @@ -33,7 +33,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKSmoothingRecursiveGaussianImage : public IFil // 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_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/ITKStandardDeviationProjectionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImage.hpp index 31663433b9..38005d6b98 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImage.hpp @@ -57,7 +57,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKStandardDeviationProjectionImage : public IFi // 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_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..916bb0c48c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImage.hpp @@ -57,7 +57,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKSumProjectionImage : public IFilter // 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_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_ProjectionDimension_Key = "projection_dimension"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImage.cpp index 870eed35d5..c1822998bc 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..3b3ee8424a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImage.hpp @@ -56,7 +56,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKThresholdMaximumConnectedComponentsImage : pu // 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_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/ITKZeroCrossingImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImage.cpp index d8f0eb0f56..457c2c6161 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..64bbe6c4a2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImage.hpp @@ -58,7 +58,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKZeroCrossingImage : public IFilter // 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_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/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/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/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/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/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/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/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/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/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/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/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/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/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..c4340d1570 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp @@ -25,7 +25,7 @@ class ORIENTATIONANALYSIS_EXPORT ConvertQuaternionFilter : public IFilter // 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_OutputDataArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_DeleteOriginalData_Key = "delete_original_data"; static inline constexpr StringLiteral k_ConversionType_Key = "conversion_type"; 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/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/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..355b37a50d 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 = "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/ReadH5EspritDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp index 42f8171631..e224842ec4 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 = "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/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..afc09333fb 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp @@ -25,7 +25,7 @@ class ORIENTATIONANALYSIS_EXPORT RodriguesConvertorFilter : public IFilter // 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_OutputDataArrayName_Key = "output_data_array_name"; static inline constexpr StringLiteral k_DeleteOriginalData_Key = "delete_original_data"; /** 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/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..06ca52f493 100644 --- a/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp @@ -154,11 +154,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/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..e58778db67 100644 --- a/src/Plugins/OrientationAnalysis/test/MergeTwinsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/MergeTwinsTest.cpp @@ -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); 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/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp index cb81b924de..2b63b8eb77 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp @@ -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..f040f1bace 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp @@ -21,8 +21,8 @@ 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_MovingGeometry_Key = "input_moving_geometry_path"; + static inline constexpr StringLiteral k_TargetGeometry_Key = "output_target_geometry_path"; static inline constexpr StringLiteral k_AlignmentType_Key = "alignment_type"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp index 124d6f3103..d3d06c35f4 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_SelectedImageGeometry_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..08e5d34cef 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_geometry_path"; + static inline constexpr StringLiteral k_DestinationGeometry_Key = "destination_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 = "new_geometry_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp index 6225b03f8b..0a62a4b997 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_SelectedImageGeometry_Key = "selected_image_geometry_path"; static inline constexpr StringLiteral k_TransformationType_Key = "transformation_type"; static inline constexpr StringLiteral k_InterpolationType_Key = "interpolation_type"; 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..afebcbed62 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_hull_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..3660f7dd71 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp @@ -26,7 +26,7 @@ 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_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..f11206bbec 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_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..7dc7508c2e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT CalculateTriangleAreasFilter : public IFilter // 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_CalculatedAreasDataName_Key = "triangle_areas_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. 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..9af7892e03 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp @@ -30,10 +30,10 @@ class SIMPLNXCORE_EXPORT ComputeMomentInvariants2DFilter : public IFilter 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..d35b068631 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp @@ -27,7 +27,7 @@ class SIMPLNXCORE_EXPORT ConvertColorToGrayScaleFilter : public IFilter static inline constexpr StringLiteral k_ConversionAlgorithm_Key = "conversion_algorithm"; 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..d2d429e4d4 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp @@ -25,8 +25,8 @@ class SIMPLNXCORE_EXPORT ConvertDataFilter : public IFilter // 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_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.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp index e45e7dc3ac..c1276ecfa3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT CreateDataArray : public IFilter static inline constexpr StringLiteral k_AdvancedOptions_Key = "advanced_options"; 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_DataPath_Key = "output_array_path"; static inline constexpr StringLiteral k_InitilizationValue_Key = "initialization_value"; 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..404620fd3b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp @@ -130,24 +130,24 @@ 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"}); @@ -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)); @@ -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())}})}; @@ -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..fb1844ceed 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp @@ -34,25 +34,25 @@ class SIMPLNXCORE_EXPORT CreateGeometryFilter : public IFilter 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/CropImageGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.cpp index fee7682326..bebefcff03 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.cpp @@ -204,8 +204,8 @@ Parameters CropImageGeometry::parameters() const 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())); @@ -218,7 +218,7 @@ 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_RenumberFeatures_Key, k_FeatureAttributeMatrixPath_Key, true); params.linkParameters(k_RemoveOriginalGeometry_Key, k_CreatedImageGeometry_Key, false); return params; @@ -238,7 +238,7 @@ IFilter::PreflightResult CropImageGeometry::preflightImpl(const DataStructure& d 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); @@ -534,7 +534,7 @@ Result<> CropImageGeometry::executeImpl(DataStructure& dataStructure, const Argu 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; @@ -719,7 +719,7 @@ Result CropImageGeometry::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometry_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..425428deff 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.hpp @@ -30,8 +30,8 @@ class SIMPLNXCORE_EXPORT CropImageGeometry : public IFilter 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_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/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.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp index 1475a679b6..1473863a5f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp @@ -23,7 +23,7 @@ class SIMPLNXCORE_EXPORT ExtractInternalSurfacesFromTriangleGeometry : public IF // 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_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"; 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..84e4c49988 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 = "triangle_geom_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/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/FindFeatureCentroidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp index 91f2ad4125..5076a40b9b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp @@ -59,11 +59,11 @@ Parameters FindFeatureCentroidsFilter::parameters() const 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,9 +116,9 @@ 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); @@ -143,9 +143,9 @@ Result FindFeatureCentroidsFilter::FromSIMPLJson(const nlohmann::json results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometry_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..335fbf3da2 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_CentroidsArrayName_Key = "centroids_array_name"; static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; + 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..15bc5cb181 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp @@ -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); @@ -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)); @@ -233,7 +233,7 @@ Result FindFeatureClusteringFilter::FromSIMPLJson(const nlohmann::jso 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..5515875ead 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.hpp @@ -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..fbc4004778 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp @@ -26,7 +26,7 @@ class SIMPLNXCORE_EXPORT FindLargestCrossSectionsFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_Plane_Key = "plane"; 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_LargestCrossSectionsArrayName_Key = "largest_cross_sections_array_name"; static inline constexpr StringLiteral k_ImageGeometryPath_Key = "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..0ea1b82318 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.cpp @@ -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)); } @@ -269,13 +269,13 @@ Parameters FindNeighborListStatistics::parameters() const std::make_unique(k_InputArray_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; } @@ -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); } @@ -438,13 +438,13 @@ Result FindNeighborListStatistics::FromSIMPLJson(const nlohmann::json 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)); // 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..06ff63ac37 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.hpp @@ -33,13 +33,13 @@ class SIMPLNXCORE_EXPORT FindNeighborListStatistics : public IFilter 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_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/FindNeighbors.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.cpp index e89d9a3619..a510df80d0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.cpp @@ -62,28 +62,28 @@ Parameters FindNeighbors::parameters() const 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"}), 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; } @@ -99,13 +99,13 @@ 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 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); @@ -169,13 +169,13 @@ 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 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); @@ -442,13 +442,15 @@ 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_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..694f459d15 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.hpp @@ -24,13 +24,13 @@ class SIMPLNXCORE_EXPORT FindNeighbors : public IFilter 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_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/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..83edc94459 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.hpp @@ -43,7 +43,7 @@ class SIMPLNXCORE_EXPORT FindSurfaceFeatures : public IFilter static inline constexpr StringLiteral k_FeatureGeometryPath_Key = "feature_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/FindVertexToTriangleDistancesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp index faff8a2818..591eda01fd 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp @@ -68,8 +68,8 @@ Parameters FindVertexToTriangleDistancesFilter::parameters() const 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; } @@ -87,8 +87,8 @@ IFilter::PreflightResult FindVertexToTriangleDistancesFilter::preflightImpl(cons auto pVertexGeometryDataPath = filterArgs.value(k_VertexDataContainer_Key); auto pTriangleGeometryDataPath = filterArgs.value(k_TriangleDataContainer_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; @@ -143,8 +143,8 @@ Result<> FindVertexToTriangleDistancesFilter::executeImpl(DataStructure& dataStr 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}); @@ -172,8 +172,8 @@ Result FindVertexToTriangleDistancesFilter::FromSIMPLJson(const nlohm 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_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..2f42649e0c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.hpp @@ -27,8 +27,8 @@ class SIMPLNXCORE_EXPORT FindVertexToTriangleDistancesFilter : public IFilter 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_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..996b0b7603 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp @@ -61,8 +61,8 @@ Parameters FlyingEdges3DFilter::parameters() const params.insertSeparator(Parameters::Separator{"Required Data Objects"}); params.insert(std::make_unique(k_SelectedImageGeometry_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( @@ -109,7 +109,7 @@ Result<> FlyingEdges3DFilter::executeImpl(DataStructure& dataStructure, const Ar FlyingEdges3DInputValues inputValues; inputValues.imageGeomPath = filterArgs.value(k_SelectedImageGeometry_Key); - inputValues.contouringArrayPath = filterArgs.value(k_SelectedDataArray_Key); + inputValues.contouringArrayPath = filterArgs.value(k_SelectedDataArrayPath_Key); inputValues.triangleGeomPath = DataPath({filterArgs.value(k_NewTriangleGeometryName_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..431d07d7ec 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT FlyingEdges3DFilter : public IFilter // 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_SelectedDataArrayPath_Key = "selected_data_array_path"; static inline constexpr StringLiteral k_NewTriangleGeometryName_Key = "new_triangle_geometry_name"; static inline constexpr StringLiteral k_IsoVal_Key = "iso_val_geometry"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp index a25334eea3..3ef2dddbc8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp @@ -193,9 +193,9 @@ Parameters InterpolatePointCloudToRegularGridFilter::parameters() const GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); params.insert(std::make_unique(k_ImageGeom_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; @@ -230,8 +230,8 @@ IFilter::PreflightResult InterpolatePointCloudToRegularGridFilter::preflightImpl 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 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)); } @@ -344,10 +344,10 @@ Result<> InterpolatePointCloudToRegularGridFilter::executeImpl(DataStructure& da 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 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..0fa2d3b251 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp @@ -29,15 +29,15 @@ class SIMPLNXCORE_EXPORT InterpolatePointCloudToRegularGridFilter : public IFilt static inline constexpr StringLiteral k_StoreKernelDistances_Key = "store_kernel_distances"; static inline constexpr StringLiteral k_InterpolationTechnique_Key = "interpolation_technique"; static inline constexpr StringLiteral k_KernelSize_Key = "kernel_size"; - static inline constexpr StringLiteral k_GaussianSigmas_Key = "guassian_sigmas"; + static inline constexpr StringLiteral k_GaussianSigmas_Key = "gaussian_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_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..9c3d64ac1c 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 = "moving_vertex_path"; + static inline constexpr StringLiteral k_TargetVertexPath_Key = "target_vertex_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/MapPointCloudToRegularGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp index 4b3e51d748..3c9c71e13c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp @@ -32,7 +32,7 @@ void createRegularGrid(DataStructure& data, const Arguments& args) const auto vertexGeomPath = args.value(MapPointCloudToRegularGridFilter::k_VertexGeometry_Key); const auto newImageGeomPath = args.value(MapPointCloudToRegularGridFilter::k_NewImageGeometry_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) { @@ -231,15 +231,15 @@ Parameters MapPointCloudToRegularGridFilter::parameters() const 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_CellDataName_Key, std::make_any(0)); @@ -261,7 +261,7 @@ IFilter::PreflightResult MapPointCloudToRegularGridFilter::preflightImpl(const D auto samplingGridType = args.value(k_SamplingGridType_Key); auto vertexGeomPath = args.value(k_VertexGeometry_Key); auto useMask = args.value(k_UseMask_Key); - auto voxelIndicesName = args.value(k_VoxelIndices_Key); + auto voxelIndicesName = args.value(k_VoxelIndicesName_Key); OutputActions actions; @@ -296,7 +296,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) @@ -320,8 +320,8 @@ Result<> MapPointCloudToRegularGridFilter::executeImpl(DataStructure& data, cons const auto samplingGridType = args.value(k_SamplingGridType_Key); const auto vertexGeomPath = args.value(k_VertexGeometry_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) @@ -405,8 +405,8 @@ Result MapPointCloudToRegularGridFilter::FromSIMPLJson(const nlohmann results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ImageDataContainerPathKey, k_ExistingImageGeometry_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_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_NewImageGeometry_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..be93d4ef25 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp @@ -31,8 +31,8 @@ class SIMPLNXCORE_EXPORT MapPointCloudToRegularGridFilter : public IFilter 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_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..96634645bb 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.cpp @@ -25,10 +25,10 @@ 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 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); } @@ -210,8 +210,8 @@ 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 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); } @@ -323,18 +323,18 @@ Parameters MinNeighbors::parameters() const 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_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 +342,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; } @@ -358,9 +358,9 @@ IFilter::PreflightResult MinNeighbors::preflightImpl(const DataStructure& dataSt auto imageGeomPath = args.value(k_ImageGeom_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 +407,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 +444,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 +454,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(); @@ -501,10 +501,11 @@ Result MinNeighbors::FromSIMPLJson(const nlohmann::json& json) 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_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..028bbebc91 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.hpp @@ -24,12 +24,12 @@ class SIMPLNXCORE_EXPORT MinNeighbors : public IFilter static inline constexpr StringLiteral k_ImageGeom_Key = "image_geom"; 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/MultiThresholdObjects.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.hpp index aefd6655ba..8a4044081b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT MultiThresholdObjects : public IFilter 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_CreatedDataPath_Key = "created_data_array_name"; static inline constexpr StringLiteral k_CreatedMaskType_Key = "created_mask_type"; /** 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..be1f40b749 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp @@ -34,7 +34,7 @@ class SIMPLNXCORE_EXPORT PointSampleTriangleGeometryFilter : public IFilter 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_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/ReadCSVFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp index 411769f6ec..c7f35b62aa 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_SelectedDataGroupPath_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_SelectedDataGroupPath_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_SelectedDataGroupPath_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_SelectedDataGroupPath_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..72b076dda8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp @@ -36,7 +36,7 @@ class SIMPLNXCORE_EXPORT ReadCSVFileFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_ReadCSVData_Key = "read_csv_data"; 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_SelectedDataGroupPath_Key = "selected_data_group_path"; static inline constexpr StringLiteral k_CreatedDataGroup_Key = "created_data_group"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp index e8ef45faca..0584aafa15 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp @@ -74,11 +74,11 @@ Parameters ReadStlFileFilter::parameters() const std::make_unique(k_TriangleGeometryName_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")); @@ -102,8 +102,8 @@ IFilter::PreflightResult ReadStlFileFilter::preflightImpl(const DataStructure& d { 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 vertexMatrixName = filterArgs.value(k_VertexAttributeMatrixName_Key); + auto faceMatrixName = filterArgs.value(k_FaceAttributeMatrixName_Key); auto faceNormalsName = filterArgs.value(k_FaceNormalsName_Key); PreflightResult preflightResult; @@ -170,8 +170,8 @@ Result<> ReadStlFileFilter::executeImpl(DataStructure& data, const Arguments& fi { 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 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); @@ -211,8 +211,8 @@ Result ReadStlFileFilter::FromSIMPLJson(const nlohmann::json& json) 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)); + 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..bdc3c2633b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp @@ -32,9 +32,9 @@ class SIMPLNXCORE_EXPORT ReadStlFileFilter : public IFilter static inline constexpr StringLiteral k_TriangleGeometryName_Key = "triangle_geometry_name"; - 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..c254b4d863 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp @@ -19,13 +19,13 @@ 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"; + 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_choice"; + 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"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.cpp index cde3a0faef..04a7f90d25 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.cpp @@ -92,7 +92,7 @@ Parameters RemoveFlaggedVertices::parameters() const params.insertSeparator(Parameters::Separator{"Input Parameters"}); params.insert(std::make_unique(k_VertexGeomPath_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.", @@ -109,7 +109,7 @@ IFilter::PreflightResult RemoveFlaggedVertices::preflightImpl(const DataStructur const std::atomic_bool& shouldCancel) const { auto vertexGeomPath = filterArgs.value(k_VertexGeomPath_Key); - auto maskArrayPath = filterArgs.value(k_MaskPath_Key); + auto maskArrayPath = filterArgs.value(k_InputMaskPath_Key); auto reducedVertexPath = filterArgs.value(k_ReducedVertexGeometryPath_Key); nx::core::Result resultOutputActions; @@ -216,7 +216,7 @@ Result<> RemoveFlaggedVertices::executeImpl(DataStructure& data, const Arguments const std::atomic_bool& shouldCancel) const { auto vertexGeomPath = args.value(k_VertexGeomPath_Key); - auto maskArrayPath = args.value(k_MaskPath_Key); + auto maskArrayPath = args.value(k_InputMaskPath_Key); auto reducedVertexPath = args.value(k_ReducedVertexGeometryPath_Key); const VertexGeom& vertexGeom = data.getDataRefAs(vertexGeomPath); @@ -286,7 +286,7 @@ 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_MaskArrayPathKey, k_InputMaskPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ReducedVertexGeometryKey, k_ReducedVertexGeometryPath_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..e2e8d7b25a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT RemoveFlaggedVertices : public IFilter // Parameter Keys static inline constexpr StringLiteral k_VertexGeomPath_Key = "vertex_geom"; - static inline constexpr StringLiteral k_MaskPath_Key = "mask"; + static inline constexpr StringLiteral k_InputMaskPath_Key = "mask_path"; static inline constexpr StringLiteral k_ReducedVertexGeometryPath_Key = "reduced_vertex"; /** 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..d99090f258 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp @@ -28,7 +28,7 @@ class SIMPLNXCORE_EXPORT ResampleRectGridToImageGeomFilter : public IFilter static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "selected_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_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/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/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..191b4472eb 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp @@ -33,9 +33,9 @@ class SIMPLNXCORE_EXPORT ScalarSegmentFeaturesFilter : public IFilter 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/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/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..bf796f9549 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp @@ -24,7 +24,7 @@ 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_SurfaceMeshTriangleNormalsArrayName_Key = "output_normals_array_name"; static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "tri_geometry_data_path"; /** 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..f9ea27ecc2 100644 --- a/src/Plugins/SimplnxCore/test/CalculateTriangleAreasFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/CalculateTriangleAreasFilterTest.cpp @@ -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/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/CreateGeometryTest.cpp b/src/Plugins/SimplnxCore/test/CreateGeometryTest.cpp index 19ccdca2bb..0e9439316b 100644 --- a/src/Plugins/SimplnxCore/test/CreateGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/CreateGeometryTest.cpp @@ -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)); @@ -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)); @@ -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("")); @@ -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("")); @@ -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("")); @@ -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("")); @@ -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)); @@ -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)); @@ -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("")); @@ -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)); @@ -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..ef7541d52d 100644 --- a/src/Plugins/SimplnxCore/test/CropImageGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/CropImageGeometryTest.cpp @@ -193,7 +193,7 @@ TEST_CASE("SimplnxCore::CropImageGeometry(Execute_Filter)", "[SimplnxCore][CropI args.insert(CropImageGeometry::k_CreatedImageGeometry_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 @@ -271,7 +271,7 @@ TEST_CASE("SimplnxCore::CropImageGeometry: Crop Physical Bounds", "[SimplnxCore] args.insert(CropImageGeometry::k_CreatedImageGeometry_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/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/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/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/FindFeatureCentroidsFilterTest.cpp b/src/Plugins/SimplnxCore/test/FindFeatureCentroidsFilterTest.cpp index e654fe0cda..7fb40eb6fa 100644 --- a/src/Plugins/SimplnxCore/test/FindFeatureCentroidsFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindFeatureCentroidsFilterTest.cpp @@ -38,8 +38,8 @@ 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_CentroidsArrayName_Key, std::make_any(k_CentroidsNX)); + args.insertOrAssign(FindFeatureCentroidsFilter::k_FeatureAttributeMatrixPath_Key, std::make_any(k_FeatureAttributeMatrix)); args.insertOrAssign(FindFeatureCentroidsFilter::k_SelectedImageGeometry_Key, std::make_any(k_SelectedImageGeometry)); // Preflight the filter and check result diff --git a/src/Plugins/SimplnxCore/test/FindFeatureClusteringTest.cpp b/src/Plugins/SimplnxCore/test/FindFeatureClusteringTest.cpp index 9d93fd8840..67ca8e5147 100644 --- a/src/Plugins/SimplnxCore/test/FindFeatureClusteringTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindFeatureClusteringTest.cpp @@ -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)); @@ -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..9c67584e73 100644 --- a/src/Plugins/SimplnxCore/test/FindNeighborListStatisticsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindNeighborListStatisticsTest.cpp @@ -53,13 +53,13 @@ TEST_CASE("SimplnxCore::FindNeighborListStatistics: Test Algorithm", "[FindNeigh 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_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); @@ -179,13 +179,13 @@ TEST_CASE("SimplnxCore::FindNeighborListStatistics: Invalid Input Array", "[Find 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_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/FindNeighborsTest.cpp b/src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp index 781ea67202..656bfb4911 100644 --- a/src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp @@ -32,18 +32,18 @@ TEST_CASE("SimplnxCore::FindNeighbors", "[SimplnxCore][FindNeighbors]") 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_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/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/FindVertexToTriangleDistancesTest.cpp b/src/Plugins/SimplnxCore/test/FindVertexToTriangleDistancesTest.cpp index a33854cbc7..54a9a1b26c 100644 --- a/src/Plugins/SimplnxCore/test/FindVertexToTriangleDistancesTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindVertexToTriangleDistancesTest.cpp @@ -42,8 +42,8 @@ TEST_CASE("SimplnxCore::FindVertexToTriangleDistancesFilter", "[SimplnxCore][Fin args.insertOrAssign(FindVertexToTriangleDistancesFilter::k_VertexDataContainer_Key, std::make_any(vertexData)); args.insertOrAssign(FindVertexToTriangleDistancesFilter::k_TriangleDataContainer_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 9cf6240143..5a643ef799 100644 --- a/src/Plugins/SimplnxCore/test/FlyingEdges3DTest.cpp +++ b/src/Plugins/SimplnxCore/test/FlyingEdges3DTest.cpp @@ -51,7 +51,7 @@ TEST_CASE("SimplnxCore::Image Contouring Valid Execution", "[SimplnxCore][Flying 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_SelectedDataArrayPath_Key, std::make_any(ContourTest::k_DataPath)); // Output Path args.insertOrAssign(FlyingEdges3DFilter::k_NewTriangleGeometryName_Key, std::make_any(ContourTest::k_NewTriangleContourName)); 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/InterpolatePointCloudToRegularGridTest.cpp b/src/Plugins/SimplnxCore/test/InterpolatePointCloudToRegularGridTest.cpp index f9dbeb9f5d..9fddc0291d 100644 --- a/src/Plugins/SimplnxCore/test/InterpolatePointCloudToRegularGridTest.cpp +++ b/src/Plugins/SimplnxCore/test/InterpolatePointCloudToRegularGridTest.cpp @@ -63,12 +63,12 @@ TEST_CASE("SimplnxCore::InterpolatePointCloudToRegularGridFilter: Valid Filter E 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_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); @@ -102,11 +102,11 @@ TEST_CASE("SimplnxCore::InterpolatePointCloudToRegularGridFilter: Valid Filter E 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_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); @@ -138,10 +138,10 @@ TEST_CASE("SimplnxCore::InterpolatePointCloudToRegularGridFilter: Invalid Filter 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_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/MapPointCloudToRegularGridTest.cpp b/src/Plugins/SimplnxCore/test/MapPointCloudToRegularGridTest.cpp index a9cc42b5b8..7972048503 100644 --- a/src/Plugins/SimplnxCore/test/MapPointCloudToRegularGridTest.cpp +++ b/src/Plugins/SimplnxCore/test/MapPointCloudToRegularGridTest.cpp @@ -56,7 +56,7 @@ TEST_CASE("SimplnxCore::MapPointCloudToRegularGridFilter: Valid Filter Execution 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_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 @@ -91,8 +91,8 @@ TEST_CASE("SimplnxCore::MapPointCloudToRegularGridFilter: Valid Filter Execution 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_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 @@ -125,8 +125,8 @@ TEST_CASE("SimplnxCore::MapPointCloudToRegularGridFilter: Valid Filter Execution 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_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); @@ -158,21 +158,21 @@ TEST_CASE("SimplnxCore::MapPointCloudToRegularGridFilter: Invalid Filter Executi 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_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..d037d2b191 100644 --- a/src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp +++ b/src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp @@ -74,18 +74,18 @@ TEST_CASE("SimplnxCore::MinNeighbors", "[SimplnxCore][MinNeighbors]") 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_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); @@ -105,9 +105,9 @@ TEST_CASE("SimplnxCore::MinNeighbors", "[SimplnxCore][MinNeighbors]") // 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_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 diff --git a/src/Plugins/SimplnxCore/test/PointSampleTriangleGeometryFilterTest.cpp b/src/Plugins/SimplnxCore/test/PointSampleTriangleGeometryFilterTest.cpp index 870013b930..26921e1c10 100644 --- a/src/Plugins/SimplnxCore/test/PointSampleTriangleGeometryFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/PointSampleTriangleGeometryFilterTest.cpp @@ -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/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/RemoveFlaggedVerticesTest.cpp b/src/Plugins/SimplnxCore/test/RemoveFlaggedVerticesTest.cpp index 42cbec3f0a..3ab173538b 100644 --- a/src/Plugins/SimplnxCore/test/RemoveFlaggedVerticesTest.cpp +++ b/src/Plugins/SimplnxCore/test/RemoveFlaggedVerticesTest.cpp @@ -16,7 +16,7 @@ TEST_CASE("SimplnxCore::RemoveFlaggedVertices: Instantiate", "[SimplnxCore][Remo Arguments args; args.insertOrAssign(RemoveFlaggedVertices::k_VertexGeomPath_Key, std::make_any()); - args.insertOrAssign(RemoveFlaggedVertices::k_MaskPath_Key, std::make_any()); + args.insertOrAssign(RemoveFlaggedVertices::k_InputMaskPath_Key, std::make_any()); args.insertOrAssign(RemoveFlaggedVertices::k_ReducedVertexGeometryPath_Key, std::make_any()); // Preflight the filter and check result @@ -69,7 +69,7 @@ TEST_CASE("SimplnxCore::RemoveFlaggedVertices: Test Algorithm", "[SimplnxCore][R 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_InputMaskPath_Key, std::make_any(maskPath)); args.insertOrAssign(RemoveFlaggedVertices::k_ReducedVertexGeometryPath_Key, std::make_any(reducedVertexPath)); // Preflight the filter and check result 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/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/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/TriangleNormalFilterTest.cpp b/src/Plugins/SimplnxCore/test/TriangleNormalFilterTest.cpp index 18974c5cb7..88bb49adef 100644 --- a/src/Plugins/SimplnxCore/test/TriangleNormalFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/TriangleNormalFilterTest.cpp @@ -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/wrapping/python/docs/generate_sphinx_docs.cpp b/wrapping/python/docs/generate_sphinx_docs.cpp index 7b2d829979..3dfa9fe87f 100644 --- a/wrapping/python/docs/generate_sphinx_docs.cpp +++ b/wrapping/python/docs/generate_sphinx_docs.cpp @@ -671,6 +671,7 @@ void GenerateMarkdownFilterParameterTable() void GeneratePythonRstFiles() { auto* filterListPtr = Application::Instance()->getFilterList(); + std::ofstream logFile("/tmp/parameter_key_updates.log", std::ios_base::trunc); // Loop over each plugin and create a .rst file const auto pluginListPtr = Application::Instance()->getPluginList(); @@ -773,7 +774,7 @@ void GeneratePythonRstFiles() { if(::isupper(letter) != 0) { - std::cout << filter->name() << "::" << paramValue->name() << " HAS CAPS. Should be lower snake case\n"; + logFile << filter->name() << "::" << paramValue->name() << " HAS CAPS. Should be lower snake case\n"; break; } } @@ -799,17 +800,17 @@ void GeneratePythonRstFiles() pType == "simplnx.DataGroupCreationParameter" || pType == "simplnx.DataGroupSelectionParameter" || pType == "simplnx.DataPathSelectionParameter" || pType == "simplnx.GeometrySelectionParameter" || pType == "simplnx.NeighborListSelectionParameter" || pType == "simplnx.DataGroupCreationParameter")) { - std::cout << filterClassName << " " << parameterPair.first << " " << pType << std::endl; + logFile << filterClassName << " " << parameterPair.first << " " << pType << std::endl; } if(pType == "simplnx.MultiArraySelectionParameter" && !nx::core::StringUtilities::ends_with(parameterPair.first, "s")) { - std::cout << filterClassName << " " << parameterPair.first << " " << pType << std::endl; + logFile << filterClassName << " " << parameterPair.first << " " << pType << std::endl; } if(pType == "simplnx.DataObjectNameParameter" && !nx::core::StringUtilities::ends_with(parameterPair.first, "_name")) { - std::cout << filterClassName << " " << parameterPair.first << " " << pType << std::endl; + logFile << filterClassName << " " << parameterPair.first << " " << pType << std::endl; } rstStream << parameterPair.first;