Fix example pipelines, python files, unit tests.

Signed-off-by: Joey Kleingers <[email protected]>
BlueQuartzSoftware · Sep 10, 2024 · cbb18a8 · cbb18a8
1 parent 08cac99
commit cbb18a8
Show file tree

Hide file tree

Showing 42 changed files with 646 additions and 246 deletions.
diff --git a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline
@@ -6,8 +6,15 @@
     {
       "args": {
         "cell_attribute_matrix_name": "Cell Data",
+        "change_image_data_type": false,
+        "color_weights": [
+          0.21250000596046448,
+          0.715399980545044,
+          0.07209999859333038
+        ],
+        "convert_to_gray_scale": false,
         "image_data_array_name": "ImageData",
-        "output_image_geometry_path": "ImageDataContainer",
+        "image_data_type_index": 0,
         "image_transform_index": 0,
         "input_file_list_object": {
           "end_index": 174,
@@ -25,6 +32,9 @@
           0.0,
           0.0
         ],
+        "output_image_geometry_path": "ImageDataContainer",
+        "scale_images": false,
+        "scaling": 1.0,
         "spacing": [
           1.0,
           1.0,
@@ -33,7 +43,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::ITKImportImageStack",
+        "name": "nx::core::ITKImportImageStackFilter",
         "uuid": "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb"
       },
       "isDisabled": false
@@ -55,11 +65,16 @@
           "type": "collection",
           "union": 0
         },
-        "output_data_array_name": "Mask"
+        "created_mask_type": 10,
+        "custom_false_value": 0.0,
+        "custom_true_value": 1.0,
+        "output_data_array_name": "Mask",
+        "use_custom_false_value": false,
+        "use_custom_true_value": false
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::MultiThresholdObjects",
+        "name": "nx::core::MultiThresholdObjectsFilter",
         "uuid": "4246245e-1011-4add-8436-0af6bed19228"
       },
       "isDisabled": false
@@ -69,16 +84,16 @@
         "active_array_name": "Active",
         "cell_feature_group_name": "Cell Feature Data",
         "feature_ids_name": "FeatureIds",
-        "input_image_geometry_path": "ImageDataContainer",
         "input_array_path": "ImageDataContainer/Cell Data/ImageData",
+        "input_image_geometry_path": "ImageDataContainer",
         "mask_path": "ImageDataContainer/Cell Data/Mask",
         "randomize_features": true,
         "scalar_tolerance": 0,
         "use_mask": true
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::ScalarSegmentFeaturesFilter",
+        "name": "nx::core::ScalarSegmentFeaturesFilter",
         "uuid": "e067cd97-9bbf-4c92-89a6-3cb4fdb76c93"
       },
       "isDisabled": false
@@ -95,7 +110,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::ComputeFeatureSizesFilter",
+        "name": "nx::core::ComputeFeatureSizesFilter",
         "uuid": "c666ee17-ca58-4969-80d0-819986c72485"
       },
       "isDisabled": false
@@ -104,49 +119,66 @@
       "args": {
         "created_array_suffix": "",
         "feature_ids_path": "ImageDataContainer/Cell Data/FeatureIds",
-        "selected_feature_array_paths": ["ImageDataContainer/Cell Feature Data/EquivalentDiameters"]
+        "selected_feature_array_paths": [
+          "ImageDataContainer/Cell Feature Data/EquivalentDiameters"
+        ]
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CopyFeatureArrayToElementArrayFilter",
+        "name": "nx::core::CopyFeatureArrayToElementArrayFilter",
         "uuid": "4c8c976a-993d-438b-bd8e-99f71114b9a1"
       },
       "isDisabled": false
     },
     {
       "args": {
-        "set_tuple_dimensions": false,
-        "component_count": 1,
+        "component_dimensions": [
+          [
+            1.0
+          ]
+        ],
         "data_format": "",
-        "initialization_value_str": "1",
+        "init_end_range": "1;1;1",
+        "init_start_range": "0;0;0",
+        "init_type_index": 0,
+        "init_value": "1",
         "numeric_type_index": 4,
         "output_array_path": "ImageDataContainer/Cell Data/Phases",
+        "seed_array_name": "InitializeDataFilter SeedValue",
+        "seed_value": 5489,
+        "set_tuple_dimensions": false,
+        "standardize_seed": false,
+        "starting_fill_value": "0;1;2",
+        "step_operation_index": 0,
+        "step_value": "1;1;1",
         "tuple_dimensions": [
           [
             164.0,
             390.0,
             524.0
           ]
-        ]
+        ],
+        "use_seed": false
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CreateDataArrayFilter",
+        "name": "nx::core::CreateDataArrayFilter",
         "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d"
       },
       "isDisabled": false
     },
     {
       "args": {
         "conditional_array_path": "ImageDataContainer/Cell Data/Mask",
+        "invert_mask": false,
         "remove_value": "0",
         "replace_value": "2",
         "selected_array_path": "ImageDataContainer/Cell Data/Phases",
         "use_conditional": true
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::ConditionalSetValueFilter",
+        "name": "nx::core::ConditionalSetValueFilter",
         "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881"
       },
       "isDisabled": false
@@ -160,7 +192,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::ComputeFeaturePhasesFilter",
+        "name": "nx::core::ComputeFeaturePhasesFilter",
         "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc"
       },
       "isDisabled": false
@@ -174,7 +206,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::ComputeFeatureCentroidsFilter",
+        "name": "nx::core::ComputeFeatureCentroidsFilter",
         "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421"
       },
       "isDisabled": false
@@ -190,7 +222,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::CreateAttributeMatrixFilter",
+        "name": "nx::core::CreateAttributeMatrixFilter",
         "uuid": "a6a28355-ee69-4874-bcac-76ed427423ed"
       },
       "isDisabled": false
@@ -202,11 +234,12 @@
       },
       "comments": "",
       "filter": {
-        "name": "simplnx::WriteDREAM3DFilter",
+        "name": "nx::core::WriteDREAM3DFilter",
         "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003"
       },
       "isDisabled": false
     }
   ],
+  "version": 1,
   "workflowParams": []
 }
diff --git a/src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline
@@ -1,17 +1,20 @@
 {
   "isDisabled": false,
-  "name": "(04) Porosity Analysis",
+  "name": "(04) Porosity Analysis.d3dpipeline",
+  "pinnedParams": [],
   "pipeline": [
     {
       "args": {
         "cell_attribute_matrix_name": "Optical Data",
+        "change_image_data_type": false,
         "color_weights": [
           0.21250000596046448,
           0.715399980545044,
           0.07209999859333038
         ],
         "convert_to_gray_scale": false,
         "image_data_array_name": "ImageData",
+        "image_data_type_index": 0,
         "image_transform_index": 0,
         "input_file_list_object": {
           "end_index": 174,
@@ -30,6 +33,8 @@
           0.0
         ],
         "output_image_geometry_path": "RoboMet.3D Image Stack",
+        "scale_images": false,
+        "scaling": 1.0,
         "spacing": [
           1.0,
           1.0,
@@ -127,17 +132,31 @@
     },
     {
       "args": {
-        "component_count": 1,
+        "component_dimensions": [
+          [
+            1.0
+          ]
+        ],
         "data_format": "",
-        "initialization_value_str": "1",
+        "init_end_range": "1;1;1",
+        "init_start_range": "0;0;0",
+        "init_type_index": 0,
+        "init_value": "1",
         "numeric_type_index": 4,
         "output_array_path": "RoboMet.3D Image Stack/Optical Data/Phases",
+        "seed_array_name": "InitializeDataFilter SeedValue",
+        "seed_value": 5489,
         "set_tuple_dimensions": false,
+        "standardize_seed": false,
+        "starting_fill_value": "0;1;2",
+        "step_operation_index": 0,
+        "step_value": "1;1;1",
         "tuple_dimensions": [
           [
             0.0
           ]
-        ]
+        ],
+        "use_seed": false
       },
       "comments": "",
       "filter": {
@@ -212,7 +231,6 @@
         "cell_ensemble_attribute_matrix_path": "RoboMet.3D Image Stack/Ensemble Data",
         "centroids_array_path": "RoboMet.3D Image Stack/Pore Data/Centroids",
         "clustering_list_array_name": "ClusteringList",
-        "equivalent_diameters_array_path": "RoboMet.3D Image Stack/Pore Data/EquivalentDiameters",
         "feature_phases_array_path": "RoboMet.3D Image Stack/Pore Data/Phases",
         "input_image_geometry_path": "RoboMet.3D Image Stack",
         "max_min_array_name": "RDFMaxMinDistances",
@@ -244,5 +262,6 @@
       "isDisabled": false
     }
   ],
-  "version": 1
-}
+  "version": 1,
+  "workflowParams": []
+}