From cbb18a8ea08c9a91073ab359c7c4933388259bae Mon Sep 17 00:00:00 2001 From: Joey Kleingers Date: Sat, 7 Sep 2024 11:55:59 -0400 Subject: [PATCH] Fix example pipelines, python files, unit tests. Signed-off-by: Joey Kleingers --- .../(02) Image Segmentation.d3dpipeline | 71 ++++++++++---- .../(04) Porosity Analysis.d3dpipeline | 33 +++++-- .../pipelines/EnsembleInfoReader.d3dpipeline | 41 +++++--- .../ApplyTransformation_Demo.d3dpipeline | 28 ++++-- .../ArrayCalculatorExample.d3dpipeline | 95 ++++++++++++++----- .../pipelines/CreateEdgeGeom.d3dpipeline | 40 ++++++-- .../CreateHexahedralGeom.d3dpipeline | 40 ++++++-- .../pipelines/CreateImageGeom.d3dpipeline | 40 ++++++-- .../pipelines/CreateQuadGeom.d3dpipeline | 40 ++++++-- .../pipelines/CreateRectGridGeom.d3dpipeline | 40 ++++++-- .../CreateTetrahedralGeom.d3dpipeline | 40 ++++++-- .../pipelines/CreateTriangleGeom.d3dpipeline | 40 ++++++-- .../pipelines/CreateVertexGeom.d3dpipeline | 40 ++++++-- .../pipelines/Import_CSV_File.d3dpipeline | 44 ++++++--- .../pipelines/Import_STL_Model.d3dpipeline | 38 ++++++-- .../Filters/CreateDataArrayFilter.cpp | 14 +-- .../Filters/CreateDataArrayFilter.hpp | 1 - .../SimplnxCore/test/DREAM3DFileTest.cpp | 4 +- .../Filters/CreateOutOfCoreArrayFilter.hpp | 2 +- wrapping/python/docs/source/DataObjects.rst | 17 ++-- .../docs/source/Python_Introduction.rst | 24 ++--- wrapping/python/docs/source/Tutorial_1.rst | 4 +- wrapping/python/docs/source/Tutorial_2.rst | 2 +- .../source/release_notes/ReleaseNotes_121.rst | 4 +- .../examples/notebooks/angle_conversion.ipynb | 4 +- .../examples/notebooks/basic_arrays.ipynb | 12 +-- .../examples/notebooks/basic_numpy.ipynb | 4 +- .../notebooks/create_image_geom.ipynb | 4 +- .../examples/notebooks/output_file.ipynb | 4 +- .../python/examples/notebooks/pipeline.ipynb | 4 +- .../02_Image_Segmentation.py | 4 +- .../Simplnx/ApplyTransformation_Demo.py | 4 +- .../Simplnx/ArrayCalculatorExample.py | 12 +-- .../pipelines/Simplnx/EnsembleInfoReader.py | 4 +- .../pipelines/Simplnx/Import_ASCII.py | 4 +- .../pipelines/Simplnx/Import_STL_Model.py | 4 +- .../examples/scripts/angle_conversion.py | 6 +- .../python/examples/scripts/basic_arrays.py | 12 +-- .../python/examples/scripts/basic_numpy.py | 4 +- .../examples/scripts/geometry_examples.py | 60 ++++++------ .../python/examples/scripts/output_file.py | 2 +- .../src/ExamplePlugin/CreateArray.py | 2 +- 42 files changed, 646 insertions(+), 246 deletions(-) diff --git a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline index 7f8e440c19..4dfaaa6265 100644 --- 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,8 +84,8 @@ "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, @@ -78,7 +93,7 @@ }, "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,34 +119,50 @@ "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 @@ -139,6 +170,7 @@ { "args": { "conditional_array_path": "ImageDataContainer/Cell Data/Mask", + "invert_mask": false, "remove_value": "0", "replace_value": "2", "selected_array_path": "ImageDataContainer/Cell Data/Phases", @@ -146,7 +178,7 @@ }, "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 index 3d578c5843..df3d581637 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline @@ -1,10 +1,12 @@ { "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, @@ -12,6 +14,7 @@ ], "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 -} \ No newline at end of file + "version": 1, + "workflowParams": [] +} diff --git a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline index eab706dee4..d56394ae55 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline @@ -1,6 +1,6 @@ { "isDisabled": false, - "name": "ReadEnsembleInfo.d3dpipeline", + "name": "EnsembleInfoReader.d3dpipeline", "pinnedParams": [], "pipeline": [ { @@ -11,12 +11,12 @@ 100, 2 ], - "output_image_geometry_path": "[Image Geometry]", "origin": [ 0.0, 0.0, 0.0 ], + "output_image_geometry_path": "[Image Geometry]", "spacing": [ 1.0, 1.0, @@ -25,7 +25,7 @@ }, "comments": "", "filter": { - "name": "simplnx::CreateImageGeometryFilter", + "name": "nx::core::CreateImageGeometryFilter", "uuid": "c4320659-1a84-461d-939e-c7c10229a504" }, "isDisabled": false @@ -48,7 +48,7 @@ }, "comments": "", "filter": { - "name": "simplnx::ReadRawBinaryFilter", + "name": "nx::core::ReadRawBinaryFilter", "uuid": "dd159366-5f12-42db-af6d-a33592ae8a89" }, "isDisabled": false @@ -62,28 +62,44 @@ }, "comments": "", "filter": { - "name": "simplnx::ConvertOrientations", + "name": "nx::core::ConvertOrientationsFilter", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false }, { "args": { - "component_count": 1, - "initialization_value_str": "1", + "component_dimensions": [ + [ + 1.0 + ] + ], + "data_format": "", + "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": "[Image Geometry]/Cell Data/Phases", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, + "set_tuple_dimensions": true, + "standardize_seed": false, + "starting_fill_value": "0;1;2", + "step_operation_index": 0, + "step_value": "1;1;1", "tuple_dimensions": [ [ 2.0, 100.0, 100.0 ] - ] + ], + "use_seed": false }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false @@ -98,7 +114,7 @@ }, "comments": "", "filter": { - "name": "simplnx::ReadEnsembleInfoFilter", + "name": "nx::core::ReadEnsembleInfoFilter", "uuid": "ecf1ec45-bc27-4ddb-b2c0-3d465b8c182a" }, "isDisabled": false @@ -119,7 +135,7 @@ }, "comments": "", "filter": { - "name": "simplnx::ComputeIPFColorsFilter", + "name": "nx::core::ComputeIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -131,11 +147,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/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline index 0df9fc92ba..0508c4f30a 100644 --- a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline @@ -1,6 +1,7 @@ { "isDisabled": false, - "name": "Apply Transformation To Geometry Demo", + "name": "ApplyTransformation_Demo.d3dpipeline", + "pinnedParams": [], "pipeline": [ { "args": { @@ -47,19 +48,33 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "2", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "2", "numeric_type_index": 4, "output_array_path": "Geometry/Cell Data/Data", + "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": [ [ 2.0, 10.0, 10.0 ] - ] + ], + "use_seed": false }, "comments": "", "filter": { @@ -127,5 +142,6 @@ "isDisabled": false } ], - "version": 1 -} \ No newline at end of file + "version": 1, + "workflowParams": [] +} diff --git a/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline index 51e5b64ebc..ea5c0e5ffa 100644 --- a/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline @@ -1,60 +1,109 @@ { "isDisabled": false, - "name": "Untitled Pipeline", + "name": "ArrayCalculatorExample.d3dpipeline", + "pinnedParams": [], "pipeline": [ { "args": { - "component_count": 1, - "initialization_value_str": "2", + "component_dimensions": [ + [ + 1.0 + ] + ], + "data_format": "", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "2", "numeric_type_index": 4, "output_array_path": "TestArray", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, + "set_tuple_dimensions": true, + "standardize_seed": false, + "starting_fill_value": "0;1;2", + "step_operation_index": 0, + "step_value": "1;1;1", "tuple_dimensions": [ [ 10.0 ] - ] + ], + "use_seed": false }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false }, { "args": { - "component_count": 1, - "initialization_value_str": "1.23878", + "component_dimensions": [ + [ + 1.0 + ] + ], + "data_format": "", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "1.23878", "numeric_type_index": 8, "output_array_path": "Confidence Index", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, + "set_tuple_dimensions": true, + "standardize_seed": false, + "starting_fill_value": "0;1;2", + "step_operation_index": 0, + "step_value": "1;1;1", "tuple_dimensions": [ [ 10.0 ] - ] + ], + "use_seed": false }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false }, { "args": { - "component_count": 3, - "initialization_value_str": "1.23878", + "component_dimensions": [ + [ + 3.0 + ] + ], + "data_format": "", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "1.23878", "numeric_type_index": 8, "output_array_path": "EulerAngles", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, + "set_tuple_dimensions": true, + "standardize_seed": false, + "starting_fill_value": "0;1;2", + "step_operation_index": 0, + "step_value": "1;1;1", "tuple_dimensions": [ [ 10.0 ] - ] + ], + "use_seed": false }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false @@ -71,7 +120,7 @@ }, "comments": "", "filter": { - "name": "simplnx::ArrayCalculatorFilter", + "name": "nx::core::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false @@ -88,7 +137,7 @@ }, "comments": "", "filter": { - "name": "simplnx::ArrayCalculatorFilter", + "name": "nx::core::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false @@ -105,7 +154,7 @@ }, "comments": "", "filter": { - "name": "simplnx::ArrayCalculatorFilter", + "name": "nx::core::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false @@ -122,7 +171,7 @@ }, "comments": "", "filter": { - "name": "simplnx::ArrayCalculatorFilter", + "name": "nx::core::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false @@ -139,7 +188,7 @@ }, "comments": "", "filter": { - "name": "simplnx::ArrayCalculatorFilter", + "name": "nx::core::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false @@ -156,7 +205,7 @@ }, "comments": "", "filter": { - "name": "simplnx::ArrayCalculatorFilter", + "name": "nx::core::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false @@ -168,10 +217,12 @@ }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } - ] -} \ No newline at end of file + ], + "version": 1, + "workflowParams": [] +} diff --git a/src/Plugins/SimplnxCore/pipelines/CreateEdgeGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateEdgeGeom.d3dpipeline index 29ee3bb56b..bc4b558153 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateEdgeGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateEdgeGeom.d3dpipeline @@ -155,17 +155,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 4, "output_array_path": "Geometry/Edge Data/Int32Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { @@ -198,17 +212,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 6, "output_array_path": "Geometry/Edge Data/Int64Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { diff --git a/src/Plugins/SimplnxCore/pipelines/CreateHexahedralGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateHexahedralGeom.d3dpipeline index 3878797320..c70a6e08db 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateHexahedralGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateHexahedralGeom.d3dpipeline @@ -173,17 +173,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 4, "output_array_path": "Geometry/Cell Data/Int32Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { @@ -216,17 +230,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 6, "output_array_path": "Geometry/Cell Data/Int64Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { diff --git a/src/Plugins/SimplnxCore/pipelines/CreateImageGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateImageGeom.d3dpipeline index de5010f239..acffcbbb2f 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateImageGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateImageGeom.d3dpipeline @@ -48,17 +48,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 4, "output_array_path": "Image Geometry/Cell Data/Int32Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { @@ -91,17 +105,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 6, "output_array_path": "Image Geometry/Cell Data/Int64Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { diff --git a/src/Plugins/SimplnxCore/pipelines/CreateQuadGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateQuadGeom.d3dpipeline index 22e07a97bb..7d805a4447 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateQuadGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateQuadGeom.d3dpipeline @@ -161,17 +161,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 4, "output_array_path": "Geometry/Face Data/Int32Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { @@ -204,17 +218,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 6, "output_array_path": "Geometry/Face Data/Int64Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { diff --git a/src/Plugins/SimplnxCore/pipelines/CreateRectGridGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateRectGridGeom.d3dpipeline index 43f2b04b90..ab5102a93f 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateRectGridGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateRectGridGeom.d3dpipeline @@ -85,17 +85,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 4, "output_array_path": "Geometry/Cell Data/Int32Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { @@ -128,17 +142,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 6, "output_array_path": "Geometry/Cell Data/Int64Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { diff --git a/src/Plugins/SimplnxCore/pipelines/CreateTetrahedralGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateTetrahedralGeom.d3dpipeline index c1237a6ee9..44719460ff 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateTetrahedralGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateTetrahedralGeom.d3dpipeline @@ -161,17 +161,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 4, "output_array_path": "Geometry/Cell Data/Int32Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { @@ -204,17 +218,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 6, "output_array_path": "Geometry/Cell Data/Int64Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { diff --git a/src/Plugins/SimplnxCore/pipelines/CreateTriangleGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateTriangleGeom.d3dpipeline index fe4a137f90..efbf97feb7 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateTriangleGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateTriangleGeom.d3dpipeline @@ -158,17 +158,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 4, "output_array_path": "Geometry/Face Data/Int32Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { @@ -201,17 +215,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 6, "output_array_path": "Geometry/Face Data/Int64Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { diff --git a/src/Plugins/SimplnxCore/pipelines/CreateVertexGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CreateVertexGeom.d3dpipeline index f461a6c40a..bdaa18160c 100644 --- a/src/Plugins/SimplnxCore/pipelines/CreateVertexGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CreateVertexGeom.d3dpipeline @@ -103,17 +103,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 4, "output_array_path": "Geometry/Vertex Data/Int32Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { @@ -146,17 +160,31 @@ }, { "args": { - "component_count": 1, + "component_dimensions": [ + [ + 1.0 + ] + ], "data_format": "", - "initialization_value_str": "0", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 6, "output_array_path": "Geometry/Vertex Data/Int64Array", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { diff --git a/src/Plugins/SimplnxCore/pipelines/Import_CSV_File.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_CSV_File.d3dpipeline index 3c24c32fac..2945eda819 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_CSV_File.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_CSV_File.d3dpipeline @@ -1,6 +1,7 @@ { "isDisabled": false, - "name": "Import CSV File", + "name": "Import_CSV_File.d3dpipeline", + "pinnedParams": [], "pipeline": [ { "args": { @@ -72,7 +73,7 @@ 480000 ] }, - "selected_attribute_matrix_path": "[Image Geometry]/Cell Data/", + "selected_attribute_matrix_path": "[Image Geometry]/Cell Data", "use_existing_group": true }, "comments": "", @@ -85,9 +86,9 @@ { "args": { "input_data_array_paths": [ - "[Image Geometry]/Cell Data//phi1", - "[Image Geometry]/Cell Data//Phi", - "[Image Geometry]/Cell Data//phi2" + "[Image Geometry]/Cell Data/phi1", + "[Image Geometry]/Cell Data/Phi", + "[Image Geometry]/Cell Data/phi2" ], "move_values": true, "normalize_data": false, @@ -123,17 +124,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": "[Image Geometry]/Cell Data//Phases", + "output_array_path": "[Image Geometry]/Cell Data/Phases", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, "set_tuple_dimensions": true, + "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": { @@ -144,9 +159,9 @@ }, { "args": { - "cell_euler_angles_array_path": "[Image Geometry]/Cell Data//Eulers", + "cell_euler_angles_array_path": "[Image Geometry]/Cell Data/Eulers", "cell_ipf_colors_array_name": "IPFColors", - "cell_phases_array_path": "[Image Geometry]/Cell Data//Phases", + "cell_phases_array_path": "[Image Geometry]/Cell Data/Phases", "crystal_structures_array_path": "[Image Geometry]/EnsembleAttributeMatrix/CrystalStructures", "mask_array_path": "", "reference_dir": [ @@ -166,7 +181,7 @@ { "args": { "file_name": "Data/Output/Import_CSV_Example/Import_ASCII_IPF.png", - "image_array_path": "[Image Geometry]/Cell Data//IPFColors", + "image_array_path": "[Image Geometry]/Cell Data/IPFColors", "index_offset": 0, "input_image_geometry_path": "[Image Geometry]", "plane_index": 0 @@ -179,5 +194,6 @@ "isDisabled": false } ], - "version": 1 -} \ No newline at end of file + "version": 1, + "workflowParams": [] +} diff --git a/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline index ddbb0fc4f3..657b7a4047 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline @@ -5,49 +5,69 @@ "pipeline": [ { "args": { + "face_attribute_matrix_name": "Face Data", + "face_normals_name": "Face Normals", "output_triangle_geometry_path": "[Triangle Geometry]", "scale_factor": 1.0, "scale_output": false, - "stl_file_path": "Data/STL_Models/Cylinder.stl" + "stl_file_path": "Data/STL_Models/Cylinder.stl", + "vertex_attribute_matrix_name": "Vertex Data" }, "comments": "", "filter": { - "name": "simplnx::ReadStlFileFilter", + "name": "nx::core::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false }, { "args": { - "triangle_areas_array_name": "Areas", - "input_triangle_geometry_path": "[Triangle Geometry]" + "input_triangle_geometry_path": "[Triangle Geometry]", + "triangle_areas_array_name": "Areas" }, "comments": "", "filter": { - "name": "simplnx::ComputeTriangleAreasFilter", + "name": "nx::core::ComputeTriangleAreasFilter", "uuid": "b149addd-c0c8-4010-a264-596005eaf2a5" }, "isDisabled": false }, { "args": { - "component_count": 1, - "initialization_value_str": "0", + "component_dimensions": [ + [ + 1.0 + ] + ], + "data_format": "", + "init_end_range": "1;1;1", + "init_start_range": "0;0;0", + "init_type_index": 0, + "init_value": "0", "numeric_type_index": 8, "output_array_path": "[Triangle Geometry]/Vertex Data/Node Type", + "seed_array_name": "InitializeDataFilter SeedValue", + "seed_value": 5489, + "set_tuple_dimensions": true, + "standardize_seed": false, + "starting_fill_value": "0;1;2", + "step_operation_index": 0, + "step_value": "1;1;1", "tuple_dimensions": [ [ 1.0 ] - ] + ], + "use_seed": false }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": true } ], + "version": 1, "workflowParams": [] } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp index af61b3ceba..e78c21c764 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp @@ -79,7 +79,7 @@ Parameters CreateDataArrayFilter::parameters() const DynamicTableInfo tableInfo; tableInfo.setRowsInfo(DynamicTableInfo::StaticVectorInfo(1)); tableInfo.setColsInfo(DynamicTableInfo::DynamicVectorInfo(1, "COMP DIM {}")); - params.insert(std::make_unique(k_CompDims_Key, "Data Array Component Dimensions (Slowest to Fastest Dimensions)", "Slowest to Fastest Dimensions.", tableInfo)); + params.insert(std::make_unique(k_CompDims_Key, "Data Array Component Dimensions (Slowest to Fastest Dimensions)", "Slowest to Fastest Component Dimensions.", tableInfo)); } params.insertSeparator(Parameters::Separator{"Initialization Options"}); @@ -90,20 +90,22 @@ Parameters CreateDataArrayFilter::parameters() const params.insert(std::make_unique(k_InitValue_Key, "Fill Values [Seperated with ;]", "Specify values for each component. Ex: A 3-component array would be 6;8;12 and every tuple would have these same component values", "1;1;1")); - params.insert(std::make_unique(k_StartingFillValue_Key, "Starting Value [Seperated with ;]", "The value to start incrementing from", "0;1;2")); - params.insert(std::make_unique(k_StepOperation_Key, "Step Operation", "The type of step operation to preform", static_cast(0), + params.insert(std::make_unique( + k_StartingFillValue_Key, "Starting Value [Seperated with ;]", + "The value to start incrementing from. Ex: 6;8;12 would increment a 3-component array starting at 6 for the first component, 8 for the 2nd, and 12 for the 3rd.", "0;1;2")); + params.insert(std::make_unique(k_StepOperation_Key, "Step Operation", "The type of step operation to perform", static_cast(0), ChoicesParameter::Choices{"Addition", "Subtraction"})); params.insert(std::make_unique(k_StepValue_Key, "Increment/Step Value [Seperated with ;]", "The number to increment/decrement the fill value by", "1;1;1")); - params.insert(std::make_unique(k_UseSeed_Key, "Use Seed for Random Generation", "When true the Seed Value will be used to seed the generator", false)); + params.insert(std::make_unique(k_UseSeed_Key, "Use Seed for Random Generation", "When true, the Seed Value will be used to seed the generator", false)); params.insert(std::make_unique>(k_SeedValue_Key, "Seed Value", "The seed fed into the random generator", std::mt19937::default_seed)); - params.insert(std::make_unique(k_SeedArrayName_Key, "Stored Seed Value Array Name", "Name of array holding the seed value", "InitializeDataFilter SeedValue")); + params.insert(std::make_unique(k_SeedArrayName_Key, "Stored Seed Value Array Name", "Name of the array holding the seed value", "InitializeDataFilter SeedValue")); params.insert(std::make_unique(k_StandardizeSeed_Key, "Use the Same Seed for Each Component", "When true the same seed will be used for each component's generator in a multi-component array", false)); params.insert( std::make_unique(k_InitStartRange_Key, "Initialization Start Range [Seperated with ;]", "[Inclusive] The lower bound initialization range for random values", "0;0;0")); - params.insert(std::make_unique(k_InitEndRange_Key, "Initialization End Range [Seperated with ;]", "[Inclusive] The upper bound initialization range for random values", "1;1;1")); + params.insert(std::make_unique(k_InitEndRange_Key, "Initialization End Range [Seperated with ;]", "[Inclusive] The upper bound initialization range for random values", "1;1;1")); params.insertSeparator(Parameters::Separator{"Output Data Array"}); params.insert(std::make_unique(k_DataPath_Key, "Created Array", "Array storing the data", DataPath{})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.hpp index 8ebcccdf62..bf225bc39d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.hpp @@ -23,7 +23,6 @@ class SIMPLNXCORE_EXPORT CreateDataArrayFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_NumericType_Key = "numeric_type_index"; static inline constexpr StringLiteral k_AdvancedOptions_Key = "set_tuple_dimensions"; - // static inline constexpr StringLiteral k_NumComps_Key = "component_count"; static inline constexpr StringLiteral k_CompDims_Key = "component_dimensions"; static inline constexpr StringLiteral k_TupleDims_Key = "tuple_dimensions"; static inline constexpr StringLiteral k_DataPath_Key = "output_array_path"; diff --git a/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp b/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp index 87fdc875e0..8c8cf99da8 100644 --- a/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp +++ b/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp @@ -160,10 +160,10 @@ Pipeline CreateExportPipeline() Arguments args; args.insert("set_tuple_dimensions", std::make_any(true)); args.insert("numeric_type_index", std::make_any(NumericType::int8)); - args.insert("component_count", std::make_any(3)); + args.insert("component_dimensions", DynamicTableInfo::TableDataType{{3.0}}); args.insert("tuple_dimensions", DynamicTableInfo::TableDataType{{1.0}}); - args.insert("initialization_value_str", std::make_any("7")); + args.insert("init_value", std::make_any("7")); args.insert("output_array_path", DataPath({DataNames::k_ArrayName})); args.insert("data_format", std::string("")); pipeline.push_back(k_CreateDataArrayHandle, args); diff --git a/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArrayFilter.hpp b/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArrayFilter.hpp index 0912ca8ea2..2b63c45269 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArrayFilter.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArrayFilter.hpp @@ -21,7 +21,7 @@ class TESTONE_EXPORT CreateOutOfCoreArray : public IFilter // Parameter Keys static inline constexpr StringLiteral k_NumericType_Key = "numeric_type_index"; - static inline constexpr StringLiteral k_NumComps_Key = "component_count"; + static inline constexpr StringLiteral k_NumComps_Key = "component_dimensions"; static inline constexpr StringLiteral k_TupleDims_Key = "tuple_dimensions"; static inline constexpr StringLiteral k_DataPath_Key = "output_array_path"; static inline constexpr StringLiteral k_InitilizationValue_Key = "initialization_value_str"; diff --git a/wrapping/python/docs/source/DataObjects.rst b/wrapping/python/docs/source/DataObjects.rst index 1c136ef08a..758951dbb0 100644 --- a/wrapping/python/docs/source/DataObjects.rst +++ b/wrapping/python/docs/source/DataObjects.rst @@ -297,12 +297,13 @@ and then print the name, tuple_dimensions and component_dims of the created DatA data_structure = nx.DataStructure() result = nx.CreateDataArrayFilter.execute(data_structure=data_structure, - component_count=3, - data_format="", - initialization_value="0", - numeric_type=nx.NumericType.float32, - output_data_array=nx.DataPath(["2D Array"]), - tuple_dimensions=[[4, 5]]) + component_dimensions=[[3]], + data_format="", + init_type_index=0, + init_value="0", + numeric_type_index=nx.NumericType.float32, + output_array_path=nx.DataPath(["2D Array"]), + tuple_dimensions=[[4, 5]]) data_array = data_structure[output_array_path] print(f'name: {data_array.name}') @@ -474,9 +475,9 @@ Pipeline create_data_array_args:dict = { "data_format": "", - "component_count":1, + "component_dimensions":[1], "initialization_value":"0", - "numeric_type":nx.NumericType.int8, + "numeric_type_index":nx.NumericType.int8, "output_data_array":nx.DataPath("Geometry/Cell Data/data"), "advanced_options": False, "tuple_dimensions": [[10,20,30]] diff --git a/wrapping/python/docs/source/Python_Introduction.rst b/wrapping/python/docs/source/Python_Introduction.rst index 752834b8fe..b2b65e23bb 100644 --- a/wrapping/python/docs/source/Python_Introduction.rst +++ b/wrapping/python/docs/source/Python_Introduction.rst @@ -77,10 +77,10 @@ An example of executing a file in immediate mode using a filter from the simplnx import simplnx as nx result = nx.CreateDataArrayFilter.execute(data_structure=data_structure, - component_count=1, + component_dimensions=[[1]], data_format="", initialization_value="10", - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, output_data_array=nx.DataPath(["3D Array"]), tuple_dimensions= [[3, 2, 5]]) npdata = data_structure[nx.DataPath(["3D Array"])].npview() @@ -130,10 +130,10 @@ of the method is as follows. # Instantiate and execute immediately teh CreateDataArrayFilter Filter result = nx.CreateDataArrayFilter.execute(data_structure=data_structure, - component_count=1, + component_dimensions=[[1]], data_format="", initialization_value="10", - numeric_type=nx.NumericType.float32, + numeric_type_index=nx.NumericType.float32, output_data_array=nx.DataPath(["3D Array"]), tuple_dimensions= [[3, 2, 5]]) # The returned result holds any warnings or errors that occurred during execution @@ -254,8 +254,8 @@ connectivity from a sample file. # Create the vertex array and fill it from data on disk array_path = nx.DataPath(['Vertices']) result = nx.CreateDataArrayFilter.execute(data_structure, - numeric_type=nx.NumericType.float32, - component_count=3, + numeric_type_index=nx.NumericType.float32, + component_dimensions=[[3]], tuple_dimensions=[[144]], output_data_array=array_path, initialization_value='0') @@ -266,8 +266,8 @@ connectivity from a sample file. # Create the triangle connectivity array and fill it from data on disk array_path = nx.DataPath(['Triangles']) result = nx.CreateDataArrayFilter.execute(data_structure, - numeric_type=nx.NumericType.uint64, - component_count=3, + numeric_type_index=nx.NumericType.uint64, + component_dimensions=[[3]], tuple_dimensions=[[242]], output_data_array=array_path, initialization_value='0') @@ -336,10 +336,10 @@ The next code section was take from `basic_arrays.py class CreateArrayFilter: NUMERIC_TYPE_KEY = "numeric_type_index" - INITILIZATION_VALUE_KEY = "initialization_value_str" + INITILIZATION_VALUE_KEY = "init_value" NUM_COMPS_KEY = "component_count" DATA_PATH_KEY = "output_array_path" TUPLE_DIMS_KEY = "tuple_dimensions"