SIMPLNxCore filters (2)

Signed-off-by: Michael Jackson <[email protected]>
BlueQuartzSoftware · Apr 28, 2024 · c5bb80f · c5bb80f
1 parent 5abf352
commit c5bb80f
Show file tree

Hide file tree

Showing 105 changed files with 698 additions and 692 deletions.
diff --git a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline b/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline
@@ -344,7 +344,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::FindNeighbors",
+        "name": "simplnx::FindNeighborsFilter",
         "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
       },
       "isDisabled": false

diff --git a/pipelines/PorosityAnalysis.d3dpipeline b/pipelines/PorosityAnalysis.d3dpipeline
@@ -108,7 +108,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CopyFeatureArrayToElementArray",
+        "name": "simplnx::CopyFeatureArrayToElementArrayFilter",
         "uuid": "4c8c976a-993d-438b-bd8e-99f71114b9a1"
       },
       "isDisabled": false
@@ -129,7 +129,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CreateDataArray",
+        "name": "simplnx::CreateDataArrayFilter",
         "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d"
       },
       "isDisabled": false

diff --git a/scripts/generate_simpl_conversion_code.py b/scripts/generate_simpl_conversion_code.py
@@ -46,7 +46,7 @@ def create_filter_conversion(simpl_filter: SIMPLFilterInfo, complex_filter_name:
   converter_code.append('\n')
   converter_code.append(f'Result<Arguments> {complex_filter_name}::FromSIMPLJson(const nlohmann::json& json)\n')
   converter_code.append('{\n')
-  converter_code.append('  Arguments args = CreateDataArray().getDefaultArguments();\n')
+  converter_code.append('  Arguments args = CreateDataArrayFilter().getDefaultArguments();\n')
   converter_code.append('\n')
   converter_code.append('  std::vector<Result<>> results;\n')
   converter_code.append('\n')

diff --git a/scripts/simpl_filters.json b/scripts/simpl_filters.json
@@ -1135,7 +1135,7 @@
                     "uuid": "{6cc3148c-0bad-53b4-9568-ee1971cadb00}"
                 },
                 {
-                    "name": "FindNeighborListStatistics",
+                    "name": "FindNeighborListStatisticsFilter",
                     "parameters": [
                         {
                             "name": "FindLength",
@@ -2371,7 +2371,7 @@
                     "uuid": "{5a2b714e-bae9-5213-8171-d1e190609e2d}"
                 },
                 {
-                    "name": "RemoveFlaggedVertices",
+                    "name": "RemoveFlaggedVerticesFilter",
                     "parameters": [
                         {
                             "name": "VertexGeometry",
@@ -2389,7 +2389,7 @@
                     "uuid": "{379ccc67-16dd-530a-984f-177db2314bac}"
                 },
                 {
-                    "name": "RobustAutomaticThreshold",
+                    "name": "RobustAutomaticThresholdFilter",
                     "parameters": [
                         {
                             "name": "InputArrayPath",
@@ -8983,7 +8983,7 @@
                     "uuid": "{697ed3de-db33-5dd1-a64b-04fb71e7d63e}"
                 },
                 {
-                    "name": "FindNeighbors",
+                    "name": "FindNeighborsFilter",
                     "parameters": [
                         {
                             "name": "StoreBoundaryCells",
@@ -11707,7 +11707,7 @@
                     "uuid": "{f4ba5fa4-bb5c-5dd1-9429-0dd86d0ecb37}"
                 },
                 {
-                    "name": "CopyFeatureArrayToElementArray",
+                    "name": "CopyFeatureArrayToElementArrayFilter",
                     "parameters": [
                         {
                             "name": "",
@@ -11781,7 +11781,7 @@
                     "uuid": "{93375ef0-7367-5372-addc-baa019b1b341}"
                 },
                 {
-                    "name": "CreateDataArray",
+                    "name": "CreateDataArrayFilter",
                     "parameters": [
                         {
                             "name": "ScalarType",
@@ -11825,7 +11825,7 @@
                     "uuid": "{816fbe6b-7c38-581b-b149-3f839fb65b93}"
                 },
                 {
-                    "name": "CreateFeatureArrayFromElementArray",
+                    "name": "CreateFeatureArrayFromElementArrayFilter",
                     "parameters": [
                         {
                             "name": "",
@@ -12491,7 +12491,7 @@
                     "uuid": "{34a19028-c50b-5dea-af0e-e06c798d3686}"
                 },
                 {
-                    "name": "MoveData",
+                    "name": "MoveDataFilter",
                     "parameters": [
                         {
                             "name": "WhatToMove",

diff --git a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline
@@ -108,7 +108,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CopyFeatureArrayToElementArray",
+        "name": "simplnx::CopyFeatureArrayToElementArrayFilter",
         "uuid": "4c8c976a-993d-438b-bd8e-99f71114b9a1"
       },
       "isDisabled": false
@@ -131,7 +131,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CreateDataArray",
+        "name": "simplnx::CreateDataArrayFilter",
         "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d"
       },
       "isDisabled": false

diff --git a/...onAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline b/...onAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline
@@ -238,7 +238,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "nx::core::FindNeighbors",
+        "name": "simplnx::FindNeighborsFilter",
         "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
       },
       "isDisabled": false
@@ -331,7 +331,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "nx::core::FindNeighbors",
+        "name": "simplnx::FindNeighborsFilter",
         "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
       },
       "isDisabled": false

diff --git a/...nAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline b/...nAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline
@@ -107,7 +107,7 @@
         "surface_features_name": "SurfaceFeatures"
       },
       "filter": {
-        "name": "simplnx::FindNeighbors",
+        "name": "simplnx::FindNeighborsFilter",
         "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
       },
       "isDisabled": false

diff --git a/...alysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline b/...alysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline
@@ -320,7 +320,7 @@
                       },
                       "comments": "",
                       "filter": {
-                        "name": "simplnx::FindNeighbors",
+                        "name": "simplnx::FindNeighborsFilter",
                         "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
                       },
                       "isDisabled": false
@@ -397,7 +397,7 @@
                       },
                       "comments": "",
                       "filter": {
-                        "name": "simplnx::FindNeighbors",
+                        "name": "simplnx::FindNeighborsFilter",
                         "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
                       },
                       "isDisabled": false
@@ -580,7 +580,7 @@
               },
               "comments": "",
               "filter": {
-                "name": "simplnx::FindNeighbors",
+                "name": "simplnx::FindNeighborsFilter",
                 "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
               },
               "isDisabled": false

diff --git a/...OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline b/...OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline
@@ -106,7 +106,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::MoveData",
+        "name": "simplnx::MoveDataFilter",
         "uuid": "651e5894-ab7c-4176-b7f0-ea466c521753"
       },
       "isDisabled": true

diff --git a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline
@@ -83,7 +83,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CreateDataArray",
+        "name": "simplnx::CreateDataArrayFilter",
         "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d"
       },
       "isDisabled": false

diff --git a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline
@@ -576,7 +576,7 @@
                                                       },
                                                       "comments": "",
                                                       "filter": {
-                                                        "name": "simplnx::FindNeighbors",
+                                                        "name": "simplnx::FindNeighborsFilter",
                                                         "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
                                                       },
                                                       "isDisabled": false
@@ -653,7 +653,7 @@
                                                       },
                                                       "comments": "",
                                                       "filter": {
-                                                        "name": "simplnx::FindNeighbors",
+                                                        "name": "simplnx::FindNeighborsFilter",
                                                         "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
                                                       },
                                                       "isDisabled": false
@@ -836,7 +836,7 @@
                                               },
                                               "comments": "",
                                               "filter": {
-                                                "name": "simplnx::FindNeighbors",
+                                                "name": "simplnx::FindNeighborsFilter",
                                                 "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
                                               },
                                               "isDisabled": false
@@ -1094,7 +1094,7 @@
                               },
                               "comments": "",
                               "filter": {
-                                "name": "simplnx::MoveData",
+                                "name": "simplnx::MoveDataFilter",
                                 "uuid": "651e5894-ab7c-4176-b7f0-ea466c521753"
                               },
                               "isDisabled": false

diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp
@@ -42,11 +42,11 @@ enum class RotationRepresentation : uint64_t
 
 } // namespace RotateSampleRefFrame
 
-namespace RenameDataObject
+namespace RenameDataObjectFilter
 {
 static inline constexpr nx::core::StringLiteral k_DataObject_Key = "data_object";
 static inline constexpr nx::core::StringLiteral k_NewName_Key = "new_name";
-} // namespace RenameDataObject
+} // namespace RenameDataObjectFilter
 
 namespace DeleteDataFilter
 {

diff --git a/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp b/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp
@@ -76,7 +76,7 @@ const FilterHandle k_ReadTextDataArrayFilterHandle(k_ReadTextDataArrayFilterId,
 // Make sure we can instantiate the Read DREAM3D Data File
 const Uuid k_ReadDREAM3DFilterId = *Uuid::FromString("0dbd31c7-19e0-4077-83ef-f4a6459a0e2d");
 const FilterHandle k_ReadDREAM3DFilterHandle(k_ReadDREAM3DFilterId, k_SimplnxCorePluginId);
-// Make sure we can instantiate the Read RenameDataObject
+// Make sure we can instantiate the Read RenameDataObjectFilter
 const Uuid k_RenameDataObjectFilterId = *Uuid::FromString("911a3aa9-d3c2-4f66-9451-8861c4b726d5");
 const FilterHandle k_RenameDataObjectFilterHandle(k_RenameDataObjectFilterId, k_SimplnxCorePluginId);
 // Make sure we can instantiate the Crop Image Geometry

diff --git a/src/Plugins/SimplnxCore/CMakeLists.txt b/src/Plugins/SimplnxCore/CMakeLists.txt
@@ -27,11 +27,11 @@ set(FilterList
   ConvertColorToGrayScaleFilter
   ConvertDataFilter
   CopyDataObjectFilter
-  CopyFeatureArrayToElementArray
+  CopyFeatureArrayToElementArrayFilter
   CreateAttributeMatrixFilter
-  CreateDataArray
+  CreateDataArrayFilter
   CreateDataGroupFilter
-  CreateFeatureArrayFromElementArray
+  CreateFeatureArrayFromElementArrayFilter
   CreateGeometryFilter
   CreateImageGeometryFilter
   CropImageGeometryFilter
@@ -59,8 +59,8 @@ set(FilterList
   FindFeaturePhasesFilter
   FindLargestCrossSectionsFilter
   FindNeighborhoodsFilter
-  FindNeighborListStatistics
-  FindNeighbors
+  FindNeighborListStatisticsFilter
+  FindNeighborsFilter
   FindNumFeaturesFilter
   FindSurfaceAreaToVolumeFilter
   FindSurfaceFeaturesFilter
@@ -83,7 +83,7 @@ set(FilterList
   LaplacianSmoothingFilter
   MapPointCloudToRegularGridFilter
   MinNeighborsFilter
-  MoveData
+  MoveDataFilter
   MultiThresholdObjectsFilter
   NearestPointFuseRegularGridsFilter
   PartitionGeometryFilter
@@ -93,22 +93,22 @@ set(FilterList
   ReadCSVFileFilter
   ReadDeformKeyFileV12Filter
   ReadDREAM3DFilter
-  ReadHDF5Dataset
+  ReadHDF5DatasetFilter
   ReadRawBinaryFilter
   ReadStlFileFilter
   ReadTextDataArrayFilter
   ReadVolumeGraphicsFileFilter
   RegularGridSampleSurfaceMeshFilter
   RemoveFlaggedFeaturesFilter
   RemoveFlaggedTrianglesFilter
-  RemoveFlaggedVertices
+  RemoveFlaggedVerticesFilter
   RemoveMinimumSizeFeaturesFilter
-  RenameDataObject
+  RenameDataObjectFilter
   ReplaceElementAttributesWithNeighborValuesFilter
   ResampleImageGeomFilter
   ResampleRectGridToImageGeomFilter
   ReverseTriangleWindingFilter
-  RobustAutomaticThreshold
+  RobustAutomaticThresholdFilter
   RotateSampleRefFrameFilter
   ScalarSegmentFeaturesFilter
   SetImageGeomOriginScalingFilter

diff --git a/...re/docs/CopyFeatureArrayToElementArray.md → ...s/CopyFeatureArrayToElementArrayFilter.md b/...re/docs/CopyFeatureArrayToElementArray.md → ...s/CopyFeatureArrayToElementArrayFilter.md
diff --git a/...ugins/SimplnxCore/docs/CreateDataArray.md → ...SimplnxCore/docs/CreateDataArrayFilter.md b/...ugins/SimplnxCore/docs/CreateDataArray.md → ...SimplnxCore/docs/CreateDataArrayFilter.md
diff --git a/...ocs/CreateFeatureArrayFromElementArray.md → ...eateFeatureArrayFromElementArrayFilter.md b/...ocs/CreateFeatureArrayFromElementArray.md → ...eateFeatureArrayFromElementArrayFilter.md
diff --git a/...nxCore/docs/FindNeighborListStatistics.md → .../docs/FindNeighborListStatisticsFilter.md b/...nxCore/docs/FindNeighborListStatistics.md → .../docs/FindNeighborListStatisticsFilter.md
diff --git a/...Plugins/SimplnxCore/docs/FindNeighbors.md → ...s/SimplnxCore/docs/FindNeighborsFilter.md b/...Plugins/SimplnxCore/docs/FindNeighbors.md → ...s/SimplnxCore/docs/FindNeighborsFilter.md
diff --git a/src/Plugins/SimplnxCore/docs/MoveData.md → ...lugins/SimplnxCore/docs/MoveDataFilter.md b/src/Plugins/SimplnxCore/docs/MoveData.md → ...lugins/SimplnxCore/docs/MoveDataFilter.md
diff --git a/...ugins/SimplnxCore/docs/ReadHDF5Dataset.md → ...SimplnxCore/docs/ReadHDF5DatasetFilter.md b/...ugins/SimplnxCore/docs/ReadHDF5Dataset.md → ...SimplnxCore/docs/ReadHDF5DatasetFilter.md
diff --git a/...SimplnxCore/docs/RemoveFlaggedVertices.md → ...xCore/docs/RemoveFlaggedVerticesFilter.md b/...SimplnxCore/docs/RemoveFlaggedVertices.md → ...xCore/docs/RemoveFlaggedVerticesFilter.md
diff --git a/...gins/SimplnxCore/docs/RenameDataObject.md → ...implnxCore/docs/RenameDataObjectFilter.md b/...gins/SimplnxCore/docs/RenameDataObject.md → ...implnxCore/docs/RenameDataObjectFilter.md
diff --git a/...plnxCore/docs/RobustAutomaticThreshold.md → ...re/docs/RobustAutomaticThresholdFilter.md b/...plnxCore/docs/RobustAutomaticThreshold.md → ...re/docs/RobustAutomaticThresholdFilter.md
diff --git a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline
@@ -83,7 +83,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CreateDataArray",
+        "name": "simplnx::CreateDataArrayFilter",
         "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d"
       },
       "isDisabled": false

diff --git a/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline
@@ -16,7 +16,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CreateDataArray",
+        "name": "simplnx::CreateDataArrayFilter",
         "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d"
       },
       "isDisabled": false
@@ -35,7 +35,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CreateDataArray",
+        "name": "simplnx::CreateDataArrayFilter",
         "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d"
       },
       "isDisabled": false
@@ -54,7 +54,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CreateDataArray",
+        "name": "simplnx::CreateDataArrayFilter",
         "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d"
       },
       "isDisabled": false

diff --git a/src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline
@@ -70,7 +70,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::FindNeighbors",
+        "name": "simplnx::FindNeighborsFilter",
         "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
       },
       "isDisabled": false

diff --git a/src/Plugins/SimplnxCore/pipelines/Import_ASCII.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_ASCII.d3dpipeline
@@ -126,7 +126,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "complex::CreateDataArray",
+        "name": "complex::CreateDataArrayFilter",
         "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d"
       },
       "isDisabled": false

diff --git a/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline
@@ -43,7 +43,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CreateDataArray",
+        "name": "simplnx::CreateDataArrayFilter",
         "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d"
       },
       "isDisabled": true

diff --git a/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline
@@ -275,7 +275,7 @@
               },
               "comments": "",
               "filter": {
-                "name": "simplnx::FindNeighbors",
+                "name": "simplnx::FindNeighborsFilter",
                 "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
               },
               "isDisabled": false
@@ -352,7 +352,7 @@
               },
               "comments": "",
               "filter": {
-                "name": "simplnx::FindNeighbors",
+                "name": "simplnx::FindNeighborsFilter",
                 "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
               },
               "isDisabled": false