From 0e847aa3db0299537f3108f632e6361fd5379fc3 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Tue, 21 Nov 2023 13:00:30 -0500 Subject: [PATCH] BUG: ErodeDilateBadData - Fix initialization of ignored data arrays. (#771) * BUG: ErodeDilateBadData - Fix initialization of ignored data arrays. * Fix bad pipeline. Signed-off-by: Michael Jackson --------- Signed-off-by: Michael Jackson --- .../ResampleRectGridToImageGeom.d3dpipeline | 40 ++++++++----------- .../Filters/ArrayCalculatorFilter.cpp | 3 +- .../Filters/ErodeDilateBadDataFilter.cpp | 4 +- .../ErodeDilateCoordinationNumberFilter.cpp | 4 +- .../Filters/RemoveFlaggedFeaturesFilter.cpp | 4 +- 5 files changed, 25 insertions(+), 30 deletions(-) diff --git a/src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline b/src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline index 0231a09463..55e16613fe 100644 --- a/src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline @@ -6,38 +6,32 @@ { "args": { "created_data_group": "Bounds", - "selected_data_group": "", - "tuple_dimensions": [ - [ - 14.0 - ] - ], - "use_existing_group": false, - "wizard_data": { - "Begin Index": 2, - "Comma As Delimiter": true, + "read_csv_data": { "Consecutive Delimiters": false, - "Data Headers": [ - "x", - "y", - "z" - ], + "Custom Headers": null, "Data Types": [ 8, 8, 8 ], "Delimiters": [ - 44 + "," ], "Header Line": 1, "Header Mode": 0, "Input File Path": "Data/ASCIIData/RectilinearGrid.csv", - "Number of Lines": 15, - "Semicolon As Delimiter": false, - "Space As Delimiter": false, - "Tab As Delimiter": false - } + "Skipped Array Mask": [ + false, + false, + false + ], + "Start Import Row": 2, + "Tuple Dimensions": [ + 14 + ] + }, + "selected_data_group": "", + "use_existing_group": false }, "comments": "", "filter": { @@ -266,5 +260,5 @@ "isDisabled": false } ], - "workflowParams": [] -} + "version": 1 +} \ No newline at end of file diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.cpp index 94842ce485..0a2272b392 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.cpp @@ -51,7 +51,8 @@ Parameters ArrayCalculatorFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_CalculatorParameter_Key, "Infix Expression", "The mathematical expression used to calculate the output array", CalculatorParameter::ValueType{})); + params.insert( + std::make_unique(k_CalculatorParameter_Key, "Infix Expression", "The mathematical expression used to calculate the output array", CalculatorParameter::ValueType{})); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert(std::make_unique(k_ScalarType_Key, "Output Numeric Type", "The data type of the calculated array", NumericType::float64)); params.insert(std::make_unique(k_CalculatedArray_Key, "Output Calculated Array", "The path to the calculated array", DataPath{})); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateBadDataFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateBadDataFilter.cpp index 4138d62baa..a6529dd16f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateBadDataFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateBadDataFilter.cpp @@ -69,8 +69,8 @@ Parameters ErodeDilateBadDataFilter::parameters() const ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_IgnoredDataArrayPaths_Key, "Attribute Arrays to Ignore", "The list of arrays to ignore when performing the algorithm", - MultiArraySelectionParameter::ValueType{DataPath(), DataPath(), DataPath()}, - MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, MultiArraySelectionParameter::AllowedDataTypes{})); + MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, + MultiArraySelectionParameter::AllowedDataTypes{})); return params; } diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateCoordinationNumberFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateCoordinationNumberFilter.cpp index 9b8a44acbb..f9a91e8b7e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateCoordinationNumberFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateCoordinationNumberFilter.cpp @@ -61,8 +61,8 @@ Parameters ErodeDilateCoordinationNumberFilter::parameters() const ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_IgnoredDataArrayPaths_Key, "Attribute Arrays to Ignore", "The list of arrays to ignore when performing the algorithm", - MultiArraySelectionParameter::ValueType{DataPath(), DataPath(), DataPath()}, - MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, MultiArraySelectionParameter::AllowedDataTypes{})); + MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, + MultiArraySelectionParameter::AllowedDataTypes{})); return params; } diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedFeaturesFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedFeaturesFilter.cpp index 1512ecbf36..fca42e4777 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedFeaturesFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedFeaturesFilter.cpp @@ -81,8 +81,8 @@ Parameters RemoveFlaggedFeaturesFilter::parameters() const params.insert(std::make_unique(k_FlaggedFeaturesArrayPath_Key, "Flagged Features", "Specifies whether the Feature will remain in the structure or not", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_IgnoredDataArrayPaths_Key, "Attribute Arrays to Ignore", "The list of arrays to ignore when removing flagged features", - MultiArraySelectionParameter::ValueType{DataPath(), DataPath(), DataPath()}, - MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, complex::GetAllDataTypes())); + MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, + complex::GetAllDataTypes())); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_Functionality_Key, k_CreatedImageGeometryPrefix_Key, std::make_any(to_underlying(Functionality::Extract)));