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 <[email protected]> --------- Signed-off-by: Michael Jackson <[email protected]>
BlueQuartzSoftware · Nov 21, 2023 · 0e847aa · 0e847aa
1 parent 12ef18c
commit 0e847aa
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 30 deletions.
diff --git 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
+}
diff --git 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<CalculatorParameter>(k_CalculatorParameter_Key, "Infix Expression", "The mathematical expression used to calculate the output array", CalculatorParameter::ValueType{}));
+  params.insert(
+      std::make_unique<CalculatorParameter>(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<NumericTypeParameter>(k_ScalarType_Key, "Output Numeric Type", "The data type of the calculated array", NumericType::float64));
   params.insert(std::make_unique<ArrayCreationParameter>(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
@@ -69,8 +69,8 @@ Parameters ErodeDilateBadDataFilter::parameters() const
                                                           ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}}));
 
   params.insert(std::make_unique<MultiArraySelectionParameter>(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
@@ -61,8 +61,8 @@ Parameters ErodeDilateCoordinationNumberFilter::parameters() const
                                                           ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}}));
 
   params.insert(std::make_unique<MultiArraySelectionParameter>(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
@@ -81,8 +81,8 @@ Parameters RemoveFlaggedFeaturesFilter::parameters() const
   params.insert(std::make_unique<ArraySelectionParameter>(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<MultiArraySelectionParameter>(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<uint64>(to_underlying(Functionality::Extract)));