Skip to content

Commit

Permalink
Update ChoicesParameters to use _index
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Jackson <[email protected]>
  • Loading branch information
imikejackson committed Apr 18, 2024
1 parent 173e272 commit 417efd4
Show file tree
Hide file tree
Showing 144 changed files with 588 additions and 721 deletions.
8 changes: 4 additions & 4 deletions pipelines/Combo-EBSD-osc_r0c0.d3dpipeline
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -67,7 +67,7 @@
{
"args": {
"euler_angles_array_path": "DataContainer/CellData/EulerAngles",
"rotation_axis": [
"rotation_axis_angle": [
0.0,
0.0,
1.0,
Expand Down Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{
"args": {
"euler_angles_array_path": "DataContainer/Cell Data/EulerAngles",
"rotation_axis": [
"rotation_axis_angle": [
0.0,
0.0,
1.0,
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{
"args": {
"euler_angles_array_path": "DataContainer/Cell Data/EulerAngles",
"rotation_axis": [
"rotation_axis_angle": [
0.0,
0.0,
1.0,
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
[
Expand All @@ -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": {
Expand Down
Loading

0 comments on commit 417efd4

Please sign in to comment.