Skip to content

Commit

Permalink
Updated more parameter constant variable names and values
Browse files Browse the repository at this point in the history
About 75 left to do..

Signed-off-by: Michael Jackson <[email protected]>
  • Loading branch information
imikejackson committed Mar 31, 2024
1 parent 01d57ac commit 32319c9
Show file tree
Hide file tree
Showing 193 changed files with 959 additions and 953 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Parameters ITKApproximateSignedDistanceMapImage::parameters() const

params.insertSeparator(Parameters::Separator{"Created Cell Data"});
params.insert(
std::make_unique<DataObjectNameParameter>(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));
std::make_unique<DataObjectNameParameter>(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));

return params;
}
Expand All @@ -100,7 +100,7 @@ IFilter::PreflightResult ITKApproximateSignedDistanceMapImage::preflightImpl(con
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
auto insideValue = filterArgs.value<float64>(k_InsideValue_Key);
auto outsideValue = filterArgs.value<float64>(k_OutsideValue_Key);
const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName);
Expand All @@ -117,7 +117,7 @@ Result<> ITKApproximateSignedDistanceMapImage::executeImpl(DataStructure& dataSt
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName);

auto insideValue = filterArgs.value<float64>(k_InsideValue_Key);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKApproximateSignedDistanceMapImage : public IF
// Parameter Keys
static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path";
static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path";
static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path";
static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name";
static inline constexpr StringLiteral k_InsideValue_Key = "inside_value";
static inline constexpr StringLiteral k_OutsideValue_Key = "outside_value";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBoundedReciprocalImage : public IFilter
// Parameter Keys
static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path";
static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path";
static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path";
static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name";

/**
* @brief Returns the name of the filter.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Parameters ITKConnectedComponentImage::parameters() const

params.insertSeparator(Parameters::Separator{"Created Cell Data"});
params.insert(
std::make_unique<DataObjectNameParameter>(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));
std::make_unique<DataObjectNameParameter>(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));

return params;
}
Expand All @@ -100,7 +100,7 @@ IFilter::PreflightResult ITKConnectedComponentImage::preflightImpl(const DataStr
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
auto fullyConnected = filterArgs.value<bool>(k_FullyConnected_Key);
const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName);

Expand All @@ -116,7 +116,7 @@ Result<> ITKConnectedComponentImage::executeImpl(DataStructure& dataStructure, c
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName);

auto fullyConnected = filterArgs.value<bool>(k_FullyConnected_Key);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKConnectedComponentImage : public IFilter
// Parameter Keys
static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path";
static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path";
static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path";
static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name";
static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected";
static inline constexpr StringLiteral k_ImageDataPath_Key = "image_data_path";
static inline constexpr StringLiteral k_MaskImage_Key = "mask_image";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Parameters ITKCurvatureAnisotropicDiffusionImage::parameters() const

params.insertSeparator(Parameters::Separator{"Created Cell Data"});
params.insert(
std::make_unique<DataObjectNameParameter>(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));
std::make_unique<DataObjectNameParameter>(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));

return params;
}
Expand All @@ -106,7 +106,7 @@ IFilter::PreflightResult ITKCurvatureAnisotropicDiffusionImage::preflightImpl(co
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
auto timeStep = filterArgs.value<float64>(k_TimeStep_Key);
auto conductanceParameter = filterArgs.value<float64>(k_ConductanceParameter_Key);
auto conductanceScalingUpdateInterval = filterArgs.value<uint32>(k_ConductanceScalingUpdateInterval_Key);
Expand All @@ -124,7 +124,7 @@ Result<> ITKCurvatureAnisotropicDiffusionImage::executeImpl(DataStructure& dataS
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName);

auto timeStep = filterArgs.value<float64>(k_TimeStep_Key);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKCurvatureAnisotropicDiffusionImage : public I
// Parameter Keys
static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path";
static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path";
static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path";
static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name";
static inline constexpr StringLiteral k_TimeStep_Key = "time_step";
static inline constexpr StringLiteral k_ConductanceParameter_Key = "conductance_parameter";
static inline constexpr StringLiteral k_ConductanceScalingUpdateInterval_Key = "conductance_scaling_update_interval";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Parameters ITKCurvatureFlowImage::parameters() const

params.insertSeparator(Parameters::Separator{"Created Cell Data"});
params.insert(
std::make_unique<DataObjectNameParameter>(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));
std::make_unique<DataObjectNameParameter>(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));

return params;
}
Expand All @@ -100,7 +100,7 @@ IFilter::PreflightResult ITKCurvatureFlowImage::preflightImpl(const DataStructur
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
auto timeStep = filterArgs.value<float64>(k_TimeStep_Key);
auto numberOfIterations = filterArgs.value<uint32>(k_NumberOfIterations_Key);
const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName);
Expand All @@ -116,7 +116,7 @@ Result<> ITKCurvatureFlowImage::executeImpl(DataStructure& dataStructure, const
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName);

auto timeStep = filterArgs.value<float64>(k_TimeStep_Key);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKCurvatureFlowImage : public IFilter
// Parameter Keys
static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path";
static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path";
static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path";
static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name";
static inline constexpr StringLiteral k_TimeStep_Key = "time_step";
static inline constexpr StringLiteral k_NumberOfIterations_Key = "number_of_iterations";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Parameters ITKDanielssonDistanceMapImage::parameters() const

params.insertSeparator(Parameters::Separator{"Created Cell Data"});
params.insert(
std::make_unique<DataObjectNameParameter>(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));
std::make_unique<DataObjectNameParameter>(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));

return params;
}
Expand All @@ -107,7 +107,7 @@ IFilter::PreflightResult ITKDanielssonDistanceMapImage::preflightImpl(const Data
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
auto inputIsBinary = filterArgs.value<bool>(k_InputIsBinary_Key);
auto squaredDistance = filterArgs.value<bool>(k_SquaredDistance_Key);
auto useImageSpacing = filterArgs.value<bool>(k_UseImageSpacing_Key);
Expand All @@ -125,7 +125,7 @@ Result<> ITKDanielssonDistanceMapImage::executeImpl(DataStructure& dataStructure
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName);

auto inputIsBinary = filterArgs.value<bool>(k_InputIsBinary_Key);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKDanielssonDistanceMapImage : public IFilter
// Parameter Keys
static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path";
static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path";
static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path";
static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name";
static inline constexpr StringLiteral k_InputIsBinary_Key = "input_is_binary";
static inline constexpr StringLiteral k_SquaredDistance_Key = "squared_distance";
static inline constexpr StringLiteral k_UseImageSpacing_Key = "use_image_spacing";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Parameters ITKDoubleThresholdImage::parameters() const

params.insertSeparator(Parameters::Separator{"Created Cell Data"});
params.insert(
std::make_unique<DataObjectNameParameter>(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));
std::make_unique<DataObjectNameParameter>(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));

return params;
}
Expand All @@ -131,7 +131,7 @@ IFilter::PreflightResult ITKDoubleThresholdImage::preflightImpl(const DataStruct
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
auto threshold1 = filterArgs.value<float64>(k_Threshold1_Key);
auto threshold2 = filterArgs.value<float64>(k_Threshold2_Key);
auto threshold3 = filterArgs.value<float64>(k_Threshold3_Key);
Expand All @@ -153,7 +153,7 @@ Result<> ITKDoubleThresholdImage::executeImpl(DataStructure& dataStructure, cons
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName);

auto threshold1 = filterArgs.value<float64>(k_Threshold1_Key);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKDoubleThresholdImage : public IFilter
// Parameter Keys
static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path";
static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path";
static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path";
static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name";
static inline constexpr StringLiteral k_Threshold1_Key = "threshold1";
static inline constexpr StringLiteral k_Threshold2_Key = "threshold2";
static inline constexpr StringLiteral k_Threshold3_Key = "threshold3";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Parameters ITKGradientAnisotropicDiffusionImage::parameters() const

params.insertSeparator(Parameters::Separator{"Created Cell Data"});
params.insert(
std::make_unique<DataObjectNameParameter>(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));
std::make_unique<DataObjectNameParameter>(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data"));

return params;
}
Expand All @@ -108,7 +108,7 @@ IFilter::PreflightResult ITKGradientAnisotropicDiffusionImage::preflightImpl(con
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
auto timeStep = filterArgs.value<float64>(k_TimeStep_Key);
auto conductanceParameter = filterArgs.value<float64>(k_ConductanceParameter_Key);
auto conductanceScalingUpdateInterval = filterArgs.value<uint32>(k_ConductanceScalingUpdateInterval_Key);
Expand All @@ -126,7 +126,7 @@ Result<> ITKGradientAnisotropicDiffusionImage::executeImpl(DataStructure& dataSt
{
auto imageGeomPath = filterArgs.value<DataPath>(k_SelectedImageGeomPath_Key);
auto selectedInputArray = filterArgs.value<DataPath>(k_SelectedImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageDataPath_Key);
auto outputArrayName = filterArgs.value<DataObjectNameParameter::ValueType>(k_OutputImageArrayName_Key);
const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName);

auto timeStep = filterArgs.value<float64>(k_TimeStep_Key);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientAnisotropicDiffusionImage : public IF
// Parameter Keys
static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path";
static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path";
static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path";
static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name";
static inline constexpr StringLiteral k_TimeStep_Key = "time_step";
static inline constexpr StringLiteral k_ConductanceParameter_Key = "conductance_parameter";
static inline constexpr StringLiteral k_ConductanceScalingUpdateInterval_Key = "conductance_scaling_update_interval";
Expand Down
Loading

0 comments on commit 32319c9

Please sign in to comment.