diff --git a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline b/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline index 9fd7b86878..8ad2739437 100644 --- a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline +++ b/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline @@ -22,7 +22,7 @@ "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -67,7 +67,7 @@ { "args": { "euler_angles_array_path": "DataContainer/CellData/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -146,9 +146,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp index 40a200cecd..f21539a70b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp @@ -52,7 +52,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryDilateImage : public IFilter static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_BoundaryToForeground_Key = "boundary_to_foreground"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp index ec142e3c02..bab3948853 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp @@ -52,7 +52,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryErodeImage : public IFilter static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_BoundaryToForeground_Key = "boundary_to_foreground"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp index f62eb07d97..7935eedbb2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp @@ -43,7 +43,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryMorphologicalClosingImage : public IFil static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp index 268e25245b..bc027ab431 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp @@ -43,7 +43,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryMorphologicalOpeningImage : public IFil static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp index 1727711594..1e50eef4ca 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp @@ -42,7 +42,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryOpeningByReconstructionImage : public I static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp index 6142a5acf0..922f982612 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp @@ -38,7 +38,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBlackTopHatImage : public IFilter static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp index 816e342eaa..4f6256e6b3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp @@ -47,7 +47,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKClosingByReconstructionImage : public IFilter static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; static inline constexpr StringLiteral k_PreserveIntensities_Key = "preserve_intensities"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp index f916c3670d..c4c534a71c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp @@ -42,7 +42,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKDilateObjectMorphologyImage : public IFilter static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_ObjectValue_Key = "object_value"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp index c2bb831a7f..2a39c3d123 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp @@ -42,7 +42,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKErodeObjectMorphologyImage : public IFilter static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_ObjectValue_Key = "object_value"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp index 246c19ec24..4c59cd036b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp @@ -37,7 +37,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleDilateImage : public IFilter static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp index c910a5b266..c49c9ab8db 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp @@ -37,7 +37,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleErodeImage : public IFilter static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp index 85bf789f5f..84cfe70433 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp @@ -37,7 +37,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleMorphologicalClosingImage : public I static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp index 3c5cd594e3..37bc12e391 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp @@ -37,7 +37,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleMorphologicalOpeningImage : public I static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.hpp index 99f6964297..0c3b803185 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.hpp @@ -29,7 +29,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKImageReader : public IFilter static inline constexpr StringLiteral k_ImageDataArrayPath_Key = "image_data_array_name"; static inline constexpr StringLiteral k_CellDataName_Key = "cell_attribute_matrix_name"; - static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit"; + static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit_index"; static inline constexpr StringLiteral k_ChangeOrigin_Key = "change_origin"; static inline constexpr StringLiteral k_CenterOrigin_Key = "center_origin"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.hpp index ba69e98be7..d87a6aaa45 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.hpp @@ -24,7 +24,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKImageWriter : public IFilter ITKImageWriter& operator=(ITKImageWriter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_Plane_Key = "plane"; + static inline constexpr StringLiteral k_Plane_Key = "plane_index"; static inline constexpr StringLiteral k_FileName_Key = "file_name"; static inline constexpr StringLiteral k_IndexOffset_Key = "index_offset"; static inline constexpr StringLiteral k_ImageArrayPath_Key = "image_array_path"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp index 3368299ea5..dbcb6cee2c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp @@ -31,7 +31,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKImportFijiMontageFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InputFile_Key = "input_file"; static inline constexpr StringLiteral k_DataGroupName_Key = "data_group_name"; - static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit"; + static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit_index"; static inline constexpr StringLiteral k_ChangeOrigin_Key = "change_origin"; static inline constexpr StringLiteral k_Origin_Key = "origin"; static inline constexpr StringLiteral k_ParentDataGroup_Key = "parent_data_group"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.hpp index 7c485c6b7b..d895467060 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.hpp @@ -30,7 +30,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKImportImageStack : public IFilter static inline constexpr StringLiteral k_ImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_ImageDataArrayPath_Key = "image_data_array_name"; static inline constexpr StringLiteral k_CellDataName_Key = "cell_attribute_matrix_name"; - static inline constexpr StringLiteral k_ImageTransformChoice_Key = "image_transform_choice"; + static inline constexpr StringLiteral k_ImageTransformChoice_Key = "image_transform_index"; static inline constexpr StringLiteral k_ConvertToGrayScale_Key = "convert_to_gray_scale"; static inline constexpr StringLiteral k_ColorWeights_Key = "color_weights"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.cpp index 1eb14332f2..609362f2d2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.cpp @@ -34,9 +34,8 @@ const FilterHandle k_ApplyTransformationToGeometryFilterHandle(k_ApplyTransforma inline constexpr StringLiteral k_SelectedImageGeometryKey = "input_image_geometry_path"; inline constexpr StringLiteral k_CellAttributeMatrixPathKey = "cell_attribute_matrix_path"; -inline constexpr StringLiteral k_TransformationTypeKey = "transformation_type"; +inline constexpr StringLiteral k_TransformationTypeKey = "transformation_type_index"; inline constexpr StringLiteral k_ManualTransformationMatrixKey = "manual_transformation_matrix"; -inline constexpr StringLiteral k_InterpolationTypeKey = "interpolation_type"; inline constexpr StringLiteral k_TranslateGeometryToGlobalOrigin_Key = "translate_geometry_to_global_origin"; const nx::core::ChoicesParameter::ValueType k_ManualTransformationMatrixIdx = 2ULL; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.hpp index cd5900cba6..7bd03475e2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.hpp @@ -24,6 +24,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKMhaFileReader : public IFilter static inline constexpr StringLiteral k_SaveImageTransformationAsArray = "save_image_transformation"; static inline constexpr StringLiteral k_TransformationMatrixDataArrayPathKey = "output_transformation_matrix_path"; static inline constexpr StringLiteral k_TransposeTransformMatrix = "transpose_transform_matrix"; + static inline constexpr StringLiteral k_InterpolationTypeKey = "interpolation_type_index"; /** * @brief Returns the name of the filter. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp index 8f9e37d687..5335db2089 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp @@ -35,7 +35,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalGradientImage : public IFilter static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp index bdbc0b6ab7..40c2c365f3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp @@ -47,7 +47,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKOpeningByReconstructionImage : public IFilter static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; static inline constexpr StringLiteral k_PreserveIntensities_Key = "preserve_intensities"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp index 12174d8a5d..9a67d40238 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp @@ -35,7 +35,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKWhiteTopHatImage : public IFilter static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; - static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; + static inline constexpr StringLiteral k_KernelType_Key = "kernel_type_index"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; /** diff --git a/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline index 09fa20c9a0..636eac9073 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline @@ -70,9 +70,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline index c1230889d2..30012ea5ae 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline @@ -20,7 +20,7 @@ { "args": { "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -39,7 +39,7 @@ "output_image_geometry_path": "DataContainer", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline index eadd5924f6..023ab26ae1 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline @@ -70,9 +70,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -356,8 +356,8 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 0, - "selected_feature_group": "DataContainer/CellFeatureData", + "operation_index": 0, + "selected_feature_group_path": "DataContainer/CellFeatureData", "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, @@ -375,8 +375,8 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 1, - "selected_feature_group": "DataContainer/CellFeatureData", + "operation_index": 1, + "selected_feature_group_path": "DataContainer/CellFeatureData", "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline index 91e3bf1267..5e03982fbf 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline @@ -157,9 +157,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -442,7 +442,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 0, + "operation_index": 0, "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, @@ -460,7 +460,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 1, + "operation_index": 1, "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, diff --git a/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline index 4b8416e734..fcc997f613 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline @@ -20,7 +20,7 @@ { "args": { "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -39,7 +39,7 @@ "output_image_geometry_path": "DataContainer", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, diff --git a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline index 3ee6611104..c0e5151b24 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline @@ -33,10 +33,10 @@ { "args": { "created_attribute_array_path": "[Image Geometry]/Cell Data/Quats", - "endian": 0, + "endian_index": 0, "input_file": "Data/OrientationAnalysis/quats.raw", "number_of_components": 4, - "scalar_type": 8, + "scalar_type_index": 8, "skip_header_bytes": 0, "tuple_dimensions": [ [ @@ -56,9 +56,9 @@ { "args": { "input_orientation_array_path": "[Image Geometry]/Cell Data/Quats", - "input_type": 2, + "input_representation_index": 2, "output_orientation_array_name": "Eulers", - "output_type": 0 + "output_representation_index": 0 }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline index a834bfc0f3..9373178e78 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline @@ -413,9 +413,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -698,7 +698,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 0, + "operation_index": 0, "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, @@ -716,7 +716,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 1, + "operation_index": 1, "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline index e1534d0c27..27086657a3 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline @@ -40,7 +40,7 @@ { "args": { "euler_angles_array_path": "ImageGeom/Cell Data/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -59,7 +59,7 @@ "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": true, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, diff --git a/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline index 2b85015131..81719ed549 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline @@ -19,7 +19,7 @@ { "args": { "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -38,7 +38,7 @@ "output_image_geometry_path": "DataContainer", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, diff --git a/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline index 9d7bd7335b..3f616ec8b4 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline @@ -23,7 +23,7 @@ "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, diff --git a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline index d052c00bb9..02f2b488a0 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline @@ -24,7 +24,7 @@ "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2 [ROTATED]", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, diff --git a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline index b7d742b35f..f7018ba84c 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline @@ -24,7 +24,7 @@ "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2 [ROTATED]", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, diff --git a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline index 03f352e3b2..069c9cd1fc 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline @@ -24,7 +24,7 @@ "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -95,9 +95,9 @@ { "args": { "input_orientation_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline index bbb7e34846..0462e8c707 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline @@ -24,7 +24,7 @@ "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -95,9 +95,9 @@ { "args": { "input_orientation_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp index 6e175a3324..3b85e6f419 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp @@ -24,8 +24,8 @@ namespace RotateSampleRefFrame { // Parameter Keys -static inline constexpr nx::core::StringLiteral k_RotationRepresentation_Key = "rotation_representation"; -static inline constexpr nx::core::StringLiteral k_RotationAxisAngle_Key = "rotation_axis"; +static inline constexpr nx::core::StringLiteral k_RotationRepresentation_Key = "rotation_representation_index"; +static inline constexpr nx::core::StringLiteral k_RotationAxisAngle_Key = "rotation_axis_angle"; static inline constexpr nx::core::StringLiteral k_RotationMatrix_Key = "rotation_matrix"; static inline constexpr nx::core::StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr nx::core::StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; @@ -51,7 +51,6 @@ static inline constexpr nx::core::StringLiteral k_NewName_Key = "new_name"; namespace DeleteData { static inline constexpr nx::core::StringLiteral k_DataPath_Key = "removed_data_path"; - } namespace diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.hpp index 575c2d6f19..e8de77010e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.hpp @@ -19,6 +19,7 @@ namespace nx::core * "Rodrigues" = 4 * "Homochoric" = 5 * "Cubochoric" = 6 + * "Stereographic" = 7 * */ class ORIENTATIONANALYSIS_EXPORT ConvertOrientations : public IFilter @@ -34,8 +35,8 @@ class ORIENTATIONANALYSIS_EXPORT ConvertOrientations : public IFilter ConvertOrientations& operator=(ConvertOrientations&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_InputType_Key = "input_type"; - static inline constexpr StringLiteral k_OutputType_Key = "output_type"; + static inline constexpr StringLiteral k_InputType_Key = "input_representation_index"; + static inline constexpr StringLiteral k_OutputType_Key = "output_representation_index"; static inline constexpr StringLiteral k_InputOrientationArrayPath_Key = "input_orientation_array_path"; static inline constexpr StringLiteral k_OutputOrientationArrayName_Key = "output_orientation_array_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp index d1d6faa4ff..0a293b9f40 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp @@ -27,7 +27,7 @@ class ORIENTATIONANALYSIS_EXPORT ConvertQuaternionFilter : public IFilter static inline constexpr StringLiteral k_CellQuatsArrayPath_Key = "input_data_array_path"; static inline constexpr StringLiteral k_OutputDataArrayName_Key = "output_data_array_name"; static inline constexpr StringLiteral k_DeleteOriginalData_Key = "delete_original_data"; - static inline constexpr StringLiteral k_ConversionType_Key = "conversion_type"; + static inline constexpr StringLiteral k_ConversionType_Key = "conversion_index"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp index 50aa2d9e31..8b78860712 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp @@ -25,8 +25,8 @@ class ORIENTATIONANALYSIS_EXPORT EbsdToH5EbsdFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_ZSpacing_Key = "z_spacing"; - static inline constexpr StringLiteral k_StackingOrder_Key = "stacking_order"; - static inline constexpr StringLiteral k_ReferenceFrame_Key = "reference_frame"; + static inline constexpr StringLiteral k_StackingOrder_Key = "stacking_order_index"; + static inline constexpr StringLiteral k_ReferenceFrame_Key = "reference_frame_index"; static inline constexpr StringLiteral k_OutputPath_Key = "output_file_path"; static inline constexpr StringLiteral k_InputFileListInfo_Key = "input_file_list_object"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp index cb0772e7ac..59942593fb 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp @@ -24,11 +24,11 @@ class ORIENTATIONANALYSIS_EXPORT FindFeatureReferenceMisorientationsFilter : pub FindFeatureReferenceMisorientationsFilter& operator=(FindFeatureReferenceMisorientationsFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ReferenceOrientation_Key = "reference_orientation"; + static inline constexpr StringLiteral k_ReferenceOrientation_Key = "reference_orientation_index"; static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; static inline constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; - static inline constexpr StringLiteral k_GBEuclideanDistancesArrayPath_Key = "g_beuclidean_distances_array_path"; + static inline constexpr StringLiteral k_GBEuclideanDistancesArrayPath_Key = "gb_euclidean_distances_array_path"; static inline constexpr StringLiteral k_AvgQuatsArrayPath_Key = "avg_quats_array_path"; static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; static inline constexpr StringLiteral k_FeatureReferenceMisorientationsArrayName_Key = "feature_reference_misorientations_array_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp index b40eba63ff..8c97cc1d58 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp @@ -26,7 +26,7 @@ class ORIENTATIONANALYSIS_EXPORT FindGBCDMetricBasedFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_PhaseOfInterest_Key = "phase_of_interest"; static inline constexpr StringLiteral k_MisorientationRotation_Key = "misorientation_rotation"; - static inline constexpr StringLiteral k_ChosenLimitDists_Key = "chosen_limit_dists"; + static inline constexpr StringLiteral k_ChosenLimitDists_Key = "chosen_limit_dists_index"; static inline constexpr StringLiteral k_NumSamplPts_Key = "num_sampl_pts"; static inline constexpr StringLiteral k_ExcludeTripleLines_Key = "exclude_triple_lines"; static inline constexpr StringLiteral k_DistOutputFile_Key = "dist_output_file"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp index 3ca97bd604..abe882798c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp @@ -24,7 +24,7 @@ class ORIENTATIONANALYSIS_EXPORT RotateEulerRefFrameFilter : public IFilter RotateEulerRefFrameFilter& operator=(RotateEulerRefFrameFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_RotationAxisAngle_Key = "rotation_axis"; + static inline constexpr StringLiteral k_RotationAxisAngle_Key = "rotation_axis_angle"; static inline constexpr StringLiteral k_EulerAnglesArrayPath_Key = "euler_angles_array_path"; /** diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp index 6687d9c407..cebb39adc1 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp @@ -25,11 +25,11 @@ class ORIENTATIONANALYSIS_EXPORT WritePoleFigureFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_Title_Key = "title"; - static inline constexpr StringLiteral k_GenerationAlgorithm_Key = "generation_algorithm"; + static inline constexpr StringLiteral k_GenerationAlgorithm_Key = "generation_algorithm_index"; static inline constexpr StringLiteral k_LambertSize_Key = "lambert_size"; static inline constexpr StringLiteral k_NumColors_Key = "num_colors"; static inline constexpr StringLiteral k_ImageFormat_Key = "image_format"; - static inline constexpr StringLiteral k_ImageLayout_Key = "image_layout"; + static inline constexpr StringLiteral k_ImageLayout_Key = "image_layout_index"; static inline constexpr StringLiteral k_OutputPath_Key = "output_path"; static inline constexpr StringLiteral k_ImagePrefix_Key = "image_prefix"; static inline constexpr StringLiteral k_ImageSize_Key = "image_size"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp index e45a3a7932..983c00fdbf 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp @@ -27,7 +27,7 @@ class ORIENTATIONANALYSIS_EXPORT WriteStatsGenOdfAngleFileFilter : public IFilte static inline constexpr StringLiteral k_OutputFile_Key = "output_file"; static inline constexpr StringLiteral k_Weight_Key = "weight"; static inline constexpr StringLiteral k_Sigma_Key = "sigma"; - static inline constexpr StringLiteral k_Delimiter_Key = "delimiter"; + static inline constexpr StringLiteral k_Delimiter_Key = "delimiter_index"; static inline constexpr StringLiteral k_ConvertToDegrees_Key = "convert_to_degrees"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_CellEulerAnglesArrayPath_Key = "cell_euler_angles_array_path"; diff --git a/src/Plugins/OrientationAnalysis/test/AlignSectionsMisorientationTest.cpp b/src/Plugins/OrientationAnalysis/test/AlignSectionsMisorientationTest.cpp index 748b400c5b..7dcbe67892 100644 --- a/src/Plugins/OrientationAnalysis/test/AlignSectionsMisorientationTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/AlignSectionsMisorientationTest.cpp @@ -70,16 +70,6 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline // Read Exemplar Shifts File { - constexpr StringLiteral k_InputFile_Key = "input_file"; - constexpr StringLiteral k_ScalarType_Key = "scalar_type"; - constexpr StringLiteral k_NTuples_Key = "number_tuples"; - constexpr StringLiteral k_NComp_Key = "number_comp"; - constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; - constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_choice"; - constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; - constexpr StringLiteral k_DataFormat_Key = "data_format"; - constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; - // Compare the output of the shifts file with the exemplar file auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); @@ -87,14 +77,15 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline Arguments args; // read in the exemplar shift data file - args.insertOrAssign(k_InputFile_Key, std::make_any(fs::path(fmt::format("{}/align_sections_misorientation.txt", unit_test::k_TestFilesDir)))); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::int32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(116)}})); - args.insertOrAssign(k_NComp_Key, std::make_any(6)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(0)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(4)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_ExemplarShiftsPath)); - args.insertOrAssign(k_DataFormat_Key, std::make_any("")); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, + std::make_any(fs::path(fmt::format("{}/align_sections_misorientation.txt", unit_test::k_TestFilesDir)))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::int32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(116)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(6)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataFormat_Key, std::make_any("")); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -144,30 +135,20 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline // Use the Read Text File Filter to read in the generated Shift File { - constexpr StringLiteral k_InputFile_Key = "input_file"; - constexpr StringLiteral k_ScalarType_Key = "scalar_type"; - constexpr StringLiteral k_NTuples_Key = "number_tuples"; - constexpr StringLiteral k_NComp_Key = "number_comp"; - constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; - constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_choice"; - constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; - constexpr StringLiteral k_DataFormat_Key = "data_format"; - constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; - // Compare the output of the shifts file with the exemplar file auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(computedShiftsFile)); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::int32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(116)}})); - args.insertOrAssign(k_NComp_Key, std::make_any(6)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(0)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(4)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_CalculatedShiftsPath)); - args.insertOrAssign(k_DataFormat_Key, std::make_any("")); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedShiftsFile)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::int32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(116)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(6)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_CalculatedShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataFormat_Key, std::make_any("")); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); diff --git a/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp b/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp index 7e4b188ceb..78feef3f09 100644 --- a/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp @@ -75,16 +75,6 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt // Read Exemplar Shifts File { - constexpr StringLiteral k_InputFile_Key = "input_file"; - constexpr StringLiteral k_ScalarType_Key = "scalar_type"; - constexpr StringLiteral k_NTuples_Key = "number_tuples"; - constexpr StringLiteral k_NComp_Key = "number_comp"; - constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; - constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_choice"; - constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; - constexpr StringLiteral k_DataFormat_Key = "data_format"; - constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; - // Compare the output of the shifts file with the exemplar file auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); @@ -92,14 +82,14 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt Arguments args; // read in the exemplar shift data file - args.insertOrAssign(k_InputFile_Key, std::make_any( - fs::path(fmt::format("{}/6_5_align_sections_mutual_information/6_5_align_sections_mutual_information.txt", unit_test::k_TestFilesDir)))); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::int32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(k_TupleDims)); - args.insertOrAssign(k_NComp_Key, std::make_any(6)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(0)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(4)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_ExemplarShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path( + fmt::format("{}/6_5_align_sections_mutual_information/6_5_align_sections_mutual_information.txt", unit_test::k_TestFilesDir)))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::int32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_TupleDims)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(6)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarShiftsPath)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -112,29 +102,19 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt // Read Computed Shifts File { - constexpr StringLiteral k_InputFile_Key = "input_file"; - constexpr StringLiteral k_ScalarType_Key = "scalar_type"; - constexpr StringLiteral k_NTuples_Key = "number_tuples"; - constexpr StringLiteral k_NComp_Key = "number_comp"; - constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; - constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_choice"; - constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; - constexpr StringLiteral k_DataFormat_Key = "data_format"; - constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; - // Compare the output of the shifts file with the exemplar file auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(computedShiftsFile)); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::int32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(k_TupleDims)); - args.insertOrAssign(k_NComp_Key, std::make_any(6)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(0)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(4)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_CalculatedShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedShiftsFile)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::int32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_TupleDims)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(6)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(4)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_CalculatedShiftsPath)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); diff --git a/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp index 42a320df3f..253df16118 100644 --- a/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp @@ -45,35 +45,20 @@ namespace fs = std::filesystem; using namespace nx::core; using namespace nx::core::Constants; -namespace FindAvgOrientationsTest -{ -// These are the argument keys for the Import Text filter. We cannot use the ones from the -// header file as that would bring in a dependency on the SimplnxCorePlugin -static constexpr StringLiteral k_InputFile_Key = "input_file"; -static constexpr StringLiteral k_ScalarType_Key = "scalar_type"; -static constexpr StringLiteral k_NTuples_Key = "number_tuples"; -static constexpr StringLiteral k_NComp_Key = "number_comp"; -static constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; -static constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_choice"; -static constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; -static constexpr StringLiteral k_DataFormat_Key = "data_format"; -static constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; -} // namespace FindAvgOrientationsTest - void runReadTextDataArrayFilter(const std::string k_InputFileName, nx::core::NumericType k_NumericType, const uint64 k_NumTuples, const uint64 k_NumComponents, const DataPath k_InputFileDataPath, DataStructure& dataStructure) { auto* filterList = Application::Instance()->getFilterList(); Arguments args; - args.insertOrAssign(FindAvgOrientationsTest::k_InputFile_Key, + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path(fmt::format("{}/ASCIIData/{}.csv", unit_test::k_TestFilesDir, k_InputFileName)))); - args.insertOrAssign(FindAvgOrientationsTest::k_ScalarType_Key, std::make_any(k_NumericType)); - args.insertOrAssign(FindAvgOrientationsTest::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(k_NumTuples)}})); - args.insertOrAssign(FindAvgOrientationsTest::k_NComp_Key, std::make_any(k_NumComponents)); - args.insertOrAssign(FindAvgOrientationsTest::k_NSkipLines_Key, std::make_any(0)); - args.insertOrAssign(FindAvgOrientationsTest::k_DelimiterChoice_Key, std::make_any(0)); - args.insertOrAssign(FindAvgOrientationsTest::k_DataArrayPath_Key, std::make_any(k_InputFileDataPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(k_NumericType)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(k_NumTuples)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(k_NumComponents)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_InputFileDataPath)); auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); diff --git a/src/Plugins/OrientationAnalysis/test/FindGBCDMetricBasedTest.cpp b/src/Plugins/OrientationAnalysis/test/FindGBCDMetricBasedTest.cpp index 57c1592787..0d698e06ee 100644 --- a/src/Plugins/OrientationAnalysis/test/FindGBCDMetricBasedTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindGBCDMetricBasedTest.cpp @@ -96,28 +96,19 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio // read in exemplar and computed data files for comparison { - constexpr StringLiteral k_InputFile_Key = "input_file"; - constexpr StringLiteral k_ScalarType_Key = "scalar_type"; - constexpr StringLiteral k_NTuples_Key = "number_tuples"; - constexpr StringLiteral k_NComp_Key = "number_comp"; - constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; - constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_choice"; - constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; - constexpr StringLiteral k_DataFormat_Key = "data_format"; - constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; auto filter = filterListPtr->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); // exemplar distribution { Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(exemplarDistOutput)); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); - args.insertOrAssign(k_NComp_Key, std::make_any(3)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(2)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_ExemplarDistributionPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(exemplarDistOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarDistributionPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) @@ -125,13 +116,13 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio // exemplar errors { Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(exemplarErrorsOutput)); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); - args.insertOrAssign(k_NComp_Key, std::make_any(3)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(2)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_ExemplarErrorPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(exemplarErrorsOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarErrorPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) @@ -139,13 +130,13 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio // computed distribution { Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(computedDistOutput)); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); - args.insertOrAssign(k_NComp_Key, std::make_any(3)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(2)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_ComputedDistributionPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedDistOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ComputedDistributionPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) @@ -153,13 +144,13 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio // computed errors { Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(computedErrorsOutput)); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); - args.insertOrAssign(k_NComp_Key, std::make_any(3)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(2)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_ComputedErrorPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedErrorsOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ComputedErrorPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) diff --git a/src/Plugins/OrientationAnalysis/test/FindGBPDMetricBasedTest.cpp b/src/Plugins/OrientationAnalysis/test/FindGBPDMetricBasedTest.cpp index 2564500ad7..dacbd6c557 100644 --- a/src/Plugins/OrientationAnalysis/test/FindGBPDMetricBasedTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindGBPDMetricBasedTest.cpp @@ -93,28 +93,18 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio // read in exemplar and computed data files for comparison { - constexpr StringLiteral k_InputFile_Key = "input_file"; - constexpr StringLiteral k_ScalarType_Key = "scalar_type"; - constexpr StringLiteral k_NTuples_Key = "number_tuples"; - constexpr StringLiteral k_NComp_Key = "number_comp"; - constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; - constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_choice"; - constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; - constexpr StringLiteral k_DataFormat_Key = "data_format"; - constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; - auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); // exemplar distribution { Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(exemplarDistOutput)); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); - args.insertOrAssign(k_NComp_Key, std::make_any(3)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(2)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_ExemplarDistributionPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(exemplarDistOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarDistributionPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) @@ -122,13 +112,13 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio // exemplar errors { Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(exemplarErrorsOutput)); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); - args.insertOrAssign(k_NComp_Key, std::make_any(3)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(2)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_ExemplarErrorPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(exemplarErrorsOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarErrorPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) @@ -136,13 +126,13 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio // computed distribution { Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(computedDistOutput)); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); - args.insertOrAssign(k_NComp_Key, std::make_any(3)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(2)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_ComputedDistributionPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedDistOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ComputedDistributionPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) @@ -150,13 +140,13 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio // computed errors { Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(computedErrorsOutput)); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); - args.insertOrAssign(k_NComp_Key, std::make_any(3)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(1)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(2)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_ComputedErrorPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedErrorsOutput)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(3)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(1)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(2)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ComputedErrorPath)); auto executeResult = filter->execute(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) diff --git a/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp b/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp index 952fa2ba73..52b62b73dc 100644 --- a/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp +++ b/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp @@ -2,6 +2,12 @@ #include +#include "OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp" +#include "OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp" +#include "OrientationAnalysis/Filters/ConvertOrientations.hpp" +#include "OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp" +#include "OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp" + #include "simplnx/Common/Uuid.hpp" #include "simplnx/Filter/FilterHandle.hpp" #include "simplnx/Parameters/ArrayThresholdsParameter.hpp" @@ -37,6 +43,31 @@ inline const std::string MaterialName("MaterialName"); } // namespace EnsembleData } // namespace EbsdLib +namespace AlignSectionsFeatureCentroidFilter +{ +// Parameter Keys +static inline constexpr StringLiteral k_WriteAlignmentShifts_Key = "write_alignment_shifts"; +static inline constexpr StringLiteral k_AlignmentShiftFileName_Key = "alignment_shift_file_name"; +static inline constexpr StringLiteral k_UseReferenceSlice_Key = "use_reference_slice"; +static inline constexpr StringLiteral k_ReferenceSlice_Key = "reference_slice"; +static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; +static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; +static inline constexpr StringLiteral k_SelectedCellDataGroup_Key = "selected_cell_data_path"; +} // namespace AlignSectionsFeatureCentroidFilter + +namespace ReadTextDataArrayFilter +{ +static inline constexpr StringLiteral k_InputFile_Key = "input_file"; +static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type_index"; +static inline constexpr StringLiteral k_NTuples_Key = "number_tuples"; +static inline constexpr StringLiteral k_NComp_Key = "number_comp"; +static inline constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; +static inline constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_index"; +static inline constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; +static inline constexpr StringLiteral k_DataFormat_Key = "data_format"; +static inline constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; +} // namespace ReadTextDataArrayFilter + namespace nx::core { // Make sure we can instantiate the Import Text Filter @@ -105,17 +136,11 @@ inline void ExecuteConvertOrientations(DataStructure& dataStructure, const Filte auto filter = filterList.createFilter(k_ConvertOrientationsFilterHandle); REQUIRE(nullptr != filter); - // Parameter Keys from AlignSectionsMisorientation. If those change these will need to be updated - constexpr StringLiteral k_InputType_Key = "input_type"; - constexpr StringLiteral k_OutputType_Key = "output_type"; - constexpr StringLiteral k_InputOrientationArrayPath_Key = "input_orientation_array_path"; - constexpr StringLiteral k_OutputOrientationArrayName_Key = "output_orientation_array_name"; - Arguments args; - args.insertOrAssign(k_InputType_Key, std::make_any(0)); - args.insertOrAssign(k_OutputType_Key, std::make_any(2)); - args.insertOrAssign(k_InputOrientationArrayPath_Key, std::make_any(Constants::k_EulersArrayPath)); - args.insertOrAssign(k_OutputOrientationArrayName_Key, std::make_any(Constants::k_Quats)); + args.insertOrAssign(ConvertOrientations::k_InputType_Key, std::make_any(0)); + args.insertOrAssign(ConvertOrientations::k_OutputType_Key, std::make_any(2)); + args.insertOrAssign(ConvertOrientations::k_InputOrientationArrayPath_Key, std::make_any(Constants::k_EulersArrayPath)); + args.insertOrAssign(ConvertOrientations::k_OutputOrientationArrayName_Key, std::make_any(Constants::k_Quats)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -133,33 +158,20 @@ inline void ExecuteEbsdSegmentFeatures(DataStructure& dataStructure, const Filte auto filter = filterList.createFilter(k_EbsdSegmentFeaturesFilterHandle); REQUIRE(nullptr != filter); - // Parameter Keys - constexpr StringLiteral k_GridGeomPath_Key = "input_image_geometry_path"; - constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance"; - constexpr StringLiteral k_UseMask_Key = "use_mask"; - constexpr StringLiteral k_QuatsArrayPath_Key = "cell_quats_array_path"; - constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; - constexpr StringLiteral k_MaskArrayPath_Key = "cell_mask_array_path"; - constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; - constexpr StringLiteral k_FeatureIdsArrayName_Key = "feature_ids_array_name"; - constexpr StringLiteral k_CellFeatureAttributeMatrixName_Key = "cell_feature_attribute_matrix_name"; - constexpr StringLiteral k_ActiveArrayName_Key = "active_array_name"; - constexpr StringLiteral k_RandomizeFeatures_Key = "randomize_features"; - Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(k_MisorientationTolerance_Key, std::make_any(5.0F)); - args.insertOrAssign(k_UseMask_Key, std::make_any(true)); - args.insertOrAssign(k_GridGeomPath_Key, std::make_any(Constants::k_DataContainerPath)); - args.insertOrAssign(k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); - args.insertOrAssign(k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); - args.insertOrAssign(k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); - args.insertOrAssign(k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); - args.insertOrAssign(k_FeatureIdsArrayName_Key, std::make_any(Constants::k_FeatureIds)); - args.insertOrAssign(k_CellFeatureAttributeMatrixName_Key, std::make_any(Constants::k_Grain_Data)); - args.insertOrAssign(k_ActiveArrayName_Key, std::make_any(Constants::k_ActiveName)); - args.insertOrAssign(k_RandomizeFeatures_Key, std::make_any(false)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_MisorientationTolerance_Key, std::make_any(5.0F)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_UseMask_Key, std::make_any(true)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_SelectedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_FeatureIdsArrayName_Key, std::make_any(Constants::k_FeatureIds)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_CellFeatureAttributeMatrixName_Key, std::make_any(Constants::k_Grain_Data)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_ActiveArrayName_Key, std::make_any(Constants::k_ActiveName)); + args.insertOrAssign(EBSDSegmentFeaturesFilter::k_RandomizeFeatures_Key, std::make_any(false)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -177,38 +189,23 @@ inline void ExecuteAlignSectionsMisorientation(DataStructure& dataStructure, con auto filter = filterList.createFilter(k_AlignSectionMisorientationFilterHandle); REQUIRE(nullptr != filter); - // Parameter Keys - constexpr StringLiteral k_WriteAlignmentShifts_Key = "write_alignment_shifts"; - constexpr StringLiteral k_AlignmentShiftFileName_Key = "alignment_shift_file_name"; - - constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance"; - - constexpr StringLiteral k_UseMask_Key = "use_mask"; - constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - - constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; - constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; - constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; - - constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; - Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(k_WriteAlignmentShifts_Key, std::make_any(true)); - args.insertOrAssign(k_AlignmentShiftFileName_Key, std::make_any(shiftsFile)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_WriteAlignmentShifts_Key, std::make_any(true)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_AlignmentShiftFileName_Key, std::make_any(shiftsFile)); - args.insertOrAssign(k_MisorientationTolerance_Key, std::make_any(5.0F)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_MisorientationTolerance_Key, std::make_any(5.0F)); - args.insertOrAssign(k_UseMask_Key, std::make_any(true)); - args.insertOrAssign(k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_UseMask_Key, std::make_any(true)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); - args.insertOrAssign(k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); - args.insertOrAssign(k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); - args.insertOrAssign(k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); - args.insertOrAssign(k_SelectedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(AlignSectionsMisorientationFilter::k_SelectedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -226,24 +223,15 @@ inline void ExecuteAlignSectionsFeatureCentroid(DataStructure& dataStructure, co auto filter = filterList.createFilter(k_AlignSectionsFeatureCentroidFilterHandle); REQUIRE(nullptr != filter); - // Parameter Keys - constexpr StringLiteral k_WriteAlignmentShifts_Key = "write_alignment_shifts"; - constexpr StringLiteral k_AlignmentShiftFileName_Key = "alignment_shift_file_name"; - constexpr StringLiteral k_UseReferenceSlice_Key = "use_reference_slice"; - constexpr StringLiteral k_ReferenceSlice_Key = "reference_slice"; - constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; - constexpr StringLiteral k_SelectedCellDataGroup_Key = "selected_cell_data_path"; - Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(k_WriteAlignmentShifts_Key, std::make_any(true)); - args.insertOrAssign(k_AlignmentShiftFileName_Key, std::make_any(shiftsFile)); - args.insertOrAssign(k_UseReferenceSlice_Key, std::make_any(true)); - args.insertOrAssign(k_ReferenceSlice_Key, std::make_any(0)); - args.insertOrAssign(k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); - args.insertOrAssign(k_SelectedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); - args.insertOrAssign(k_SelectedCellDataGroup_Key, std::make_any(Constants::k_CellAttributeMatrix)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_WriteAlignmentShifts_Key, std::make_any(true)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_AlignmentShiftFileName_Key, std::make_any(shiftsFile)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_UseReferenceSlice_Key, std::make_any(true)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_ReferenceSlice_Key, std::make_any(0)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_SelectedImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_SelectedCellDataGroup_Key, std::make_any(Constants::k_CellAttributeMatrix)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -261,24 +249,16 @@ inline void ExecuteBadDataNeighborOrientationCheck(DataStructure& dataStructure, INFO(fmt::format("Error creating Filter '{}' ", k_BadDataNeighborOrientationCheckFilterHandle.getFilterName())); auto filter = filterList.createFilter(k_BadDataNeighborOrientationCheckFilterHandle); REQUIRE(nullptr != filter); - // Parameter Keys - constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance"; - constexpr StringLiteral k_NumberOfNeighbors_Key = "number_of_neighbors"; - constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; - constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; - constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; - constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(k_MisorientationTolerance_Key, std::make_any(5.0f)); - args.insertOrAssign(k_NumberOfNeighbors_Key, std::make_any(4)); - args.insertOrAssign(k_ImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); - args.insertOrAssign(k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); - args.insertOrAssign(k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); - args.insertOrAssign(k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); - args.insertOrAssign(k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_MisorientationTolerance_Key, std::make_any(5.0f)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_NumberOfNeighbors_Key, std::make_any(4)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_ImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); + args.insertOrAssign(BadDataNeighborOrientationCheckFilter::k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); @@ -296,28 +276,17 @@ inline void ExecuteNeighborOrientationCorrelation(DataStructure& dataStructure, auto filter = filterList.createFilter(k_NeighborOrientationCorrelationFilterHandle); REQUIRE(nullptr != filter); - // Parameter Keys - constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; - constexpr StringLiteral k_MinConfidence_Key = "min_confidence"; - constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance"; - constexpr StringLiteral k_Level_Key = "level"; - constexpr StringLiteral k_CorrelationArrayPath_Key = "correlation_array_path"; - constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; - constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path"; - constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; - constexpr StringLiteral k_IgnoredDataArrayPaths_Key = "ignored_data_array_paths"; - Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(k_ImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); - args.insertOrAssign(k_MinConfidence_Key, std::make_any(0.2f)); - args.insertOrAssign(k_MisorientationTolerance_Key, std::make_any(5.0f)); - args.insertOrAssign(k_Level_Key, std::make_any(2)); - args.insertOrAssign(k_CorrelationArrayPath_Key, std::make_any(Constants::k_ConfidenceIndexArrayPath)); - args.insertOrAssign(k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); - args.insertOrAssign(k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); - args.insertOrAssign(k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); - args.insertOrAssign(k_IgnoredDataArrayPaths_Key, std::make_any>()); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_ImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_MinConfidence_Key, std::make_any(0.2f)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_MisorientationTolerance_Key, std::make_any(5.0f)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_Level_Key, std::make_any(2)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_CorrelationArrayPath_Key, std::make_any(Constants::k_ConfidenceIndexArrayPath)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_QuatsArrayPath_Key, std::make_any(Constants::k_QuatsArrayPath)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_CrystalStructuresArrayPath_Key, std::make_any(Constants::k_CrystalStructuresArrayPath)); + args.insertOrAssign(NeighborOrientationCorrelationFilter::k_IgnoredDataArrayPaths_Key, std::make_any>()); // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); diff --git a/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp index 014d5858a0..fb127d4935 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp @@ -20,7 +20,7 @@ TEST_CASE("OrientationAnalysis::ReadH5Ebsd: Valid filter execution", "[Orientati { const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_h5ebsd.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_h5ebsd.tar.gz", "Small_IN100.h5ebsd"); Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); auto* filterList = Application::Instance()->getFilterList(); @@ -57,6 +57,10 @@ TEST_CASE("OrientationAnalysis::ReadH5Ebsd: Valid filter execution", "[Orientati SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } + // #ifdef SIMPLNX_WRITE_TEST_OUTPUT + WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/read_h5ebsd_test.dream3d", unit_test::k_BinaryTestOutputDir))); + // #endif + // Loop and compare each array from the 'Exemplar Data / CellData' to the 'Data Container / CellData' group { auto& cellDataGroup = dataStructure.getDataRefAs(Constants::k_CellAttributeMatrix); diff --git a/src/Plugins/OrientationAnalysis/test/RotateEulerRefFrameTest.cpp b/src/Plugins/OrientationAnalysis/test/RotateEulerRefFrameTest.cpp index a926e3bb6a..662128d78a 100644 --- a/src/Plugins/OrientationAnalysis/test/RotateEulerRefFrameTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/RotateEulerRefFrameTest.cpp @@ -38,18 +38,6 @@ TEST_CASE("OrientationAnalysis::RotateEulerRefFrame", "[OrientationAnalysis]") std::string inputFile = fmt::format("{}/ASCIIData/EulerAngles.csv", unit_test::k_TestFilesDir.view()); std::string comparisonDataFile = fmt::format("{}/ASCIIData/EulersRotated.csv", unit_test::k_TestFilesDir.view()); - // These are the argument keys for the Import Text filter. We cannot use the ones from the - // header file as that would bring in a dependency on the SimplnxCorePlugin - constexpr StringLiteral k_InputFile_Key = "input_file"; - constexpr StringLiteral k_ScalarType_Key = "scalar_type"; - constexpr StringLiteral k_NTuples_Key = "number_tuples"; - constexpr StringLiteral k_NComp_Key = "number_comp"; - constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; - constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_choice"; - constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; - constexpr StringLiteral k_DataFormat_Key = "data_format"; - constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; - // Make sure we can load the "Import Text Filter" filter from the plugin auto* filterList = Application::Instance()->getFilterList(); // Make sure we can instantiate the Import Text Filter @@ -59,13 +47,13 @@ TEST_CASE("OrientationAnalysis::RotateEulerRefFrame", "[OrientationAnalysis]") // Run the "Import Text" Filter to import the data for the EulerAngles and EulersRotated { Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(k_ScalarType_Key, std::make_any(k_NumericType)); - args.insertOrAssign(k_NTuples_Key, std::make_any(k_NumTuples)); - args.insertOrAssign(k_NComp_Key, std::make_any(k_NumComponents)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(0)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(0)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_EulerAnglesDataPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path(inputFile))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(k_NumericType)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_NumTuples)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(k_NumComponents)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_EulerAnglesDataPath)); auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); @@ -81,13 +69,13 @@ TEST_CASE("OrientationAnalysis::RotateEulerRefFrame", "[OrientationAnalysis]") { Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(fs::path(comparisonDataFile))); - args.insertOrAssign(k_ScalarType_Key, std::make_any(k_NumericType)); - args.insertOrAssign(k_NTuples_Key, std::make_any(k_NumTuples)); - args.insertOrAssign(k_NComp_Key, std::make_any(k_NumComponents)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(0)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(0)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_EulersRotatedDataPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path(comparisonDataFile))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(k_NumericType)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_NumTuples)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(k_NumComponents)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(0)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_EulersRotatedDataPath)); auto filter = filterList->createFilter(k_ReadTextDataArrayFilterHandle); REQUIRE(nullptr != filter); diff --git a/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline index c22588481f..1fab3c951e 100644 --- a/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline @@ -32,7 +32,7 @@ }, { "args": { - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/ConfidenceIndex.csv", "number_tuples": 1, "skip_line_count": 0, @@ -42,7 +42,7 @@ ] ], "output_array_path": "[Image Geometry]/Cell Data/Confidence Index", - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -53,7 +53,7 @@ }, { "args": { - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/FeatureIds.csv", "number_tuples": 1, "skip_line_count": 0, @@ -63,7 +63,7 @@ ] ], "output_array_path": "[Image Geometry]/Cell Data/FeatureIds", - "scalar_type": 4 + "scalar_type_index": 4 }, "comments": "", "filter": { @@ -74,7 +74,7 @@ }, { "args": { - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/ImageQuality.csv", "number_tuples": 1, "skip_line_count": 0, @@ -84,7 +84,7 @@ ] ], "output_array_path": "[Image Geometry]/Cell Data/Image Quality", - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -95,7 +95,7 @@ }, { "args": { - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/IPFColor.csv", "number_tuples": 3, "skip_line_count": 0, @@ -105,7 +105,7 @@ ] ], "output_array_path": "[Image Geometry]/Cell Data/IPFColors", - "scalar_type": 1 + "scalar_type_index": 1 }, "comments": "", "filter": { diff --git a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline index acdee86e12..ba6cc70eb0 100644 --- a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline @@ -27,7 +27,7 @@ }, { "args": { - "array_handling": 0, + "array_handling_index": 0, "cell_attribute_matrix_name": "Cell Data", "dimensions": [ 10, diff --git a/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline index d50b89b3d7..776f98bbb4 100644 --- a/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline @@ -67,7 +67,7 @@ "selected_group": "", "units": 0 }, - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -84,7 +84,7 @@ "selected_group": "", "units": 0 }, - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -101,7 +101,7 @@ "selected_group": "", "units": 0 }, - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -118,7 +118,7 @@ "selected_group": "", "units": 0 }, - "scalar_type": 9 + "scalar_type_index": 9 }, "comments": "", "filter": { @@ -135,7 +135,7 @@ "selected_group": "", "units": 0 }, - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -152,7 +152,7 @@ "selected_group": "", "units": 0 }, - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { diff --git a/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline index 1a421f1ddd..85f6c437ae 100644 --- a/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline @@ -19,7 +19,7 @@ { "args": { "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, @@ -38,7 +38,7 @@ "output_image_geometry_path": "DataContainer", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -156,7 +156,7 @@ }, { "args": { - "array_handling": 0, + "array_handling_index": 0, "included_data_array_paths": [ "DataContainer/Cell Data/Confidence Index", "DataContainer/Cell Data/EulerAngles", diff --git a/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline index 6f405aada0..590199bc45 100644 --- a/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline @@ -70,9 +70,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { diff --git a/src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline index 74c6ebe6fa..33d675b7e9 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline @@ -34,7 +34,7 @@ "args": { "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/ConfidenceIndex.csv", "number_comp": 1, "skip_line_count": 0, @@ -44,7 +44,7 @@ ] ], "output_data_array_path": "[Image Geometry]/Cell Data/Confidence Index", - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -57,7 +57,7 @@ "args": { "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/FeatureIds.csv", "number_comp": 1, "skip_line_count": 0, @@ -67,7 +67,7 @@ ] ], "output_data_array_path": "[Image Geometry]/Cell Data/FeatureIds", - "scalar_type": 4 + "scalar_type_index": 4 }, "comments": "", "filter": { @@ -80,7 +80,7 @@ "args": { "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/ImageQuality.csv", "number_comp": 1, "skip_line_count": 0, @@ -90,7 +90,7 @@ ] ], "output_data_array_path": "[Image Geometry]/Cell Data/Image Quality", - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -103,7 +103,7 @@ "args": { "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/IPFColor.csv", "number_comp": 3, "skip_line_count": 0, @@ -113,7 +113,7 @@ ] ], "output_data_array_path": "[Image Geometry]/Cell Data/IPFColors", - "scalar_type": 1 + "scalar_type_index": 1 }, "comments": "", "filter": { diff --git a/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline index 1b2583a365..5cc647cf09 100644 --- a/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline @@ -69,7 +69,7 @@ "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": false, - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 1.0, 0.0, @@ -105,7 +105,7 @@ { "args": { "euler_angles_array_path": "DataContainer/Cell Data/EulerAngles", - "rotation_axis": [ + "rotation_axis_angle": [ 0.0, 0.0, 1.0, diff --git a/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline index 69da76ee49..95141560d0 100644 --- a/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline @@ -42,7 +42,7 @@ }, { "args": { - "array_handling": 1, + "array_handling_index": 1, "cell_attribute_matrix_name": "CellData", "dimensions": [ 20, @@ -55,7 +55,7 @@ "geometry_name": "RectGridGeometry", "geometry_type": 1, "hexahedral_list_name": "", - "length_unit_type": 7, + "length_unit_index": 7, "origin": [ 0.0, 0.0, @@ -87,7 +87,7 @@ "args": { "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/ConfidenceIndex.csv", "number_tuples": 1, "skip_line_count": 0, @@ -97,7 +97,7 @@ ] ], "output_array_path": "RectGridGeometry/CellData/ConfidenceIndex", - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -110,7 +110,7 @@ "args": { "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/ImageQuality.csv", "number_tuples": 1, "skip_line_count": 0, @@ -120,7 +120,7 @@ ] ], "output_array_path": "RectGridGeometry/CellData/ImageQuality", - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -133,7 +133,7 @@ "args": { "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/SEM Signal.csv", "number_tuples": 1, "skip_line_count": 0, @@ -143,7 +143,7 @@ ] ], "output_array_path": "RectGridGeometry/CellData/SEM Signal", - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -156,7 +156,7 @@ "args": { "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/Fit.csv", "number_tuples": 1, "skip_line_count": 0, @@ -166,7 +166,7 @@ ] ], "output_array_path": "RectGridGeometry/CellData/Fit", - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -179,7 +179,7 @@ "args": { "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/EulerAngles.csv", "number_tuples": 3, "skip_line_count": 0, @@ -189,7 +189,7 @@ ] ], "output_array_path": "RectGridGeometry/CellData/EulerAngles", - "scalar_type": 8 + "scalar_type_index": 8 }, "comments": "", "filter": { @@ -202,7 +202,7 @@ "args": { "set_tuple_dimensions": false, "data_format": "", - "delimiter_choice": 0, + "delimiter_index": 0, "input_file": "Data/ASCIIData/Phases.csv", "number_tuples": 1, "skip_line_count": 0, @@ -212,7 +212,7 @@ ] ], "output_array_path": "RectGridGeometry/CellData/Phases", - "scalar_type": 4 + "scalar_type_index": 4 }, "comments": "", "filter": { diff --git a/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline index 8fbf8a74b0..beb7d7c12f 100644 --- a/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline @@ -112,9 +112,9 @@ { "args": { "input_orientation_array_path": "DataContainer/CellData/EulerAngles", - "input_type": 0, + "input_representation_index": 0, "output_orientation_array_name": "Quats", - "output_type": 2 + "output_representation_index": 2 }, "comments": "", "filter": { @@ -397,7 +397,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 0, + "operation_index": 0, "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, @@ -415,7 +415,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "ignored_data_array_paths": [], "num_iterations": 2, - "operation": 1, + "operation_index": 1, "input_image_geometry_path": "DataContainer", "x_dir_on": true, "y_dir_on": true, diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp index 26294e093a..614e4e4830 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp @@ -23,7 +23,7 @@ class SIMPLNXCORE_EXPORT AlignGeometries : public IFilter // Parameter Keys static inline constexpr StringLiteral k_MovingGeometry_Key = "input_moving_geometry_path"; static inline constexpr StringLiteral k_TargetGeometry_Key = "input_target_geometry_path"; - static inline constexpr StringLiteral k_AlignmentType_Key = "alignment_type"; + static inline constexpr StringLiteral k_AlignmentType_Key = "alignment_type_index"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp index 2ba334db5a..51c617d667 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp @@ -25,8 +25,8 @@ class SIMPLNXCORE_EXPORT ApplyTransformationToGeometryFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_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_TransformationType_Key = "transformation_type_index"; + static inline constexpr StringLiteral k_InterpolationType_Key = "interpolation_type_index"; static inline constexpr StringLiteral k_ManualTransformationMatrix_Key = "manual_transformation_matrix"; static inline constexpr StringLiteral k_Rotation_Key = "rotation"; static inline constexpr StringLiteral k_Translation_Key = "translation"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp index 3660f7dd71..ef7c8d9ccc 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp @@ -25,7 +25,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_ScalarType_Key = "scalar_type_index"; static inline constexpr StringLiteral k_CalculatedArray_Key = "calculated_array_path"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.hpp index 846a1207b2..7379d8ffda 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT ChangeAngleRepresentation : public IFilter ChangeAngleRepresentation& operator=(ChangeAngleRepresentation&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ConversionType_Key = "conversion_type"; + static inline constexpr StringLiteral k_ConversionType_Key = "conversion_type_index"; static inline constexpr StringLiteral k_AnglesArrayPath_Key = "angles_array_path"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp index d35b068631..2b8e7a6f8b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT ConvertColorToGrayScaleFilter : public IFilter ConvertColorToGrayScaleFilter& operator=(ConvertColorToGrayScaleFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ConversionAlgorithm_Key = "conversion_algorithm"; + static inline constexpr StringLiteral k_ConversionAlgorithm_Key = "conversion_algorithm_index"; static inline constexpr StringLiteral k_ColorWeights_Key = "color_weights"; static inline constexpr StringLiteral k_ColorChannel_Key = "color_channel"; static inline constexpr StringLiteral k_InputDataArrayPath_Key = "input_data_array_paths"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp index d2d429e4d4..496ddd3468 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT ConvertDataFilter : public IFilter ConvertDataFilter& operator=(ConvertDataFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type"; + static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type_index"; static inline constexpr StringLiteral k_ArrayToConvertPath_Key = "array_to_convert_path"; static inline constexpr StringLiteral k_ConvertedArrayName_Key = "converted_array_name"; static inline constexpr StringLiteral k_DeleteOriginal_Key = "delete_original_array"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp index b130858e30..b8cfa07f5f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp @@ -21,7 +21,7 @@ class SIMPLNXCORE_EXPORT CreateDataArray : public IFilter CreateDataArray& operator=(CreateDataArray&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_NumericType_Key = "numeric_type"; + static inline constexpr StringLiteral k_NumericType_Key = "numeric_type_index"; static inline constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; static inline constexpr StringLiteral k_NumComps_Key = "component_count"; static inline constexpr StringLiteral k_TupleDims_Key = "tuple_dimensions"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp index 1c20dd97dd..2ef6faaabb 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp @@ -24,11 +24,11 @@ class SIMPLNXCORE_EXPORT CreateGeometryFilter : public IFilter CreateGeometryFilter& operator=(CreateGeometryFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_GeometryType_Key = "geometry_type"; - static inline constexpr StringLiteral k_LengthUnitType_Key = "length_unit_type"; + static inline constexpr StringLiteral k_GeometryType_Key = "geometry_type_index"; + static inline constexpr StringLiteral k_LengthUnitType_Key = "length_unit_index"; static inline constexpr StringLiteral k_GeometryPath_Key = "output_geometry_path"; static inline constexpr StringLiteral k_WarningsAsErrors_Key = "warnings_as_errors"; - static inline constexpr StringLiteral k_ArrayHandling_Key = "array_handling"; + static inline constexpr StringLiteral k_ArrayHandling_Key = "array_handling_index"; // Image Geometry static inline constexpr StringLiteral k_Dimensions_Key = "dimensions"; static inline constexpr StringLiteral k_Origin_Key = "origin"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp index 65e8c3616d..5adc6126b8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp @@ -26,7 +26,7 @@ class SIMPLNXCORE_EXPORT ErodeDilateBadDataFilter : public IFilter ErodeDilateBadDataFilter& operator=(ErodeDilateBadDataFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_Operation_Key = "operation"; + static inline constexpr StringLiteral k_Operation_Key = "operation_index"; static inline constexpr StringLiteral k_NumIterations_Key = "num_iterations"; static inline constexpr StringLiteral k_XDirOn_Key = "x_dir_on"; static inline constexpr StringLiteral k_YDirOn_Key = "y_dir_on"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp index 9f056cad82..40c4e95e32 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp @@ -26,7 +26,7 @@ class SIMPLNXCORE_EXPORT ErodeDilateMaskFilter : public IFilter ErodeDilateMaskFilter& operator=(ErodeDilateMaskFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_Operation_Key = "operation"; + static inline constexpr StringLiteral k_Operation_Key = "operation_index"; static inline constexpr StringLiteral k_NumIterations_Key = "num_iterations"; static inline constexpr StringLiteral k_XDirOn_Key = "x_dir_on"; static inline constexpr StringLiteral k_YDirOn_Key = "y_dir_on"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp index c9534ac44e..fa106722ee 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp @@ -26,7 +26,7 @@ class SIMPLNXCORE_EXPORT ExtractVertexGeometryFilter : public IFilter ExtractVertexGeometryFilter& operator=(ExtractVertexGeometryFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ArrayHandling_Key = "array_handling"; + static inline constexpr StringLiteral k_ArrayHandling_Key = "array_handling_index"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; static inline constexpr StringLiteral k_InputGeometryPath_Key = "input_grid_geometry_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp index 5dd2f5c228..9678d53b41 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT FindLargestCrossSectionsFilter : public IFilter FindLargestCrossSectionsFilter& operator=(FindLargestCrossSectionsFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_Plane_Key = "plane"; + static inline constexpr StringLiteral k_Plane_Key = "plane_index"; static inline constexpr StringLiteral k_FeatureIdsArrayPath_Key = "feature_ids_array_path"; static inline constexpr StringLiteral k_LargestCrossSectionsArrayName_Key = "largest_cross_sections_array_name"; static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.hpp index 8a8d8b6cb8..e92565b429 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.hpp @@ -22,10 +22,10 @@ class SIMPLNXCORE_EXPORT InitializeData : public IFilter // Parameter Keys static inline constexpr StringLiteral k_ArrayPath_Key = "array_path"; - static inline constexpr StringLiteral k_InitType_Key = "init_type"; + static inline constexpr StringLiteral k_InitType_Key = "init_type_index"; static inline constexpr StringLiteral k_InitValue_Key = "init_value"; static inline constexpr StringLiteral k_StartingFillValue_Key = "starting_fill_value"; - static inline constexpr StringLiteral k_StepOperation_Key = "step_operation"; + static inline constexpr StringLiteral k_StepOperation_Key = "step_operation_index"; static inline constexpr StringLiteral k_StepValue_Key = "step_value"; static inline constexpr StringLiteral k_UseSeed_Key = "use_seed"; static inline constexpr StringLiteral k_SeedValue_Key = "seed_value"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.hpp index bbad29fa5b..23635a6511 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT InitializeImageGeomCellData : public IFilter static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_MinPoint_Key = "min_point"; static inline constexpr StringLiteral k_MaxPoint_Key = "max_point"; - static inline constexpr StringLiteral k_InitType_Key = "init_type"; + static inline constexpr StringLiteral k_InitType_Key = "init_type_index"; static inline constexpr StringLiteral k_InitValue_Key = "init_value"; static inline constexpr StringLiteral k_InitRange_Key = "init_range"; static inline constexpr StringLiteral k_UseSeed_Key = "use_seed"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp index 076c36600c..90485c4ab9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp @@ -27,7 +27,7 @@ class SIMPLNXCORE_EXPORT InterpolatePointCloudToRegularGridFilter : public IFilt // Parameter Keys static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_StoreKernelDistances_Key = "store_kernel_distances"; - static inline constexpr StringLiteral k_InterpolationTechnique_Key = "interpolation_technique"; + static inline constexpr StringLiteral k_InterpolationTechnique_Key = "interpolation_index"; static inline constexpr StringLiteral k_KernelSize_Key = "kernel_size"; static inline constexpr StringLiteral k_GaussianSigmas_Key = "gaussian_sigmas"; static inline constexpr StringLiteral k_SelectedVertexGeometryPath_Key = "input_vertex_geometry_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.hpp index 24a352dce0..69d48cbc61 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT KMeansFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InitClusters_Key = "init_clusters"; - static inline constexpr StringLiteral k_DistanceMetric_Key = "distance_metric"; + static inline constexpr StringLiteral k_DistanceMetric_Key = "distance_metric_index"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_SelectedArrayPath_Key = "selected_array_path"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.hpp index 67abba935f..25f494209f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT KMedoidsFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InitClusters_Key = "init_clusters"; - static inline constexpr StringLiteral k_DistanceMetric_Key = "distance_metric"; + static inline constexpr StringLiteral k_DistanceMetric_Key = "distance_metric_index"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_SelectedArrayPath_Key = "selected_array_path"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp index 09e5736ad8..10a1bfc270 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp @@ -25,7 +25,7 @@ class SIMPLNXCORE_EXPORT MapPointCloudToRegularGridFilter : public IFilter MapPointCloudToRegularGridFilter& operator=(MapPointCloudToRegularGridFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SamplingGridType_Key = "sampling_grid_type"; + static inline constexpr StringLiteral k_SamplingGridType_Key = "sampling_grid_index"; static inline constexpr StringLiteral k_GridDimensions_Key = "grid_dimensions"; static inline constexpr StringLiteral k_SelectedVertexGeometryPath_Key = "input_vertex_geometry_path"; static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp index 399a3ae540..bbc7ffdf0f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp @@ -52,7 +52,7 @@ class SIMPLNXCORE_EXPORT PartitionGeometryFilter : public IFilter }; // Parameter Keys - static inline constexpr StringLiteral k_PartitioningMode_Key = "partitioning_mode"; + static inline constexpr StringLiteral k_PartitioningMode_Key = "partitioning_mode_index"; static inline constexpr StringLiteral k_StartingFeatureID_Key = "starting_partition_id"; static inline constexpr StringLiteral k_OutOfBoundsFeatureID_Key = "out_of_bounds_value"; static inline constexpr StringLiteral k_NumberOfCellsPerAxis_Key = "number_of_partitions_per_axis"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp index e0e2a32136..fbf9594c04 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp @@ -37,7 +37,7 @@ class SIMPLNXCORE_EXPORT ReadBinaryCTNorthstarFilter : public IFilter static inline constexpr StringLiteral k_ImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_DensityArrayName_Key = "density_array_name"; - static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit"; + static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit_index"; static inline constexpr StringLiteral k_ImportSubvolume_Key = "import_subvolume"; static inline constexpr StringLiteral k_StartVoxelCoord_Key = "start_voxel_coord"; static inline constexpr StringLiteral k_EndVoxelCoord_Key = "end_voxel_coord"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp index 7ddd253f7b..b20a91afa3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp @@ -30,10 +30,10 @@ class SIMPLNXCORE_EXPORT ReadRawBinaryFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_InputFile_Key = "input_file"; - static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type"; + static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type_index"; static inline constexpr StringLiteral k_TupleDims_Key = "tuple_dimensions"; static inline constexpr StringLiteral k_NumberOfComponents_Key = "number_of_components"; - static inline constexpr StringLiteral k_Endian_Key = "endian"; + static inline constexpr StringLiteral k_Endian_Key = "endian_index"; static inline constexpr StringLiteral k_SkipHeaderBytes_Key = "skip_header_bytes"; static inline constexpr StringLiteral k_CreatedAttributeArrayPath_Key = "created_attribute_array_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp index d9f1e01b44..305fbc15a8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp @@ -20,11 +20,11 @@ class SIMPLNXCORE_EXPORT ReadTextDataArrayFilter : public IFilter ReadTextDataArrayFilter& operator=(ReadTextDataArrayFilter&&) noexcept = delete; static inline constexpr StringLiteral k_InputFile_Key = "input_file"; - static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type"; + static inline constexpr StringLiteral k_ScalarType_Key = "scalar_type_index"; static inline constexpr StringLiteral k_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_DelimiterChoice_Key = "delimiter_index"; static inline constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; static inline constexpr StringLiteral k_DataFormat_Key = "data_format"; static inline constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp index bb9f907417..db984b0389 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp @@ -28,7 +28,7 @@ class SIMPLNXCORE_EXPORT RegularGridSampleSurfaceMeshFilter : public IFilter static inline constexpr StringLiteral k_Dimensions_Key = "dimensions"; static inline constexpr StringLiteral k_Spacing_Key = "spacing"; static inline constexpr StringLiteral k_Origin_Key = "origin"; - static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit"; + static inline constexpr StringLiteral k_LengthUnit_Key = "length_unit_index"; static inline constexpr StringLiteral k_ImageGeomPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_TriangleGeometryPath_Key = "input_triangle_geometry_path"; static inline constexpr StringLiteral k_FeatureIdsArrayName_Key = "feature_ids_array_name"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp index 623e99f262..d0fa45b971 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp @@ -27,7 +27,7 @@ class SIMPLNXCORE_EXPORT RemoveFlaggedFeaturesFilter : public IFilter static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_CreatedImageGeometryPrefix_Key = "output_image_geometry_prefix"; static inline constexpr StringLiteral k_FillRemovedFeatures_Key = "fill_removed_features"; - static inline constexpr StringLiteral k_Functionality_Key = "functionality"; + static inline constexpr StringLiteral k_Functionality_Key = "operation_type_index"; static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; static inline constexpr StringLiteral k_FlaggedFeaturesArrayPath_Key = "flagged_features_array_path"; static inline constexpr StringLiteral k_IgnoredDataArrayPaths_Key = "ignored_data_array_paths"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp index 72d109c250..52d988d5a7 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp @@ -26,7 +26,7 @@ class SIMPLNXCORE_EXPORT ReplaceElementAttributesWithNeighborValuesFilter : publ // Parameter Keys static inline constexpr StringLiteral k_MinConfidence_Key = "min_confidence"; - static inline constexpr StringLiteral k_SelectedComparison_Key = "selected_comparison"; + static inline constexpr StringLiteral k_SelectedComparison_Key = "comparison_index"; static inline constexpr StringLiteral k_Loop_Key = "loop"; static inline constexpr StringLiteral k_ComparisonDataPath = "comparison_data_path"; static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp index 301b45fc75..1bac3cbd47 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT ResampleImageGeomFilter : public IFilter ResampleImageGeomFilter& operator=(ResampleImageGeomFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ResamplingMode_Key = "resampling_mode"; + static inline constexpr StringLiteral k_ResamplingMode_Key = "resampling_mode_index"; static inline constexpr StringLiteral k_Spacing_Key = "spacing"; static inline constexpr StringLiteral k_Scaling_Key = "scaling"; static inline constexpr StringLiteral k_ExactDimensions_Key = "exact_dimensions"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp index 47319df042..c185b3ea8f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp @@ -31,8 +31,8 @@ class SIMPLNXCORE_EXPORT RotateSampleRefFrameFilter : public IFilter }; // Parameter Keys - static inline constexpr StringLiteral k_RotationRepresentation_Key = "rotation_representation"; - static inline constexpr StringLiteral k_RotationAxisAngle_Key = "rotation_axis"; + static inline constexpr StringLiteral k_RotationRepresentation_Key = "rotation_representation_index"; + static inline constexpr StringLiteral k_RotationAxisAngle_Key = "rotation_axis_angle"; static inline constexpr StringLiteral k_RotationMatrix_Key = "rotation_matrix"; static inline constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp index 40eabfd2db..dd102cd39c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT SilhouetteFilter : public IFilter SilhouetteFilter& operator=(SilhouetteFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_DistanceMetric_Key = "distance_metric"; + static inline constexpr StringLiteral k_DistanceMetric_Key = "distance_metric_index"; static inline constexpr StringLiteral k_UseMask_Key = "use_mask"; static inline constexpr StringLiteral k_SelectedArrayPath_Key = "selected_array_path"; static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp index c22422538a..50e2a42ebd 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp @@ -38,13 +38,13 @@ class SIMPLNXCORE_EXPORT WriteASCIIDataFilter : public IFilter }; // Parameter Keys - static inline constexpr StringLiteral k_OutputStyle_Key = "output_style"; + static inline constexpr StringLiteral k_OutputStyle_Key = "output_style_index"; static inline constexpr StringLiteral k_OutputPath_Key = "output_path"; static inline constexpr StringLiteral k_OutputDir_Key = "output_dir"; static inline constexpr StringLiteral k_FileExtension_Key = "file_extension"; static inline constexpr StringLiteral k_MaxValPerLine_Key = "max_val_per_line"; - static inline constexpr StringLiteral k_Delimiter_Key = "delimiter"; - static inline constexpr StringLiteral k_Includes_Key = "includes"; + static inline constexpr StringLiteral k_Delimiter_Key = "delimiter_index"; + static inline constexpr StringLiteral k_Includes_Key = "header_option_index"; static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "input_data_array_paths"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp index 203e9ef5af..2484794f49 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp @@ -31,7 +31,7 @@ class SIMPLNXCORE_EXPORT WriteBinaryDataFilter : public IFilter }; // Parameter Keys - static inline constexpr StringLiteral k_Endianess_Key = "endianess"; + static inline constexpr StringLiteral k_Endianess_Key = "endian_index"; static inline constexpr StringLiteral k_OutputPath_Key = "output_path"; static inline constexpr StringLiteral k_FileExtension_Key = "file_extension"; static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "input_data_array_paths"; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp index 8e0d9a9a7e..6a2db8e406 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp @@ -9,7 +9,7 @@ namespace nx::core { /** * @class WriteFeatureDataCSVFilter - * @brief This filter will export feature data as ASCII to a single file using choice delimiter + * @brief This filter will export feature data as ASCII to a single file using choice delimiter_index */ class SIMPLNXCORE_EXPORT WriteFeatureDataCSVFilter : public IFilter { @@ -36,7 +36,7 @@ class SIMPLNXCORE_EXPORT WriteFeatureDataCSVFilter : public IFilter static inline constexpr StringLiteral k_FeatureDataFile_Key = "feature_data_file"; static inline constexpr StringLiteral k_WriteNeighborListData_Key = "write_neighborlist_data"; static inline constexpr StringLiteral k_WriteNumFeaturesLine_Key = "write_num_features_line"; - static inline constexpr StringLiteral k_DelimiterChoiceInt_Key = "delimiter_choice_int"; + static inline constexpr StringLiteral k_DelimiterChoiceInt_Key = "delimiter_index"; static inline constexpr StringLiteral k_CellFeatureAttributeMatrixPath_Key = "cell_feature_attribute_matrix_path"; /** diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp index 5eba5f254d..19d7658c2d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp @@ -24,7 +24,7 @@ class SIMPLNXCORE_EXPORT WriteStlFileFilter : public IFilter WriteStlFileFilter& operator=(WriteStlFileFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_GroupingType_Key = "grouping_type"; + static inline constexpr StringLiteral k_GroupingType_Key = "grouping_type_index"; static inline constexpr StringLiteral k_OutputStlFile_Key = "output_stl_file"; static inline constexpr StringLiteral k_OutputStlDirectory_Key = "output_stl_directory"; static inline constexpr StringLiteral k_OutputStlPrefix_Key = "output_stl_prefix"; diff --git a/src/Plugins/SimplnxCore/test/AlignSectionsFeatureCentroidTest.cpp b/src/Plugins/SimplnxCore/test/AlignSectionsFeatureCentroidTest.cpp index 64f7146296..f50c24738e 100644 --- a/src/Plugins/SimplnxCore/test/AlignSectionsFeatureCentroidTest.cpp +++ b/src/Plugins/SimplnxCore/test/AlignSectionsFeatureCentroidTest.cpp @@ -50,24 +50,15 @@ TEST_CASE("SimplnxCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][A AlignSectionsFeatureCentroidFilter filter; - // Parameter Keys - constexpr StringLiteral k_WriteAlignmentShifts_Key = "write_alignment_shifts"; - constexpr StringLiteral k_AlignmentShiftFileName_Key = "alignment_shift_file_name"; - constexpr StringLiteral k_UseReferenceSlice_Key = "use_reference_slice"; - constexpr StringLiteral k_ReferenceSlice_Key = "reference_slice"; - constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; - constexpr StringLiteral k_SelectedImageGeometryPath_Key = "input_image_geometry_path"; - constexpr StringLiteral k_SelectedCellDataGroup_Key = "selected_cell_data_path"; - Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(k_WriteAlignmentShifts_Key, std::make_any(true)); - args.insertOrAssign(k_AlignmentShiftFileName_Key, std::make_any(computedShiftsFile)); - args.insertOrAssign(k_UseReferenceSlice_Key, std::make_any(true)); - args.insertOrAssign(k_ReferenceSlice_Key, std::make_any(0)); - args.insertOrAssign(k_MaskArrayPath_Key, std::make_any(k_MaskArrayPath)); - args.insertOrAssign(k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); - args.insertOrAssign(k_SelectedCellDataGroup_Key, std::make_any(k_CellAttributeMatrix)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_WriteAlignmentShifts_Key, std::make_any(true)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_AlignmentShiftFileName_Key, std::make_any(computedShiftsFile)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_UseReferenceSlice_Key, std::make_any(true)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_ReferenceSlice_Key, std::make_any(0)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_MaskArrayPath_Key, std::make_any(k_MaskArrayPath)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_SelectedImageGeometryPath_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(AlignSectionsFeatureCentroidFilter::k_SelectedCellDataGroup_Key, std::make_any(k_CellAttributeMatrix)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -84,30 +75,20 @@ TEST_CASE("SimplnxCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][A // Read Exemplar Shifts File { - constexpr StringLiteral k_InputFile_Key = "input_file"; - constexpr StringLiteral k_ScalarType_Key = "scalar_type"; - constexpr StringLiteral k_NTuples_Key = "number_tuples"; - constexpr StringLiteral k_NComp_Key = "number_comp"; - constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; - constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_choice"; - constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; - constexpr StringLiteral k_DataFormat_Key = "data_format"; - constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; - // Compare the output of the shifts file with the exemplar file ReadTextDataArrayFilter filter; Arguments args; // read in the exemplar shift data file - args.insertOrAssign(k_InputFile_Key, std::make_any( - fs::path(fmt::format("{}/6_6_align_sections_feature_centroids/6_6_align_sections_feature_centroids.txt", unit_test::k_TestFilesDir)))); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(k_TupleDims)); - args.insertOrAssign(k_NComp_Key, std::make_any(k_NumColumns)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(k_SkipHeaderLines)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(k_Comma)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_ExemplarShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(fs::path( + fmt::format("{}/6_6_align_sections_feature_centroids/6_6_align_sections_feature_centroids.txt", unit_test::k_TestFilesDir)))); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_TupleDims)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(k_NumColumns)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(k_SkipHeaderLines)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(k_Comma)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_ExemplarShiftsPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -120,28 +101,18 @@ TEST_CASE("SimplnxCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][A // Read Computed Shifts File { - constexpr StringLiteral k_InputFile_Key = "input_file"; - constexpr StringLiteral k_ScalarType_Key = "scalar_type"; - constexpr StringLiteral k_NTuples_Key = "number_tuples"; - constexpr StringLiteral k_NComp_Key = "number_comp"; - constexpr StringLiteral k_NSkipLines_Key = "skip_line_count"; - constexpr StringLiteral k_DelimiterChoice_Key = "delimiter_choice"; - constexpr StringLiteral k_DataArrayPath_Key = "output_data_array_path"; - constexpr StringLiteral k_DataFormat_Key = "data_format"; - constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; - // Compare the output of the shifts file with the exemplar file ReadTextDataArrayFilter filter; Arguments args; - args.insertOrAssign(k_InputFile_Key, std::make_any(computedShiftsFile)); - args.insertOrAssign(k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); - args.insertOrAssign(k_NTuples_Key, std::make_any(k_TupleDims)); - args.insertOrAssign(k_NComp_Key, std::make_any(k_NumColumns)); - args.insertOrAssign(k_NSkipLines_Key, std::make_any(k_SkipHeaderLines)); - args.insertOrAssign(k_DelimiterChoice_Key, std::make_any(k_Comma)); - args.insertOrAssign(k_DataArrayPath_Key, std::make_any(k_CalculatedShiftsPath)); + args.insertOrAssign(ReadTextDataArrayFilter::k_InputFile_Key, std::make_any(computedShiftsFile)); + args.insertOrAssign(ReadTextDataArrayFilter::k_ScalarType_Key, std::make_any(nx::core::NumericType::float32)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NTuples_Key, std::make_any(k_TupleDims)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NComp_Key, std::make_any(k_NumColumns)); + args.insertOrAssign(ReadTextDataArrayFilter::k_NSkipLines_Key, std::make_any(k_SkipHeaderLines)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DelimiterChoice_Key, std::make_any(k_Comma)); + args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayPath_Key, std::make_any(k_CalculatedShiftsPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp b/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp index 323545df32..ccc85b2d05 100644 --- a/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp +++ b/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp @@ -159,7 +159,7 @@ Pipeline CreateExportPipeline() { Arguments args; args.insert("set_tuple_dimensions", std::make_any(true)); - args.insert("numeric_type", std::make_any(NumericType::int8)); + args.insert("numeric_type_index", std::make_any(NumericType::int8)); args.insert("component_count", std::make_any(3)); args.insert("tuple_dimensions", DynamicTableInfo::TableDataType{{1.0}}); diff --git a/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.hpp b/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.hpp index c2bf00caae..71d52956f2 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.hpp @@ -20,7 +20,7 @@ class TESTONE_EXPORT CreateOutOfCoreArray : public IFilter CreateOutOfCoreArray& operator=(CreateOutOfCoreArray&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_NumericType_Key = "numeric_type"; + static inline constexpr StringLiteral k_NumericType_Key = "numeric_type_index"; static inline constexpr StringLiteral k_NumComps_Key = "component_count"; static inline constexpr StringLiteral k_TupleDims_Key = "tuple_dimensions"; static inline constexpr StringLiteral k_DataPath_Key = "output_array_path"; diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.cpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.cpp index 9cfaf94fbc..2e345fd760 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.cpp @@ -25,10 +25,10 @@ constexpr StringLiteral k_Param2 = "param2"; constexpr StringLiteral k_Param3 = "param3"; constexpr StringLiteral k_Param4 = "param4"; constexpr StringLiteral k_Param5 = "param5"; -constexpr StringLiteral k_Param6 = "param6"; +constexpr StringLiteral k_Param6 = "param6_index"; constexpr StringLiteral k_Param7 = "param7"; constexpr StringLiteral k_Param8 = "param8"; -constexpr StringLiteral k_Param9 = "param9"; +constexpr StringLiteral k_Param9 = "param9_index"; constexpr StringLiteral k_Param10 = "param10"; } // namespace diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.cpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.cpp index 3eeb8faf4b..a27c97e9bd 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.cpp @@ -19,7 +19,7 @@ namespace { constexpr StringLiteral k_Param1 = "param1"; constexpr StringLiteral k_Param2 = "param2"; -constexpr StringLiteral k_Param3 = "param3"; +constexpr StringLiteral k_Param3 = "param3_index"; constexpr StringLiteral k_Param4 = "param4"; constexpr StringLiteral k_Param5 = "param5_path"; constexpr StringLiteral k_Param6 = "param6_path"; diff --git a/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp b/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp index 1e5151fbce..9571ed8d9e 100644 --- a/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp +++ b/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp @@ -11,7 +11,7 @@ namespace { constexpr StringLiteral k_Param1 = "param1"; constexpr StringLiteral k_Param2 = "param2"; -constexpr StringLiteral k_Param3 = "param3"; +constexpr StringLiteral k_Param3 = "param3_index"; } // namespace Test2Filter::Test2Filter() = default; diff --git a/test/PluginTest.cpp b/test/PluginTest.cpp index e6ecca67b7..48bfbcfd76 100644 --- a/test/PluginTest.cpp +++ b/test/PluginTest.cpp @@ -240,6 +240,10 @@ TEST_CASE("Test Filter Parameter Keys") { output << plugName << "->" << filter->name() << "->" << paramValue->name() << " The parameter key should end with '_name' for a Parameter of Type " << pType << std::endl; } + if((pType == "simplnx.ChoicesParameter" || pType == "simplnx.NumericTypeParameter") && !nx::core::StringUtilities::ends_with(parameter.first, "_index")) + { + output << plugName << "->" << filter->name() << "->" << paramValue->name() << " The parameter key should end with '_index' for a Parameter of Type " << pType << std::endl; + } } } } diff --git a/test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp b/test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp index e5e824acaa..b215f7f935 100644 --- a/test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp +++ b/test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp @@ -438,7 +438,7 @@ void CompareDataArrays(const IDataArray& left, const IDataArray& right, usize st newVal = newDataStore[i]; if(oldVal != newVal) { - UNSCOPED_INFO(fmt::format("oldValue != newValue. {} != {}", oldVal, newVal)); + UNSCOPED_INFO(fmt::format("index=: {} oldValue != newValue. {} != {}", i, oldVal, newVal)); if constexpr(std::is_floating_point_v) { diff --git a/wrapping/python/docs/generate_sphinx_docs.cpp b/wrapping/python/docs/generate_sphinx_docs.cpp index 72b15d90e9..e8b43ba149 100644 --- a/wrapping/python/docs/generate_sphinx_docs.cpp +++ b/wrapping/python/docs/generate_sphinx_docs.cpp @@ -814,6 +814,10 @@ void GeneratePythonRstFiles() { logFile << filterClassName << " " << parameterPair.first << " " << pType << std::endl; } + if((pType == "simplnx.ChoicesParameter" || pType == "simplnx.NumericTypeParameter") && !nx::core::StringUtilities::ends_with(parameterPair.first, "_index")) + { + logFile << filterClassName << " " << parameterPair.first << " " << pType << std::endl; + } if(nx::core::StringUtilities::contains(parameterPair.first, "data_array")) { thingsWithGeomInName.insert(parameterPair.first); diff --git a/wrapping/python/examples/pipelines/ITKImageProcessing/02_Image_Segmentation.py b/wrapping/python/examples/pipelines/ITKImageProcessing/02_Image_Segmentation.py index fbb9789684..4ea0c12148 100644 --- a/wrapping/python/examples/pipelines/ITKImageProcessing/02_Image_Segmentation.py +++ b/wrapping/python/examples/pipelines/ITKImageProcessing/02_Image_Segmentation.py @@ -31,7 +31,7 @@ cell_attribute_matrix_name="Cell Data", image_data_array_name="ImageData", output_image_geometry_path=nx.DataPath("ImageDataContainer"), - image_transform_choice=0, + image_transform_index=0, input_file_list_object =generated_file_list_value, origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0] @@ -121,7 +121,7 @@ component_count=1, data_format="", initialization_value_str="1", - numeric_type=nx.NumericType.int32, + numeric_type_index=nx.NumericType.int32, output_array_path=nx.DataPath("ImageDataContainer/Cell Data/Phases") # tuple_dimensions: List[List[float]] = ... # Not currently part of the code ) diff --git a/wrapping/python/examples/pipelines/ITKImageProcessing/03_Porosity_Mesh_Export.py b/wrapping/python/examples/pipelines/ITKImageProcessing/03_Porosity_Mesh_Export.py index 30fabcb8ad..6f02f54695 100644 --- a/wrapping/python/examples/pipelines/ITKImageProcessing/03_Porosity_Mesh_Export.py +++ b/wrapping/python/examples/pipelines/ITKImageProcessing/03_Porosity_Mesh_Export.py @@ -32,7 +32,7 @@ cell_attribute_matrix_name="Cell Data", image_data_array_name="ImageData", output_image_geometry_path=nx.DataPath("ImageDataContainer"), - image_transform_choice=0, + image_transform_index=0, input_file_list_object =generated_file_list_value, origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0] diff --git a/wrapping/python/examples/pipelines/Incomplete/ImportEdaxOIMData.py b/wrapping/python/examples/pipelines/Incomplete/ImportEdaxOIMData.py index ec6d291d59..2bf785c89f 100644 --- a/wrapping/python/examples/pipelines/Incomplete/ImportEdaxOIMData.py +++ b/wrapping/python/examples/pipelines/Incomplete/ImportEdaxOIMData.py @@ -31,7 +31,7 @@ result = nx_filter.execute( data_structure=data_structure, euler_angles_array_path=nx.DataPath("ImageGeom/Cell Data/EulerAngles"), - rotation_axis=[0.0, 0.0, 1.0, 90.0] + rotation_axis_angle=[0.0, 0.0, 1.0, 90.0] ) nxtest.check_filter_result(nx_filter, result) @@ -43,7 +43,7 @@ data_structure=data_structure, remove_original_geometry=True, rotate_slice_by_slice=True, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], rotation_representation=("Axis Angle"), input_image_geometry_path=nx.DataPath("ImageGeom") ) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Archive.py b/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Archive.py index 807b6bf971..b0bae41dba 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Archive.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Archive.py @@ -30,8 +30,8 @@ data_structure=data_structure, input_file_list_object =generated_file_list_value, output_file_path=nxtest.get_data_directory() / "Output/Reconstruction/Small_IN100.h5ebsd", - reference_frame=0, - stacking_order=1, + reference_frame_index=0, + stacking_order_index=1, z_spacing=0.25 ) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_Crystallographic_Statistics.py b/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_Crystallographic_Statistics.py index 741f882110..aaafe2d56d 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_Crystallographic_Statistics.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_Crystallographic_Statistics.py @@ -109,7 +109,7 @@ feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), feature_reference_misorientations_array_name="FeatureReferenceMisorientations", quats_array_path=nx.DataPath("DataContainer/CellData/Quats"), - reference_orientation=0 + reference_orientation_index=0 # cell_feature_attribute_matrix_path=nx.DataPath("DataContainer/"), # Not currently part of the code # g_beuclidean_distances_array_path=nx.DataPath("DataContainer/"), # Not currently part of the code ) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_GBCD_Metric.py b/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_GBCD_Metric.py index d93b34a53f..9e6a849b52 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_GBCD_Metric.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/05_Small_IN100_GBCD_Metric.py @@ -102,7 +102,7 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - chosen_limit_dists=0, + chosen_limit_dists_index=0, crystal_structures_array_path=nx.DataPath("DataContainer/CellEnsembleData/CrystalStructures"), dist_output_file="Data/Output/SurfaceMesh/7_0_small_in100_distribution_1.dat", err_output_file="Data/Output/SurfaceMesh/7_0_small_in100_distribution_errors_1.dat", diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/08_Small_IN100_Full_Reconstruction.py b/wrapping/python/examples/pipelines/OrientationAnalysis/08_Small_IN100_Full_Reconstruction.py index efcb227f6f..b7abb7299b 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/08_Small_IN100_Full_Reconstruction.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/08_Small_IN100_Full_Reconstruction.py @@ -65,9 +65,9 @@ result = nx_filter.execute( data_structure=data_structure, input_orientation_array_path=nx.DataPath("DataContainer/CellData/EulerAngles"), - input_type=0, + input_representation_index=0, output_orientation_array_name="Quats", - output_type=2 + output_representation_index=2 ) nxtest.check_filter_result(nx_filter, result) @@ -339,7 +339,7 @@ data_structure=data_structure, feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), num_iterations=2, - operation=0, + operation_index=0, input_image_geometry_path=nx.DataPath("DataContainer"), x_dir_on=True, y_dir_on=True, @@ -356,7 +356,7 @@ data_structure=data_structure, feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), num_iterations=2, - operation=1, # Dilate operation + operation_index=1, # Dilate operation input_image_geometry_path=nx.DataPath("DataContainer"), x_dir_on=True, y_dir_on=True, diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/APTR12_Analysis.py b/wrapping/python/examples/pipelines/OrientationAnalysis/APTR12_Analysis.py index bf8b239c53..757591eab1 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/APTR12_Analysis.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/APTR12_Analysis.py @@ -33,9 +33,9 @@ output_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], #rotation_matrix=[] - rotation_representation=0, + rotation_representation_index=0, input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr") ) nxtest.check_filter_result(nx_filter, result) @@ -69,9 +69,9 @@ result = nx_filter.execute( data_structure=data_structure, input_orientation_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/EulerAngles"), - input_type=0, + input_representation_index=0, output_orientation_array_name="Quats", - output_type=2 + output_representation_index=2 ) nxtest.check_filter_result(nx_filter, result) @@ -84,7 +84,7 @@ comparison_data_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/Error"), loop=False, min_confidence=0.0, - selected_comparison=0, + comparison_index=0, input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr") ) nxtest.check_filter_result(nx_filter, result) @@ -114,7 +114,7 @@ image_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/IPF_001"), input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -144,7 +144,7 @@ image_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/IPF_010"), input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -173,7 +173,7 @@ image_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/IPF_100"), input_image_geometry_path=nx.DataPath("fw-ar-IF1-aptr12-corr"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -318,7 +318,7 @@ feature_ids_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds"), feature_reference_misorientations_array_name="FeatureReferenceMisorientations", quats_array_path=nx.DataPath("fw-ar-IF1-aptr12-corr/Cell Data/Quats"), - reference_orientation=0 + reference_orientation_index=0 # Parameters for cell_feature_attribute_matrix_path and g_beuclidean_distances_array_path are not used ) nxtest.check_filter_result(nx_filter, result) @@ -330,7 +330,7 @@ result = nx_filter.execute( data_structure=data_structure, cell_feature_attribute_matrix_path=nx.DataPath("fw-ar-IF1-aptr12-corr/CellFeatureData"), - delimiter_choice_int=2, + delimiter_index=2, feature_data_file=nxtest.get_data_directory() / "Output/fw-ar-IF1-aptr12-corr/FeatureData.csv", write_neighborlist_data=False, write_num_features_line=True @@ -358,9 +358,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - delimiter=2, + delimiter_index=2, output_path=nxtest.get_data_directory() / "Output/fw-ar-IF1-aptr12-corr/EqDiamHistogram.csv", - output_style=1, + output_style_index=1, input_data_array_paths=[nx.DataPath("fw-ar-IF1-aptr12-corr/Histograms/EquivalentDiameters Histogram")] ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/AVTR12_Analysis.py b/wrapping/python/examples/pipelines/OrientationAnalysis/AVTR12_Analysis.py index 9012e9dea3..0cc5640c77 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/AVTR12_Analysis.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/AVTR12_Analysis.py @@ -33,9 +33,9 @@ output_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], #rotation_matrix=[] - rotation_representation=0, + rotation_representation_index=0, input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr") ) nxtest.check_filter_result(nx_filter, result) @@ -69,9 +69,9 @@ result = nx_filter.execute( data_structure=data_structure, input_orientation_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/EulerAngles"), - input_type=0, + input_representation_index=0, output_orientation_array_name="Quats", - output_type=2 + output_representation_index=2 ) nxtest.check_filter_result(nx_filter, result) @@ -84,7 +84,7 @@ comparison_data_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/Error"), loop=False, min_confidence=0.0, - selected_comparison=0, + comparison_index=0, input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr") ) nxtest.check_filter_result(nx_filter, result) @@ -114,7 +114,7 @@ image_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/IPF_001"), input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -144,7 +144,7 @@ image_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/IPF_010"), input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -173,7 +173,7 @@ image_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/IPF_100"), input_image_geometry_path=nx.DataPath("fw-ar-IF1-avtr12-corr"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -318,7 +318,7 @@ feature_ids_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds"), feature_reference_misorientations_array_name="FeatureReferenceMisorientations", quats_array_path=nx.DataPath("fw-ar-IF1-avtr12-corr/Cell Data/Quats"), - reference_orientation=0 + reference_orientation_index=0 # Parameters for cell_feature_attribute_matrix_path and g_beuclidean_distances_array_path are not used ) nxtest.check_filter_result(nx_filter, result) @@ -330,7 +330,7 @@ result = nx_filter.execute( data_structure=data_structure, cell_feature_attribute_matrix_path=nx.DataPath("fw-ar-IF1-avtr12-corr/CellFeatureData"), - delimiter_choice_int=2, + delimiter_index=2, feature_data_file=nxtest.get_data_directory() / "Output/fw-ar-IF1-avtr12-corr/FeatureData.csv", write_neighborlist_data=False, write_num_features_line=True @@ -358,9 +358,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - delimiter=2, + delimiter_index=2, output_path=nxtest.get_data_directory() / "Output/fw-ar-IF1-avtr12-corr/EqDiamHistogram.csv", - output_style=1, + output_style_index=1, input_data_array_paths=[nx.DataPath("fw-ar-IF1-avtr12-corr/Histograms/EquivalentDiameters Histogram")] ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/AlignSectionsMutualInformation.py b/wrapping/python/examples/pipelines/OrientationAnalysis/AlignSectionsMutualInformation.py index e2de7f8010..118ac08a7b 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/AlignSectionsMutualInformation.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/AlignSectionsMutualInformation.py @@ -66,9 +66,9 @@ result = nx_filter.execute( data_structure=data_structure, input_orientation_array_path=nx.DataPath("DataContainer/CellData/EulerAngles"), - input_type=0, + input_representation_index=0, output_orientation_array_name="Quats", - output_type=2 + output_representation_index=2 ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/CI_Histogram.py b/wrapping/python/examples/pipelines/OrientationAnalysis/CI_Histogram.py index 4c71ae8133..64cf7670cc 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/CI_Histogram.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/CI_Histogram.py @@ -29,7 +29,7 @@ result = nx_filter.execute( data_structure=data_structure, euler_angles_array_path=nx.DataPath("DataContainer/Cell Data/EulerAngles"), - rotation_axis=[0.0, 0.0, 1.0, 90.0] + rotation_axis_angle=[0.0, 0.0, 1.0, 90.0] ) nxtest.check_filter_result(nx_filter, result) @@ -42,8 +42,8 @@ output_image_geometry_path=nx.DataPath("beans"), remove_original_geometry=False, rotate_slice_by_slice=True, - rotation_axis=[0.0, 1.0, 0.0, 180.0], - rotation_representation=0, + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], + rotation_representation_index=0, input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -110,12 +110,12 @@ result = nx_filter.execute( data_structure=data_structure, #file_extension: str = ..., - delimiter=2, - includes=1, + delimiter_index=2, + header_option_index=1, #max_val_per_line: int = ..., #output_dir: PathLike = ..., output_path=output_file_path, - output_style=1, + output_style_index=1, input_data_array_paths=[nx.DataPath("DataContainer/Statistics/Confidence Index Histogram")] ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/Edax_IPF_Colors.py b/wrapping/python/examples/pipelines/OrientationAnalysis/Edax_IPF_Colors.py index c0bfe6948e..7dffdffd3d 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/Edax_IPF_Colors.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/Edax_IPF_Colors.py @@ -29,7 +29,7 @@ result = nx_filter.execute( data_structure=data_structure, euler_angles_array_path=nx.DataPath("DataContainer/Cell Data/EulerAngles"), - rotation_axis=[0.0, 0.0, 1.0, 90.0] + rotation_axis_angle=[0.0, 0.0, 1.0, 90.0] ) nxtest.check_filter_result(nx_filter, result) @@ -41,8 +41,8 @@ data_structure=data_structure, remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], - rotation_representation=0, + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], + rotation_representation_index=0, input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -98,7 +98,7 @@ image_array_path=nx.DataPath("DataContainer/Cell Data/IPFColors"), input_image_geometry_path=nx.DataPath("DataContainer"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/FindGBCD-GBPDMetricBased.py b/wrapping/python/examples/pipelines/OrientationAnalysis/FindGBCD-GBPDMetricBased.py index ce60b91d46..579894f0bf 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/FindGBCD-GBPDMetricBased.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/FindGBCD-GBPDMetricBased.py @@ -44,7 +44,7 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - chosen_limit_dists=2, + chosen_limit_dists_index=2, crystal_structures_array_path=nx.DataPath("DataContainer/CellEnsembleData/CrystalStructures"), dist_output_file=nxtest.get_data_directory() / "Output/GBPDMetricBased/gbcd_distribution.dat", err_output_file=nxtest.get_data_directory() / "Output/GBPDMetricBased/gbcd_distribution_errors.dat", diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/FindLargestCrossSections.py b/wrapping/python/examples/pipelines/OrientationAnalysis/FindLargestCrossSections.py index e12816cfdd..bfd5223eae 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/FindLargestCrossSections.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/FindLargestCrossSections.py @@ -61,9 +61,9 @@ result = nx_filter.execute( data_structure=data_structure, input_orientation_array_path=nx.DataPath("DataContainer/CellData/EulerAngles"), - input_type=0, + input_representation_index=0, output_orientation_array_name="Quats", - output_type=2 + output_representation_index=2 ) nxtest.check_filter_result(nx_filter, result) @@ -97,7 +97,7 @@ feature_ids_array_path=nx.DataPath("DataContainer/CellData/FeatureIds"), input_image_geometry_path=nx.DataPath("DataContainer"), largest_cross_sections_array_name="LargestCrossSections", - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/ReadAng.py b/wrapping/python/examples/pipelines/OrientationAnalysis/ReadAng.py index 659ba067da..d9f0a92ce7 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/ReadAng.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/ReadAng.py @@ -29,7 +29,7 @@ result = nx_filter.execute( data_structure=data_structure, euler_angles_array_path=nx.DataPath("DataContainer/Cell Data/EulerAngles"), - rotation_axis=[0.0, 0.0, 1.0, 90.0] + rotation_axis_angle=[0.0, 0.0, 1.0, 90.0] ) nxtest.check_filter_result(nx_filter, result) @@ -42,9 +42,9 @@ #created_image_geometry: DataPath = ..., remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], #rotation_matrix: Any = ..., - rotation_representation=0, + rotation_representation_index=0, input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/ReadCTF.py b/wrapping/python/examples/pipelines/OrientationAnalysis/ReadCTF.py index 7902b61dba..6608069ce8 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/ReadCTF.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/ReadCTF.py @@ -33,9 +33,9 @@ #output_image_geometry_path=nx.DataPath("DataContainer/"), remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], #rotation_matrix: List[List[float]] = ..., - rotation_representation=0, + rotation_representation_index=0, input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Exposed.py b/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Exposed.py index c077494dad..7197bca7e1 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Exposed.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Exposed.py @@ -32,9 +32,9 @@ data_structure=data_structure, remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], #rotation_matrix= - rotation_representation=0, + rotation_representation_index=0, input_image_geometry_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2") ) nxtest.check_filter_result(nx_filter, result) @@ -96,7 +96,7 @@ image_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/IPF_Exposed_001"), input_image_geometry_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -109,10 +109,10 @@ cell_euler_angles_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles"), cell_phases_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases"), crystal_structures_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures"), - generation_algorithm=0, + generation_algorithm_index=0, mask_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask"), output_image_geometry_path=nx.DataPath("PoleFigure"), - image_layout=2, + image_layout_index=2, image_prefix="Cugrid_after 2nd_15kv_2kx_2_Exposed_", image_size=1024, lambert_size=64, diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Unexposed.py b/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Unexposed.py index aa0cd90dcd..c9d9c61e19 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Unexposed.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/TxCopper_Unexposed.py @@ -32,9 +32,9 @@ data_structure=data_structure, remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180.0], + rotation_axis_angle=[0.0, 1.0, 0.0, 180.0], #rotation_matrix= - rotation_representation=0, + rotation_representation_index=0, input_image_geometry_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2") ) nxtest.check_filter_result(nx_filter, result) @@ -95,7 +95,7 @@ image_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/IPF_Unexposed_001"), input_image_geometry_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -108,10 +108,10 @@ cell_euler_angles_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles"), cell_phases_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases"), crystal_structures_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures"), - generation_algorithm=0, + generation_algorithm_index=0, mask_array_path=nx.DataPath("Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask"), output_image_geometry_path=nx.DataPath("PoleFigure"), - image_layout=2, + image_layout_index=2, image_prefix="Cugrid_after 2nd_15kv_2kx_2_Unexposed_", image_size=1024, lambert_size=64, diff --git a/wrapping/python/examples/pipelines/Simplnx/AppendImageGeometryZSlice.py b/wrapping/python/examples/pipelines/Simplnx/AppendImageGeometryZSlice.py index eb944949fc..d91d8851a5 100644 --- a/wrapping/python/examples/pipelines/Simplnx/AppendImageGeometryZSlice.py +++ b/wrapping/python/examples/pipelines/Simplnx/AppendImageGeometryZSlice.py @@ -31,13 +31,13 @@ data_structure=data_structure, set_tuple_dimensions=True, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/ConfidenceIndex.csv", number_comp=1, skip_line_count=0, number_tuples=[[480000.0]], output_data_array_path=nx.DataPath("Confidence Index"), - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -49,13 +49,13 @@ data_structure=data_structure, set_tuple_dimensions=True, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/FeatureIds.csv", number_comp=1, skip_line_count=0, number_tuples=[[480000.0]], output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/FeatureIds"), - scalar_type=nx.NumericType.int32 + scalar_type_index=nx.NumericType.int32 ) nxtest.check_filter_result(nx_filter, result) @@ -68,13 +68,13 @@ data_structure=data_structure, set_tuple_dimensions=True, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/ImageQuality.csv", number_comp=1, skip_line_count=0, number_tuples=[[480000.0]], output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/Image Quality"), - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) # Filter 5 @@ -85,13 +85,13 @@ data_structure=data_structure, set_tuple_dimensions=True, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/IPFColor.csv", number_comp=3, skip_line_count=0, number_tuples=[[480000.0]], output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/IPFColors"), - scalar_type=nx.NumericType.uint8 + scalar_type_index=nx.NumericType.uint8 ) nxtest.check_filter_result(nx_filter, result) # Filter 6 diff --git a/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Demo.py b/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Demo.py index 686e8873bf..ff27060b03 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Demo.py +++ b/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Demo.py @@ -35,16 +35,16 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_handling=0, + array_handling_index=0, cell_attribute_matrix_name="Cell Data", dimensions=[10, 10 , 2], #edge_attribute_matrix_name="Edge Data", (not used here) #edge_list_name: DataPath = ..., (not used here) #face_attribute_matrix_name="Face Data", (not used here) output_geometry_path=nx.DataPath("Group 1/Group 2/[Geometry]"), - geometry_type=0, + geometry_type_index=0, #hexahedral_list_name: DataPath = ..., (not used here) - length_unit_type=7, + length_unit_index=7, origin=[0.0, 0.0, 0.0], #quadrilateral_list_name: DataPath = ..., (not used here) spacing=[1.0, 1.0, 1.0], @@ -69,7 +69,7 @@ component_count=1, data_format="", initialization_value_str="2", - numeric_type=nx.NumericType.int32, + numeric_type_index=nx.NumericType.int32, output_array_path=nx.DataPath("Group 1/Group 2/[Geometry]/Cell Data/Data"), tuple_dimensions=[[2.0, 10.0, 10.0]] ) @@ -82,10 +82,10 @@ result = nx_filter.execute( data_structure=data_structure, cell_attribute_matrix_path=nx.DataPath("Group 1/Group 2/[Geometry]/Cell Data"), - interpolation_type=1, + interpolation_type_index=1, scale=[2.0, 2.0, 2.0], input_image_geometry_path=nx.DataPath("Group 1/Group 2/[Geometry]"), - transformation_type=5, + transformation_type_index=5, translate_geometry_to_global_origin=False ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Image.py b/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Image.py index 192287fbea..d85a9d606c 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Image.py +++ b/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Image.py @@ -42,10 +42,10 @@ result = nx_filter.execute( data_structure=data_structure, cell_attribute_matrix_path=nx.DataPath("Transform [Rotate]/Cell Data"), - interpolation_type=1, + interpolation_type_index=1, rotation=[0.0, 1.0, 0.0, 180.0], input_image_geometry_path=nx.DataPath("Transform [Rotate]"), - transformation_type=3, + transformation_type_index=3, translate_geometry_to_global_origin=False # computed_transformation_matrix: DataPath = ..., # Not used here # manual_transformation_matrix: List[List[float]] = ..., # Not used here @@ -75,10 +75,10 @@ result = nx_filter.execute( data_structure=data_structure, cell_attribute_matrix_path=nx.DataPath("Transform [Scale]/Cell Data"), - interpolation_type=1, + interpolation_type_index=1, scale=[2.0, 2.0, 1.0], # Scale transformation input_image_geometry_path=nx.DataPath("Transform [Scale]"), - transformation_type=5, # Type for scale transformation + transformation_type_index=5, # Type for scale transformation translate_geometry_to_global_origin=False # computed_transformation_matrix: DataPath = ..., # manual_transformation_matrix: List[List[float]] = ..., @@ -107,9 +107,9 @@ result = nx_filter.execute( data_structure=data_structure, cell_attribute_matrix_path=nx.DataPath("Transform [Translate]/Cell Data"), - interpolation_type=1, + interpolation_type_index=1, input_image_geometry_path=nx.DataPath("Transform [Translate]"), - transformation_type=4, + transformation_type_index=4, translate_geometry_to_global_origin=False, translation=[50.0, 0.0, 0.0] # computed_transformation_matrix: DataPath = ..., # Not used here @@ -139,10 +139,10 @@ result = nx_filter.execute( data_structure=data_structure, cell_attribute_matrix_path=nx.DataPath("Transform [Rotation-Interpolation]/Cell Data"), - interpolation_type=0, + interpolation_type_index=0, rotation=[0.0, 0.0, 1.0, 45.0], input_image_geometry_path=nx.DataPath("Transform [Rotation-Interpolation]"), - transformation_type=3, + transformation_type_index=3, translate_geometry_to_global_origin=False # computed_transformation_matrix: DataPath = ..., # manual_transformation_matrix: List[List[float]] = ..., @@ -172,10 +172,10 @@ result = nx_filter.execute( data_structure=data_structure, cell_attribute_matrix_path=nx.DataPath("Transform [Scale-Interpolation]/Cell Data"), - interpolation_type=0, + interpolation_type_index=0, scale=[3.0, 3.0, 1.0], input_image_geometry_path=nx.DataPath("Transform [Scale-Interpolation]"), - transformation_type=5, + transformation_type_index=5, translate_geometry_to_global_origin=False # computed_transformation_matrix: DataPath = ..., # manual_transformation_matrix: List[List[float]] = ..., diff --git a/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Node.py b/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Node.py index c23e26ac3d..fbb6e46a3c 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Node.py +++ b/wrapping/python/examples/pipelines/Simplnx/ApplyTransformation_Node.py @@ -48,12 +48,12 @@ data_structure=data_structure, #cell_attribute_matrix_path: DataPath = ..., #computed_transformation_matrix: DataPath = ..., - interpolation_type=2, + interpolation_type_index=2, #manual_transformation_matrix: List[List[float]] = ..., rotation=[1.0, 0.0, 0.0, 180], #scale: List[float] = ..., input_image_geometry_path=nx.DataPath("Blade [Rotation]"), - transformation_type=3, + transformation_type_index=3, translate_geometry_to_global_origin=False #translation: List[float] = ... ) @@ -80,9 +80,9 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - interpolation_type=2, + interpolation_type_index=2, input_image_geometry_path=nx.DataPath("Blade [Translation]"), - transformation_type=4, + transformation_type_index=4, translate_geometry_to_global_origin=False, translation=[10.0, 10.0, 10.0] ) @@ -109,10 +109,10 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - interpolation_type=2, + interpolation_type_index=2, scale=[0.5, 0.5, 1.0], input_image_geometry_path=nx.DataPath("Blade [Scale]"), - transformation_type=5, + transformation_type_index=5, translate_geometry_to_global_origin=False ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/ArrayCalculatorExample.py b/wrapping/python/examples/pipelines/Simplnx/ArrayCalculatorExample.py index 7e9beef256..e2339646e4 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ArrayCalculatorExample.py +++ b/wrapping/python/examples/pipelines/Simplnx/ArrayCalculatorExample.py @@ -19,7 +19,7 @@ component_count=1, data_format="", initialization_value_str="2", - numeric_type=nx.NumericType.int32, + numeric_type_index=nx.NumericType.int32, output_array_path=nx.DataPath("TestArray"), tuple_dimensions=[[10.0]] ) @@ -36,7 +36,7 @@ component_count=1, data_format="", initialization_value_str="1.23878", - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, output_array_path=nx.DataPath("Confidence Index"), tuple_dimensions=[[10.0]] ) @@ -52,7 +52,7 @@ component_count=3, data_format="", initialization_value_str="1.23878", - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, output_array_path=nx.DataPath("EulerAngles"), tuple_dimensions=[[10.0]] ) @@ -68,7 +68,7 @@ data_structure=data_structure, calculated_array_path=nx.DataPath("Caclulated_TestArray"), calculator_parameter=calc_param, - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -81,7 +81,7 @@ data_structure=data_structure, calculated_array_path=nx.DataPath("Caclulated_ConfidenceIndex"), calculator_parameter=calc_param, - scalar_type=nx.NumericType.float64 + scalar_type_index=nx.NumericType.float64 ) nxtest.check_filter_result(nx_filter, result) @@ -95,7 +95,7 @@ data_structure=data_structure, calculated_array_path=nx.DataPath("Caclulated_EulerAngles"), calculator_parameter=calc_param, - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -108,7 +108,7 @@ data_structure=data_structure, calculated_array_path=nx.DataPath("Caclulated_EulerAngles2"), calculator_parameter=calc_param, - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/EnsembleInfoReader.py b/wrapping/python/examples/pipelines/Simplnx/EnsembleInfoReader.py index a2eb0fea5c..92aded354c 100644 --- a/wrapping/python/examples/pipelines/Simplnx/EnsembleInfoReader.py +++ b/wrapping/python/examples/pipelines/Simplnx/EnsembleInfoReader.py @@ -30,10 +30,10 @@ result = nx_filter.execute( data_structure=data_structure, created_attribute_array_path=nx.DataPath("[Image Geometry]/Cell Data/Quats"), - endian=0, + endian_index=0, input_file=nxtest.get_data_directory() / "OrientationAnalysis/quats.raw", number_of_components=4, - scalar_type=nx.NumericType.float32, + scalar_type_index=nx.NumericType.float32, skip_header_bytes=0, tuple_dimensions=[[2.0, 100.0, 100.0]] ) @@ -46,9 +46,9 @@ result = nx_filter.execute( data_structure=data_structure, input_orientation_array_path=nx.DataPath("[Image Geometry]/Cell Data/Quats"), - input_type=2, + input_representation_index=2, output_orientation_array_name="Eulers", - output_type=0 + output_representation_index=0 ) nxtest.check_filter_result(nx_filter, result) @@ -63,7 +63,7 @@ component_count=1, data_format="", initialization_value_str="1", - numeric_type=nx.NumericType.int32, + numeric_type_index=nx.NumericType.int32, output_array_path=nx.DataPath("[Image Geometry]/Cell Data/Phases"), tuple_dimensions=[[2.0, 100.0, 100.0]] ) diff --git a/wrapping/python/examples/pipelines/Simplnx/Import_ASCII.py b/wrapping/python/examples/pipelines/Simplnx/Import_ASCII.py index a5471d098f..7d9c1f9d3c 100644 --- a/wrapping/python/examples/pipelines/Simplnx/Import_ASCII.py +++ b/wrapping/python/examples/pipelines/Simplnx/Import_ASCII.py @@ -15,16 +15,16 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_handling=0, + array_handling_index=0, cell_attribute_matrix_name="Cell Data", dimensions=[60, 80, 100], #edge_attribute_matrix_name: str = ..., #edge_list_name: DataPath = ..., #face_attribute_matrix_name: str = ..., output_geometry_path=nx.DataPath("[Image Geometry]"), - geometry_type=0, + geometry_type_index=0, #hexahedral_list_name: DataPath = ..., - length_unit_type=7, + length_unit_index=7, origin=[0, 0, 0], #quadrilateral_list_name: DataPath = ..., spacing=[1, 1, 1], @@ -75,7 +75,7 @@ component_count=1, data_format="", initialization_value_str="1", - numeric_type=nx.NumericType.int32, + numeric_type_index=nx.NumericType.int32, output_array_path=nx.DataPath("[Image Geometry]/Cell Data/Phase") #tuple_dimensions=[] ) @@ -146,7 +146,7 @@ image_array_path=nx.DataPath("[Image Geometry]/Cell Data/IPFColors"), input_image_geometry_path=nx.DataPath("[Image Geometry]"), index_offset=0, - plane=0 + plane_index=0 ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/Import_CSV_Data.py b/wrapping/python/examples/pipelines/Simplnx/Import_CSV_Data.py index 8ea8d9b7f7..4f08004640 100644 --- a/wrapping/python/examples/pipelines/Simplnx/Import_CSV_Data.py +++ b/wrapping/python/examples/pipelines/Simplnx/Import_CSV_Data.py @@ -31,13 +31,13 @@ data_structure=data_structure, set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/ConfidenceIndex.csv", number_comp=1, skip_line_count=0, #n_tuples: List[List[float]] = ..., output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/Confidence Index"), - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -49,13 +49,13 @@ data_structure=data_structure, set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/FeatureIds.csv", number_comp=1, skip_line_count=0, #n_tuples: List[List[float]] = ..., output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/FeatureIds"), - scalar_type=nx.NumericType.int32 + scalar_type_index=nx.NumericType.int32 ) nxtest.check_filter_result(nx_filter, result) @@ -67,13 +67,13 @@ data_structure=data_structure, set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/ImageQuality.csv", number_comp=1, skip_line_count=0, #n_tuples: List[List[float]] = ..., output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/Image Quality"), - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -85,13 +85,13 @@ data_structure=data_structure, set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/IPFColor.csv", number_comp=3, skip_line_count=0, #n_tuples: List[List[float]] = ..., output_data_array_path=nx.DataPath("[Image Geometry]/Cell Data/IPFColors"), - scalar_type=nx.NumericType.uint8 + scalar_type_index=nx.NumericType.uint8 ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/Import_STL_Model.py b/wrapping/python/examples/pipelines/Simplnx/Import_STL_Model.py index 5b1e0e2806..32d20ff656 100644 --- a/wrapping/python/examples/pipelines/Simplnx/Import_STL_Model.py +++ b/wrapping/python/examples/pipelines/Simplnx/Import_STL_Model.py @@ -45,7 +45,7 @@ component_count=1, data_format="", initialization_value_str="0", - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, output_array_path=nx.DataPath("Node Type"), tuple_dimensions=[[1.0]] ) diff --git a/wrapping/python/examples/pipelines/Simplnx/ReplaceElementAttributesWithNeighbor.py b/wrapping/python/examples/pipelines/Simplnx/ReplaceElementAttributesWithNeighbor.py index cea59655f3..b6e20dc22d 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ReplaceElementAttributesWithNeighbor.py +++ b/wrapping/python/examples/pipelines/Simplnx/ReplaceElementAttributesWithNeighbor.py @@ -59,8 +59,8 @@ data_structure=data_structure, remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0.0, 1.0, 0.0, 180], - rotation_representation=0, + rotation_axis_angle=[0.0, 1.0, 0.0, 180], + rotation_representation_index=0, input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) @@ -72,7 +72,7 @@ result = nx_filter.execute( data_structure=data_structure, euler_angles_array_path=nx.DataPath("DataContainer/Cell Data/EulerAngles"), - rotation_axis=[0.0, 0.0, 1.0, 90.0] + rotation_axis_angle=[0.0, 0.0, 1.0, 90.0] ) nxtest.check_filter_result(nx_filter, result) @@ -134,7 +134,7 @@ comparison_data_path=nx.DataPath("DataContainer/Cell Data/Confidence Index"), loop=True, min_confidence=0.1, - selected_comparison=0, + comparison_index=0, input_image_geometry_path=nx.DataPath("DataContainer") ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/ResamplePorosityImage.py b/wrapping/python/examples/pipelines/Simplnx/ResamplePorosityImage.py index 73fc08dcf3..274b4d441c 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ResamplePorosityImage.py +++ b/wrapping/python/examples/pipelines/Simplnx/ResamplePorosityImage.py @@ -31,7 +31,7 @@ cell_attribute_matrix_name="Cell Data", image_data_array_name="ImageData", output_image_geometry_path=nx.DataPath("Porosity_Image"), - image_transform_choice=0, + image_transform_index=0, input_file_list_object =generated_file_list_value, origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0] @@ -51,7 +51,7 @@ new_data_container_path=nx.DataPath("Porosity_Image_Resampled_Spacing"), remove_original_geometry=False, renumber_features=False, - resampling_mode=0, + resampling_mode_index=0, #scaling: List[float] = ..., input_image_geometry_path=nx.DataPath("Porosity_Image"), spacing=[2.0, 2.0, 2.0] @@ -71,7 +71,7 @@ new_data_container_path=nx.DataPath("Porosity_Image_Resampled_Scaled"), remove_original_geometry=False, renumber_features=False, - resampling_mode=1, + resampling_mode_index=1, scaling=[0.5, 0.5, 0.5], input_image_geometry_path=nx.DataPath("Porosity_Image") #spacing: List[float] = ... @@ -92,7 +92,7 @@ new_data_container_path=nx.DataPath("Porosity_Image_Resampled_Exact_Dims"), remove_original_geometry=False, renumber_features=False, - resampling_mode=2, + resampling_mode_index=2, #scaling: List[float] = ..., input_image_geometry_path=nx.DataPath("Porosity_Image") #spacing: List[float] = ... diff --git a/wrapping/python/examples/pipelines/Simplnx/ResampleRectGridToImageGeom.py b/wrapping/python/examples/pipelines/Simplnx/ResampleRectGridToImageGeom.py index 6cbf11dec4..9c4dbbd60c 100644 --- a/wrapping/python/examples/pipelines/Simplnx/ResampleRectGridToImageGeom.py +++ b/wrapping/python/examples/pipelines/Simplnx/ResampleRectGridToImageGeom.py @@ -43,16 +43,16 @@ # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, - array_handling=1, + array_handling_index=1, cell_attribute_matrix_name="CellData", # dimensions: List[int] = ..., # edge_attribute_matrix_name: str = ..., # edge_list_name: DataPath = ..., # face_attribute_matrix_name: str = ..., output_geometry_path=nx.DataPath("RectGridGeometry"), - geometry_type=1, + geometry_type_index=1, # hexahedral_list_name: DataPath = ..., - length_unit_type=7, + length_unit_index=7, # origin: List[float] = ..., # quadrilateral_list_name: DataPath = ..., # spacing: List[float] = ..., @@ -76,13 +76,13 @@ data_structure=data_structure, set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/ConfidenceIndex.csv", number_comp=1, skip_line_count=0, # n_tuples: List[List[float]] = ..., output_data_array_path=nx.DataPath("RectGridGeometry/CellData/ConfidenceIndex"), - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -94,13 +94,13 @@ data_structure=data_structure, set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/ImageQuality.csv", number_comp=1, skip_line_count=0, # n_tuples: List[List[float]] = ..., output_data_array_path=nx.DataPath("RectGridGeometry/CellData/ImageQuality"), - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -113,13 +113,13 @@ data_structure=data_structure, set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/SEM Signal.csv", number_comp=1, skip_line_count=0, # n_tuples: List[List[float]] = ..., output_data_array_path=nx.DataPath("RectGridGeometry/CellData/SEM Signal"), - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -131,13 +131,13 @@ data_structure=data_structure, set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/Fit.csv", number_comp=1, skip_line_count=0, # n_tuples: List[List[float]] = ..., output_data_array_path=nx.DataPath("RectGridGeometry/CellData/Fit"), - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -150,13 +150,13 @@ data_structure=data_structure, set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/EulerAngles.csv", number_comp=3, skip_line_count=0, # n_tuples: List[List[float]] = ..., output_data_array_path=nx.DataPath("RectGridGeometry/CellData/EulerAngles"), - scalar_type=nx.NumericType.float32 + scalar_type_index=nx.NumericType.float32 ) nxtest.check_filter_result(nx_filter, result) @@ -168,13 +168,13 @@ data_structure=data_structure, set_tuple_dimensions=False, data_format="", - delimiter_choice=0, + delimiter_index=0, input_file=nxtest.get_data_directory() / "ASCIIData/Phases.csv", number_comp=1, skip_line_count=0, # n_tuples: List[List[float]] = ..., output_data_array_path=nx.DataPath("RectGridGeometry/CellData/Phases"), - scalar_type=nx.NumericType.int32 + scalar_type_index=nx.NumericType.int32 ) nxtest.check_filter_result(nx_filter, result) diff --git a/wrapping/python/examples/pipelines/Simplnx/SurfaceNets_Demo.py b/wrapping/python/examples/pipelines/Simplnx/SurfaceNets_Demo.py index 12a90c6ef0..2e943b1568 100644 --- a/wrapping/python/examples/pipelines/Simplnx/SurfaceNets_Demo.py +++ b/wrapping/python/examples/pipelines/Simplnx/SurfaceNets_Demo.py @@ -31,7 +31,7 @@ cell_attribute_matrix_name="Optical Data", image_data_array_name="Image Data", output_image_geometry_path=nx.DataPath("RoboMet.3D Image Stack"), - image_transform_choice=0, + image_transform_index=0, input_file_list_object =generated_file_list_value, origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0] diff --git a/wrapping/python/examples/scripts/angle_conversion.py b/wrapping/python/examples/scripts/angle_conversion.py index ff93273c17..33331b09ea 100644 --- a/wrapping/python/examples/scripts/angle_conversion.py +++ b/wrapping/python/examples/scripts/angle_conversion.py @@ -57,7 +57,7 @@ # Create a DataArray to copy the Euler Angles into array_path = nx.DataPath(['Euler Angles']) result = nx.CreateDataArray.execute(data_structure=data_structure, - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, component_count=3, tuple_dimensions=[[99]], output_array_path=array_path, @@ -82,9 +82,9 @@ quat_path = nx.DataPath(['Quaternions']) result = nxor.ConvertOrientations.execute(data_structure=data_structure, input_orientation_array_path=array_path, - input_type=0, + input_representation_index=0, output_orientation_array_name='Quaternions', - output_type=2) + output_representation_index=2) nxtest.check_filter_result(nxor.ConvertOrientations, result) diff --git a/wrapping/python/examples/scripts/basic_arrays.py b/wrapping/python/examples/scripts/basic_arrays.py index ac520b510e..4b987b3479 100644 --- a/wrapping/python/examples/scripts/basic_arrays.py +++ b/wrapping/python/examples/scripts/basic_arrays.py @@ -122,7 +122,7 @@ component_count=1, data_format="", initialization_value_str="10", - numeric_type=array_type, + numeric_type_index=array_type, output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) @@ -145,7 +145,7 @@ component_count=1, data_format="", initialization_value_str="10", - numeric_type=array_type, + numeric_type_index=array_type, output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) @@ -174,7 +174,7 @@ component_count=1, data_format="", initialization_value_str="10", - numeric_type=array_type, + numeric_type_index=array_type, output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) diff --git a/wrapping/python/examples/scripts/basic_ebsd_ipf.py b/wrapping/python/examples/scripts/basic_ebsd_ipf.py index 5b48b78665..a7031db430 100644 --- a/wrapping/python/examples/scripts/basic_ebsd_ipf.py +++ b/wrapping/python/examples/scripts/basic_ebsd_ipf.py @@ -67,7 +67,7 @@ #------------------------------------------------------------------------------ result = nxor.RotateEulerRefFrameFilter.execute(data_structure=data_structure, euler_angles_array_path=nx.DataPath(["Small IN100", "Scan Data", "EulerAngles"]), - rotation_axis=[0,0,1,90]) + rotation_axis_angle=[0,0,1,90]) nxtest.check_filter_result(nxor.RotateEulerRefFrameFilter, result) #------------------------------------------------------------------------------ @@ -77,8 +77,8 @@ # output_image_geometry_path=nx.DataPath(["Small IN100 Rotated"]), remove_original_geometry=True, rotate_slice_by_slice=False, - rotation_axis=[0,1,0,180], - rotation_representation=0, + rotation_axis_angle=[0,1,0,180], + rotation_representation_index=0, input_image_geometry_path=nx.DataPath(["Small IN100"]), #rotation_matrix=[[1,0,0],[0,1,0],[0,0,1]] ) @@ -133,7 +133,7 @@ image_array_path=nx.DataPath(["Small IN100", "Scan Data", "IPFColors"]), input_image_geometry_path=nx.DataPath(["Small IN100"]), index_offset=0, - plane=0) + plane_index=0) nxtest.check_filter_result(nxitk.ITKImageWriter, result) # #------------------------------------------------------------------------------ @@ -171,10 +171,10 @@ cell_euler_angles_array_path=nx.DataPath(["Small IN100", "Scan Data", "EulerAngles"]), cell_phases_array_path=nx.DataPath(["Small IN100", "Scan Data", "Phases"]), crystal_structures_array_path=nx.DataPath(["Small IN100", "Phase Data", "CrystalStructures"]), - generation_algorithm=1, # Discrete = 1 + generation_algorithm_index=1, # Discrete = 1 mask_array_path=nx.DataPath(["Small IN100", "Scan Data", "Mask"]), output_image_geometry_path=nx.DataPath(["Small IN100 Pole Figure"]), - image_layout=0, # O = Horizontal Layout + image_layout_index=0, # O = Horizontal Layout image_prefix=prefix, image_size=512, lambert_size=64, diff --git a/wrapping/python/examples/scripts/basic_numpy.py b/wrapping/python/examples/scripts/basic_numpy.py index 5b55f5dc39..b76f0f240a 100644 --- a/wrapping/python/examples/scripts/basic_numpy.py +++ b/wrapping/python/examples/scripts/basic_numpy.py @@ -57,7 +57,7 @@ array_path = nx.DataPath(['data']) assert nx.CreateDataArray.execute(data_structure, - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, component_count=1, tuple_dimensions=[[3, 2]], output_array_path=array_path, @@ -74,7 +74,7 @@ radians_data = np.radians(degrees_data) # Run a D3D filter to convert back to degrees -result = nx.ChangeAngleRepresentation.execute(data_structure, conversion_type=0, angles_array_path=array_path) +result = nx.ChangeAngleRepresentation.execute(data_structure, conversion_type_index=0, angles_array_path=array_path) nxtest.check_filter_result(nx.ChangeAngleRepresentation, result) # compare the 2 arrays diff --git a/wrapping/python/examples/scripts/generated_file_list.py b/wrapping/python/examples/scripts/generated_file_list.py index b5b70ea56a..28cf251f51 100644 --- a/wrapping/python/examples/scripts/generated_file_list.py +++ b/wrapping/python/examples/scripts/generated_file_list.py @@ -69,7 +69,7 @@ cell_attribute_matrix_name="Cell Data", image_data_array_name="Image Data", output_image_geometry_path=nx.DataPath(["Image Stack"]), - image_transform_choice=0, + image_transform_index=0, input_file_list_object=generated_file_list_value, origin=[0., 0., 0.], spacing=[1., 1.,1.]) diff --git a/wrapping/python/examples/scripts/geometry_examples.py b/wrapping/python/examples/scripts/geometry_examples.py index 697ee861a7..1a2caf7601 100644 --- a/wrapping/python/examples/scripts/geometry_examples.py +++ b/wrapping/python/examples/scripts/geometry_examples.py @@ -58,11 +58,11 @@ data_structure = nx.DataStructure() ig_dims = [10, 20, 30] # NOTE: These are in XYZ order result = nx.CreateGeometryFilter.execute(data_structure=data_structure, - array_handling=0, # This does not matter for Image Geometry + array_handling_index=0, # This does not matter for Image Geometry cell_attribute_matrix_name="Cell Data", dimensions=ig_dims, # Note that the dimensions are list as X, Y, Z output_geometry_path=nx.DataPath("Image Geometry"), - geometry_type=0, # 0 = Image Geometry + geometry_type_index=0, # 0 = Image Geometry origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0]) nxtest.check_filter_result(nx.CreateGeometryFilter, result) @@ -85,7 +85,7 @@ create_array_nx_filter = nx.CreateDataArray() result = create_array_nx_filter.execute(data_structure=data_structure, component_count=1, data_format="", initialization_value_str="10", - numeric_type=array_type, output_array_path=output_array_path) + numeric_type_index=array_type, output_array_path=output_array_path) nxtest.check_filter_result(nx.CreateDataArray, result) @@ -109,7 +109,7 @@ component_count=1, data_format="", initialization_value_str="0", - numeric_type=array_type, + numeric_type_index=array_type, output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) @@ -127,7 +127,7 @@ component_count=1, data_format="", initialization_value_str="0", - numeric_type=array_type, + numeric_type_index=array_type, output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) @@ -145,7 +145,7 @@ component_count=1, data_format="", initialization_value_str="0", - numeric_type=array_type, + numeric_type_index=array_type, output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) @@ -156,10 +156,10 @@ z_coords[:] = np.arange(20, 30, 1) result = nx.CreateGeometryFilter.execute(data_structure=data_structure, - array_handling=1, # Move the arrays from their original location. + array_handling_index=1, # Move the arrays from their original location. cell_attribute_matrix_name="Cell Data", output_geometry_path=nx.DataPath("RectGrid Geometry"), - geometry_type=1, + geometry_type_index=1, x_bounds_path=nx.DataPath("RectGridCoords/X Coords"), y_bounds_path=nx.DataPath("RectGridCoords/Y Coords"), z_bounds_path=nx.DataPath("RectGridCoords/Z Coords") @@ -181,7 +181,7 @@ # ------------------------------------------------------------------------------ array_path = nx.DataPath('Vertices') result = nx.CreateDataArray.execute(data_structure, - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, component_count=3, tuple_dimensions=[[144]], output_array_path=array_path, @@ -196,7 +196,7 @@ array_path = nx.DataPath('Triangles') result = nx.CreateDataArray.execute(data_structure, - numeric_type=nx.NumericType.uint64, + numeric_type_index=nx.NumericType.uint64, component_count=3, tuple_dimensions=[[242]], output_array_path=array_path, @@ -209,9 +209,9 @@ triangles[:] = np.loadtxt(file_path, delimiter=',', skiprows=1) result = nx.CreateGeometryFilter.execute(data_structure=data_structure, - array_handling=1, # Move the arrays from their original location. + array_handling_index=1, # Move the arrays from their original location. output_geometry_path=nx.DataPath("Triangle Geometry"), - geometry_type=4, + geometry_type_index=4, face_attribute_matrix_name="Triangle Data", edge_attribute_matrix_name="Triangle Edge Data", vertex_attribute_matrix_name="Vertex Data", @@ -227,7 +227,7 @@ # ------------------------------------------------------------------------------ array_path = nx.DataPath('Vertices') result = nx.CreateDataArray.execute(data_structure, - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, component_count=3, tuple_dimensions=[[144]], output_array_path=array_path, @@ -242,7 +242,7 @@ array_path = nx.DataPath('Edges') result = nx.CreateDataArray.execute(data_structure, - numeric_type=nx.NumericType.uint64, + numeric_type_index=nx.NumericType.uint64, component_count=2, tuple_dimensions=[[264]], output_array_path=array_path, @@ -256,9 +256,9 @@ edges_view[:] = np.loadtxt(file_path, delimiter=',', skiprows=1) result = nx.CreateGeometryFilter.execute(data_structure=data_structure, - array_handling=1, # Move the arrays from their original location. + array_handling_index=1, # Move the arrays from their original location. output_geometry_path=nx.DataPath("Edge Geometry"), - geometry_type=3, + geometry_type_index=3, edge_attribute_matrix_name="Edge Data", vertex_attribute_matrix_name="Vertex Data", vertex_list_path=nx.DataPath('Vertices'), diff --git a/wrapping/python/examples/scripts/output_file.py b/wrapping/python/examples/scripts/output_file.py index d13f87df63..08fabd4202 100644 --- a/wrapping/python/examples/scripts/output_file.py +++ b/wrapping/python/examples/scripts/output_file.py @@ -60,7 +60,7 @@ tuple_dims = [[3, 2,5]] create_array_nx_filter = nx.CreateDataArray() result = create_array_nx_filter.execute(data_structure=data_structure, component_count=1, data_format="", initialization_value_str="10", - numeric_type=array_type, output_array_path=output_array_path, tuple_dimensions=tuple_dims) + numeric_type_index=array_type, output_array_path=output_array_path, tuple_dimensions=tuple_dims) nxtest.check_filter_result(nx.CreateDataArray, result) diff --git a/wrapping/python/examples/scripts/pipeline.py b/wrapping/python/examples/scripts/pipeline.py index fc15762475..606820d7d7 100644 --- a/wrapping/python/examples/scripts/pipeline.py +++ b/wrapping/python/examples/scripts/pipeline.py @@ -56,8 +56,8 @@ -# pipeline.append(nx.CreateDataArray(), {'numeric_type': nx.NumericType.int32}) -# pipeline[0].set_args({'numeric_type': nx.NumericType.int32}) +# pipeline.append(nx.CreateDataArray(), {'numeric_type_index': nx.NumericType.int32}) +# pipeline[0].set_args({'numeric_type_index': nx.NumericType.int32}) # did_execute = pipeline.execute(data_structure) diff --git a/wrapping/python/plugins/ExamplePlugin/CreateArray.py b/wrapping/python/plugins/ExamplePlugin/CreateArray.py index 8fe0ef299c..c993638ea1 100644 --- a/wrapping/python/plugins/ExamplePlugin/CreateArray.py +++ b/wrapping/python/plugins/ExamplePlugin/CreateArray.py @@ -1,9 +1,9 @@ from typing import List, Union import simplnx as nx -def _convert_str_to_num(init_value: str, numeric_type: nx.NumericType) -> Union[int, float, None]: +def _convert_str_to_num(init_value: str, numeric_type_index: nx.NumericType) -> Union[int, float, None]: try: - if numeric_type == nx.NumericType.float32 or numeric_type == nx.NumericType.float64: + if numeric_type_index == nx.NumericType.float32 or numeric_type_index == nx.NumericType.float64: return float(init_value) else: return int(init_value) @@ -11,7 +11,7 @@ def _convert_str_to_num(init_value: str, numeric_type: nx.NumericType) -> Union[ return None class CreateArrayFilter: - NUMERIC_TYPE_KEY = "numeric_type" + NUMERIC_TYPE_KEY = "numeric_type_index" INITILIZATION_VALUE_KEY = "initialization_value_str" NUM_COMPS_KEY = "component_count" DATA_PATH_KEY = "output_array_path" @@ -50,7 +50,7 @@ def parameters(self) -> nx.Parameters: return params def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.PreflightResult: - numeric_type: nx.NumericType = args[CreateArrayFilter.NUMERIC_TYPE_KEY] + numeric_type_index: nx.NumericType = args[CreateArrayFilter.NUMERIC_TYPE_KEY] init_value: str = args[CreateArrayFilter.INITILIZATION_VALUE_KEY] num_components: int = args[CreateArrayFilter.NUM_COMPS_KEY] data_array_path: nx.DataPath = args[CreateArrayFilter.DATA_PATH_KEY] @@ -59,7 +59,7 @@ def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_h if init_value == '': return nx.IFilter.PreflightResult(errors=[nx.Error(-123, 'Init Value cannot be empty')]) - if _convert_str_to_num(init_value, numeric_type) is None: + if _convert_str_to_num(init_value, numeric_type_index) is None: return nx.IFilter.PreflightResult(errors=[nx.Error(-124, 'Init Value cannot be converted')]) tuple_dims: List[int] = [] @@ -69,18 +69,18 @@ def preflight_impl(self, data_structure: nx.DataStructure, args: dict, message_h tuple_dims.append(int(value)) output_actions = nx.OutputActions() - output_actions.append_action(nx.CreateArrayAction(nx.convert_numeric_type_to_data_type(numeric_type), tuple_dims, [num_components], data_array_path)) + output_actions.append_action(nx.CreateArrayAction(nx.convert_numeric_type_to_data_type(numeric_type_index), tuple_dims, [num_components], data_array_path)) return nx.IFilter.PreflightResult(output_actions=output_actions) def execute_impl(self, data_structure: nx.DataStructure, args: dict, message_handler: nx.IFilter.MessageHandler, should_cancel: nx.AtomicBoolProxy) -> nx.IFilter.ExecuteResult: - numeric_type: nx.NumericType = args[CreateArrayFilter.NUMERIC_TYPE_KEY] + numeric_type_index: nx.NumericType = args[CreateArrayFilter.NUMERIC_TYPE_KEY] init_value: str = args[CreateArrayFilter.INITILIZATION_VALUE_KEY] data_array_path: nx.DataPath = args[CreateArrayFilter.DATA_PATH_KEY] - value = _convert_str_to_num(init_value, numeric_type) + value = _convert_str_to_num(init_value, numeric_type_index) if value is None: - raise RuntimeError(f'Unable to convert init value "{init_value}" to "{numeric_type}"') + raise RuntimeError(f'Unable to convert init value "{init_value}" to "{numeric_type_index}"') data_array = data_structure[data_array_path] data = data_array.store.npview()