From 67ff3dac2c63a9db39bfe868db2be35da15fc554 Mon Sep 17 00:00:00 2001 From: Joey Kleingers Date: Thu, 19 Dec 2024 15:06:31 -0500 Subject: [PATCH] Use GeometrySelectionParameter instead of DataPathSelectionParameter. Signed-off-by: Joey Kleingers --- .../Filters/ApproximatePointCloudHullFilter.cpp | 5 +++-- .../SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp | 5 ++--- .../SimplnxCore/Filters/IterativeClosestPointFilter.cpp | 8 +++++--- .../Filters/PointSampleTriangleGeometryFilter.cpp | 5 +++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.cpp index 37a2f8853b..ccec8b7530 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.cpp @@ -5,7 +5,7 @@ #include "simplnx/Filter/Actions/CreateVertexGeometryAction.hpp" #include "simplnx/Parameters/DataGroupCreationParameter.hpp" #include "simplnx/Parameters/DataGroupSelectionParameter.hpp" -#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" #include "simplnx/Parameters/NumberParameter.hpp" #include "simplnx/Parameters/VectorParameter.hpp" @@ -67,7 +67,8 @@ Parameters ApproximatePointCloudHullFilter::parameters() const params.insert(std::make_unique(k_MinEmptyNeighbors_Key, "Minimum Number of Empty Neighbors", "Minimum number of empty neighbors", 0)); params.insertSeparator(Parameters::Separator{"Input Vertex Geometry"}); - params.insert(std::make_unique(k_VertexGeomPath_Key, "Vertex Geometry", "Path to the target Vertex geometry", DataPath())); + params.insert(std::make_unique(k_VertexGeomPath_Key, "Vertex Geometry", "Path to the target Vertex geometry", DataPath(), + GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); params.insertSeparator(Parameters::Separator{"Output Vertex Geometry"}); params.insert(std::make_unique(k_HullVertexGeomPath_Key, "Hull Vertex Geometry", "Path to create the hull Vertex geometry", DataPath{})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp index f348344b63..c9d13c22d0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp @@ -5,7 +5,6 @@ #include "simplnx/Filter/Actions/CreateArrayAction.hpp" #include "simplnx/Parameters/ArrayCreationParameter.hpp" #include "simplnx/Parameters/ArraySelectionParameter.hpp" -#include "simplnx/Parameters/DataPathSelectionParameter.hpp" #include "simplnx/Utilities/FilterUtilities.hpp" #include @@ -141,8 +140,8 @@ Parameters ComputeDifferencesMapFilter::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); - params.insert(std::make_unique(k_FirstInputArrayPath_Key, "First Input Array", "DataPath to the first input DataArray", DataPath{})); - params.insert(std::make_unique(k_SecondInputArrayPath_Key, "Second Input Array", "DataPath to the second input DataArray", DataPath{})); + params.insert(std::make_unique(k_FirstInputArrayPath_Key, "First Input Array", "DataPath to the first input DataArray", DataPath{}, GetAllDataTypes())); + params.insert(std::make_unique(k_SecondInputArrayPath_Key, "Second Input Array", "DataPath to the second input DataArray", DataPath{}, GetAllDataTypes())); params.insert(std::make_unique(k_DifferenceMapArrayPath_Key, "Difference Map", "DataPath for created Difference Map DataArray", DataPath{})); return params; } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp index efe1fa211b..8a7c912d0b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp @@ -9,7 +9,7 @@ #include "simplnx/Parameters/BoolParameter.hpp" #include "simplnx/Parameters/DataGroupCreationParameter.hpp" #include "simplnx/Parameters/DataGroupSelectionParameter.hpp" -#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" #include "simplnx/Parameters/NumberParameter.hpp" #include "simplnx/Utilities/SIMPLConversion.hpp" @@ -106,8 +106,10 @@ Parameters IterativeClosestPointFilter::parameters() const params.insert(std::make_unique(k_ApplyTransformation_Key, "Apply Transformation to Moving Geometry", "If checked, geometry will be updated implicitly", false)); params.insertSeparator(Parameters::Separator{"Input Data Objects"}); - params.insert(std::make_unique(k_MovingVertexPath_Key, "Moving Vertex Geometry", "The geometry to align [mutable]", DataPath())); - params.insert(std::make_unique(k_TargetVertexPath_Key, "Target Vertex Geometry", "The geometry to be matched against [immutable]", DataPath())); + params.insert(std::make_unique(k_MovingVertexPath_Key, "Moving Vertex Geometry", "The geometry to align [mutable]", DataPath(), + GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); + params.insert(std::make_unique(k_TargetVertexPath_Key, "Target Vertex Geometry", "The geometry to be matched against [immutable]", DataPath(), + GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_TransformArrayPath_Key, "Output Transform Array", "This is the array to store the transform matrix in", DataPath())); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp index 44a800878a..b5d386b6bb 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp @@ -11,7 +11,7 @@ #include "simplnx/Parameters/DataGroupCreationParameter.hpp" #include "simplnx/Parameters/DataGroupSelectionParameter.hpp" #include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" #include "simplnx/Parameters/MultiArraySelectionParameter.hpp" #include "simplnx/Parameters/NumberParameter.hpp" #include "simplnx/Utilities/SIMPLConversion.hpp" @@ -70,7 +70,8 @@ Parameters PointSampleTriangleGeometryFilter::parameters() const params.insert(std::make_unique(k_SeedArrayName_Key, "Stored Seed Value Array Name", "Name of array holding the seed value", "PointSampleTriangleGeometry SeedValue")); params.insertSeparator(Parameters::Separator{"Input Triangle Geometry"}); - params.insert(std::make_unique(k_TriangleGeometry_Key, "Triangle Geometry to Sample", "The complete path to the triangle Geometry from which to sample", DataPath{})); + params.insert(std::make_unique(k_TriangleGeometry_Key, "Triangle Geometry to Sample", "The complete path to the triangle Geometry from which to sample", DataPath{}, + GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insertSeparator(Parameters::Separator{"Input Triangle Face Data"}); params.insert(std::make_unique(k_TriangleAreasArrayPath_Key, "Face Areas", "The complete path to the array specifying the area of each Face", DataPath{},