diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.cpp index bac89c5ddc..158883b5e6 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.cpp @@ -68,14 +68,14 @@ Parameters ITKAbsImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKAbsImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKAbsImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKAbsImage::preflightImpl(const DataStructure& dataStr Result<> ITKAbsImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKAbsImage::ITKAbsImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKAbsImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.hpp index cbc3f055c4..1e41c69aae 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKAbsImage : public IFilter ITKAbsImage& operator=(ITKAbsImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.cpp index 008807804e..3e831e0261 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.cpp @@ -68,14 +68,14 @@ Parameters ITKAcosImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKAcosImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKAcosImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKAcosImage::preflightImpl(const DataStructure& dataSt Result<> ITKAcosImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKAcosImage::ITKAcosImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKAcosImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.hpp index 4ebeabfc7e..f7859ba2b6 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.hpp @@ -48,9 +48,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKAcosImage : public IFilter ITKAcosImage& operator=(ITKAcosImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.cpp index bf61a00da8..1dc6732989 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.cpp @@ -91,14 +91,14 @@ Parameters ITKAdaptiveHistogramEqualizationImage::parameters() const "Set/Get the value of beta. If beta = 1 (and alpha = 1), then the output image matches the input image. As beta approaches 0, the filter behaves as an unsharp mask. Default is 0.3.", 0.3f)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -113,9 +113,9 @@ IFilter::UniquePointer ITKAdaptiveHistogramEqualizationImage::clone() const IFilter::PreflightResult ITKAdaptiveHistogramEqualizationImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto radius = filterArgs.value(k_Radius_Key); auto alpha = filterArgs.value(k_Alpha_Key); @@ -131,9 +131,9 @@ IFilter::PreflightResult ITKAdaptiveHistogramEqualizationImage::preflightImpl(co Result<> ITKAdaptiveHistogramEqualizationImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto radius = filterArgs.value(k_Radius_Key); @@ -171,9 +171,9 @@ Result ITKAdaptiveHistogramEqualizationImage::FromSIMPLJson(const nlo results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_RadiusKey, k_Radius_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_AlphaKey, k_Alpha_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_BetaKey, k_Beta_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp index ab86d66901..0f3e0e5568 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp @@ -44,9 +44,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKAdaptiveHistogramEqualizationImage : public I ITKAdaptiveHistogramEqualizationImage& operator=(ITKAdaptiveHistogramEqualizationImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Radius_Key = "radius"; static inline constexpr StringLiteral k_Alpha_Key = "alpha"; static inline constexpr StringLiteral k_Beta_Key = "beta"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.cpp index 10acb950b2..bf5100c329 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.cpp @@ -68,14 +68,14 @@ Parameters ITKAsinImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKAsinImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKAsinImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKAsinImage::preflightImpl(const DataStructure& dataSt Result<> ITKAsinImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKAsinImage::ITKAsinImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKAsinImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.hpp index 79eb64752d..05a499ea33 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.hpp @@ -48,9 +48,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKAsinImage : public IFilter ITKAsinImage& operator=(ITKAsinImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.cpp index 8887f5c265..2132397842 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.cpp @@ -68,14 +68,14 @@ Parameters ITKAtanImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKAtanImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKAtanImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKAtanImage::preflightImpl(const DataStructure& dataSt Result<> ITKAtanImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKAtanImage::ITKAtanImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKAtanImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.hpp index 4bc85a3740..7d3b649e0d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.hpp @@ -44,9 +44,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKAtanImage : public IFilter ITKAtanImage& operator=(ITKAtanImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.cpp index 0db4f22b1f..693ab9419e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.cpp @@ -83,14 +83,14 @@ Parameters ITKBinaryContourImage::parameters() const params.insert(std::make_unique(k_ForegroundValue_Key, "ForegroundValue", "Set/Get the foreground value used to identify the objects in the input and output images.", 1.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKBinaryContourImage::clone() const IFilter::PreflightResult ITKBinaryContourImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); auto foregroundValue = filterArgs.value(k_ForegroundValue_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKBinaryContourImage::preflightImpl(const DataStructur Result<> ITKBinaryContourImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -160,9 +160,9 @@ Result ITKBinaryContourImage::FromSIMPLJson(const nlohmann::json& jso results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ForegroundValueKey, k_ForegroundValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.hpp index f5295e2b4a..5e7e0afb4b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.hpp @@ -39,9 +39,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryContourImage : public IFilter ITKBinaryContourImage& operator=(ITKBinaryContourImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.cpp index a30ba832ba..b72afd8a42 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.cpp @@ -90,14 +90,14 @@ Parameters ITKBinaryDilateImage::parameters() const params.insert(std::make_unique(k_BoundaryToForeground_Key, "BoundaryToForeground", "Mark the boundary between foreground and background.", false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -112,9 +112,9 @@ IFilter::UniquePointer ITKBinaryDilateImage::clone() const IFilter::PreflightResult ITKBinaryDilateImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); @@ -131,9 +131,9 @@ IFilter::PreflightResult ITKBinaryDilateImage::preflightImpl(const DataStructure Result<> ITKBinaryDilateImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -175,9 +175,9 @@ Result ITKBinaryDilateImage::FromSIMPLJson(const nlohmann::json& json results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ForegroundValueKey, k_ForegroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BoundaryToForegroundKey, k_BoundaryToForeground_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp index 0d38838331..5b3e2a9399 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp @@ -48,9 +48,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryDilateImage : public IFilter ITKBinaryDilateImage& operator=(ITKBinaryDilateImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.cpp index 23c8a5d886..c897837c62 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.cpp @@ -90,14 +90,14 @@ Parameters ITKBinaryErodeImage::parameters() const params.insert(std::make_unique(k_BoundaryToForeground_Key, "BoundaryToForeground", "Mark the boundary between foreground and background.", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -112,9 +112,9 @@ IFilter::UniquePointer ITKBinaryErodeImage::clone() const IFilter::PreflightResult ITKBinaryErodeImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); @@ -131,9 +131,9 @@ IFilter::PreflightResult ITKBinaryErodeImage::preflightImpl(const DataStructure& Result<> ITKBinaryErodeImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -175,9 +175,9 @@ Result ITKBinaryErodeImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ForegroundValueKey, k_ForegroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BoundaryToForegroundKey, k_BoundaryToForeground_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp index e9359caeda..445774943a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp @@ -48,9 +48,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryErodeImage : public IFilter ITKBinaryErodeImage& operator=(ITKBinaryErodeImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.cpp index 6d9b5bd3b4..55adba4722 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.cpp @@ -86,14 +86,14 @@ Parameters ITKBinaryMorphologicalClosingImage::parameters() const params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -108,9 +108,9 @@ IFilter::UniquePointer ITKBinaryMorphologicalClosingImage::clone() const IFilter::PreflightResult ITKBinaryMorphologicalClosingImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto foregroundValue = filterArgs.value(k_ForegroundValue_Key); @@ -126,9 +126,9 @@ IFilter::PreflightResult ITKBinaryMorphologicalClosingImage::preflightImpl(const Result<> ITKBinaryMorphologicalClosingImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp index b6a305cdca..1782889902 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp @@ -39,9 +39,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryMorphologicalClosingImage : public IFil ITKBinaryMorphologicalClosingImage& operator=(ITKBinaryMorphologicalClosingImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.cpp index 913b01d7e0..e0d758c465 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.cpp @@ -86,14 +86,14 @@ Parameters ITKBinaryMorphologicalOpeningImage::parameters() const params.insert(std::make_unique(k_ForegroundValue_Key, "ForegroundValue", "Set the value in the image to consider as 'foreground'. Defaults to maximum value of PixelType.", 1.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -108,9 +108,9 @@ IFilter::UniquePointer ITKBinaryMorphologicalOpeningImage::clone() const IFilter::PreflightResult ITKBinaryMorphologicalOpeningImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); @@ -126,9 +126,9 @@ IFilter::PreflightResult ITKBinaryMorphologicalOpeningImage::preflightImpl(const Result<> ITKBinaryMorphologicalOpeningImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -167,9 +167,9 @@ Result ITKBinaryMorphologicalOpeningImage::FromSIMPLJson(const nlohma results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ForegroundValueKey, k_ForegroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp index efad2f5d01..82551c1cf0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp @@ -39,9 +39,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryMorphologicalOpeningImage : public IFil ITKBinaryMorphologicalOpeningImage& operator=(ITKBinaryMorphologicalOpeningImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.cpp index 72d9fe711b..b3e89e23cb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.cpp @@ -93,14 +93,14 @@ Parameters ITKBinaryOpeningByReconstructionImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -115,9 +115,9 @@ IFilter::UniquePointer ITKBinaryOpeningByReconstructionImage::clone() const IFilter::PreflightResult ITKBinaryOpeningByReconstructionImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto foregroundValue = filterArgs.value(k_ForegroundValue_Key); @@ -134,9 +134,9 @@ IFilter::PreflightResult ITKBinaryOpeningByReconstructionImage::preflightImpl(co Result<> ITKBinaryOpeningByReconstructionImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -178,9 +178,9 @@ Result ITKBinaryOpeningByReconstructionImage::FromSIMPLJson(const nlo results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp index 29d1587b9f..0ec2765add 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp @@ -38,9 +38,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryOpeningByReconstructionImage : public I ITKBinaryOpeningByReconstructionImage& operator=(ITKBinaryOpeningByReconstructionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.cpp index 11ea213a2e..ab69551806 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.cpp @@ -84,14 +84,14 @@ Parameters ITKBinaryProjectionImage::parameters() const 0.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -106,9 +106,9 @@ IFilter::UniquePointer ITKBinaryProjectionImage::clone() const IFilter::PreflightResult ITKBinaryProjectionImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto projectionDimension = filterArgs.value(k_ProjectionDimension_Key); auto foregroundValue = filterArgs.value(k_ForegroundValue_Key); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); @@ -123,9 +123,9 @@ IFilter::PreflightResult ITKBinaryProjectionImage::preflightImpl(const DataStruc Result<> ITKBinaryProjectionImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto projectionDimension = filterArgs.value(k_ProjectionDimension_Key); @@ -161,9 +161,9 @@ Result ITKBinaryProjectionImage::FromSIMPLJson(const nlohmann::json& results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_ProjectionDimensionKey, k_ProjectionDimension_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ForegroundValueKey, k_ForegroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp index 4d81e22340..b5393eaa3d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp @@ -55,9 +55,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryProjectionImage : public IFilter ITKBinaryProjectionImage& operator=(ITKBinaryProjectionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_ProjectionDimension_Key = "projection_dimension"; static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.cpp index 6feffc7cc5..0b59852a2f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.cpp @@ -67,14 +67,14 @@ Parameters ITKBinaryThinningImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKBinaryThinningImage::clone() const IFilter::PreflightResult ITKBinaryThinningImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKBinaryThinningImage::preflightImpl(const DataStructu Result<> ITKBinaryThinningImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKBinaryThinningImage::ITKBinaryThinningImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKBinaryThinningImage::FromSIMPLJson(const nlohmann::json& js std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp index b68a579d21..f3e06d7d44 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp @@ -41,9 +41,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryThinningImage : public IFilter ITKBinaryThinningImage& operator=(ITKBinaryThinningImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.cpp index 43092faac4..9903d85e53 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.cpp @@ -84,14 +84,14 @@ Parameters ITKBinaryThresholdImage::parameters() const params.insert(std::make_unique(k_OutsideValue_Key, "OutsideValue", "Set the 'outside' pixel value. The default value NumericTraits::ZeroValue() .", 0u)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -106,9 +106,9 @@ IFilter::UniquePointer ITKBinaryThresholdImage::clone() const IFilter::PreflightResult ITKBinaryThresholdImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto lowerThreshold = filterArgs.value(k_LowerThreshold_Key); auto upperThreshold = filterArgs.value(k_UpperThreshold_Key); auto insideValue = filterArgs.value(k_InsideValue_Key); @@ -125,9 +125,9 @@ IFilter::PreflightResult ITKBinaryThresholdImage::preflightImpl(const DataStruct Result<> ITKBinaryThresholdImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto lowerThreshold = filterArgs.value(k_LowerThreshold_Key); @@ -167,9 +167,9 @@ Result ITKBinaryThresholdImage::FromSIMPLJson(const nlohmann::json& j results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UpperThresholdKey, k_UpperThreshold_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_InsideValueKey, k_InsideValue_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_OutsideValueKey, k_OutsideValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp index 9d8b72023f..39eddb82f6 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp @@ -39,9 +39,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryThresholdImage : public IFilter ITKBinaryThresholdImage& operator=(ITKBinaryThresholdImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_LowerThreshold_Key = "lower_threshold"; static inline constexpr StringLiteral k_UpperThreshold_Key = "upper_threshold"; static inline constexpr StringLiteral k_InsideValue_Key = "inside_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.cpp index a5338f56d7..697011a815 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.cpp @@ -83,14 +83,14 @@ Parameters ITKBlackTopHatImage::parameters() const params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKBlackTopHatImage::clone() const IFilter::PreflightResult ITKBlackTopHatImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto safeBorder = filterArgs.value(k_SafeBorder_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKBlackTopHatImage::preflightImpl(const DataStructure& Result<> ITKBlackTopHatImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -160,9 +160,9 @@ Result ITKBlackTopHatImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SafeBorderKey, k_SafeBorder_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp index cd70055a2a..4aca14487c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp @@ -34,9 +34,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKBlackTopHatImage : public IFilter ITKBlackTopHatImage& operator=(ITKBlackTopHatImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.cpp index 30f6cabb6b..6817a1cfc1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.cpp @@ -91,14 +91,14 @@ Parameters ITKClosingByReconstructionImage::parameters() const "Set/Get whether the original intensities of the image retained for those pixels unaffected by the opening by reconstruction. If Off, the output pixel contrast will be reduced.", false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -113,9 +113,9 @@ IFilter::UniquePointer ITKClosingByReconstructionImage::clone() const IFilter::PreflightResult ITKClosingByReconstructionImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -131,9 +131,9 @@ IFilter::PreflightResult ITKClosingByReconstructionImage::preflightImpl(const Da Result<> ITKClosingByReconstructionImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -172,9 +172,9 @@ Result ITKClosingByReconstructionImage::FromSIMPLJson(const nlohmann: results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_PreserveIntensitiesKey, k_PreserveIntensities_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp index f3f4a5d4bb..30e27d8201 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp @@ -43,9 +43,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKClosingByReconstructionImage : public IFilter ITKClosingByReconstructionImage& operator=(ITKClosingByReconstructionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.cpp index 521481648c..880329ed7d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.cpp @@ -68,14 +68,14 @@ Parameters ITKCosImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKCosImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKCosImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKCosImage::preflightImpl(const DataStructure& dataStr Result<> ITKCosImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKCosImage::ITKCosImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKCosImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.hpp index db4dc5f98e..002c1bcc30 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.hpp @@ -48,9 +48,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKCosImage : public IFilter ITKCosImage& operator=(ITKCosImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.cpp index 8884a0895e..6684b56bc2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.cpp @@ -83,14 +83,14 @@ Parameters ITKDilateObjectMorphologyImage::parameters() const params.insert(std::make_unique(k_ObjectValue_Key, "ObjectValue", "The pixel value of the 'Object' to be dilated", 1)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKDilateObjectMorphologyImage::clone() const IFilter::PreflightResult ITKDilateObjectMorphologyImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto objectValue = filterArgs.value(k_ObjectValue_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKDilateObjectMorphologyImage::preflightImpl(const Dat Result<> ITKDilateObjectMorphologyImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -160,9 +160,9 @@ Result ITKDilateObjectMorphologyImage::FromSIMPLJson(const nlohmann:: results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ObjectValueKey, k_ObjectValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp index 94cfbc481f..d7709956cc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp @@ -38,9 +38,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKDilateObjectMorphologyImage : public IFilter ITKDilateObjectMorphologyImage& operator=(ITKDilateObjectMorphologyImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_ObjectValue_Key = "object_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.cpp index 147aa82de1..be902af9a0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.cpp @@ -94,14 +94,14 @@ Parameters ITKDiscreteGaussianImage::parameters() const true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -116,9 +116,9 @@ IFilter::UniquePointer ITKDiscreteGaussianImage::clone() const IFilter::PreflightResult ITKDiscreteGaussianImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto variance = filterArgs.value(k_Variance_Key); auto maximumKernelWidth = filterArgs.value(k_MaximumKernelWidth_Key); @@ -136,9 +136,9 @@ IFilter::PreflightResult ITKDiscreteGaussianImage::preflightImpl(const DataStruc Result<> ITKDiscreteGaussianImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto variance = filterArgs.value(k_Variance_Key); @@ -179,9 +179,9 @@ Result ITKDiscreteGaussianImage::FromSIMPLJson(const nlohmann::json& results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_MaximumKernelWidthKey, k_MaximumKernelWidth_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaximumErrorKey, k_MaximumError_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseImageSpacingKey, k_UseImageSpacing_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.hpp index bf5e92e49f..fe992beee0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.hpp @@ -49,9 +49,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKDiscreteGaussianImage : public IFilter ITKDiscreteGaussianImage& operator=(ITKDiscreteGaussianImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Variance_Key = "variance"; static inline constexpr StringLiteral k_MaximumKernelWidth_Key = "maximum_kernel_width"; static inline constexpr StringLiteral k_MaximumError_Key = "maximum_error"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.cpp index b7e06c3e92..992400c680 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.cpp @@ -86,14 +86,14 @@ Parameters ITKErodeObjectMorphologyImage::parameters() const params.insert(std::make_unique(k_BackgroundValue_Key, "BackgroundValue", "Set the value to be assigned to eroded pixels", 0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -108,9 +108,9 @@ IFilter::UniquePointer ITKErodeObjectMorphologyImage::clone() const IFilter::PreflightResult ITKErodeObjectMorphologyImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto objectValue = filterArgs.value(k_ObjectValue_Key); @@ -126,9 +126,9 @@ IFilter::PreflightResult ITKErodeObjectMorphologyImage::preflightImpl(const Data Result<> ITKErodeObjectMorphologyImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -167,9 +167,9 @@ Result ITKErodeObjectMorphologyImage::FromSIMPLJson(const nlohmann::j results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ObjectValueKey, k_ObjectValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp index 487d92b48a..f9dbf0bf5f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp @@ -38,9 +38,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKErodeObjectMorphologyImage : public IFilter ITKErodeObjectMorphologyImage& operator=(ITKErodeObjectMorphologyImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_ObjectValue_Key = "object_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.cpp index 02562f098b..101e6a1e14 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.cpp @@ -68,14 +68,14 @@ Parameters ITKExpImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKExpImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKExpImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKExpImage::preflightImpl(const DataStructure& dataStr Result<> ITKExpImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKExpImage::ITKExpImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKExpImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.hpp index ed47035824..b6b5c25da3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKExpImage : public IFilter ITKExpImage& operator=(ITKExpImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.cpp index 8c47a66ffa..2554fa3e85 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.cpp @@ -68,14 +68,14 @@ Parameters ITKExpNegativeImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -90,9 +90,9 @@ IFilter::UniquePointer ITKExpNegativeImage::clone() const IFilter::PreflightResult ITKExpNegativeImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -104,9 +104,9 @@ IFilter::PreflightResult ITKExpNegativeImage::preflightImpl(const DataStructure& Result<> ITKExpNegativeImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKExpNegativeImage::ITKExpNegativeImageFunctor itkFunctor = {}; @@ -132,9 +132,9 @@ Result ITKExpNegativeImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.hpp index 195f75e578..8547000391 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKExpNegativeImage : public IFilter ITKExpNegativeImage& operator=(ITKExpNegativeImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.cpp index 4269dc837e..c9c1c3ffb5 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.cpp @@ -78,14 +78,14 @@ Parameters ITKGradientMagnitudeImage::parameters() const true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -100,9 +100,9 @@ IFilter::UniquePointer ITKGradientMagnitudeImage::clone() const IFilter::PreflightResult ITKGradientMagnitudeImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto useImageSpacing = filterArgs.value(k_UseImageSpacing_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -116,9 +116,9 @@ IFilter::PreflightResult ITKGradientMagnitudeImage::preflightImpl(const DataStru Result<> ITKGradientMagnitudeImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto useImageSpacing = filterArgs.value(k_UseImageSpacing_Key); @@ -149,9 +149,9 @@ Result ITKGradientMagnitudeImage::FromSIMPLJson(const nlohmann::json& std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseImageSpacingKey, k_UseImageSpacing_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp index e616b4f443..891cb14836 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp @@ -38,9 +38,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientMagnitudeImage : public IFilter ITKGradientMagnitudeImage& operator=(ITKGradientMagnitudeImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_UseImageSpacing_Key = "use_image_spacing"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.cpp index 44b6c0e43a..66afb08f1f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.cpp @@ -88,12 +88,12 @@ Parameters ITKGradientMagnitudeRecursiveGaussianImage::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath{}, + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, ArraySelectionParameter::AllowedTypes{})); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); params.insert(std::make_unique(k_Sigma_Key, "Sigma", "", 1.0)); params.insert(std::make_unique(k_NormalizeAcrossScale_Key, "NormalizeAcrossScale", "", false)); @@ -121,7 +121,7 @@ IFilter::PreflightResult ITKGradientMagnitudeRecursiveGaussianImage::preflightIm */ auto pImageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto pSelectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto pOutputArrayPath = filterArgs.value(k_OutputImageDataPath_Key); + auto pOutputArrayPath = filterArgs.value(k_OutputImageArrayName_Key); auto pSigma = filterArgs.value(k_Sigma_Key); auto pNormalizeAcrossScale = filterArgs.value(k_NormalizeAcrossScale_Key); @@ -162,7 +162,7 @@ Result<> ITKGradientMagnitudeRecursiveGaussianImage::executeImpl(DataStructure& ***************************************************************************/ auto pImageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); auto pSelectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto pOutputArrayPath = filterArgs.value(k_OutputImageDataPath_Key); + auto pOutputArrayPath = filterArgs.value(k_OutputImageArrayName_Key); auto pSigma = filterArgs.value(k_Sigma_Key); auto pNormalizeAcrossScale = filterArgs.value(k_NormalizeAcrossScale_Key); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.hpp index db8592413b..8eb0b3818c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientMagnitudeRecursiveGaussianImage : pub ITKGradientMagnitudeRecursiveGaussianImage& operator=(ITKGradientMagnitudeRecursiveGaussianImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Sigma_Key = "sigma"; static inline constexpr StringLiteral k_NormalizeAcrossScale_Key = "normalize_across_scale"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.cpp index a92d536baf..02bdbefba1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.cpp @@ -79,14 +79,14 @@ Parameters ITKGrayscaleDilateImage::parameters() const ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -101,9 +101,9 @@ IFilter::UniquePointer ITKGrayscaleDilateImage::clone() const IFilter::PreflightResult ITKGrayscaleDilateImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -117,9 +117,9 @@ IFilter::PreflightResult ITKGrayscaleDilateImage::preflightImpl(const DataStruct Result<> ITKGrayscaleDilateImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -152,9 +152,9 @@ Result ITKGrayscaleDilateImage::FromSIMPLJson(const nlohmann::json& j results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp index 725bdb3779..54b3d08a8b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp @@ -33,9 +33,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleDilateImage : public IFilter ITKGrayscaleDilateImage& operator=(ITKGrayscaleDilateImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.cpp index 12844c3fa5..c010786af3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.cpp @@ -79,14 +79,14 @@ Parameters ITKGrayscaleErodeImage::parameters() const ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -101,9 +101,9 @@ IFilter::UniquePointer ITKGrayscaleErodeImage::clone() const IFilter::PreflightResult ITKGrayscaleErodeImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -117,9 +117,9 @@ IFilter::PreflightResult ITKGrayscaleErodeImage::preflightImpl(const DataStructu Result<> ITKGrayscaleErodeImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -152,9 +152,9 @@ Result ITKGrayscaleErodeImage::FromSIMPLJson(const nlohmann::json& js results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp index 8fcdcbbf66..ebb3666a8d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp @@ -33,9 +33,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleErodeImage : public IFilter ITKGrayscaleErodeImage& operator=(ITKGrayscaleErodeImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.cpp index 17f39548e5..82b422cc29 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.cpp @@ -76,14 +76,14 @@ Parameters ITKGrayscaleFillholeImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -98,9 +98,9 @@ IFilter::UniquePointer ITKGrayscaleFillholeImage::clone() const IFilter::PreflightResult ITKGrayscaleFillholeImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -113,9 +113,9 @@ IFilter::PreflightResult ITKGrayscaleFillholeImage::preflightImpl(const DataStru Result<> ITKGrayscaleFillholeImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -145,9 +145,9 @@ Result ITKGrayscaleFillholeImage::FromSIMPLJson(const nlohmann::json& std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp index 77a9ff9098..85680fcec9 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp @@ -44,9 +44,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleFillholeImage : public IFilter ITKGrayscaleFillholeImage& operator=(ITKGrayscaleFillholeImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.cpp index 45ef97057d..aadfbb8a89 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.cpp @@ -76,14 +76,14 @@ Parameters ITKGrayscaleGrindPeakImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -98,9 +98,9 @@ IFilter::UniquePointer ITKGrayscaleGrindPeakImage::clone() const IFilter::PreflightResult ITKGrayscaleGrindPeakImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -113,9 +113,9 @@ IFilter::PreflightResult ITKGrayscaleGrindPeakImage::preflightImpl(const DataStr Result<> ITKGrayscaleGrindPeakImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -145,9 +145,9 @@ Result ITKGrayscaleGrindPeakImage::FromSIMPLJson(const nlohmann::json std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp index ef280dbce7..a913b0a9c8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp @@ -46,9 +46,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleGrindPeakImage : public IFilter ITKGrayscaleGrindPeakImage& operator=(ITKGrayscaleGrindPeakImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.cpp index 974153dd2f..bea6f8b252 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.cpp @@ -83,14 +83,14 @@ Parameters ITKGrayscaleMorphologicalClosingImage::parameters() const params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKGrayscaleMorphologicalClosingImage::clone() const IFilter::PreflightResult ITKGrayscaleMorphologicalClosingImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto safeBorder = filterArgs.value(k_SafeBorder_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKGrayscaleMorphologicalClosingImage::preflightImpl(co Result<> ITKGrayscaleMorphologicalClosingImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -160,9 +160,9 @@ Result ITKGrayscaleMorphologicalClosingImage::FromSIMPLJson(const nlo results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SafeBorderKey, k_SafeBorder_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp index c28c3de9a1..c7739d1229 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp @@ -33,9 +33,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleMorphologicalClosingImage : public I ITKGrayscaleMorphologicalClosingImage& operator=(ITKGrayscaleMorphologicalClosingImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.cpp index 87e18906e1..8993939c1c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.cpp @@ -83,14 +83,14 @@ Parameters ITKGrayscaleMorphologicalOpeningImage::parameters() const params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKGrayscaleMorphologicalOpeningImage::clone() const IFilter::PreflightResult ITKGrayscaleMorphologicalOpeningImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto safeBorder = filterArgs.value(k_SafeBorder_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKGrayscaleMorphologicalOpeningImage::preflightImpl(co Result<> ITKGrayscaleMorphologicalOpeningImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -160,9 +160,9 @@ Result ITKGrayscaleMorphologicalOpeningImage::FromSIMPLJson(const nlo results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SafeBorderKey, k_SafeBorder_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp index 29d1e04c4e..f7dc80cdda 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp @@ -33,9 +33,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleMorphologicalOpeningImage : public I ITKGrayscaleMorphologicalOpeningImage& operator=(ITKGrayscaleMorphologicalOpeningImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.cpp index 4d221ac313..4733a71e5b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.cpp @@ -83,14 +83,14 @@ Parameters ITKHConvexImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKHConvexImage::clone() const IFilter::PreflightResult ITKHConvexImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto height = filterArgs.value(k_Height_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -121,9 +121,9 @@ IFilter::PreflightResult ITKHConvexImage::preflightImpl(const DataStructure& dat Result<> ITKHConvexImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto height = filterArgs.value(k_Height_Key); @@ -156,9 +156,9 @@ Result ITKHConvexImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_HeightKey, k_Height_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.hpp index 72224f4212..6e93b311ce 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.hpp @@ -40,9 +40,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKHConvexImage : public IFilter ITKHConvexImage& operator=(ITKHConvexImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Height_Key = "height"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.cpp index 91d7125e84..21296bfb69 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.cpp @@ -76,14 +76,14 @@ Parameters ITKHMaximaImage::parameters() const 2.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -98,9 +98,9 @@ IFilter::UniquePointer ITKHMaximaImage::clone() const IFilter::PreflightResult ITKHMaximaImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto height = filterArgs.value(k_Height_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -113,9 +113,9 @@ IFilter::PreflightResult ITKHMaximaImage::preflightImpl(const DataStructure& dat Result<> ITKHMaximaImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto height = filterArgs.value(k_Height_Key); @@ -145,9 +145,9 @@ Result ITKHMaximaImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_HeightKey, k_Height_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.hpp index cd296e8bc7..6aa4db1ff1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.hpp @@ -46,9 +46,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKHMaximaImage : public IFilter ITKHMaximaImage& operator=(ITKHMaximaImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Height_Key = "height"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.cpp index f2b633a120..41c82bbad5 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.cpp @@ -83,14 +83,14 @@ Parameters ITKHMinimaImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKHMinimaImage::clone() const IFilter::PreflightResult ITKHMinimaImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto height = filterArgs.value(k_Height_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -121,9 +121,9 @@ IFilter::PreflightResult ITKHMinimaImage::preflightImpl(const DataStructure& dat Result<> ITKHMinimaImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto height = filterArgs.value(k_Height_Key); @@ -156,9 +156,9 @@ Result ITKHMinimaImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_HeightKey, k_Height_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.hpp index 05e8fcadf4..32995fd477 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.hpp @@ -43,9 +43,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKHMinimaImage : public IFilter ITKHMinimaImage& operator=(ITKHMinimaImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Height_Key = "height"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.cpp index 4138659961..859af5b9fa 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.cpp @@ -82,14 +82,14 @@ Parameters ITKIntensityWindowingImage::parameters() const params.insert(std::make_unique(k_OutputMaximum_Key, "OutputMaximum", "Set/Get the values of the maximum and minimum intensities of the output image.", 255.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -104,9 +104,9 @@ IFilter::UniquePointer ITKIntensityWindowingImage::clone() const IFilter::PreflightResult ITKIntensityWindowingImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto windowMinimum = filterArgs.value(k_WindowMinimum_Key); auto windowMaximum = filterArgs.value(k_WindowMaximum_Key); auto outputMinimum = filterArgs.value(k_OutputMinimum_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKIntensityWindowingImage::preflightImpl(const DataStr Result<> ITKIntensityWindowingImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto windowMinimum = filterArgs.value(k_WindowMinimum_Key); @@ -163,9 +163,9 @@ Result ITKIntensityWindowingImage::FromSIMPLJson(const nlohmann::json results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_WindowMaximumKey, k_WindowMaximum_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputMinimumKey, k_OutputMinimum_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputMaximumKey, k_OutputMaximum_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp index b218dc653d..22b87b5400 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp @@ -36,9 +36,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKIntensityWindowingImage : public IFilter ITKIntensityWindowingImage& operator=(ITKIntensityWindowingImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_WindowMinimum_Key = "window_minimum"; static inline constexpr StringLiteral k_WindowMaximum_Key = "window_maximum"; static inline constexpr StringLiteral k_OutputMinimum_Key = "output_minimum"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.cpp index f7df59b115..34b36237a2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.cpp @@ -74,14 +74,14 @@ Parameters ITKInvertIntensityImage::parameters() const params.insert(std::make_unique(k_Maximum_Key, "Maximum", "Set/Get the maximum intensity value for the inversion.", 255)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -96,9 +96,9 @@ IFilter::UniquePointer ITKInvertIntensityImage::clone() const IFilter::PreflightResult ITKInvertIntensityImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto maximum = filterArgs.value(k_Maximum_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -111,9 +111,9 @@ IFilter::PreflightResult ITKInvertIntensityImage::preflightImpl(const DataStruct Result<> ITKInvertIntensityImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto maximum = filterArgs.value(k_Maximum_Key); @@ -143,9 +143,9 @@ Result ITKInvertIntensityImage::FromSIMPLJson(const nlohmann::json& j std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaximumKey, k_Maximum_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp index 1481222e63..e0dd97a4ae 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp @@ -35,9 +35,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKInvertIntensityImage : public IFilter ITKInvertIntensityImage& operator=(ITKInvertIntensityImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Maximum_Key = "maximum"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.cpp index 9730bb6549..c360df9634 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.cpp @@ -81,14 +81,14 @@ Parameters ITKLabelContourImage::parameters() const "Set/Get the background value used to identify the objects and mark the pixels not on the border of the objects.", 0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -103,9 +103,9 @@ IFilter::UniquePointer ITKLabelContourImage::clone() const IFilter::PreflightResult ITKLabelContourImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); auto backgroundValue = filterArgs.value(k_BackgroundValue_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -119,9 +119,9 @@ IFilter::PreflightResult ITKLabelContourImage::preflightImpl(const DataStructure Result<> ITKLabelContourImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -154,9 +154,9 @@ Result ITKLabelContourImage::FromSIMPLJson(const nlohmann::json& json results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.hpp index c0d1c3236a..5f91400b93 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.hpp @@ -39,9 +39,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKLabelContourImage : public IFilter ITKLabelContourImage& operator=(ITKLabelContourImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.cpp index f14cec8577..e637646450 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.cpp @@ -68,14 +68,14 @@ Parameters ITKLog10Image::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKLog10Image::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKLog10Image::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKLog10Image::preflightImpl(const DataStructure& dataS Result<> ITKLog10Image::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKLog10Image::ITKLog10ImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKLog10Image::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.hpp index 7890e90c9f..c300c84a12 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKLog10Image : public IFilter ITKLog10Image& operator=(ITKLog10Image&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.cpp index 7668e7977b..4710381291 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.cpp @@ -68,14 +68,14 @@ Parameters ITKLogImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKLogImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKLogImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKLogImage::preflightImpl(const DataStructure& dataStr Result<> ITKLogImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKLogImage::ITKLogImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKLogImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.hpp index 6d959e9b93..608f287f4e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKLogImage : public IFilter ITKLogImage& operator=(ITKLogImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.cpp index 0e958e7bbe..70c4594eca 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.cpp @@ -148,16 +148,16 @@ Parameters ITKMaskImage::parameters() const params.insert(std::make_unique(k_OutsideValue_Key, "OutsideValue", "Method to explicitly set the outside value of the mask.", 0)); params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath{}, + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - nx::core::GetAllDataTypes())); + params.insert( + std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::GetAllDataTypes())); params.insert(std::make_unique(k_MaskImageDataPath_Key, "MaskImage", "The path to the image data to be used as the mask (should be the same size as the input image)", DataPath{}, nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -171,9 +171,9 @@ IFilter::UniquePointer ITKMaskImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKMaskImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto outsideValue = filterArgs.value(k_OutsideValue_Key); auto maskArrayPath = filterArgs.value(k_MaskImageDataPath_Key); @@ -194,9 +194,9 @@ IFilter::PreflightResult ITKMaskImage::preflightImpl(const DataStructure& dataSt Result<> ITKMaskImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto outsideValue = filterArgs.value(k_OutsideValue_Key); auto maskArrayPath = filterArgs.value(k_MaskImageDataPath_Key); @@ -231,10 +231,10 @@ Result ITKMaskImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutsideValueKey, k_OutsideValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskCellArrayPathKey, k_MaskImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.hpp index c584bda85e..6314422b94 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.hpp @@ -52,9 +52,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKMaskImage : public IFilter ITKMaskImage& operator=(ITKMaskImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_OutsideValue_Key = "outside_value"; static inline constexpr StringLiteral k_MaskImageDataPath_Key = "mask_image_data_path"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.cpp index 503b11c87b..49b58c36ec 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.cpp @@ -81,14 +81,14 @@ Parameters ITKMedianImage::parameters() const params.insert(std::make_unique(k_Radius_Key, "Radius", "Radius Dimensions XYZ", std::vector(3, 1), std::vector{"X", "Y", "Z"})); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -103,9 +103,9 @@ IFilter::UniquePointer ITKMedianImage::clone() const IFilter::PreflightResult ITKMedianImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto radius = filterArgs.value(k_Radius_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -119,9 +119,9 @@ IFilter::PreflightResult ITKMedianImage::preflightImpl(const DataStructure& data Result<> ITKMedianImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto radius = filterArgs.value(k_Radius_Key); @@ -151,9 +151,9 @@ Result ITKMedianImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_RadiusKey, k_Radius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.hpp index ff0a2217a0..fd73b740b3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.hpp @@ -44,9 +44,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKMedianImage : public IFilter ITKMedianImage& operator=(ITKMedianImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Radius_Key = "radius"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.cpp index 020ad432cc..94840da1e1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.cpp @@ -79,14 +79,14 @@ Parameters ITKMorphologicalGradientImage::parameters() const ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -101,9 +101,9 @@ IFilter::UniquePointer ITKMorphologicalGradientImage::clone() const IFilter::PreflightResult ITKMorphologicalGradientImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -117,9 +117,9 @@ IFilter::PreflightResult ITKMorphologicalGradientImage::preflightImpl(const Data Result<> ITKMorphologicalGradientImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -152,9 +152,9 @@ Result ITKMorphologicalGradientImage::FromSIMPLJson(const nlohmann::j results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp index 8bd4c42372..b38637bccb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp @@ -31,9 +31,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalGradientImage : public IFilter ITKMorphologicalGradientImage& operator=(ITKMorphologicalGradientImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.cpp index a049c5a08b..fdc4487fc1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.cpp @@ -87,14 +87,14 @@ Parameters ITKMorphologicalWatershedImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -109,9 +109,9 @@ IFilter::UniquePointer ITKMorphologicalWatershedImage::clone() const IFilter::PreflightResult ITKMorphologicalWatershedImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto level = filterArgs.value(k_Level_Key); auto markWatershedLine = filterArgs.value(k_MarkWatershedLine_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -127,9 +127,9 @@ IFilter::PreflightResult ITKMorphologicalWatershedImage::preflightImpl(const Dat Result<> ITKMorphologicalWatershedImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto level = filterArgs.value(k_Level_Key); @@ -166,9 +166,9 @@ Result ITKMorphologicalWatershedImage::FromSIMPLJson(const nlohmann:: results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_LevelKey, k_Level_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MarkWatershedLineKey, k_MarkWatershedLine_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp index 44131e5a18..240606bcb3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp @@ -41,9 +41,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalWatershedImage : public IFilter ITKMorphologicalWatershedImage& operator=(ITKMorphologicalWatershedImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Level_Key = "level"; static inline constexpr StringLiteral k_MarkWatershedLine_Key = "mark_watershed_line"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.cpp index 75ec4740c1..2b01937570 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.cpp @@ -70,14 +70,14 @@ Parameters ITKNormalizeImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -92,9 +92,9 @@ IFilter::UniquePointer ITKNormalizeImage::clone() const IFilter::PreflightResult ITKNormalizeImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = @@ -107,9 +107,9 @@ IFilter::PreflightResult ITKNormalizeImage::preflightImpl(const DataStructure& d Result<> ITKNormalizeImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKNormalizeImage::ITKNormalizeImageFunctor itkFunctor = {}; @@ -135,9 +135,9 @@ Result ITKNormalizeImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.hpp index 4fcb31cbae..d2b7bfcf44 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.hpp @@ -35,9 +35,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKNormalizeImage : public IFilter ITKNormalizeImage& operator=(ITKNormalizeImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.cpp index 947acf6fb8..d924f373b7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.cpp @@ -67,14 +67,14 @@ Parameters ITKNotImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -88,9 +88,9 @@ IFilter::UniquePointer ITKNotImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKNotImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -102,9 +102,9 @@ IFilter::PreflightResult ITKNotImage::preflightImpl(const DataStructure& dataStr Result<> ITKNotImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKNotImage::ITKNotImageFunctor itkFunctor = {}; @@ -130,9 +130,9 @@ Result ITKNotImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.hpp index 2e6abe31be..f7716a3795 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.hpp @@ -50,9 +50,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKNotImage : public IFilter ITKNotImage& operator=(ITKNotImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.cpp index 8f989bbf3f..34c0d2c419 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.cpp @@ -91,14 +91,14 @@ Parameters ITKOpeningByReconstructionImage::parameters() const "Set/Get whether the original intensities of the image retained for those pixels unaffected by the opening by reconstruction. If Off, the output pixel contrast will be reduced.", false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -113,9 +113,9 @@ IFilter::UniquePointer ITKOpeningByReconstructionImage::clone() const IFilter::PreflightResult ITKOpeningByReconstructionImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -131,9 +131,9 @@ IFilter::PreflightResult ITKOpeningByReconstructionImage::preflightImpl(const Da Result<> ITKOpeningByReconstructionImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -172,9 +172,9 @@ Result ITKOpeningByReconstructionImage::FromSIMPLJson(const nlohmann: results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_PreserveIntensitiesKey, k_PreserveIntensities_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp index e14fb28337..bc5f753125 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp @@ -43,9 +43,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKOpeningByReconstructionImage : public IFilter ITKOpeningByReconstructionImage& operator=(ITKOpeningByReconstructionImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.cpp index b01683f848..5994634400 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.cpp @@ -89,14 +89,14 @@ Parameters ITKOtsuMultipleThresholdsImage::parameters() const std::make_unique(k_ReturnBinMidpoint_Key, "ReturnBinMidpoint", "Should the threshold value be mid-point of the bin or the maximum? Default is to return bin maximum.", false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -111,9 +111,9 @@ IFilter::UniquePointer ITKOtsuMultipleThresholdsImage::clone() const IFilter::PreflightResult ITKOtsuMultipleThresholdsImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto numberOfThresholds = filterArgs.value(k_NumberOfThresholds_Key); auto labelOffset = filterArgs.value(k_LabelOffset_Key); auto numberOfHistogramBins = filterArgs.value(k_NumberOfHistogramBins_Key); @@ -131,9 +131,9 @@ IFilter::PreflightResult ITKOtsuMultipleThresholdsImage::preflightImpl(const Dat Result<> ITKOtsuMultipleThresholdsImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto numberOfThresholds = filterArgs.value(k_NumberOfThresholds_Key); @@ -174,9 +174,9 @@ Result ITKOtsuMultipleThresholdsImage::FromSIMPLJson(const nlohmann:: results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_LabelOffsetKey, k_LabelOffset_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_NumberOfHistogramBinsKey, k_NumberOfHistogramBins_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ValleyEmphasisKey, k_ValleyEmphasis_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp index aaf6d84807..23d85c5e20 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp @@ -43,9 +43,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKOtsuMultipleThresholdsImage : public IFilter ITKOtsuMultipleThresholdsImage& operator=(ITKOtsuMultipleThresholdsImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_NumberOfThresholds_Key = "number_of_thresholds"; static inline constexpr StringLiteral k_LabelOffset_Key = "label_offset"; static inline constexpr StringLiteral k_NumberOfHistogramBins_Key = "number_of_histogram_bins"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.cpp index d2b7fb280b..d1c00f0170 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.cpp @@ -81,14 +81,14 @@ Parameters ITKRelabelComponentImage::parameters() const params.insert(std::make_unique(k_SortByObjectSize_Key, "SortByObjectSize", "Controls whether the object labels are sorted by size. If false, initial order of labels is kept.", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -103,9 +103,9 @@ IFilter::UniquePointer ITKRelabelComponentImage::clone() const IFilter::PreflightResult ITKRelabelComponentImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto minimumObjectSize = filterArgs.value(k_MinimumObjectSize_Key); auto sortByObjectSize = filterArgs.value(k_SortByObjectSize_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -119,9 +119,9 @@ IFilter::PreflightResult ITKRelabelComponentImage::preflightImpl(const DataStruc Result<> ITKRelabelComponentImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto minimumObjectSize = filterArgs.value(k_MinimumObjectSize_Key); @@ -154,9 +154,9 @@ Result ITKRelabelComponentImage::FromSIMPLJson(const nlohmann::json& results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MinimumObjectSizeKey, k_MinimumObjectSize_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SortByObjectSizeKey, k_SortByObjectSize_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp index a3c2aeaf2c..f575c7e273 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp @@ -47,9 +47,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKRelabelComponentImage : public IFilter ITKRelabelComponentImage& operator=(ITKRelabelComponentImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_MinimumObjectSize_Key = "minimum_object_size"; static inline constexpr StringLiteral k_SortByObjectSize_Key = "sort_by_object_size"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.cpp index c4875991f1..6cc064d451 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.cpp @@ -77,14 +77,14 @@ Parameters ITKRescaleIntensityImage::parameters() const params.insert(std::make_unique(k_OutputMaximum_Key, "OutputMaximum", "The maximum output value that is used.", 255)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -99,9 +99,9 @@ IFilter::UniquePointer ITKRescaleIntensityImage::clone() const IFilter::PreflightResult ITKRescaleIntensityImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto outputMinimum = filterArgs.value(k_OutputMinimum_Key); auto outputMaximum = filterArgs.value(k_OutputMaximum_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -115,9 +115,9 @@ IFilter::PreflightResult ITKRescaleIntensityImage::preflightImpl(const DataStruc Result<> ITKRescaleIntensityImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto outputMinimum = filterArgs.value(k_OutputMinimum_Key); @@ -152,9 +152,9 @@ Result ITKRescaleIntensityImage::FromSIMPLJson(const nlohmann::json& // Output Type parameter is not applicable in NX results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputMinimumKey, k_OutputMinimum_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputMaximumKey, k_OutputMaximum_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.hpp index 8289af9a57..9e8c691340 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.hpp @@ -44,9 +44,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKRescaleIntensityImage : public IFilter ITKRescaleIntensityImage& operator=(ITKRescaleIntensityImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_OutputMinimum_Key = "output_minimum"; static inline constexpr StringLiteral k_OutputMaximum_Key = "output_maximum"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.cpp index 35376539b7..f56162b8d8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.cpp @@ -82,14 +82,14 @@ Parameters ITKSigmoidImage::parameters() const params.insert(std::make_unique(k_OutputMinimum_Key, "OutputMinimum", "The minimum output value", 0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -104,9 +104,9 @@ IFilter::UniquePointer ITKSigmoidImage::clone() const IFilter::PreflightResult ITKSigmoidImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto alpha = filterArgs.value(k_Alpha_Key); auto beta = filterArgs.value(k_Beta_Key); auto outputMaximum = filterArgs.value(k_OutputMaximum_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKSigmoidImage::preflightImpl(const DataStructure& dat Result<> ITKSigmoidImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto alpha = filterArgs.value(k_Alpha_Key); @@ -163,9 +163,9 @@ Result ITKSigmoidImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BetaKey, k_Beta_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputMaximumKey, k_OutputMaximum_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutputMinimumKey, k_OutputMinimum_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.hpp index 2444c00f7d..c6efb1315f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.hpp @@ -33,9 +33,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSigmoidImage : public IFilter ITKSigmoidImage& operator=(ITKSigmoidImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Alpha_Key = "alpha"; static inline constexpr StringLiteral k_Beta_Key = "beta"; static inline constexpr StringLiteral k_OutputMaximum_Key = "output_maximum"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.cpp index f75c992cc2..7c08c1828e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.cpp @@ -86,14 +86,14 @@ Parameters ITKSignedMaurerDistanceMapImage::parameters() const params.insert(std::make_unique(k_BackgroundValue_Key, "BackgroundValue", "Set the background value which defines the object. Usually this value is = 0.", 0.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -108,9 +108,9 @@ IFilter::UniquePointer ITKSignedMaurerDistanceMapImage::clone() const IFilter::PreflightResult ITKSignedMaurerDistanceMapImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto insideIsPositive = filterArgs.value(k_InsideIsPositive_Key); auto squaredDistance = filterArgs.value(k_SquaredDistance_Key); auto useImageSpacing = filterArgs.value(k_UseImageSpacing_Key); @@ -127,9 +127,9 @@ IFilter::PreflightResult ITKSignedMaurerDistanceMapImage::preflightImpl(const Da Result<> ITKSignedMaurerDistanceMapImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto insideIsPositive = filterArgs.value(k_InsideIsPositive_Key); @@ -169,9 +169,9 @@ Result ITKSignedMaurerDistanceMapImage::FromSIMPLJson(const nlohmann: results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SquaredDistanceKey, k_SquaredDistance_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseImageSpacingKey, k_UseImageSpacing_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_BackgroundValueKey, k_BackgroundValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp index 367755d4a7..61e263efed 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp @@ -45,9 +45,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSignedMaurerDistanceMapImage : public IFilter ITKSignedMaurerDistanceMapImage& operator=(ITKSignedMaurerDistanceMapImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_InsideIsPositive_Key = "inside_is_positive"; static inline constexpr StringLiteral k_SquaredDistance_Key = "squared_distance"; static inline constexpr StringLiteral k_UseImageSpacing_Key = "use_image_spacing"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.cpp index 8fc8de858e..fd3391e829 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.cpp @@ -68,14 +68,14 @@ Parameters ITKSinImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKSinImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKSinImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKSinImage::preflightImpl(const DataStructure& dataStr Result<> ITKSinImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKSinImage::ITKSinImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKSinImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.hpp index 25058a8d87..53dbdc065d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSinImage : public IFilter ITKSinImage& operator=(ITKSinImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.cpp index 720b3b551e..8451af70dc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.cpp @@ -68,14 +68,14 @@ Parameters ITKSqrtImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKSqrtImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKSqrtImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKSqrtImage::preflightImpl(const DataStructure& dataSt Result<> ITKSqrtImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKSqrtImage::ITKSqrtImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKSqrtImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.hpp index 306da35f69..a4023bf257 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSqrtImage : public IFilter ITKSqrtImage& operator=(ITKSqrtImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.cpp index de39745163..37b08c2615 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.cpp @@ -68,14 +68,14 @@ Parameters ITKSquareImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -90,9 +90,9 @@ IFilter::UniquePointer ITKSquareImage::clone() const IFilter::PreflightResult ITKSquareImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -104,9 +104,9 @@ IFilter::PreflightResult ITKSquareImage::preflightImpl(const DataStructure& data Result<> ITKSquareImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKSquareImage::ITKSquareImageFunctor itkFunctor = {}; @@ -132,9 +132,9 @@ Result ITKSquareImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.hpp index 10499f4d6d..4d326b0032 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKSquareImage : public IFilter ITKSquareImage& operator=(ITKSquareImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.cpp index 978dc8dc8a..cf21a340a7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.cpp @@ -68,14 +68,14 @@ Parameters ITKTanImage::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -89,9 +89,9 @@ IFilter::UniquePointer ITKTanImage::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ITKTanImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); Result resultOutputActions = ITK::DataCheck(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath); @@ -103,9 +103,9 @@ IFilter::PreflightResult ITKTanImage::preflightImpl(const DataStructure& dataStr Result<> ITKTanImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); const cxITKTanImage::ITKTanImageFunctor itkFunctor = {}; @@ -131,9 +131,9 @@ Result ITKTanImage::FromSIMPLJson(const nlohmann::json& json) std::vector> results; - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.hpp index 953f7fa99e..cce265aeba 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.hpp @@ -29,9 +29,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKTanImage : public IFilter ITKTanImage& operator=(ITKTanImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.cpp index d1f55e04e2..d09ce7a530 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.cpp @@ -80,14 +80,14 @@ Parameters ITKThresholdImage::parameters() const "The pixel type must support comparison operators. Set the 'outside' pixel value. The default value NumericTraits::ZeroValue() .", 0.0)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -102,9 +102,9 @@ IFilter::UniquePointer ITKThresholdImage::clone() const IFilter::PreflightResult ITKThresholdImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto lower = filterArgs.value(k_Lower_Key); auto upper = filterArgs.value(k_Upper_Key); auto outsideValue = filterArgs.value(k_OutsideValue_Key); @@ -119,9 +119,9 @@ IFilter::PreflightResult ITKThresholdImage::preflightImpl(const DataStructure& d Result<> ITKThresholdImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto lower = filterArgs.value(k_Lower_Key); @@ -157,9 +157,9 @@ Result ITKThresholdImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_LowerKey, k_Lower_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UpperKey, k_Upper_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_OutsideValueKey, k_OutsideValue_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.hpp index c9b34b4d4e..a65055811c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.hpp @@ -41,9 +41,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKThresholdImage : public IFilter ITKThresholdImage& operator=(ITKThresholdImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_Lower_Key = "lower"; static inline constexpr StringLiteral k_Upper_Key = "upper"; static inline constexpr StringLiteral k_OutsideValue_Key = "outside_value"; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.cpp index c23d3cb76c..15d02835e7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.cpp @@ -76,14 +76,14 @@ Parameters ITKValuedRegionalMaximaImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -98,9 +98,9 @@ IFilter::UniquePointer ITKValuedRegionalMaximaImage::clone() const IFilter::PreflightResult ITKValuedRegionalMaximaImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -113,9 +113,9 @@ IFilter::PreflightResult ITKValuedRegionalMaximaImage::preflightImpl(const DataS Result<> ITKValuedRegionalMaximaImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -145,9 +145,9 @@ Result ITKValuedRegionalMaximaImage::FromSIMPLJson(const nlohmann::js std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp index 877c557fef..fcf01440f1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp @@ -42,9 +42,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKValuedRegionalMaximaImage : public IFilter ITKValuedRegionalMaximaImage& operator=(ITKValuedRegionalMaximaImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.cpp index 267073e3c4..8fd521e653 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.cpp @@ -76,14 +76,14 @@ Parameters ITKValuedRegionalMinimaImage::parameters() const false)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -98,9 +98,9 @@ IFilter::UniquePointer ITKValuedRegionalMinimaImage::clone() const IFilter::PreflightResult ITKValuedRegionalMinimaImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); @@ -113,9 +113,9 @@ IFilter::PreflightResult ITKValuedRegionalMinimaImage::preflightImpl(const DataS Result<> ITKValuedRegionalMinimaImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto fullyConnected = filterArgs.value(k_FullyConnected_Key); @@ -145,9 +145,9 @@ Result ITKValuedRegionalMinimaImage::FromSIMPLJson(const nlohmann::js std::vector> results; results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FullyConnectedKey, k_FullyConnected_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp index dd4be487b0..f281165ab7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp @@ -39,9 +39,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKValuedRegionalMinimaImage : public IFilter ITKValuedRegionalMinimaImage& operator=(ITKValuedRegionalMinimaImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.cpp index 8e2a611e95..25293a36a2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.cpp @@ -83,14 +83,14 @@ Parameters ITKWhiteTopHatImage::parameters() const params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert( - std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } @@ -105,9 +105,9 @@ IFilter::UniquePointer ITKWhiteTopHatImage::clone() const IFilter::PreflightResult ITKWhiteTopHatImage::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); auto kernelType = static_cast(filterArgs.value(k_KernelType_Key)); auto safeBorder = filterArgs.value(k_SafeBorder_Key); @@ -122,9 +122,9 @@ IFilter::PreflightResult ITKWhiteTopHatImage::preflightImpl(const DataStructure& Result<> ITKWhiteTopHatImage::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto imageGeomPath = filterArgs.value(k_SelectedImageGeomPath_Key); - auto selectedInputArray = filterArgs.value(k_SelectedImageDataPath_Key); - auto outputArrayName = filterArgs.value(k_OutputImageDataPath_Key); + auto imageGeomPath = filterArgs.value(k_InputImageGeomPath_Key); + auto selectedInputArray = filterArgs.value(k_InputImageDataPath_Key); + auto outputArrayName = filterArgs.value(k_OutputImageArrayName_Key); const DataPath outputArrayPath = selectedInputArray.getParent().createChildPath(outputArrayName); auto kernelRadius = filterArgs.value::ValueType>(k_KernelRadius_Key); @@ -160,9 +160,9 @@ Result ITKWhiteTopHatImage::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelTypeKey, k_KernelType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SafeBorderKey, k_SafeBorder_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelRadiusKey, k_KernelRadius_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageGeomPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_SelectedImageDataPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageGeomPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedCellArrayPathKey, k_InputImageDataPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellArrayNameKey, k_OutputImageArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp index 8ce8b36006..e9f3cb65ed 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp @@ -31,9 +31,9 @@ class ITKIMAGEPROCESSING_EXPORT ITKWhiteTopHatImage : public IFilter ITKWhiteTopHatImage& operator=(ITKWhiteTopHatImage&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name"; static inline constexpr StringLiteral k_KernelRadius_Key = "kernel_radius"; static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; diff --git a/src/Plugins/ITKImageProcessing/test/ITKAbsImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAbsImageTest.cpp index 551a224fdd..a806a0c934 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAbsImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAbsImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKAbsImageFilter(float)", "[ITKImageProcessing][ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKAbsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAbsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAbsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAbsImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAbsImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAbsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -71,9 +71,9 @@ TEST_CASE("ITKImageProcessing::ITKAbsImageFilter(short)", "[ITKImageProcessing][ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKAbsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAbsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAbsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAbsImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAbsImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAbsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKAcosImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAcosImageTest.cpp index 941fb8ca39..f1c0ecda5e 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAcosImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAcosImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKAcosImageFilter(defaults)", "[ITKImageProcessi } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKAcosImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAcosImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAcosImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAcosImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAcosImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAcosImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp index 9a9878bd32..aa25c82037 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp @@ -97,9 +97,9 @@ TEST_CASE("ITKImageProcessing::ITKAdaptiveHistogramEqualizationImageFilter(defau const ITKAdaptiveHistogramEqualizationImage filter; Arguments args; - args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Alpha_Key, std::make_any(0.5f)); args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Beta_Key, std::make_any(0.5f)); args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Radius_Key, std::make_any(VectorUInt32Parameter::ValueType{10, 19, 10})); @@ -145,9 +145,9 @@ TEST_CASE("ITKImageProcessing::ITKAdaptiveHistogramEqualizationImageFilter(histo ITKAdaptiveHistogramEqualizationImage filter; Arguments args; - args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Alpha_Key, std::make_any(1.0f)); args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Beta_Key, std::make_any(0.25f)); args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Radius_Key, std::make_any(VectorUInt32Parameter::ValueType{10, 10, 10})); diff --git a/src/Plugins/ITKImageProcessing/test/ITKAsinImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAsinImageTest.cpp index 1b76cd3ab8..03f87ea925 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAsinImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAsinImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKAsinImageFilter(defaults)", "[ITKImageProcessi } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKAsinImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAsinImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAsinImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAsinImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAsinImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAsinImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKAtanImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAtanImageTest.cpp index ecd608c448..bea0a81fbc 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAtanImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAtanImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKAtanImageFilter(defaults)", "[ITKImageProcessi } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKAtanImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKAtanImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKAtanImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKAtanImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKAtanImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKAtanImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryContourImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryContourImageTest.cpp index 7ef2591b03..6830664097 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryContourImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryContourImageTest.cpp @@ -36,9 +36,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryContourImageFilter(default)", "[ITKImage } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryContourImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryContourImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryContourImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryContourImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryContourImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryContourImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryContourImage::k_ForegroundValue_Key, std::make_any(255.0)); auto preflightResult = filter.preflight(dataStructure, args); @@ -70,9 +70,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryContourImageFilter(custom)", "[ITKImageP } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryContourImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryContourImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryContourImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryContourImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryContourImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryContourImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryContourImage::k_ForegroundValue_Key, std::make_any(100)); args.insertOrAssign(ITKBinaryContourImage::k_FullyConnected_Key, std::make_any(true)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryDilateImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryDilateImageTest.cpp index f1fcf58a88..cb30016975 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryDilateImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryDilateImageTest.cpp @@ -38,9 +38,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryDilateImageFilter(BinaryDilate)", "[ITKI } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryDilateImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryDilateImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryDilateImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryDilateImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryDilateImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryDilateImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryDilateImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKBinaryDilateImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); args.insertOrAssign(ITKBinaryDilateImage::k_ForegroundValue_Key, std::make_any(255.0)); @@ -74,9 +74,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryDilateImageFilter(BinaryDilateVectorRadi } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryDilateImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryDilateImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryDilateImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryDilateImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryDilateImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryDilateImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryDilateImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{20, 1, 1})); args.insertOrAssign(ITKBinaryDilateImage::k_KernelType_Key, std::make_any(itk::simple::sitkBox)); args.insertOrAssign(ITKBinaryDilateImage::k_ForegroundValue_Key, std::make_any(255)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryErodeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryErodeImageTest.cpp index 682822e657..d02a1b96e5 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryErodeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryErodeImageTest.cpp @@ -36,9 +36,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryErodeImageFilter(BinaryErode)", "[ITKIma } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryErodeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryErodeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryErodeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryErodeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryErodeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryErodeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryErodeImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKBinaryErodeImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); args.insertOrAssign(ITKBinaryErodeImage::k_ForegroundValue_Key, std::make_any(255)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalClosingImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalClosingImageTest.cpp index 337ac65b1f..2fb3f091fc 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalClosingImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalClosingImageTest.cpp @@ -35,9 +35,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalClosingImageFilter(BinaryMo } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); @@ -69,9 +69,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalClosingImageFilter(BinaryMo } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{5, 5, 5})); args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_SafeBorder_Key, std::make_any(false)); args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_ForegroundValue_Key, std::make_any(255)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalOpeningImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalOpeningImageTest.cpp index edb0b9fbef..de977d4687 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalOpeningImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalOpeningImageTest.cpp @@ -35,9 +35,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalOpeningImageFilter(BinaryMo } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_ForegroundValue_Key, std::make_any(255)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryOpeningByReconstructionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryOpeningByReconstructionImageTest.cpp index 933aec2266..9c96dd209b 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryOpeningByReconstructionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryOpeningByReconstructionImageTest.cpp @@ -37,9 +37,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryOpeningByReconstructionImageFilter(Binar } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{5, 1, 1})); args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_ForegroundValue_Key, std::make_any(200)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryProjectionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryProjectionImageTest.cpp index 05822323ac..e6108cdf5d 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryProjectionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryProjectionImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryProjectionImageFilter(defaults)", "[ITKI } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryProjectionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryProjectionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryProjectionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryProjectionImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryProjectionImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryProjectionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -64,9 +64,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryProjectionImageFilter(another_dimension) } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryProjectionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryProjectionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryProjectionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryProjectionImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryProjectionImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryProjectionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryProjectionImage::k_ProjectionDimension_Key, std::make_any(1)); args.insertOrAssign(ITKBinaryProjectionImage::k_ForegroundValue_Key, std::make_any(255)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryThinningImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryThinningImageTest.cpp index 8d82afba2f..23f3cb8840 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryThinningImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryThinningImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryThinningImageFilter(BinaryThinning)", "[ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBinaryThinningImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryThinningImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryThinningImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryThinningImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryThinningImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryThinningImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryThresholdImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryThresholdImageTest.cpp index 7b20218f25..331d52c253 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryThresholdImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryThresholdImageTest.cpp @@ -29,9 +29,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryThresholdImageFilter(default)", "[ITKIma SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKBinaryThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryThresholdImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryThresholdImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryThresholdImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryThresholdImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -58,9 +58,9 @@ TEST_CASE("ITKImageProcessing::ITKBinaryThresholdImageFilter(NarrowThreshold)", SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKBinaryThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBinaryThresholdImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBinaryThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBinaryThresholdImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBinaryThresholdImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBinaryThresholdImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBinaryThresholdImage::k_LowerThreshold_Key, std::make_any(10)); args.insertOrAssign(ITKBinaryThresholdImage::k_UpperThreshold_Key, std::make_any(100)); args.insertOrAssign(ITKBinaryThresholdImage::k_InsideValue_Key, std::make_any(255)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBlackTopHatImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBlackTopHatImageTest.cpp index fcfe4494a3..0c6641b434 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBlackTopHatImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBlackTopHatImageTest.cpp @@ -35,9 +35,9 @@ TEST_CASE("ITKImageProcessing::ITKBlackTopHatImageFilter(BlackTopHapErode)", "[I } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKBlackTopHatImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKBlackTopHatImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKBlackTopHatImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKBlackTopHatImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKBlackTopHatImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKBlackTopHatImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKBlackTopHatImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKBlackTopHatImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKClosingByReconstructionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKClosingByReconstructionImageTest.cpp index 084bd27853..dbcf401001 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKClosingByReconstructionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKClosingByReconstructionImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKClosingByReconstructionImageFilter(ClosingByRe } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKClosingByReconstructionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKClosingByReconstructionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKClosingByReconstructionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKClosingByReconstructionImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKClosingByReconstructionImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKClosingByReconstructionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKClosingByReconstructionImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKClosingByReconstructionImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKCosImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKCosImageTest.cpp index 841d91cfc6..4d4eae658e 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKCosImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKCosImageTest.cpp @@ -30,9 +30,9 @@ TEST_CASE("ITKImageProcessing::ITKCosImageFilter(float)", "[ITKImageProcessing][ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKCosImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKCosImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKCosImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKCosImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKCosImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKCosImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -66,9 +66,9 @@ TEST_CASE("ITKImageProcessing::ITKCosImageFilter(short)", "[ITKImageProcessing][ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKCosImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKCosImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKCosImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKCosImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKCosImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKCosImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKDilateObjectMorphologyImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKDilateObjectMorphologyImageTest.cpp index cb262734db..4de3e80ce0 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKDilateObjectMorphologyImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKDilateObjectMorphologyImageTest.cpp @@ -35,9 +35,9 @@ TEST_CASE("ITKImageProcessing::ITKDilateObjectMorphologyImageFilter(float)", "[I } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKDilateObjectMorphologyImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKDilateObjectMorphologyImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDilateObjectMorphologyImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDilateObjectMorphologyImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKDilateObjectMorphologyImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKDilateObjectMorphologyImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKDilateObjectMorphologyImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKDilateObjectMorphologyImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); @@ -73,9 +73,9 @@ TEST_CASE("ITKImageProcessing::ITKDilateObjectMorphologyImageFilter(short)", "[I } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKDilateObjectMorphologyImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKDilateObjectMorphologyImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDilateObjectMorphologyImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDilateObjectMorphologyImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKDilateObjectMorphologyImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKDilateObjectMorphologyImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKDilateObjectMorphologyImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKDilateObjectMorphologyImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKDiscreteGaussianImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKDiscreteGaussianImageTest.cpp index 5ec6283a5e..7fbd476516 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKDiscreteGaussianImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKDiscreteGaussianImageTest.cpp @@ -37,9 +37,9 @@ TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(float)", "[ITKImag } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKDiscreteGaussianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKDiscreteGaussianImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -75,9 +75,9 @@ TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(short)", "[ITKImag } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKDiscreteGaussianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKDiscreteGaussianImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -113,9 +113,9 @@ TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(bigG)", "[ITKImage } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKDiscreteGaussianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKDiscreteGaussianImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKDiscreteGaussianImage::k_Variance_Key, std::make_any(VectorFloat64Parameter::ValueType{ 100.0, 100.0, diff --git a/src/Plugins/ITKImageProcessing/test/ITKErodeObjectMorphologyImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKErodeObjectMorphologyImageTest.cpp index a58430804e..9249346110 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKErodeObjectMorphologyImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKErodeObjectMorphologyImageTest.cpp @@ -35,9 +35,9 @@ TEST_CASE("ITKImageProcessing::ITKErodeObjectMorphologyImageFilter(float)", "[IT } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKErodeObjectMorphologyImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKErodeObjectMorphologyImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKErodeObjectMorphologyImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKErodeObjectMorphologyImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKErodeObjectMorphologyImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKErodeObjectMorphologyImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKErodeObjectMorphologyImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKErodeObjectMorphologyImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); @@ -73,9 +73,9 @@ TEST_CASE("ITKImageProcessing::ITKErodeObjectMorphologyImageFilter(short)", "[IT } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKErodeObjectMorphologyImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKErodeObjectMorphologyImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKErodeObjectMorphologyImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKErodeObjectMorphologyImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKErodeObjectMorphologyImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKErodeObjectMorphologyImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKErodeObjectMorphologyImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKErodeObjectMorphologyImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKExpImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKExpImageTest.cpp index c4e9c682bc..193a1cbedd 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKExpImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKExpImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKExpImageFilter(defaults)", "[ITKImageProcessin } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKExpImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKExpImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKExpImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKExpImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKExpImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKExpImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKExpNegativeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKExpNegativeImageTest.cpp index 3612845431..a44834ee4d 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKExpNegativeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKExpNegativeImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKExpNegativeImageFilter(defaults)", "[ITKImageP } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKExpNegativeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKExpNegativeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKExpNegativeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKExpNegativeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKExpNegativeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKExpNegativeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeImageTest.cpp index 5cffcb9b6d..c375485671 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeImageTest.cpp @@ -29,9 +29,9 @@ TEST_CASE("ITKImageProcessing::ITKGradientMagnitudeImageFilter(default)", "[ITKI SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKGradientMagnitudeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGradientMagnitudeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGradientMagnitudeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGradientMagnitudeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGradientMagnitudeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGradientMagnitudeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleDilateImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleDilateImageTest.cpp index 7141c4aae0..a4c5e11a26 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleDilateImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleDilateImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleDilateImageFilter(GrayscaleDilate)", } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleDilateImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleDilateImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleDilateImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleDilateImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleDilateImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleDilateImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGrayscaleDilateImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKGrayscaleDilateImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleErodeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleErodeImageTest.cpp index 2f13753f41..74c3c43c86 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleErodeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleErodeImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleErodeImageFilter(GrayscaleErode)", "[ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleErodeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleErodeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleErodeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleErodeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleErodeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleErodeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGrayscaleErodeImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKGrayscaleErodeImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleFillholeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleFillholeImageTest.cpp index a7afe520d0..a44d604121 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleFillholeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleFillholeImageTest.cpp @@ -29,9 +29,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleFillholeImageFilter(GrayscaleFillhole SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKGrayscaleFillholeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleFillholeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleFillholeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleFillholeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleFillholeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleFillholeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -58,9 +58,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleFillholeImageFilter(GrayscaleFillhole SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKGrayscaleFillholeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleFillholeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleFillholeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleFillholeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleFillholeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleFillholeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleGrindPeakImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleGrindPeakImageTest.cpp index a5726ad222..6e38f8bda7 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleGrindPeakImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleGrindPeakImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleGrindPeakImageFilter(GrayscaleGrindPe } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -64,9 +64,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleGrindPeakImageFilter(GrayscaleGrindPe } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalClosingImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalClosingImageTest.cpp index 4701ab0b81..025934bf7d 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalClosingImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalClosingImageTest.cpp @@ -36,9 +36,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalClosingImageFilter(Grays } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalOpeningImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalOpeningImageTest.cpp index 9092a5dfc5..e873d04706 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalOpeningImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalOpeningImageTest.cpp @@ -36,9 +36,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(Grays } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); @@ -70,9 +70,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(Grays } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{20, 5, 2})); args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelType_Key, std::make_any(itk::simple::sitkCross)); @@ -104,9 +104,9 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(Grays } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{20, 5, 1})); args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelType_Key, std::make_any(itk::simple::sitkBox)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKHConvexImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKHConvexImageTest.cpp index b71e408993..5349b42d4f 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKHConvexImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKHConvexImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKHConvexImageFilter(HConvex)", "[ITKImageProces } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKHConvexImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKHConvexImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKHConvexImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKHConvexImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKHConvexImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKHConvexImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKHConvexImage::k_Height_Key, std::make_any(10000)); auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ITKImageProcessing/test/ITKHMaximaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKHMaximaImageTest.cpp index 0ae2472e0b..a5b7ea6cd7 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKHMaximaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKHMaximaImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKHMaximaImageFilter(HMaxima)", "[ITKImageProces } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKHMaximaImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKHMaximaImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKHMaximaImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKHMaximaImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKHMaximaImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKHMaximaImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKHMaximaImage::k_Height_Key, std::make_any(2000)); auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ITKImageProcessing/test/ITKHMinimaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKHMinimaImageTest.cpp index aee95d8e0f..8b313f1619 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKHMinimaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKHMinimaImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKHMinimaImageFilter(HMinima)", "[ITKImageProces } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKHMinimaImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKHMinimaImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKHMinimaImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKHMinimaImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKHMinimaImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKHMinimaImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKHMinimaImage::k_Height_Key, std::make_any(2000)); auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ITKImageProcessing/test/ITKIntensityWindowingImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKIntensityWindowingImageTest.cpp index 0124382fbb..ab18260da0 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKIntensityWindowingImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKIntensityWindowingImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(2d)", "[ITKImage } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKIntensityWindowingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKIntensityWindowingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKIntensityWindowingImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKIntensityWindowingImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -64,9 +64,9 @@ TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(3dFloat)", "[ITK } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKIntensityWindowingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKIntensityWindowingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKIntensityWindowingImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKIntensityWindowingImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -95,9 +95,9 @@ TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(3dShort)", "[ITK } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKIntensityWindowingImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKIntensityWindowingImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKIntensityWindowingImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKIntensityWindowingImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKInvertIntensityImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKInvertIntensityImageTest.cpp index 490c8f940e..28e5dd3e08 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKInvertIntensityImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKInvertIntensityImageTest.cpp @@ -31,9 +31,9 @@ TEST_CASE("ITKImageProcessing::ITKInvertIntensityImageFilter(3d)", "[ITKImagePro } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKInvertIntensityImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKInvertIntensityImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKInvertIntensityImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKInvertIntensityImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKInvertIntensityImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKInvertIntensityImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKLabelContourImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKLabelContourImageTest.cpp index 68de70f8d2..dd2736aedd 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKLabelContourImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKLabelContourImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKLabelContourImageFilter(default)", "[ITKImageP } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKLabelContourImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKLabelContourImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKLabelContourImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKLabelContourImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKLabelContourImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKLabelContourImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKLog10ImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKLog10ImageTest.cpp index be34eb3281..d2fcd56ed6 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKLog10ImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKLog10ImageTest.cpp @@ -30,9 +30,9 @@ TEST_CASE("ITKImageProcessing::ITKLog10ImageFilter(defaults)", "[ITKImageProcess } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKLog10Image::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKLog10Image::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKLog10Image::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKLog10Image::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKLog10Image::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKLog10Image::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKLogImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKLogImageTest.cpp index 5a6b809400..53f62d04d4 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKLogImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKLogImageTest.cpp @@ -30,9 +30,9 @@ TEST_CASE("ITKImageProcessing::ITKLogImageFilter(defaults)", "[ITKImageProcessin } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKLogImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKLogImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKLogImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKLogImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKLogImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKLogImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKMaskImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMaskImageTest.cpp index a45b0adb2b..912fb14254 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMaskImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMaskImageTest.cpp @@ -42,9 +42,9 @@ TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(2d)", "[ITKImageProcessing][IT REQUIRE(inputGeom.getDimensions() == maskGeom.getDimensions()); Arguments args; - args.insertOrAssign(ITKMaskImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMaskImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMaskImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMaskImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMaskImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMaskImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKMaskImage::k_MaskImageDataPath_Key, std::make_any(maskDataPath)); auto preflightResult = filter.preflight(dataStructure, args); @@ -85,9 +85,9 @@ TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(cthead1)", "[ITKImageProcessin REQUIRE(inputGeom.getDimensions() == maskGeom.getDimensions()); Arguments args; - args.insertOrAssign(ITKMaskImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMaskImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMaskImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMaskImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMaskImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMaskImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKMaskImage::k_MaskImageDataPath_Key, std::make_any(maskDataPath)); auto preflightResult = filter.preflight(dataStructure, args); @@ -128,9 +128,9 @@ TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(rgb)", "[ITKImageProcessing][I REQUIRE(inputGeom.getDimensions() == maskGeom.getDimensions()); Arguments args; - args.insertOrAssign(ITKMaskImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMaskImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMaskImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMaskImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMaskImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMaskImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKMaskImage::k_MaskImageDataPath_Key, std::make_any(maskDataPath)); args.insertOrAssign(ITKMaskImage::k_OutsideValue_Key, std::make_any(10.0)); @@ -173,9 +173,9 @@ TEST_CASE("ITKMaskImageFilter(cthead1_maskvalue)", "[ITKImageProcessing][ITKMask REQUIRE(inputGeom.getDimensions() == maskGeom.getDimensions()); Arguments args; - args.insertOrAssign(ITKMaskImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMaskImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMaskImage::k_OutputImageDataPath_Key, std::make_any(outputDataPath)); + args.insertOrAssign(ITKMaskImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMaskImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMaskImage::k_OutputImageArrayName_Key, std::make_any(outputDataPath)); args.insertOrAssign(ITKMaskImage::k_MaskImageDataPath_Key, std::make_any(maskDataPath)); args.insertOrAssign(ITKMaskImage::k_MaskingValue_Key, std::make_any(100.0)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKMedianImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMedianImageTest.cpp index 75b6f28963..97fc4df75e 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMedianImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMedianImageTest.cpp @@ -37,9 +37,9 @@ TEST_CASE("ITKImageProcessing::ITKMedianImageFilter(defaults)", "[ITKImageProces SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKMedianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMedianImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMedianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMedianImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMedianImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMedianImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -68,9 +68,9 @@ TEST_CASE("ITKImageProcessing::ITKMedianImageFilter(by23)", "[ITKImageProcessing SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKMedianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMedianImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMedianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMedianImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMedianImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMedianImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); // 0 should be unused args.insertOrAssign(ITKMedianImage::k_Radius_Key, std::make_any(VectorUInt32Parameter::ValueType{2, 3, 0})); diff --git a/src/Plugins/ITKImageProcessing/test/ITKMorphologicalGradientImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMorphologicalGradientImageTest.cpp index d96d328268..985efff830 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMorphologicalGradientImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMorphologicalGradientImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKMorphologicalGradientImageFilter(Morphological } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKMorphologicalGradientImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMorphologicalGradientImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMorphologicalGradientImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMorphologicalGradientImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMorphologicalGradientImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMorphologicalGradientImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKMorphologicalGradientImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKMorphologicalGradientImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKMorphologicalWatershedImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMorphologicalWatershedImageTest.cpp index 22a2ff564f..5551e202a5 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMorphologicalWatershedImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMorphologicalWatershedImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKMorphologicalWatershedImageFilter(defaults)", } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKMorphologicalWatershedImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMorphologicalWatershedImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMorphologicalWatershedImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMorphologicalWatershedImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMorphologicalWatershedImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMorphologicalWatershedImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -63,9 +63,9 @@ TEST_CASE("ITKImageProcessing::ITKMorphologicalWatershedImageFilter(level_1)", " } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKMorphologicalWatershedImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKMorphologicalWatershedImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKMorphologicalWatershedImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKMorphologicalWatershedImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKMorphologicalWatershedImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKMorphologicalWatershedImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKMorphologicalWatershedImage::k_Level_Key, std::make_any(1.0)); args.insertOrAssign(ITKMorphologicalWatershedImage::k_MarkWatershedLine_Key, std::make_any(false)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKNormalizeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKNormalizeImageTest.cpp index 251de43fe5..51453d24b1 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKNormalizeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKNormalizeImageTest.cpp @@ -28,9 +28,9 @@ TEST_CASE("ITKImageProcessing::ITKNormalizeImageFilter(defaults)", "[ITKImagePro SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKNormalizeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKNormalizeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKNormalizeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKNormalizeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKNormalizeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKNormalizeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -66,9 +66,9 @@ TEST_CASE("ITKImageProcessing::ITKNormalizeImageFilter(vector)", "[.][ITKImagePr SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKNormalizeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKNormalizeImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKNormalizeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKNormalizeImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKNormalizeImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKNormalizeImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKNotImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKNotImageTest.cpp index 5c783582fa..d3cd3cb33d 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKNotImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKNotImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKNotImageFilter(defaults)", "[ITKImageProcessin } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKNotImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKNotImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKNotImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKNotImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKNotImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKNotImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKOpeningByReconstructionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKOpeningByReconstructionImageTest.cpp index d2fd58ecca..455224c656 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKOpeningByReconstructionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKOpeningByReconstructionImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKOpeningByReconstructionImageFilter(OpeningByRe } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKOpeningByReconstructionImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKOpeningByReconstructionImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKOpeningByReconstructionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKOpeningByReconstructionImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKOpeningByReconstructionImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKOpeningByReconstructionImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKOpeningByReconstructionImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKOpeningByReconstructionImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKOtsuMultipleThresholdsImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKOtsuMultipleThresholdsImageTest.cpp index ac422da4f1..9e31e5180a 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKOtsuMultipleThresholdsImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKOtsuMultipleThresholdsImageTest.cpp @@ -30,9 +30,9 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(default)", " SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -59,9 +59,9 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(two_on_float SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_NumberOfThresholds_Key, std::make_any(2)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_ReturnBinMidpoint_Key, std::make_any(true)); @@ -90,9 +90,9 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(three_on)", SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_NumberOfThresholds_Key, std::make_any(3)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_NumberOfHistogramBins_Key, std::make_any(256)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_ReturnBinMidpoint_Key, std::make_any(true)); @@ -122,9 +122,9 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(valley_empha SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_NumberOfThresholds_Key, std::make_any(3)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_ValleyEmphasis_Key, std::make_any(true)); args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_ReturnBinMidpoint_Key, std::make_any(true)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKRelabelComponentImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKRelabelComponentImageTest.cpp index 26af37ba5b..e4a340a8e6 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKRelabelComponentImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKRelabelComponentImageTest.cpp @@ -34,9 +34,9 @@ TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(default)", "[ITKIm } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKRelabelComponentImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKRelabelComponentImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKRelabelComponentImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKRelabelComponentImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -65,9 +65,9 @@ TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(no_sorting)", "[IT } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKRelabelComponentImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKRelabelComponentImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKRelabelComponentImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKRelabelComponentImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKRelabelComponentImage::k_SortByObjectSize_Key, std::make_any(false)); auto preflightResult = filter.preflight(dataStructure, args); @@ -97,9 +97,9 @@ TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(no_sorting2)", "[I } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKRelabelComponentImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKRelabelComponentImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKRelabelComponentImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKRelabelComponentImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKRelabelComponentImage::k_SortByObjectSize_Key, std::make_any(false)); args.insertOrAssign(ITKRelabelComponentImage::k_MinimumObjectSize_Key, std::make_any(140)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKRescaleIntensityImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKRescaleIntensityImageTest.cpp index 48cef04da4..04b89b10f4 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKRescaleIntensityImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKRescaleIntensityImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKRescaleIntensityImageFilter(3d)", "[ITKImagePr } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKRescaleIntensityImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKRescaleIntensityImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKRescaleIntensityImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKRescaleIntensityImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKRescaleIntensityImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKRescaleIntensityImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKSigmoidImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSigmoidImageTest.cpp index 486aed8c0b..0399291b75 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSigmoidImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSigmoidImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKSigmoidImageFilter(defaults)", "[ITKImageProce } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKSigmoidImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKSigmoidImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKSigmoidImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKSigmoidImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKSigmoidImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKSigmoidImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKSignedMaurerDistanceMapImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSignedMaurerDistanceMapImageTest.cpp index 3e117357a4..60944bb360 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSignedMaurerDistanceMapImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSignedMaurerDistanceMapImageTest.cpp @@ -31,9 +31,9 @@ TEST_CASE("ITKImageProcessing::ITKSignedMaurerDistanceMapImageFilter(default)", } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKSinImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSinImageTest.cpp index ebd479ffc6..3fa557cf10 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSinImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSinImageTest.cpp @@ -30,9 +30,9 @@ TEST_CASE("ITKImageProcessing::ITKSinImageFilter(defaults)", "[ITKImageProcessin } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKSinImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKSinImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKSinImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKSinImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKSinImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKSinImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKSqrtImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSqrtImageTest.cpp index 7882acc33c..b8f0bba745 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSqrtImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSqrtImageTest.cpp @@ -30,9 +30,9 @@ TEST_CASE("ITKImageProcessing::ITKSqrtImageFilter(defaults)", "[ITKImageProcessi } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKSqrtImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKSqrtImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKSqrtImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKSqrtImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKSqrtImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKSqrtImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKSquareImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSquareImageTest.cpp index 223fae4777..9f4e5c2e39 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSquareImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSquareImageTest.cpp @@ -32,9 +32,9 @@ TEST_CASE("ITKImageProcessing::ITKSquareImageFilter(defaults)", "[ITKImageProces } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKSquareImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKSquareImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKSquareImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKSquareImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKSquareImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKSquareImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKTanImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKTanImageTest.cpp index b652cbb88a..b8ab57ec15 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKTanImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKTanImageTest.cpp @@ -31,9 +31,9 @@ TEST_CASE("ITKImageProcessing::ITKTanImageFilter(defaults)", "[ITKImageProcessin } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKTanImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKTanImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKTanImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKTanImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKTanImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKTanImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKThresholdImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKThresholdImageTest.cpp index 5fee80ecc0..41967170ac 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKThresholdImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKThresholdImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Default)", "[ITKImageProc } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKThresholdImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKThresholdImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKThresholdImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKThresholdImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -64,9 +64,9 @@ TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Threshold1)", "[ITKImageP } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKThresholdImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKThresholdImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKThresholdImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKThresholdImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKThresholdImage::k_Lower_Key, std::make_any(25000)); args.insertOrAssign(ITKThresholdImage::k_Upper_Key, std::make_any(65535)); @@ -97,9 +97,9 @@ TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Threshold2)", "[ITKImageP } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKThresholdImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKThresholdImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKThresholdImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKThresholdImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKThresholdImage::k_Lower_Key, std::make_any(0)); args.insertOrAssign(ITKThresholdImage::k_Upper_Key, std::make_any(25000)); args.insertOrAssign(ITKThresholdImage::k_OutsideValue_Key, std::make_any(25000)); diff --git a/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMaximaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMaximaImageTest.cpp index 86a843b69d..1d6538641a 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMaximaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMaximaImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKValuedRegionalMaximaImageFilter(defaults)", "[ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKValuedRegionalMaximaImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKValuedRegionalMaximaImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKValuedRegionalMaximaImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKValuedRegionalMaximaImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKValuedRegionalMaximaImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKValuedRegionalMaximaImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMinimaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMinimaImageTest.cpp index be935d85d0..786c71872f 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMinimaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMinimaImageTest.cpp @@ -33,9 +33,9 @@ TEST_CASE("ITKImageProcessing::ITKValuedRegionalMinimaImageFilter(defaults)", "[ } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKValuedRegionalMinimaImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKValuedRegionalMinimaImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKValuedRegionalMinimaImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKValuedRegionalMinimaImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKValuedRegionalMinimaImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKValuedRegionalMinimaImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) diff --git a/src/Plugins/ITKImageProcessing/test/ITKWhiteTopHatImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKWhiteTopHatImageTest.cpp index f28f0aed81..a3cbe2c874 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKWhiteTopHatImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKWhiteTopHatImageTest.cpp @@ -35,9 +35,9 @@ TEST_CASE("ITKImageProcessing::ITKWhiteTopHatImageFilter(WhiteTopHatErode)", "[I } // End Image Comparison Scope Arguments args; - args.insertOrAssign(ITKWhiteTopHatImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ITKWhiteTopHatImage::k_SelectedImageDataPath_Key, std::make_any(inputDataPath)); - args.insertOrAssign(ITKWhiteTopHatImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); + args.insertOrAssign(ITKWhiteTopHatImage::k_InputImageGeomPath_Key, std::make_any(inputGeometryPath)); + args.insertOrAssign(ITKWhiteTopHatImage::k_InputImageDataPath_Key, std::make_any(inputDataPath)); + args.insertOrAssign(ITKWhiteTopHatImage::k_OutputImageArrayName_Key, std::make_any(outputArrayName)); args.insertOrAssign(ITKWhiteTopHatImage::k_KernelRadius_Key, std::make_any::ValueType>(std::vector{1, 1, 1})); args.insertOrAssign(ITKWhiteTopHatImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); diff --git a/src/Plugins/ITKImageProcessing/tools/filter.cpp.in b/src/Plugins/ITKImageProcessing/tools/filter.cpp.in index a0cf6fe106..2d77d31065 100644 --- a/src/Plugins/ITKImageProcessing/tools/filter.cpp.in +++ b/src/Plugins/ITKImageProcessing/tools/filter.cpp.in @@ -54,11 +54,11 @@ Parameters ${FILTER_NAME}::parameters() const Parameters params; ${PARAMETER_DEFS} params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, ${INPUT_ARRAY_TYPES})); + params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, ${INPUT_ARRAY_TYPES})); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageDataPath_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } diff --git a/src/Plugins/ITKImageProcessing/tools/filter.hpp.in b/src/Plugins/ITKImageProcessing/tools/filter.hpp.in index 1bda691ffd..7faeff6294 100644 --- a/src/Plugins/ITKImageProcessing/tools/filter.hpp.in +++ b/src/Plugins/ITKImageProcessing/tools/filter.hpp.in @@ -29,9 +29,9 @@ public: ${FILTER_NAME}& operator=(${FILTER_NAME}&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_SelectedImageGeomPath_Key = "selected_image_geom_path"; - static inline constexpr StringLiteral k_SelectedImageDataPath_Key = "input_image_data_path"; - static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path";${PARAMETER_KEYS} + static inline constexpr StringLiteral k_InputImageGeomPath_Key = "input_image_geom_path"; + static inline constexpr StringLiteral k_InputImageDataPath_Key = "input_image_data_path"; + static inline constexpr StringLiteral k_OutputImageArrayName_Key = "output_array_name";${PARAMETER_KEYS} /** * @brief Returns the name of the filter. * @return diff --git a/wrapping/python/docs/generate_sphinx_docs.cpp b/wrapping/python/docs/generate_sphinx_docs.cpp index 1f5aae98d8..380643a442 100644 --- a/wrapping/python/docs/generate_sphinx_docs.cpp +++ b/wrapping/python/docs/generate_sphinx_docs.cpp @@ -765,10 +765,10 @@ void GeneratePythonRstFiles() for(const auto& parameter : parameters) { auto const& paramValue = parameter.second; - if(paramValue->helpText().empty()) - { - std::cout << filter->name() << "::" << paramValue->name() << " HELP Text is empty\n"; - } + // if(paramValue->helpText().empty()) + // { + // std::cout << filter->name() << "::" << paramValue->name() << " HELP Text is empty\n"; + // } for(const auto& letter : paramValue->name()) { if(::isupper(letter) != 0) @@ -793,6 +793,24 @@ void GeneratePythonRstFiles() { auto const& anyParameter = parameterPair.second; rstStream << ", "; + std::string pType = s_ParameterMap[anyParameter->uuid()]; + if(!nx::core::StringUtilities::ends_with(parameterPair.first, "_path") && + (pType == "simplnx.ArraySelectionParameter" || pType == "simplnx.ArrayCreationParameter" || pType == "simplnx.AttributeMatrixSelectionParameter" || + pType == "simplnx.DataGroupCreationParameter" || pType == "simplnx.DataGroupSelectionParameter" || pType == "simplnx.DataPathSelectionParameter" || + pType == "simplnx.GeometrySelectionParameter" || pType == "simplnx.NeighborListSelectionParameter" || pType == "simplnx.DataGroupCreationParameter")) + { + std::cout << filterClassName << " " << parameterPair.first << " " << pType << std::endl; + } + + if(pType == "simplnx.MultiArraySelectionParameter" && !nx::core::StringUtilities::ends_with(parameterPair.first, "s")) + { + std::cout << filterClassName << " " << parameterPair.first << " " << pType << std::endl; + } + + if(pType == "simplnx.DataObjectNameParameter" && !nx::core::StringUtilities::ends_with(parameterPair.first, "_name")) + { + std::cout << filterClassName << " " << parameterPair.first << " " << pType << std::endl; + } rstStream << parameterPair.first; memberStream << " :param " << nx::core::StringUtilities::replace(s_ParameterMap[anyParameter->uuid()], "simplnx.", "") << " " << anyParameter->name() << ": " << anyParameter->helpText()