From a2cea05359d760365c4c62938d2e660afef90f91 Mon Sep 17 00:00:00 2001 From: Joey Kleingers Date: Thu, 19 Dec 2024 14:58:10 -0500 Subject: [PATCH 1/2] Use AttributeMatrixSelectionParameter instead of DataGroupSelectionParameter. Signed-off-by: Joey Kleingers --- .../Filters/ComputeTriangleGeomShapesFilter.cpp | 6 +++--- .../src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp | 6 ++---- .../src/SimplnxCore/Filters/ComputeNumFeaturesFilter.cpp | 7 +++---- .../SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.cpp | 7 +++---- .../Filters/ComputeTriangleGeomCentroidsFilter.cpp | 8 ++++---- .../Filters/ComputeTriangleGeomVolumesFilter.cpp | 8 ++++---- .../SimplnxCore/Filters/ComputeVolumeFractionsFilter.cpp | 7 +++---- .../Filters/CreateFeatureArrayFromElementArrayFilter.cpp | 7 +++---- .../Filters/NearestPointFuseRegularGridsFilter.cpp | 9 ++++----- .../SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp | 4 +--- 10 files changed, 30 insertions(+), 39 deletions(-) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeTriangleGeomShapesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeTriangleGeomShapesFilter.cpp index 8f96dd20da..91cc7490b4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeTriangleGeomShapesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeTriangleGeomShapesFilter.cpp @@ -55,9 +55,9 @@ Parameters ComputeTriangleGeomShapesFilter::parameters() const ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{2}})); params.insertSeparator(Parameters::Separator{"Input Face Feature Data"}); - params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Face Feature Attribute Matrix", - "The DataPath to the AttributeMatrix that holds feature data for the faces", DataPath({"TriangleDataContainer", "Face Feature Data"}), - DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); + params.insert(std::make_unique( + k_FeatureAttributeMatrixPath_Key, "Face Feature Attribute Matrix", "The DataPath to the AttributeMatrix that holds feature data for the faces", + DataPath({"TriangleDataContainer", "Face Feature Data"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); params.insert(std::make_unique(k_CentroidsArrayPath_Key, "Face Feature Centroids", "Input DataPath to the **Feature Centroids** for the face data", DataPath({"Face Feature Data", "Centroids"}), ArraySelectionParameter::AllowedTypes{DataType::float32})); params.insert(std::make_unique(k_VolumesArrayPath_Key, "Face Feature Volumes", "Input DataPath to the **Feature Volumes** for the face data", diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp index f9b3b0b886..4773441ba5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp @@ -6,7 +6,6 @@ #include "simplnx/Filter/Actions/CreateArrayAction.hpp" #include "simplnx/Parameters/ArraySelectionParameter.hpp" #include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" #include "simplnx/Utilities/SIMPLConversion.hpp" @@ -54,9 +53,8 @@ Parameters ComputeFeatureRectFilter::parameters() const params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{{"FeatureIds"}}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_FeatureDataAttributeMatrixPath_Key, "Feature Data Attribute Matrix", - "The path to the feature data attribute matrix associated with the input feature ids array", DataPath{}, - DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); + params.insert(std::make_unique(k_FeatureDataAttributeMatrixPath_Key, "Feature Data Attribute Matrix", + "The path to the feature data attribute matrix associated with the input feature ids array", DataPath{})); params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_FeatureRectArrayName_Key, "Feature Rect", "The feature rect calculated from the feature ids", "FeatureRect")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNumFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNumFeaturesFilter.cpp index 7471a81f44..cd46b6e336 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNumFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNumFeaturesFilter.cpp @@ -6,7 +6,6 @@ #include "simplnx/Filter/Actions/CreateArrayAction.hpp" #include "simplnx/Parameters/ArraySelectionParameter.hpp" #include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" #include "simplnx/Utilities/SIMPLConversion.hpp" @@ -56,9 +55,9 @@ Parameters ComputeNumFeaturesFilter::parameters() const DataPath({"DataContainer", "Feature Data", "Phases"}), nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); - params.insert(std::make_unique(k_EnsembleAttributeMatrixPath_Key, "Ensemble Attribute Matrix", - "The path to the ensemble attribute matrix where the number of features array will be stored", - DataPath({"DataContainer", "Ensemble Data"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); + params.insert(std::make_unique(k_EnsembleAttributeMatrixPath_Key, "Ensemble Attribute Matrix", + "The path to the ensemble attribute matrix where the number of features array will be stored", + DataPath({"DataContainer", "Ensemble Data"}))); params.insertSeparator(Parameters::Separator{"Output Ensemble Data"}); params.insert(std::make_unique(k_NumFeaturesArrayName_Key, "Number of Features", "The number of Features that belong to each Ensemble", "Number of Features")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.cpp index 6d0f5d18c6..b30991c8c1 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeSurfaceFeaturesFilter.cpp @@ -1,4 +1,5 @@ #include "ComputeSurfaceFeaturesFilter.hpp" +#include #include "simplnx/Common/Array.hpp" #include "simplnx/DataStructure/DataPath.hpp" @@ -7,7 +8,6 @@ #include "simplnx/Parameters/ArraySelectionParameter.hpp" #include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" #include "simplnx/Parameters/BoolParameter.hpp" -#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" #include "simplnx/Parameters/DataObjectNameParameter.hpp" #include "simplnx/Parameters/GeometrySelectionParameter.hpp" @@ -239,9 +239,8 @@ Parameters ComputeSurfaceFeaturesFilter::parameters() const params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"Cell Data", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Input Cell Feature Data"}); - params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", - "The path to the cell feature attribute matrix associated with the input feature ids array", DataPath{}, - DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); + params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", + "The path to the cell feature attribute matrix associated with the input feature ids array", DataPath{})); params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_SurfaceFeaturesArrayName_Key, "Surface Features", "The created surface features array. Flag of 1 if Feature touches an outer surface or of 0 if it does not", "SurfaceFeatures")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomCentroidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomCentroidsFilter.cpp index c0f60ba2db..e27015a198 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomCentroidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomCentroidsFilter.cpp @@ -6,7 +6,7 @@ #include "simplnx/DataStructure/DataPath.hpp" #include "simplnx/Filter/Actions/CreateArrayAction.hpp" #include "simplnx/Parameters/ArraySelectionParameter.hpp" -#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" #include "simplnx/Parameters/DataObjectNameParameter.hpp" #include "simplnx/Parameters/GeometrySelectionParameter.hpp" @@ -55,9 +55,9 @@ Parameters ComputeTriangleGeomCentroidsFilter::parameters() const params.insert(std::make_unique(k_FaceLabelsArrayPath_Key, "Face Labels", "The DataPath to the FaceLabels values.", DataPath{}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{2}})); params.insertSeparator(Parameters::Separator{"Input Face Feature Data"}); - params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Face Feature Attribute Matrix", - "The DataPath to the AttributeMatrix that holds feature data for the faces", DataPath({"TriangleDataContainer", "Face Feature Data"}), - DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); + params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Face Feature Attribute Matrix", + "The DataPath to the AttributeMatrix that holds feature data for the faces", + DataPath({"TriangleDataContainer", "Face Feature Data"}))); params.insertSeparator(Parameters::Separator{"Output Face Feature Data"}); params.insert(std::make_unique(k_CentroidsArrayName_Key, "Calculated Centroids", "Centroid values created in the Face Feature Data", "Centroids")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomVolumesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomVolumesFilter.cpp index ac871a44e3..923f29a89d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomVolumesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeTriangleGeomVolumesFilter.cpp @@ -7,7 +7,7 @@ #include "simplnx/DataStructure/DataPath.hpp" #include "simplnx/Filter/Actions/CreateArrayAction.hpp" #include "simplnx/Parameters/ArraySelectionParameter.hpp" -#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" #include "simplnx/Parameters/DataObjectNameParameter.hpp" #include "simplnx/Parameters/GeometrySelectionParameter.hpp" @@ -56,9 +56,9 @@ Parameters ComputeTriangleGeomVolumesFilter::parameters() const params.insert(std::make_unique(k_FaceLabelsArrayPath_Key, "Face Labels", "The DataPath to the FaceLabels values.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{2}})); params.insertSeparator(Parameters::Separator{"Input Face Feature Data"}); - params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Face Feature Attribute Matrix", - "The DataPath to the AttributeMatrix that holds feature data for the faces", DataPath({"TriangleDataContainer", "Face Feature Data"}), - DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); + params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Face Feature Attribute Matrix", + "The DataPath to the AttributeMatrix that holds feature data for the faces", + DataPath({"TriangleDataContainer", "Face Feature Data"}))); params.insertSeparator(Parameters::Separator{"Output Face Feature Data"}); params.insert(std::make_unique(k_VolumesArrayName_Key, "Calculated Volumes", "Calculated volumes data created in the Face Feature Data Attribute Matrix", "Volumes")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVolumeFractionsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVolumeFractionsFilter.cpp index 39cccce8f5..8630c64a25 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVolumeFractionsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeVolumeFractionsFilter.cpp @@ -6,7 +6,6 @@ #include "simplnx/Filter/Actions/CreateArrayAction.hpp" #include "simplnx/Parameters/ArraySelectionParameter.hpp" #include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" #include "simplnx/Utilities/SIMPLConversion.hpp" @@ -57,9 +56,9 @@ Parameters ComputeVolumeFractionsFilter::parameters() const DataPath({"DataContainer", "Cell Data", "Phases"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); - params.insert(std::make_unique(k_CellEnsembleAttributeMatrixPath_Key, "Cell Ensemble Attribute Matrix", - "The path to the cell ensemble attribute matrix where the output volume fractions array will be stored", - DataPath({"DataContainer", "Cell Ensemble Data"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); + params.insert(std::make_unique(k_CellEnsembleAttributeMatrixPath_Key, "Cell Ensemble Attribute Matrix", + "The path to the cell ensemble attribute matrix where the output volume fractions array will be stored", + DataPath({"DataContainer", "Cell Ensemble Data"}))); params.insertSeparator(Parameters::Separator{"Output Ensemble Data"}); params.insert(std::make_unique(k_VolFractionsArrayName_Key, "Volume Fractions", "Fraction of volume that belongs to each Ensemble", "Volume Fractions")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp index 64ad228ee4..d7c3b6e4ed 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp @@ -6,7 +6,6 @@ #include "simplnx/Filter/Actions/CreateArrayAction.hpp" #include "simplnx/Parameters/ArraySelectionParameter.hpp" #include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" #include "simplnx/Parameters/DataObjectNameParameter.hpp" #include "simplnx/Utilities/DataObjectUtilities.hpp" #include "simplnx/Utilities/FilterUtilities.hpp" @@ -115,9 +114,9 @@ Parameters CreateFeatureArrayFromElementArrayFilter::parameters() const params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Input Feature Data"}); - params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", - "The path to the cell feature attribute matrix where the converted output feature array will be stored", - DataPath({"DataContainer", "Cell Feature Data"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); + params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", + "The path to the cell feature attribute matrix where the converted output feature array will be stored", + DataPath({"DataContainer", "Cell Feature Data"}))); params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_CreatedArrayName_Key, "Created Feature Attribute Array", "The path to the copied AttributeArray", "")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp index cfc60c5cae..31356bb07e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp @@ -10,7 +10,6 @@ #include "simplnx/Filter/Actions/CreateStringArrayAction.hpp" #include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" #include "simplnx/Parameters/BoolParameter.hpp" -#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" #include "simplnx/Parameters/GeometrySelectionParameter.hpp" #include "simplnx/Parameters/NumberParameter.hpp" #include "simplnx/Utilities/SIMPLConversion.hpp" @@ -63,14 +62,14 @@ Parameters NearestPointFuseRegularGridsFilter::parameters() const params.insert(std::make_unique(k_SamplingGeometryPath_Key, "Sampling Image Geometry", "This is the geometry that will be copied into the reference geometry at the overlap", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_SamplingCellAttributeMatrixPath_Key, "Sampling Cell Attribute Matrix", "The attribute matrix for the sampling geometry", DataPath{}, - DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); + params.insert( + std::make_unique(k_SamplingCellAttributeMatrixPath_Key, "Sampling Cell Attribute Matrix", "The attribute matrix for the sampling geometry", DataPath{})); params.insertSeparator(Parameters::Separator{"Input Reference Data"}); params.insert(std::make_unique(k_ReferenceGeometryPath_Key, "Reference Image Geometry", "This is the geometry that will store the values from the overlap", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_ReferenceCellAttributeMatrixPath_Key, "Reference Cell Attribute Matrix", "The attribute matrix for the reference geometry", DataPath{}, - DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); + params.insert( + std::make_unique(k_ReferenceCellAttributeMatrixPath_Key, "Reference Cell Attribute Matrix", "The attribute matrix for the reference geometry", DataPath{})); // link parameters params.linkParameters(k_UseFill_Key, k_FillValue_Key, true); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp index bbd30c9779..cd12dc85d6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp @@ -7,7 +7,6 @@ #include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" #include "simplnx/Parameters/BoolParameter.hpp" #include "simplnx/Parameters/ChoicesParameter.hpp" -#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" #include "simplnx/Parameters/FileSystemPathParameter.hpp" #include "simplnx/Utilities/DataGroupUtilities.hpp" #include "simplnx/Utilities/OStreamUtilities.hpp" @@ -65,8 +64,7 @@ Parameters WriteFeatureDataCSVFilter::parameters() const params.insert(std::make_unique(k_DelimiterChoiceInt_Key, "Delimiter", "Default Delimiter is Comma", to_underlying(OStreamUtilities::Delimiter::Comma), ChoicesParameter::Choices{"Space", "Semicolon", "Comma", "Colon", "Tab"})); // sequence dependent DO NOT REORDER params.insertSeparator(Parameters::Separator{"Input Data Objects"}); - params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "Input Feature Attribute Matrix", DataPath{}, - DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); + params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "Input Feature Attribute Matrix", DataPath{})); return params; } From 67ff3dac2c63a9db39bfe868db2be35da15fc554 Mon Sep 17 00:00:00 2001 From: Joey Kleingers Date: Thu, 19 Dec 2024 15:06:31 -0500 Subject: [PATCH 2/2] 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{},